[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  842dc98705e32789bbfef230dc02ab43885d429f (commit)
       via  e6f2bb66042f329fbb6a4ab810abce7c295b08dc (commit)
      from  53385e1fee6e53043ba36d9c414b0387a4f87cd7 (commit)


- Log -----------------------------------------------------------------
commit 842dc98705e32789bbfef230dc02ab43885d429f
Author: Kirill Marinushkin <k.marinushkin at gmail.com>
Date:   Sun Apr 24 11:30:08 2016 +0200

    Add aliases for des-ede-ecb and des-ede3-ecb ciphers.
    
    Currently we can get all block ciphers with
    	EVP_get_cipherbyname("<alg_name>-<block-mode-name>")
    for example, by names "aes-128-ecb" or "des-ede-cbc".
    I found a problem with des-ede-ecb and des-ede3-ecb ciphers as
    they can be accessed only with names:
    	EVP_get_cipherbyname("des-ede")
    	EVP_get_cipherbyname("des-ede3")
    It breaks the general concept.
    
    In this patch I add aliases which allow to use names:
    	EVP_get_cipherbyname("des-ede-ecb")
    	EVP_get_cipherbyname("des-ede3-ecb")
    in addition to the currently used names.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit e6f2bb66042f329fbb6a4ab810abce7c295b08dc
Author: Kirill Marinushkin <k.marinushkin at gmail.com>
Date:   Sun Apr 24 02:01:25 2016 +0200

    Fixed scripts order for generate_crypto_objects target
    
    Script obj_dat.pl depends on file obj_mac.h generated by script objects.pl
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 Configurations/unix-Makefile.tmpl | 6 +++---
 crypto/evp/c_allc.c               | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 900c09f..23014f7 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -653,13 +653,13 @@ generate_crypto_bn:
 	( cd $(SRCDIR); $(PERL) crypto/bn/bn_prime.pl > crypto/bn/bn_prime.h )
 
 generate_crypto_objects:
-	( cd $(SRCDIR); $(PERL) crypto/objects/obj_dat.pl \
-				include/openssl/obj_mac.h \
-				crypto/objects/obj_dat.h )
 	( cd $(SRCDIR); $(PERL) crypto/objects/objects.pl \
 				crypto/objects/objects.txt \
 				crypto/objects/obj_mac.num \
 				include/openssl/obj_mac.h )
+	( cd $(SRCDIR); $(PERL) crypto/objects/obj_dat.pl \
+				include/openssl/obj_mac.h \
+				crypto/objects/obj_dat.h )
 	( cd $(SRCDIR); $(PERL) crypto/objects/objxref.pl \
 				crypto/objects/obj_mac.num \
 				crypto/objects/obj_xref.txt \
diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index ac172e8..0482f78 100644
--- a/crypto/evp/c_allc.c
+++ b/crypto/evp/c_allc.c
@@ -92,7 +92,11 @@ void openssl_add_all_ciphers_int(void)
 
     EVP_add_cipher(EVP_des_ecb());
     EVP_add_cipher(EVP_des_ede());
+    EVP_add_cipher_alias(SN_des_ede_ecb, "DES-EDE-ECB");
+    EVP_add_cipher_alias(SN_des_ede_ecb, "des-ede-ecb");
     EVP_add_cipher(EVP_des_ede3());
+    EVP_add_cipher_alias(SN_des_ede3_ecb, "DES-EDE3-ECB");
+    EVP_add_cipher_alias(SN_des_ede3_ecb, "des-ede3-ecb");
     EVP_add_cipher(EVP_des_ede3_wrap());
     EVP_add_cipher_alias(SN_id_smime_alg_CMS3DESwrap, "des3-wrap");
 #endif