Re: Minimum emacs version for Oort

[Simon Josefsson <jas@extundo.com>]

Kai.Grossjohann@CS.Uni-Dortmund.DE (Kai Großjohann) writes:

> Simon Josefsson <jas@extundo.com> writes:
>
>> No.  Does your emacs have `base64-encode-region'?  As a 
>> workaround put gnus/contrib in your load path.
>
> The base64.el there does not have base64-encode-string, so that 
  won't help.
 
Oops.  Paul, does the following patch work? 

--- canlock.el.~6.5.~	Wed Jan  9 16:25:50 2002
+++ canlock.el	Mon Jan 21 16:32:48 2002
@@ -103,6 +103,18 @@
 	(list 'string-as-unibyte string)
       string)))
 
+(defun canlock-base64-encode-string (string &optional no-line-break)
+  (save-excursion
+    (set-buffer (get-buffer-create " *base64-encode*"))
+    (erase-buffer)
+    (insert string)
+    (base64-encode-region (point-min) (point-max) no-line-break)
+    (skip-chars-backward " \t\r\n")
+    (delete-region (point-max) (point))
+    (prog1
+	(buffer-string)
+      (kill-buffer (current-buffer)))))
+
 (defun canlock-sha1-with-openssl (message)
   "Make a SHA-1 digest of MESSAGE using OpenSSL."
   (let (default-enable-multibyte-characters)
@@ -153,7 +165,7 @@
 	(opad (mapconcat (lambda (char)
 			   (char-to-string (logxor 92 char)))
 			 password "")))
-    (base64-encode-string
+    (canlock-base64-encode-string
      (funcall canlock-sha1-function
 	      (concat
 	       opad
@@ -250,8 +262,8 @@
 		(insert "Cancel-Key: sha1:" key-for-key "\n"))
 	      (when key-for-lock
 		(insert "Cancel-Lock: sha1:"
-			(base64-encode-string (funcall canlock-sha1-function
-						       key-for-lock))
+			(canlock-base64-encode-string
+			 (funcall canlock-sha1-function key-for-lock))
 			"\n")))))))))
 
 ;;;###autoload
@@ -307,8 +319,8 @@
 	(when locks
 	  (when id-for-lock
 	    (setq key-for-lock
-		  (base64-encode-string (funcall canlock-sha1-function
-						 (canlock-make-cancel-key
+		  (canlock-base64-encode-string
+		   (funcall canlock-sha1-function (canlock-make-cancel-key
 						  id-for-lock password))))
 	    (when (and locks (not match))
 	      (setq match (string-equal key-for-lock (pop locks)))))