`make update'

diff --git a/crypto/engine/Makefile.ssl b/crypto/engine/Makefile.ssl
index fc4ef971d4d350ae7aadd73058c472b977354c1d..fde4ee85a7bd6b29932d3c722af55309df53f962 100644 (file)
--- a/crypto/engine/Makefile.ssl
+++ b/crypto/engine/Makefile.ssl
@@ -127,6 +127,7 @@ hw_atalla.o: ../../include/openssl/opensslconf.h
 hw_atalla.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
 hw_atalla.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 hw_atalla.o: ../../include/openssl/stack.h ../cryptlib.h engine_int.h
+hw_atalla.o: vendor_defns/atalla.h
 hw_cswift.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 hw_cswift.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 hw_cswift.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
@@ -137,6 +138,7 @@ hw_cswift.o: ../../include/openssl/opensslconf.h
 hw_cswift.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
 hw_cswift.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 hw_cswift.o: ../../include/openssl/stack.h ../cryptlib.h engine_int.h
+hw_cswift.o: vendor_defns/cswift.h
 hw_ncipher.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 hw_ncipher.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 hw_ncipher.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
@@ -147,3 +149,4 @@ hw_ncipher.o: ../../include/openssl/opensslconf.h
 hw_ncipher.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
 hw_ncipher.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 hw_ncipher.o: ../../include/openssl/stack.h ../cryptlib.h engine_int.h
+hw_ncipher.o: vendor_defns/hwcryptohook.h

diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h
index 6797a356cfb04c2db29ef289e71e0c7306009c4d..61c81859b5448aa43b6993027e17eedee73af670 100644 (file)
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
@@ -335,6 +335,7 @@ void ERR_load_ENGINE_strings(void);
 
 /* Reason codes. */
 #define ENGINE_R_ALREADY_LOADED                                 100
+#define ENGINE_R_BIO_WAS_FREED                          121
 #define ENGINE_R_BN_CTX_FULL                            101
 #define ENGINE_R_BN_EXPAND_FAIL                                 102
 #define ENGINE_R_CONFLICTING_ENGINE_ID                  103

diff --git a/crypto/engine/engine_err.c b/crypto/engine/engine_err.c
index 01c382f5bab2fa4eb33d4ef0cb894f55b03f1ff9..4f78d0c5d9ec5877d1f6fe427ed07bb5e084af32 100644 (file)
--- a/crypto/engine/engine_err.c
+++ b/crypto/engine/engine_err.c
@@ -126,6 +126,7 @@ static ERR_STRING_DATA ENGINE_str_functs[]=
 static ERR_STRING_DATA ENGINE_str_reasons[]=
        {
 {ENGINE_R_ALREADY_LOADED                 ,"already loaded"},
+{ENGINE_R_BIO_WAS_FREED                  ,"bio was freed"},
 {ENGINE_R_BN_CTX_FULL                    ,"BN_CTX full"},
 {ENGINE_R_BN_EXPAND_FAIL                 ,"bn_expand fail"},
 {ENGINE_R_CONFLICTING_ENGINE_ID          ,"conflicting engine id"},