[openssl-commits] [openssl] master update

[Emilia Kasper]

The branch master has been updated
       via  6f73d28c20459034bfd4090494be9fb1a479c8af (commit)
      from  b84939cc96896a5a9a8f5181794e53dce9b5d229 (commit)


- Log -----------------------------------------------------------------
commit 6f73d28c20459034bfd4090494be9fb1a479c8af
Author: Emilia Kasper <emilia at openssl.org>
Date:   Wed Oct 14 18:32:38 2015 +0200

    Remove EVP_CHECK_DES_KEY
    
    Thanks to the OpenBSD community for bringing this to our attention.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 CHANGES             |  2 ++
 crypto/evp/e_des.c  |  5 -----
 crypto/evp/e_des3.c | 13 -------------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/CHANGES b/CHANGES
index ec55dc3..3d9c183 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@
  _______________
 
  Changes between 1.0.2 and 1.1.0  [xx XXX xxxx]
+  *) Remove EVP_CHECK_DES_KEY, a compile-time option that never compiled.
+     [Emilia Käsper]
 
   *) Removed DES and RC4 ciphersuites from DEFAULT. Also removed RC2 although
      in 1.0.2 EXPORT was already removed and the only RC2 ciphersuite is also
diff --git a/crypto/evp/e_des.c b/crypto/evp/e_des.c
index 0506973..74e87e8 100644
--- a/crypto/evp/e_des.c
+++ b/crypto/evp/e_des.c
@@ -241,12 +241,7 @@ static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
         }
     }
 # endif
-# ifdef EVP_CHECK_DES_KEY
-    if (DES_set_key_checked(deskey, dat->ks.ks) != 0)
-        return 0;
-# else
     DES_set_key_unchecked(deskey, ctx->cipher_data);
-# endif
     return 1;
 }
 
diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c
index db36634..c113a17 100644
--- a/crypto/evp/e_des3.c
+++ b/crypto/evp/e_des3.c
@@ -269,14 +269,8 @@ static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
         }
     }
 # endif
-# ifdef EVP_CHECK_DES_KEY
-    if (DES_set_key_checked(&deskey[0], &dat->ks1)
-        || DES_set_key_checked(&deskey[1], &dat->ks2))
-        return 0;
-# else
     DES_set_key_unchecked(&deskey[0], &dat->ks1);
     DES_set_key_unchecked(&deskey[1], &dat->ks2);
-# endif
     memcpy(&dat->ks3, &dat->ks1, sizeof(dat->ks1));
     return 1;
 }
@@ -302,16 +296,9 @@ static int des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
         }
     }
 # endif
-# ifdef EVP_CHECK_DES_KEY
-    if (DES_set_key_checked(&deskey[0], &dat->ks1)
-        || DES_set_key_checked(&deskey[1], &dat->ks2)
-        || DES_set_key_checked(&deskey[2], &dat->ks3))
-        return 0;
-# else
     DES_set_key_unchecked(&deskey[0], &dat->ks1);
     DES_set_key_unchecked(&deskey[1], &dat->ks2);
     DES_set_key_unchecked(&deskey[2], &dat->ks3);
-# endif
     return 1;
 }