[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

paul.dale at oracle.com paul.dale at oracle.com
Tue Aug 22 05:16:40 UTC 2017


The branch OpenSSL_1_0_2-stable has been updated
       via  173f0a0e61139d721c203c12213d1a162eb545d4 (commit)
      from  0ab24083a16c8a4dd35833031bbeaeb0437a7219 (commit)


- Log -----------------------------------------------------------------
commit 173f0a0e61139d721c203c12213d1a162eb545d4
Author: Pauli <paul.dale at oracle.com>
Date:   Tue Aug 22 09:10:50 2017 +1000

    Use casts for arguments to ctype functions.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4212)

-----------------------------------------------------------------------

Summary of changes:
 crypto/pem/pem_lib.c | 3 ++-
 ssl/ssl_ciph.c       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index c82b3c0..865976b 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -536,7 +536,8 @@ int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher)
               ((c >= '0') && (c <= '9'))))
             break;
 #else
-        if (!(isupper(c) || (c == '-') || isdigit(c)))
+        if (!(isupper((unsigned char)c) || (c == '-')
+            || isdigit((unsigned char)c)))
             break;
 #endif
         header++;
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 4002132..ccdf00f 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1205,7 +1205,7 @@ static int ssl_cipher_process_rulestr(const char *rule_str,
                    ((ch >= '0') && (ch <= '9')) ||
                    ((ch >= 'a') && (ch <= 'z')) || (ch == '-') || (ch == '.'))
 #else
-            while (isalnum(ch) || (ch == '-') || (ch == '.'))
+            while (isalnum((unsigned char)ch) || (ch == '-') || (ch == '.'))
 #endif
             {
                 ch = *(++l);


More information about the openssl-commits mailing list