[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  5898b8eb87e464b80153cae3424f4d283cb841b6 (commit)
      from  3663990760f9e414c50f3a73fa7276b4b528ef41 (commit)


- Log -----------------------------------------------------------------
commit 5898b8eb87e464b80153cae3424f4d283cb841b6
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sat Aug 6 17:03:15 2016 +0200

    Fix spelling of error code
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1421)

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

Summary of changes:
 crypto/evp/e_rc5.c    | 2 +-
 crypto/evp/evp_err.c  | 4 ++--
 include/openssl/evp.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto/evp/e_rc5.c b/crypto/evp/e_rc5.c
index 1bc8141..f69ba5b 100644
--- a/crypto/evp/e_rc5.c
+++ b/crypto/evp/e_rc5.c
@@ -54,7 +54,7 @@ static int rc5_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
             return 1;
 
         default:
-            EVPerr(EVP_F_RC5_CTRL, EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS);
+            EVPerr(EVP_F_RC5_CTRL, EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS);
             return 0;
         }
 
diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c
index a0d2250..d2e43fe 100644
--- a/crypto/evp/evp_err.c
+++ b/crypto/evp/evp_err.c
@@ -143,8 +143,8 @@ static ERR_STRING_DATA EVP_str_reasons[] = {
     {ERR_REASON(EVP_R_UNKNOWN_DIGEST), "unknown digest"},
     {ERR_REASON(EVP_R_UNKNOWN_OPTION), "unknown option"},
     {ERR_REASON(EVP_R_UNKNOWN_PBE_ALGORITHM), "unknown pbe algorithm"},
-    {ERR_REASON(EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS),
-     "unsuported number of rounds"},
+    {ERR_REASON(EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS),
+     "unsupported number of rounds"},
     {ERR_REASON(EVP_R_UNSUPPORTED_ALGORITHM), "unsupported algorithm"},
     {ERR_REASON(EVP_R_UNSUPPORTED_CIPHER), "unsupported cipher"},
     {ERR_REASON(EVP_R_UNSUPPORTED_KEYLENGTH), "unsupported keylength"},
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 3671bd0..84df8a0 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -1561,7 +1561,7 @@ int ERR_load_EVP_strings(void);
 # define EVP_R_UNKNOWN_DIGEST                             161
 # define EVP_R_UNKNOWN_OPTION                             169
 # define EVP_R_UNKNOWN_PBE_ALGORITHM                      121
-# define EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS                135
+# define EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS               135
 # define EVP_R_UNSUPPORTED_ALGORITHM                      156
 # define EVP_R_UNSUPPORTED_CIPHER                         107
 # define EVP_R_UNSUPPORTED_KEYLENGTH                      123