rot13 internal function names.

diff --git a/epa.el b/epa.el
index 3a2c3ae..9ae9bf2 100644 (file)
--- a/epa.el
+++ b/epa.el
@@ -189,9 +189,9 @@
                      ? ))
            (epg-sub-key-id primary-sub-key)
            " "
                      ? ))
            (epg-sub-key-id primary-sub-key)
            " "

-           (if (stringp (epg-user-id-name primary-user-id))
-               (epg-user-id-name primary-user-id)
-             (epg-decode-dn (epg-user-id-name primary-user-id))))))
+           (if (stringp (epg-user-id-string primary-user-id))
+               (epg-user-id-string primary-user-id)
+             (epg-decode-dn (epg-user-id-string primary-user-id))))))

 
 (defun epa-key-widget-button-face-get (widget)
   (let ((validity (epg-sub-key-validity (car (epg-key-sub-key-list
 
 (defun epa-key-widget-button-face-get (widget)
   (let ((validity (epg-sub-key-validity (car (epg-key-sub-key-list

@@ -392,9 +392,9 @@ If SECRET is non-nil, list secret keys instead of public keys."
                               epg-key-validity-alist)))
                " ")
              " "
                               epg-key-validity-alist)))
                " ")
              " "

-             (if (stringp (epg-user-id-name (car pointer)))
-                 (epg-user-id-name (car pointer))
-               (epg-decode-dn (epg-user-id-name (car pointer))))
+             (if (stringp (epg-user-id-string (car pointer)))
+                 (epg-user-id-string (car pointer))
+               (epg-decode-dn (epg-user-id-string (car pointer))))

              "\n")
       (setq pointer (cdr pointer)))
     (setq pointer (epg-key-sub-key-list key))
              "\n")
       (setq pointer (cdr pointer)))
     (setq pointer (epg-key-sub-key-list key))

diff --git a/epg.el b/epg.el
index 02c1ff0..16005c3 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -818,7 +818,7 @@ This function is for internal use only."
              (epg-context-result-for epg-context 'error)))
        (delete-process process)))))
 
              (epg-context-result-for epg-context 'error)))
        (delete-process process)))))
 

-(defun epg-signature-status-internal (status string)
+(defun epg-fvtangher-fgnghf (status string)

   (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string)
       (let* ((key-id (match-string 1 string))
             (user-id (match-string 2 string))
   (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string)
       (let* ((key-id (match-string 1 string))
             (user-id (match-string 2 string))

@@ -843,19 +843,19 @@ This function is for internal use only."
           (epg-context-result-for epg-context 'verify)))))
 
 (defun epg-status-GOODSIG (process string)
           (epg-context-result-for epg-context 'verify)))))
 
 (defun epg-status-GOODSIG (process string)

-  (epg-signature-status-internal 'good string))
+  (epg-fvtangher-fgnghf 'good string))

 
 (defun epg-status-EXPSIG (process string)
 
 (defun epg-status-EXPSIG (process string)

-  (epg-signature-status-internal 'expired string))
+  (epg-fvtangher-fgnghf 'expired string))

 
 (defun epg-status-EXPKEYSIG (process string)
 
 (defun epg-status-EXPKEYSIG (process string)

-  (epg-signature-status-internal 'expired-key string))
+  (epg-fvtangher-fgnghf 'expired-key string))

 
 (defun epg-status-REVKEYSIG (process string)
 
 (defun epg-status-REVKEYSIG (process string)

-  (epg-signature-status-internal 'revoked-key string))
+  (epg-fvtangher-fgnghf 'revoked-key string))

 
 (defun epg-status-BADSIG (process string)
 
 (defun epg-status-BADSIG (process string)

-  (epg-signature-status-internal 'bad string))
+  (epg-fvtangher-fgnghf 'bad string))

 
 (defun epg-status-NO_PUBKEY (process string)
   (epg-context-set-result-for
 
 (defun epg-status-NO_PUBKEY (process string)
   (epg-context-set-result-for

@@ -1072,7 +1072,7 @@ This function is for internal use only."
                           config))))
     config))
 
                           config))))
     config))
 

-(defun epg-list-keys-1 (context name mode)
+(defun epg-yvfg-xrlf-1 (context name mode)

   (let ((args (append (list "--with-colons" "--no-greeting" "--batch"
                            "--with-fingerprint"
                            "--with-fingerprint"
   (let ((args (append (list "--with-colons" "--no-greeting" "--batch"
                            "--with-fingerprint"
                            "--with-fingerprint"

@@ -1104,7 +1104,7 @@ This function is for internal use only."
          (setq field (1+ field))))
       (nreverse keys))))
 
          (setq field (1+ field))))
       (nreverse keys))))
 

-(defun epg-make-sub-key-1 (line)
+(defun epg-znxr-fho-xrl-1 (line)

   (epg-make-sub-key
    (if (aref line 1)
        (cdr (assq (string-to-char (aref line 1)) epg-key-validity-alist)))
   (epg-make-sub-key
    (if (aref line 1)
        (cdr (assq (string-to-char (aref line 1)) epg-key-validity-alist)))

@@ -1118,33 +1118,37 @@ This function is for internal use only."
    (aref line 5)
    (aref line 6)))
 
    (aref line 5)
    (aref line 6)))
 

+(defun epg-yvfg-xrlf-cbfgcebprff (key)
+  (let (key-id user-id-string entry)
+    (epg-key-set-sub-key-list
+     key
+     (nreverse (epg-key-sub-key-list key)))
+    (epg-key-set-user-id-list
+     key
+     (nreverse (epg-key-user-id-list key)))
+    (setq key-id
+         (epg-sub-key-id (car (epg-key-sub-key-list key)))
+         user-id-string
+         (epg-user-id-string (car (epg-key-user-id-list key)))
+         entry (assoc key-id epg-user-id-alist))
+    (if entry
+       (setcdr entry user-id-string)
+      (setq epg-user-id-alist (cons (cons key-id user-id-string)
+                                   epg-user-id-alist)))))
+

 (defun epg-list-keys (context &optional name mode)
   "Return a list of epg-key objects matched with NAME.
 If MODE is nil, only public keyring should be searched.
 If MODE is t or 'secret, only secret keyring should be searched. 
 Otherwise, only public keyring should be searched and the key
 signatures should be included."
 (defun epg-list-keys (context &optional name mode)
   "Return a list of epg-key objects matched with NAME.
 If MODE is nil, only public keyring should be searched.
 If MODE is t or 'secret, only secret keyring should be searched. 
 Otherwise, only public keyring should be searched and the key
 signatures should be included."

-  (let ((lines (epg-list-keys-1 context name mode))
-       keys cert key-id user-id-string entry)
+  (let ((lines (epg-yvfg-xrlf-1 context name mode))
+       keys cert)

     (while lines
       (cond
        ((member (aref (car lines) 0) '("pub" "sec" "crt" "crs"))
     (while lines
       (cond
        ((member (aref (car lines) 0) '("pub" "sec" "crt" "crs"))

-       (when (car keys)
-         (epg-key-set-sub-key-list
-          (car keys)
-          (nreverse (epg-key-sub-key-list (car keys))))
-         (epg-key-set-user-id-list
-          (car keys)
-          (nreverse (epg-key-user-id-list (car keys))))
-         (setq key-id
-               (epg-sub-key-id (car (epg-key-sub-key-list (car keys))))
-               user-id-string
-               (epg-user-id-string (car (epg-key-user-id-list (car keys))))
-               entry (assoc key-id epg-user-id-alist))
-         (if entry
-             (setcdr entry user-id-string)
-           (setq epg-user-id-alist (cons (cons key-id user-id-string)
-                                         epg-user-id-alist))))
+       (if (car keys)
+           (epg-yvfg-xrlf-cbfgcebprff (car keys)))

        (setq cert (member (aref (car lines) 0) '("crt" "crs"))
              keys (cons (epg-make-key
                          (if (aref (car lines) 8)
        (setq cert (member (aref (car lines) 0) '("crt" "crs"))
              keys (cons (epg-make-key
                          (if (aref (car lines) 8)

@@ -1153,12 +1157,12 @@ signatures should be included."
                         keys))
        (epg-key-set-sub-key-list
         (car keys)
                         keys))
        (epg-key-set-sub-key-list
         (car keys)

-        (cons (epg-make-sub-key-1 (car lines))
+        (cons (epg-znxr-fho-xrl-1 (car lines))

               (epg-key-sub-key-list (car keys)))))
        ((member (aref (car lines) 0) '("sub" "ssb"))
        (epg-key-set-sub-key-list
         (car keys)
               (epg-key-sub-key-list (car keys)))))
        ((member (aref (car lines) 0) '("sub" "ssb"))
        (epg-key-set-sub-key-list
         (car keys)

-        (cons (epg-make-sub-key-1 (car lines))
+        (cons (epg-znxr-fho-xrl-1 (car lines))

               (epg-key-sub-key-list (car keys)))))
        ((equal (aref (car lines) 0) "uid")
        (epg-key-set-user-id-list
               (epg-key-sub-key-list (car keys)))))
        ((equal (aref (car lines) 0) "uid")
        (epg-key-set-user-id-list

@@ -1177,22 +1181,8 @@ signatures should be included."
        (epg-sub-key-set-fingerprint (car (epg-key-sub-key-list (car keys)))
                                     (aref (car lines) 9))))
       (setq lines (cdr lines)))
        (epg-sub-key-set-fingerprint (car (epg-key-sub-key-list (car keys)))
                                     (aref (car lines) 9))))
       (setq lines (cdr lines)))

-    (when (car keys)
-      (epg-key-set-sub-key-list
-       (car keys)
-       (nreverse (epg-key-sub-key-list (car keys))))
-      (epg-key-set-user-id-list
-       (car keys)
-       (nreverse (epg-key-user-id-list (car keys))))
-      (setq key-id
-               (epg-sub-key-id (car (epg-key-sub-key-list (car keys))))
-               user-id-string
-               (epg-user-id-string (car (epg-key-user-id-list (car keys))))
-               entry (assoc key-id epg-user-id-alist))
-         (if entry
-             (setcdr entry user-id-string)
-           (setq epg-user-id-alist (cons (cons key-id user-id-string)
-                                         epg-user-id-alist))))
+    (if (car keys)
+       (epg-yvfg-xrlf-cbfgcebprff (car keys)))

     (nreverse keys)))
 
 (if (fboundp 'make-temp-file)
     (nreverse keys)))
 
 (if (fboundp 'make-temp-file)