Fix spelling of "intermediate" (it's not "intermediary")

* doc/emacs/misc.texi (Network Security): Ditto.

* lisp/net/nsm.el (network-security-protocol-checks): Fix spelling
on "intermediate".
(nsm-protocol-check--intermediate-sha1): Ditto.

diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 0a15df412062f05f180e51e8ef81bcf00b8bfcdc..692f1fd650408d3f706dc18c150a551390dcdb8f 100644 (file)
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -361,8 +361,8 @@ third parties.  If this number is too low, you will be warned.
 The @acronym{RC4} stream cipher is believed to be of low quality and
 may allow eavesdropping by third parties.
 
-@item @acronym{SHA1} in the host certificate or in intermediary certificates
-It is believed that if an intermediary certificate uses
+@item @acronym{SHA1} in the host certificate or in intermediate certificates
+It is believed that if an intermediate certificate uses
 the @acronym{SHA1} hashing algorithm, then third parties can issue
 certificates pretending to be that issuing instance.  These
 connections are therefore vulnerable to man-in-the-middle attacks.

diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index 146d0d55254be75ec7326225635da8307d13e5bd..0653cfbb1a286904c663d6acca664cd9aff51ffa 100644 (file)
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -185,7 +185,7 @@ unencrypted."
   '((diffie-hellman-prime-bits medium 1024)
     (rc4 medium)
     (signature-sha1 medium)
-    (intermediary-sha1 medium)
+    (intermediate-sha1 medium)
     (3des high)
     (ssl medium))
   "This variable specifies what TLS connection checks to perform.
@@ -255,7 +255,7 @@ HOST PORT STATUS OPTIONAL-PARAMETER.")
          "The certificate used to verify the connection to %s:%s uses the SHA1 algorithm (%s), which is believed to be unsafe."
          host port signature-algorithm))))
 
-(defun nsm-protocol-check--intermediary-sha1 (host port status _)
+(defun nsm-protocol-check--intermediate-sha1 (host port status _)
   ;; Skip the first certificate, because that's the host certificate.
   (cl-loop for certificate in (cdr (plist-get status :certificates))
            for algo = (plist-get certificate :signature-algorithm)
@@ -266,7 +266,7 @@ HOST PORT STATUS OPTIONAL-PARAMETER.")
                      (string-match "\\bSHA1\\b" algo)
                      (not (nsm-query
                            host port status :signature-sha1
-                           "An intermediary certificate used to verify the connection to %s:%s uses the SHA1 algorithm (%s), which is believed to be unsafe."
+                           "An intermediate certificate used to verify the connection to %s:%s uses the SHA1 algorithm (%s), which is believed to be unsafe."
                            host port algo)))
            do (cl-return nil)
            finally (cl-return t)))