rewrite

diff --git a/ChangeLog b/ChangeLog
index 653afeb..29cd5e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-02-17  Kenichi OKADA <okada@opaopa.org>
 
+       * sasl-scram.el(sasl-scram-md5-make-unique-nonce): Rewrite.
+
+2001-02-17  Kenichi OKADA <okada@opaopa.org>
+
        * sasl-scram.el: Add comment.
        (sasl-scram-md5-steps): New variable.
        (sasl-scram-md5-make-client-msg-1): Add optional nonce.

diff --git a/sasl-scram.el b/sasl-scram.el
index 142d679..f45e010 100644 (file)
--- a/sasl-scram.el
+++ b/sasl-scram.el
@@ -97,12 +97,10 @@
 (defun sasl-scram-md5-make-unique-nonce ()     ; 8*OCTET, globally unique.
   ;; For example, concatenated string of process-identifier, system-clock,
   ;; sequence-number, random-number, and domain-name.
-  (let ((sasl-unique-id-function sasl-scram-md5-unique-id-function)
-       id)
+  (let* ((sasl-unique-id-function sasl-scram-md5-unique-id-function)
+        (id (sasl-unique-id)))
     (unwind-protect
-       (concat "<" 
-               (setq id (sasl-unique-id))
-               "@" (system-name) ">")
+       (concat "<" id "@" (system-name) ">")
       (fillarray id 0))))
 
 (defun sasl-scram-md5-xor-string (str1 str2)