From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 3 Jun 2015 17:31:30 +0000 (+0000)
Subject: Update messages from tlscheck.
X-Git-Tag: v2.2b1~273
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47ddc8127160e7b2e7c9005de08684e1b29aa7ff;p=thirdparty%2Fcups.git

Update messages from tlscheck.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12688 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/cups/tlscheck.c b/cups/tlscheck.c
index 352c3344d1..861222ef2a 100644
--- a/cups/tlscheck.c
+++ b/cups/tlscheck.c
@@ -652,21 +652,21 @@ main(int  argc,				/* I - Number of command-line arguments */
   if (cipher == TLS_RSA_WITH_RC4_128_MD5 ||
       cipher == TLS_RSA_WITH_RC4_128_SHA)
   {
-    printf("%s: ERROR (Insecure RC4 negotiated)\n", server);
+    printf("%s: ERROR (Printers MUST NOT negotiate RC4 cipher suites.)\n", server);
     httpClose(http);
     return (1);
   }
 
   if ((err = SSLGetDiffieHellmanParams(http->tls, &params, &paramsLen)) != noErr && paramsNeeded)
   {
-    printf("%s: ERROR (Unable to get Diffie Hellman parameters - %d)\n", server, (int)err);
+    printf("%s: ERROR (Unable to get Diffie-Hellman parameters - %d)\n", server, (int)err);
     httpClose(http);
     return (1);
   }
 
   if (paramsLen < 128 && paramsLen != 0)
   {
-    printf("%s: ERROR (Diffie Hellman parameters only %d bytes/%d bits)\n", server, (int)paramsLen, (int)paramsLen * 8);
+    printf("%s: ERROR (Diffie-Hellman parameters MUST be at least 2048 bits, but Printer uses only %d bits/%d bytes)\n", server, (int)paramsLen * 8, (int)paramsLen);
     httpClose(http);
     return (1);
   }
@@ -675,9 +675,9 @@ main(int  argc,				/* I - Number of command-line arguments */
 #endif /* __APPLE__ */
 
   if (dhBits > 0)
-    printf("%s: OK (%d.%d, %s, %d DH bits)\n", server, tlsVersion / 10, tlsVersion % 10, cipherName, dhBits);
+    printf("%s: OK (TLS: %d.%d, %s, %d DH bits)\n", server, tlsVersion / 10, tlsVersion % 10, cipherName, dhBits);
   else
-    printf("%s: OK (%d.%d, %s)\n", server, tlsVersion / 10, tlsVersion % 10, cipherName);
+    printf("%s: OK (TLS: %d.%d, %s)\n", server, tlsVersion / 10, tlsVersion % 10, cipherName);
 
   if (verbose)
   {