Ticket #815: dict.patch

dict.meta

@@ -5 +5 @@
  (category net)
  (license "MIT")
  (doc-from-wiki)
- (depends defstruct md5 utf8)
+ (depends defstruct (md5 3.0.0) (message-digest 3.0.0) utf8)
  (test-depends test)
  (files "dict.release-info" "dict.meta" "dict.scm" "tests/example.scm" "tests/run.scm" "dict.setup"))

tests/run.scm

@@ -30 +30 @@
 ;; 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use test utf8 dict md5)
+(use test utf8 dict md5 message-digest)
 
 ;;some helpers
 (define (with-stubbed-io input proc)
@@ -224 +224 @@
                             (receive (s r) (!status con)
                               (list s r)))))
    ;;enable this once md5 has been ported to chicken 4
-    (define test-password (md5-digest (string-append "<test@example.org>" "test")))
+    (define test-password (message-digest-string (md5-primitive) (string-append "<test@example.org>" "test")))
 
     (test "authenticate success"
           `((output . ,(conc "AUTH test " test-password "\r\n"))

dict.scm

@@ -43 +43 @@
     !help !status !quit !announce-client !authenticate)
   
   (import scheme chicken)
-  (require-library tcp defstruct srfi-13 srfi-14 md5)
 
   (cond-expand
    (total-irregex
     (use irregex))
    (else
-    (require-library regex)
-    (import (rename irregex
-                    (irregex-match-start irregex-match-start-index)
-                    (irregex-match-end irregex-match-end-index)))
+    (use (rename irregex
+                 (irregex-match-start irregex-match-start-index)
+                 (irregex-match-end irregex-match-end-index)))
     (define irregex-num-submatches irregex-submatches)
     (define irregex-match-num-submatches irregex-submatches)
     (define (irregex-match-valid-index? m i)
@@ -78 +76 @@
     (define (maybe-string->sre obj)
       (if (string? obj) (string->sre obj) obj))))
   
-  (import tcp defstruct
-          (only md5 md5-digest) 
-          (only srfi-14 char-set:digit)
-          (only srfi-13 string-join string-index string-trim-right string-trim-both string-trim string-skip string-take string-drop)
-;          (only regex string-split-fields)
-          (only extras fprintf read-line)
-          (only data-structures alist-ref alist-update!))
+  (use tcp defstruct
+       (only md5 md5-primitive)
+       (only message-digest message-digest-string)
+       (only srfi-14 char-set:digit)
+       (only srfi-13 string-join string-index string-trim-right string-trim-both string-trim string-skip string-take string-drop)
+;      (only regex string-split-fields)
+       (only extras fprintf read-line)
+       (only data-structures alist-ref alist-update!))
           
 
   ;;add support for parsing mime-headers
@@ -454 +453 @@
        (status:authentication-successful? status)))
 
    (define (compute-password con password)
-     (md5-digest (string-append (connection-msg-id con) password)))
+     (message-digest-string (md5-primitive) (string-append (connection-msg-id con) password)))
 
 
   (define (connect server #!key (port (*default-port*)) (client "dict.egg for chicken scheme") (timeout #f))