make update (1.0.1-stable)

This meant a slight renumbering in util/libeay.num due to symbols
appearing in 1.0.0-stable.  However, since there's been no release on
this branch yet, it should be harmless.

diff --git a/TABLE b/TABLE
index cab7e1cad83a5c4576eee14acd2fb8568c94580e..c6a5ef75db671ddc0822f99498ee095fa27ec46f 100644 (file)
--- a/TABLE
+++ b/TABLE
@@ -1426,6 +1426,68 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
 $arflags      = 
 $multilib     = 
 

+*** debug-VC-WIN64A
+$cc           = cl
+$cflags       = -W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
+$unistd       = 
+$thread_cflag = 
+$sys_id       = WIN64A
+$lflags       = 
+$bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
+$cpuid_obj    = x86_64cpuid.o
+$bn_obj       = bn_asm.o x86_64-mont.o
+$des_obj      = 
+$aes_obj      = aes-x86_64.o
+$bf_obj       = 
+$md5_obj      = md5-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
+$cast_obj     = 
+$rc4_obj      = rc4-x86_64.o
+$rmd160_obj   = 
+$rc5_obj      = 
+$wp_obj       = wp-x86_64.o
+$cmll_obj     = cmll-x86_64.o cmll_misc.o
+$perlasm_scheme = auto
+$dso_scheme   = win32
+$shared_target= 
+$shared_cflag = 
+$shared_ldflag = 
+$shared_extension = 
+$ranlib       = 
+$arflags      = 
+$multilib     = 
+
+*** debug-VC-WIN64I
+$cc           = cl
+$cflags       = -W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
+$unistd       = 
+$thread_cflag = 
+$sys_id       = WIN64I
+$lflags       = 
+$bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
+$cpuid_obj    = ia64cpuid.o
+$bn_obj       = ia64.o
+$des_obj      = 
+$aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
+$bf_obj       = 
+$md5_obj      = md5-ia64.o
+$sha1_obj     = sha1-ia64.o sha256-ia64.o sha512-ia64.o
+$cast_obj     = 
+$rc4_obj      = 
+$rmd160_obj   = 
+$rc5_obj      = 
+$wp_obj       = 
+$cmll_obj     = 
+$perlasm_scheme = ias
+$dso_scheme   = win32
+$shared_target= 
+$shared_cflag = 
+$shared_ldflag = 
+$shared_extension = 
+$ranlib       = 
+$arflags      = 
+$multilib     = 
+

 *** debug-ben
 $cc           = gcc
 $cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG_UNUSED -O2 -pedantic -Wall -Wshadow -Werror -pipe
 *** debug-ben
 $cc           = gcc
 $cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG_UNUSED -O2 -pedantic -Wall -Wshadow -Werror -pipe

diff --git a/apps/Makefile b/apps/Makefile
index 61c80da0fb5d270443ad32f99cc0a94413d5df96..bb384abdf3ee1618a51a4e82327f59e3a241ae48 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -812,13 +812,13 @@ s_client.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 s_client.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s_client.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 s_client.o: ../include/openssl/rand.h ../include/openssl/safestack.h
 s_client.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s_client.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 s_client.o: ../include/openssl/rand.h ../include/openssl/safestack.h

-s_client.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s_client.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s_client.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s_client.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s_client.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
-s_client.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-s_client.o: s_apps.h s_client.c timeouts.h
+s_client.o: ../include/openssl/sha.h ../include/openssl/srp.h
+s_client.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s_client.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s_client.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s_client.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
+s_client.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+s_client.o: ../include/openssl/x509v3.h apps.h s_apps.h s_client.c timeouts.h

 s_server.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s_server.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 s_server.o: ../include/openssl/comp.h ../include/openssl/conf.h
 s_server.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s_server.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 s_server.o: ../include/openssl/comp.h ../include/openssl/conf.h


@@ -836,13 +836,13 @@ s_server.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s_server.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 s_server.o: ../include/openssl/rand.h ../include/openssl/rsa.h
 s_server.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 s_server.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 s_server.o: ../include/openssl/rand.h ../include/openssl/rsa.h
 s_server.o: ../include/openssl/safestack.h ../include/openssl/sha.h

-s_server.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s_server.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s_server.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s_server.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
-s_server.o: ../include/openssl/ui.h ../include/openssl/x509.h
-s_server.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-s_server.o: s_apps.h s_server.c timeouts.h
+s_server.o: ../include/openssl/srp.h ../include/openssl/ssl.h
+s_server.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s_server.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s_server.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+s_server.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
+s_server.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+s_server.o: ../include/openssl/x509v3.h apps.h s_apps.h s_server.c timeouts.h

 s_socket.o: ../e_os.h ../e_os2.h ../include/openssl/asn1.h
 s_socket.o: ../include/openssl/bio.h ../include/openssl/buffer.h
 s_socket.o: ../include/openssl/comp.h ../include/openssl/conf.h
 s_socket.o: ../e_os.h ../e_os2.h ../include/openssl/asn1.h
 s_socket.o: ../include/openssl/bio.h ../include/openssl/buffer.h
 s_socket.o: ../include/openssl/comp.h ../include/openssl/conf.h


@@ -964,6 +964,21 @@ spkac.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 spkac.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 spkac.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
 spkac.o: spkac.c
 spkac.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 spkac.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
 spkac.o: spkac.c

+srp.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
+srp.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+srp.o: ../include/openssl/conf.h ../include/openssl/crypto.h
+srp.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+srp.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+srp.o: ../include/openssl/engine.h ../include/openssl/err.h
+srp.o: ../include/openssl/evp.h ../include/openssl/lhash.h
+srp.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+srp.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
+srp.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+srp.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
+srp.o: ../include/openssl/sha.h ../include/openssl/srp.h
+srp.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+srp.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
+srp.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h srp.c

 ts.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ts.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 ts.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 ts.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ts.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 ts.o: ../include/openssl/conf.h ../include/openssl/crypto.h

diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
index 1ef583726c6f42c91f615256703120c25f7fba2d..b980a3060f8b37fa261fc6d68d4f25ca1de6e4fd 100644 (file)
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -345,3 +345,8 @@ bn_word.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bn_word.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bn_word.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 bn_word.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_word.c
 bn_word.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bn_word.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 bn_word.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_word.c

+bn_x931p.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+bn_x931p.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+bn_x931p.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+bn_x931p.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bn_x931p.o: ../../include/openssl/symhacks.h bn_x931p.c

diff --git a/crypto/buffer/Makefile b/crypto/buffer/Makefile
index d0e0d5f8967a281cf96c09bddb7c6c3f0303eb1e..2efba47f07002c7552db21854b7d8e2e7a8a454f 100644 (file)
--- a/crypto/buffer/Makefile
+++ b/crypto/buffer/Makefile
@@ -81,6 +81,13 @@ buf_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 buf_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 buf_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 buf_err.o: buf_err.c
 buf_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 buf_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 buf_err.o: buf_err.c

+buf_str.o: ../../e_os.h ../../include/openssl/bio.h
+buf_str.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+buf_str.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+buf_str.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+buf_str.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+buf_str.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+buf_str.o: ../../include/openssl/symhacks.h ../cryptlib.h buf_str.c

 buffer.o: ../../e_os.h ../../include/openssl/bio.h
 buffer.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 buffer.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 buffer.o: ../../e_os.h ../../include/openssl/bio.h
 buffer.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 buffer.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

diff --git a/crypto/dsa/Makefile b/crypto/dsa/Makefile
index 8073c4ecfed7bea6e5ed92760fa5da6dc7d767c4..5fef4ca5adfc5382873c5bf2cc0e00b510b4a724 100644 (file)
--- a/crypto/dsa/Makefile
+++ b/crypto/dsa/Makefile
@@ -99,8 +99,9 @@ dsa_asn1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
 dsa_asn1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 dsa_asn1.o: ../../include/openssl/opensslconf.h
 dsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 dsa_asn1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 dsa_asn1.o: ../../include/openssl/opensslconf.h
 dsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

-dsa_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-dsa_asn1.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_asn1.c
+dsa_asn1.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+dsa_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+dsa_asn1.o: ../cryptlib.h dsa_asn1.c

 dsa_depr.o: ../../e_os.h ../../include/openssl/asn1.h
 dsa_depr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 dsa_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 dsa_depr.o: ../../e_os.h ../../include/openssl/asn1.h
 dsa_depr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 dsa_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h


@@ -189,7 +190,7 @@ dsa_prn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 dsa_prn.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 dsa_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 dsa_prn.o: ../cryptlib.h dsa_prn.c
 dsa_prn.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 dsa_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 dsa_prn.o: ../cryptlib.h dsa_prn.c

-dsa_sign.o: ../../e_os.h ../../include/openssl/bio.h
+dsa_sign.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h

 dsa_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 dsa_sign.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
 dsa_sign.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 dsa_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 dsa_sign.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
 dsa_sign.o: ../../include/openssl/err.h ../../include/openssl/lhash.h

diff --git a/crypto/dso/Makefile b/crypto/dso/Makefile
index fb2709ed63a7601f5fe86ab6e6dec60c00abb7cb..f26a05b701f577a62726d78770ad43fed4d110cc 100644 (file)
--- a/crypto/dso/Makefile
+++ b/crypto/dso/Makefile
@@ -139,7 +139,7 @@ dso_vms.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 dso_vms.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 dso_vms.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 dso_vms.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 dso_vms.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 dso_vms.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 dso_vms.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-dso_vms.o: ../cryptlib.h dso_vms.c
+dso_vms.o: ../cryptlib.h ../vms_rms.h dso_vms.c

 dso_win32.o: ../../e_os.h ../../include/openssl/bio.h
 dso_win32.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 dso_win32.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
 dso_win32.o: ../../e_os.h ../../include/openssl/bio.h
 dso_win32.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 dso_win32.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h

diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile
index 82825e5299e3b7a3eb645519eb99144c28ade7d1..97c4ea9db61deaa1ba9d684e0216241b1af37c24 100644 (file)
--- a/crypto/evp/Makefile
+++ b/crypto/evp/Makefile
@@ -189,11 +189,11 @@ e_aes.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
 e_aes.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
 e_aes.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 e_aes.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
 e_aes.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
 e_aes.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 e_aes.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h

-e_aes.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-e_aes.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-e_aes.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-e_aes.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h e_aes.c
-e_aes.o: evp_locl.h
+e_aes.o: ../../include/openssl/modes.h ../../include/openssl/obj_mac.h
+e_aes.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+e_aes.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+e_aes.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+e_aes.o: ../../include/openssl/symhacks.h e_aes.c evp_locl.h

 e_bf.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_bf.o: ../../include/openssl/blowfish.h ../../include/openssl/buffer.h
 e_bf.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 e_bf.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_bf.o: ../../include/openssl/blowfish.h ../../include/openssl/buffer.h
 e_bf.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

diff --git a/crypto/objects/obj_xref.h b/crypto/objects/obj_xref.h
index d5b9b8e19830c30e6fbf87cc972a66c77beef0c1..7836f01d95ccacbc6a51b66abf65fdda8abef2fd 100644 (file)
--- a/crypto/objects/obj_xref.h
+++ b/crypto/objects/obj_xref.h
@@ -1,4 +1,4 @@
-/* AUTOGENERATED BY objxref.pl, DO NOT EDIT */
+/* AUTOGENERATED BY crypto/objects/objxref.pl, DO NOT EDIT */

 
 typedef struct
        {
 
 typedef struct
        {

diff --git a/crypto/rsa/Makefile b/crypto/rsa/Makefile
index d14a88b77d8279404019922f19495ee35a5e44c2..d9791debadce5bb6104ec4ae04d64c782b4162fb 100644 (file)
--- a/crypto/rsa/Makefile
+++ b/crypto/rsa/Makefile
@@ -114,6 +114,21 @@ rsa_chk.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 rsa_chk.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 rsa_chk.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rsa_chk.o: rsa_chk.c
 rsa_chk.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 rsa_chk.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rsa_chk.o: rsa_chk.c

+rsa_crpt.o: ../../e_os.h ../../include/openssl/asn1.h
+rsa_crpt.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+rsa_crpt.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+rsa_crpt.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+rsa_crpt.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+rsa_crpt.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+rsa_crpt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+rsa_crpt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+rsa_crpt.o: ../../include/openssl/opensslconf.h
+rsa_crpt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rsa_crpt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+rsa_crpt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_crpt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+rsa_crpt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+rsa_crpt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h rsa_crpt.c

 rsa_depr.o: ../../e_os.h ../../include/openssl/asn1.h
 rsa_depr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 rsa_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 rsa_depr.o: ../../e_os.h ../../include/openssl/asn1.h
 rsa_depr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 rsa_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

diff --git a/crypto/srp/Makefile b/crypto/srp/Makefile
index 06545a920beb871db8c0b122ff2eb42ae4976e63..1b75368966e9c795bcb5aacbf4ffd82005e89265 100644 (file)
--- a/crypto/srp/Makefile
+++ b/crypto/srp/Makefile
@@ -72,20 +72,26 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

-srp_lib.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
+srp_lib.o: ../../e_os.h ../../include/openssl/asn1.h
+srp_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

 srp_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 srp_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 srp_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 srp_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

-srp_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-srp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+srp_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+srp_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+srp_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+srp_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h

 srp_lib.o: ../../include/openssl/sha.h ../../include/openssl/srp.h
 srp_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 srp_lib.o: ../cryptlib.h srp_grps.h srp_lcl.h srp_lib.c
 srp_lib.o: ../../include/openssl/sha.h ../../include/openssl/srp.h
 srp_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 srp_lib.o: ../cryptlib.h srp_grps.h srp_lcl.h srp_lib.c

-srp_vfy.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
+srp_vfy.o: ../../e_os.h ../../include/openssl/asn1.h
+srp_vfy.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

 srp_vfy.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 srp_vfy.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 srp_vfy.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 srp_vfy.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

-srp_vfy.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-srp_vfy.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-srp_vfy.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
-srp_vfy.o: ../../include/openssl/sha.h ../../include/openssl/srp.h
-srp_vfy.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-srp_vfy.o: ../../include/openssl/txt_db.h ../cryptlib.h srp_lcl.h srp_vfy.c
+srp_vfy.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+srp_vfy.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+srp_vfy.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+srp_vfy.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+srp_vfy.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+srp_vfy.o: ../../include/openssl/srp.h ../../include/openssl/stack.h
+srp_vfy.o: ../../include/openssl/symhacks.h ../../include/openssl/txt_db.h
+srp_vfy.o: ../cryptlib.h srp_lcl.h srp_vfy.c

diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h
index 319cd48088171166f3bd6bdd20d96ec3a69a296c..fa74584fff379567dfdc6906fe4587a1f527a4e9 100644 (file)
--- a/crypto/stack/safestack.h
+++ b/crypto/stack/safestack.h
@@ -1459,7 +1459,7 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 #define sk_POLICY_MAPPING_sort(st) SKM_sk_sort(POLICY_MAPPING, (st))
 #define sk_POLICY_MAPPING_is_sorted(st) SKM_sk_is_sorted(POLICY_MAPPING, (st))
 
 #define sk_POLICY_MAPPING_sort(st) SKM_sk_sort(POLICY_MAPPING, (st))
 #define sk_POLICY_MAPPING_is_sorted(st) SKM_sk_is_sorted(POLICY_MAPPING, (st))
 

-#define sk_SRP_gN_new(st) SKM_sk_new(SRP_gN, (st))
+#define sk_SRP_gN_new(cmp) SKM_sk_new(SRP_gN, (cmp))

 #define sk_SRP_gN_new_null() SKM_sk_new_null(SRP_gN)
 #define sk_SRP_gN_free(st) SKM_sk_free(SRP_gN, (st))
 #define sk_SRP_gN_num(st) SKM_sk_num(SRP_gN, (st))
 #define sk_SRP_gN_new_null() SKM_sk_new_null(SRP_gN)
 #define sk_SRP_gN_free(st) SKM_sk_free(SRP_gN, (st))
 #define sk_SRP_gN_num(st) SKM_sk_num(SRP_gN, (st))


@@ -1469,6 +1469,7 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 #define sk_SRP_gN_push(st, val) SKM_sk_push(SRP_gN, (st), (val))
 #define sk_SRP_gN_unshift(st, val) SKM_sk_unshift(SRP_gN, (st), (val))
 #define sk_SRP_gN_find(st, val) SKM_sk_find(SRP_gN, (st), (val))
 #define sk_SRP_gN_push(st, val) SKM_sk_push(SRP_gN, (st), (val))
 #define sk_SRP_gN_unshift(st, val) SKM_sk_unshift(SRP_gN, (st), (val))
 #define sk_SRP_gN_find(st, val) SKM_sk_find(SRP_gN, (st), (val))

+#define sk_SRP_gN_find_ex(st, val) SKM_sk_find_ex(SRP_gN, (st), (val))

 #define sk_SRP_gN_delete(st, i) SKM_sk_delete(SRP_gN, (st), (i))
 #define sk_SRP_gN_delete_ptr(st, ptr) SKM_sk_delete_ptr(SRP_gN, (st), (ptr))
 #define sk_SRP_gN_insert(st, val, i) SKM_sk_insert(SRP_gN, (st), (val), (i))
 #define sk_SRP_gN_delete(st, i) SKM_sk_delete(SRP_gN, (st), (i))
 #define sk_SRP_gN_delete_ptr(st, ptr) SKM_sk_delete_ptr(SRP_gN, (st), (ptr))
 #define sk_SRP_gN_insert(st, val, i) SKM_sk_insert(SRP_gN, (st), (val), (i))


@@ -1478,8 +1479,9 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 #define sk_SRP_gN_shift(st) SKM_sk_shift(SRP_gN, (st))
 #define sk_SRP_gN_pop(st) SKM_sk_pop(SRP_gN, (st))
 #define sk_SRP_gN_sort(st) SKM_sk_sort(SRP_gN, (st))
 #define sk_SRP_gN_shift(st) SKM_sk_shift(SRP_gN, (st))
 #define sk_SRP_gN_pop(st) SKM_sk_pop(SRP_gN, (st))
 #define sk_SRP_gN_sort(st) SKM_sk_sort(SRP_gN, (st))

+#define sk_SRP_gN_is_sorted(st) SKM_sk_is_sorted(SRP_gN, (st))

 
 

-#define sk_SRP_gN_cache_new(st) SKM_sk_new(SRP_gN_cache, (st))
+#define sk_SRP_gN_cache_new(cmp) SKM_sk_new(SRP_gN_cache, (cmp))

 #define sk_SRP_gN_cache_new_null() SKM_sk_new_null(SRP_gN_cache)
 #define sk_SRP_gN_cache_free(st) SKM_sk_free(SRP_gN_cache, (st))
 #define sk_SRP_gN_cache_num(st) SKM_sk_num(SRP_gN_cache, (st))
 #define sk_SRP_gN_cache_new_null() SKM_sk_new_null(SRP_gN_cache)
 #define sk_SRP_gN_cache_free(st) SKM_sk_free(SRP_gN_cache, (st))
 #define sk_SRP_gN_cache_num(st) SKM_sk_num(SRP_gN_cache, (st))


@@ -1489,6 +1491,7 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 #define sk_SRP_gN_cache_push(st, val) SKM_sk_push(SRP_gN_cache, (st), (val))
 #define sk_SRP_gN_cache_unshift(st, val) SKM_sk_unshift(SRP_gN_cache, (st), (val))
 #define sk_SRP_gN_cache_find(st, val) SKM_sk_find(SRP_gN_cache, (st), (val))
 #define sk_SRP_gN_cache_push(st, val) SKM_sk_push(SRP_gN_cache, (st), (val))
 #define sk_SRP_gN_cache_unshift(st, val) SKM_sk_unshift(SRP_gN_cache, (st), (val))
 #define sk_SRP_gN_cache_find(st, val) SKM_sk_find(SRP_gN_cache, (st), (val))

+#define sk_SRP_gN_cache_find_ex(st, val) SKM_sk_find_ex(SRP_gN_cache, (st), (val))

 #define sk_SRP_gN_cache_delete(st, i) SKM_sk_delete(SRP_gN_cache, (st), (i))
 #define sk_SRP_gN_cache_delete_ptr(st, ptr) SKM_sk_delete_ptr(SRP_gN_cache, (st), (ptr))
 #define sk_SRP_gN_cache_insert(st, val, i) SKM_sk_insert(SRP_gN_cache, (st), (val), (i))
 #define sk_SRP_gN_cache_delete(st, i) SKM_sk_delete(SRP_gN_cache, (st), (i))
 #define sk_SRP_gN_cache_delete_ptr(st, ptr) SKM_sk_delete_ptr(SRP_gN_cache, (st), (ptr))
 #define sk_SRP_gN_cache_insert(st, val, i) SKM_sk_insert(SRP_gN_cache, (st), (val), (i))


@@ -1498,8 +1501,9 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 #define sk_SRP_gN_cache_shift(st) SKM_sk_shift(SRP_gN_cache, (st))
 #define sk_SRP_gN_cache_pop(st) SKM_sk_pop(SRP_gN_cache, (st))
 #define sk_SRP_gN_cache_sort(st) SKM_sk_sort(SRP_gN_cache, (st))
 #define sk_SRP_gN_cache_shift(st) SKM_sk_shift(SRP_gN_cache, (st))
 #define sk_SRP_gN_cache_pop(st) SKM_sk_pop(SRP_gN_cache, (st))
 #define sk_SRP_gN_cache_sort(st) SKM_sk_sort(SRP_gN_cache, (st))

+#define sk_SRP_gN_cache_is_sorted(st) SKM_sk_is_sorted(SRP_gN_cache, (st))

 
 

-#define sk_SRP_user_pwd_new(st) SKM_sk_new(SRP_user_pwd, (st))
+#define sk_SRP_user_pwd_new(cmp) SKM_sk_new(SRP_user_pwd, (cmp))

 #define sk_SRP_user_pwd_new_null() SKM_sk_new_null(SRP_user_pwd)
 #define sk_SRP_user_pwd_free(st) SKM_sk_free(SRP_user_pwd, (st))
 #define sk_SRP_user_pwd_num(st) SKM_sk_num(SRP_user_pwd, (st))
 #define sk_SRP_user_pwd_new_null() SKM_sk_new_null(SRP_user_pwd)
 #define sk_SRP_user_pwd_free(st) SKM_sk_free(SRP_user_pwd, (st))
 #define sk_SRP_user_pwd_num(st) SKM_sk_num(SRP_user_pwd, (st))


@@ -1509,6 +1513,7 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 #define sk_SRP_user_pwd_push(st, val) SKM_sk_push(SRP_user_pwd, (st), (val))
 #define sk_SRP_user_pwd_unshift(st, val) SKM_sk_unshift(SRP_user_pwd, (st), (val))
 #define sk_SRP_user_pwd_find(st, val) SKM_sk_find(SRP_user_pwd, (st), (val))
 #define sk_SRP_user_pwd_push(st, val) SKM_sk_push(SRP_user_pwd, (st), (val))
 #define sk_SRP_user_pwd_unshift(st, val) SKM_sk_unshift(SRP_user_pwd, (st), (val))
 #define sk_SRP_user_pwd_find(st, val) SKM_sk_find(SRP_user_pwd, (st), (val))

+#define sk_SRP_user_pwd_find_ex(st, val) SKM_sk_find_ex(SRP_user_pwd, (st), (val))

 #define sk_SRP_user_pwd_delete(st, i) SKM_sk_delete(SRP_user_pwd, (st), (i))
 #define sk_SRP_user_pwd_delete_ptr(st, ptr) SKM_sk_delete_ptr(SRP_user_pwd, (st), (ptr))
 #define sk_SRP_user_pwd_insert(st, val, i) SKM_sk_insert(SRP_user_pwd, (st), (val), (i))
 #define sk_SRP_user_pwd_delete(st, i) SKM_sk_delete(SRP_user_pwd, (st), (i))
 #define sk_SRP_user_pwd_delete_ptr(st, ptr) SKM_sk_delete_ptr(SRP_user_pwd, (st), (ptr))
 #define sk_SRP_user_pwd_insert(st, val, i) SKM_sk_insert(SRP_user_pwd, (st), (val), (i))


@@ -1518,6 +1523,7 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 #define sk_SRP_user_pwd_shift(st) SKM_sk_shift(SRP_user_pwd, (st))
 #define sk_SRP_user_pwd_pop(st) SKM_sk_pop(SRP_user_pwd, (st))
 #define sk_SRP_user_pwd_sort(st) SKM_sk_sort(SRP_user_pwd, (st))
 #define sk_SRP_user_pwd_shift(st) SKM_sk_shift(SRP_user_pwd, (st))
 #define sk_SRP_user_pwd_pop(st) SKM_sk_pop(SRP_user_pwd, (st))
 #define sk_SRP_user_pwd_sort(st) SKM_sk_sort(SRP_user_pwd, (st))

+#define sk_SRP_user_pwd_is_sorted(st) SKM_sk_is_sorted(SRP_user_pwd, (st))

 
 #define sk_SSL_CIPHER_new(cmp) SKM_sk_new(SSL_CIPHER, (cmp))
 #define sk_SSL_CIPHER_new_null() SKM_sk_new_null(SSL_CIPHER)
 
 #define sk_SSL_CIPHER_new(cmp) SKM_sk_new(SSL_CIPHER, (cmp))
 #define sk_SSL_CIPHER_new_null() SKM_sk_new_null(SSL_CIPHER)

diff --git a/ssl/Makefile b/ssl/Makefile
index 720859d95c48e7f29ff22bb4ef95071b1ffaeddf..4af20f65851717c15196f54cdf2d24d71c021f0d 100644 (file)
--- a/ssl/Makefile
+++ b/ssl/Makefile
@@ -609,13 +609,14 @@ s3_pkt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 s3_pkt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 s3_pkt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s3_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s3_pkt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 s3_pkt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s3_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h

-s3_pkt.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
-s3_pkt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s3_pkt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s3_pkt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s3_pkt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s3_pkt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-s3_pkt.o: ../include/openssl/x509_vfy.h s3_pkt.c ssl_locl.h
+s3_pkt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
+s3_pkt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s3_pkt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s3_pkt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s3_pkt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s3_pkt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+s3_pkt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s3_pkt.c
+s3_pkt.o: ssl_locl.h

 s3_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s3_srvr.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 s3_srvr.o: ../include/openssl/comp.h ../include/openssl/crypto.h
 s3_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s3_srvr.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 s3_srvr.o: ../include/openssl/comp.h ../include/openssl/crypto.h


@@ -887,13 +888,13 @@ t1_enc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 t1_enc.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 t1_enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 t1_enc.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 t1_enc.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 t1_enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 t1_enc.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h

-t1_enc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-t1_enc.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-t1_enc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-t1_enc.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-t1_enc.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-t1_enc.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
-t1_enc.o: t1_enc.c
+t1_enc.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+t1_enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+t1_enc.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+t1_enc.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+t1_enc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+t1_enc.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+t1_enc.o: ../include/openssl/x509_vfy.h ssl_locl.h t1_enc.c

 t1_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 t1_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 t1_lib.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 t1_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 t1_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 t1_lib.o: ../include/openssl/conf.h ../include/openssl/crypto.h


@@ -973,3 +974,24 @@ t1_srvr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 t1_srvr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
 t1_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
 t1_srvr.o: t1_srvr.c
 t1_srvr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
 t1_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
 t1_srvr.o: t1_srvr.c

+tls_srp.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
+tls_srp.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+tls_srp.o: ../include/openssl/comp.h ../include/openssl/crypto.h
+tls_srp.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h
+tls_srp.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+tls_srp.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+tls_srp.o: ../include/openssl/err.h ../include/openssl/evp.h
+tls_srp.o: ../include/openssl/hmac.h ../include/openssl/kssl.h
+tls_srp.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
+tls_srp.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+tls_srp.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+tls_srp.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+tls_srp.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
+tls_srp.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+tls_srp.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+tls_srp.o: ../include/openssl/srp.h ../include/openssl/ssl.h
+tls_srp.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+tls_srp.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+tls_srp.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+tls_srp.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
+tls_srp.o: tls_srp.c

diff --git a/test/Makefile b/test/Makefile
index e9785652e5f37eac82f47195f0eeb605c61ce5ae..f87ae7adb45440001b5b80cda093b81d49d5c26f 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -677,6 +677,13 @@ shatest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 shatest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 shatest.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 shatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h shatest.c
 shatest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 shatest.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 shatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h shatest.c

+srptest.o: ../include/openssl/bio.h ../include/openssl/bn.h
+srptest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
+srptest.o: ../include/openssl/err.h ../include/openssl/lhash.h
+srptest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+srptest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
+srptest.o: ../include/openssl/safestack.h ../include/openssl/srp.h
+srptest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h srptest.c

 ssltest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ssltest.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 ssltest.o: ../include/openssl/comp.h ../include/openssl/conf.h
 ssltest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ssltest.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 ssltest.o: ../include/openssl/comp.h ../include/openssl/conf.h


@@ -693,12 +700,12 @@ ssltest.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 ssltest.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssltest.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
 ssltest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 ssltest.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssltest.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
 ssltest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h

-ssltest.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-ssltest.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-ssltest.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-ssltest.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-ssltest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-ssltest.o: ../include/openssl/x509v3.h ssltest.c
+ssltest.o: ../include/openssl/sha.h ../include/openssl/srp.h
+ssltest.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ssltest.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ssltest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+ssltest.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+ssltest.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h ssltest.c

 wp_test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 wp_test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 wp_test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
 wp_test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 wp_test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 wp_test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h

diff --git a/util/libeay.num b/util/libeay.num
index 24c3f9063f970410d5173a6e4e88585d2d527fcf..104b187280e93a4a992d12ba78d31383bd2406cc 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1050,7 +1050,7 @@ ASN1_TYPE_get_octetstring               1077      EXIST::FUNCTION:
 ASN1_TYPE_set_int_octetstring           1078   EXIST::FUNCTION:
 ASN1_TYPE_set_octetstring               1079   EXIST::FUNCTION:
 ASN1_UTCTIME_set_string                 1080   EXIST::FUNCTION:
 ASN1_TYPE_set_int_octetstring           1078   EXIST::FUNCTION:
 ASN1_TYPE_set_octetstring               1079   EXIST::FUNCTION:
 ASN1_UTCTIME_set_string                 1080   EXIST::FUNCTION:

-ERR_add_error_data                      1081   EXIST::FUNCTION:BIO
+ERR_add_error_data                      1081   EXIST::FUNCTION:

 ERR_set_error_data                      1082   EXIST::FUNCTION:
 EVP_CIPHER_asn1_to_param                1083   EXIST::FUNCTION:
 EVP_CIPHER_param_to_asn1                1084   EXIST::FUNCTION:
 ERR_set_error_data                      1082   EXIST::FUNCTION:
 EVP_CIPHER_asn1_to_param                1083   EXIST::FUNCTION:
 EVP_CIPHER_param_to_asn1                1084   EXIST::FUNCTION:


@@ -2882,7 +2882,7 @@ RSA_verify_PKCS1_PSS                    3321      EXIST::FUNCTION:RSA
 RSA_padding_add_X931                    3322   EXIST::FUNCTION:RSA
 RSA_padding_add_PKCS1_PSS               3323   EXIST::FUNCTION:RSA
 PKCS1_MGF1                              3324   EXIST::FUNCTION:RSA
 RSA_padding_add_X931                    3322   EXIST::FUNCTION:RSA
 RSA_padding_add_PKCS1_PSS               3323   EXIST::FUNCTION:RSA
 PKCS1_MGF1                              3324   EXIST::FUNCTION:RSA

-BN_X931_generate_Xpq                    3325   NOEXIST::FUNCTION:
+BN_X931_generate_Xpq                    3325   EXIST::FUNCTION:

 RSA_X931_generate_key                   3326   NOEXIST::FUNCTION:
 BN_X931_derive_prime                    3327   NOEXIST::FUNCTION:
 BN_X931_generate_prime                  3328   NOEXIST::FUNCTION:
 RSA_X931_generate_key                   3326   NOEXIST::FUNCTION:
 BN_X931_derive_prime                    3327   NOEXIST::FUNCTION:
 BN_X931_generate_prime                  3328   NOEXIST::FUNCTION:


@@ -3670,7 +3670,7 @@ int_EVP_MD_set_engine_callbacks         4056      NOEXIST::FUNCTION:
 int_CRYPTO_set_do_dynlock_callback      4057   NOEXIST::FUNCTION:
 FIPS_rng_stick                          4058   NOEXIST::FUNCTION:
 EVP_CIPHER_CTX_set_flags                4059   EXIST::FUNCTION:
 int_CRYPTO_set_do_dynlock_callback      4057   NOEXIST::FUNCTION:
 FIPS_rng_stick                          4058   NOEXIST::FUNCTION:
 EVP_CIPHER_CTX_set_flags                4059   EXIST::FUNCTION:

-BN_X931_generate_prime_ex               4060   NOEXIST::FUNCTION:
+BN_X931_generate_prime_ex               4060   EXIST::FUNCTION:

 FIPS_selftest_check                     4061   NOEXIST::FUNCTION:
 FIPS_rand_set_dt                        4062   NOEXIST::FUNCTION:
 CRYPTO_dbg_pop_info                     4063   NOEXIST::FUNCTION:
 FIPS_selftest_check                     4061   NOEXIST::FUNCTION:
 FIPS_rand_set_dt                        4062   NOEXIST::FUNCTION:
 CRYPTO_dbg_pop_info                     4063   NOEXIST::FUNCTION:


@@ -3695,7 +3695,7 @@ FIPS_rand_test_mode                     4081      NOEXIST::FUNCTION:
 FIPS_rand_reset                         4082   NOEXIST::FUNCTION:
 FIPS_dsa_new                            4083   NOEXIST::FUNCTION:
 int_RAND_set_callbacks                  4084   NOEXIST::FUNCTION:
 FIPS_rand_reset                         4082   NOEXIST::FUNCTION:
 FIPS_dsa_new                            4083   NOEXIST::FUNCTION:
 int_RAND_set_callbacks                  4084   NOEXIST::FUNCTION:

-BN_X931_derive_prime_ex                 4085   NOEXIST::FUNCTION:
+BN_X931_derive_prime_ex                 4085   EXIST::FUNCTION:

 int_ERR_lib_init                        4086   NOEXIST::FUNCTION:
 int_EVP_CIPHER_init_engine_callbacks    4087   NOEXIST::FUNCTION:
 FIPS_rsa_free                           4088   NOEXIST::FUNCTION:
 int_ERR_lib_init                        4086   NOEXIST::FUNCTION:
 int_EVP_CIPHER_init_engine_callbacks    4087   NOEXIST::FUNCTION:
 FIPS_rsa_free                           4088   NOEXIST::FUNCTION:


@@ -4189,20 +4189,33 @@ CRYPTO_cts128_encrypt_block             4560    EXIST::FUNCTION:
 CRYPTO_cbc128_decrypt                   4561   EXIST::FUNCTION:
 CRYPTO_cfb128_encrypt                   4562   EXIST::FUNCTION:
 CRYPTO_cfb128_8_encrypt                 4563   EXIST::FUNCTION:
 CRYPTO_cbc128_decrypt                   4561   EXIST::FUNCTION:
 CRYPTO_cfb128_encrypt                   4562   EXIST::FUNCTION:
 CRYPTO_cfb128_8_encrypt                 4563   EXIST::FUNCTION:

-SRP_VBASE_get_by_user                   4564   EXIST::FUNCTION:SRP
-SRP_Calc_server_key                     4565   EXIST::FUNCTION:SRP
-SRP_create_verifier                     4566   EXIST::FUNCTION:SRP
-SRP_create_verifier_BN                  4567   EXIST::FUNCTION:SRP
-SRP_Calc_u                              4568   EXIST::FUNCTION:SRP
-SRP_VBASE_free                          4569   EXIST::FUNCTION:SRP
-SRP_Calc_client_key                     4570   EXIST::FUNCTION:SRP
-SRP_get_default_gN                      4571   EXIST::FUNCTION:SRP
-SRP_Calc_x                              4572   EXIST::FUNCTION:SRP
-SRP_Calc_B                              4573   EXIST::FUNCTION:SRP
-SRP_VBASE_new                           4574   EXIST::FUNCTION:SRP
-SRP_check_known_gN_param                4575   EXIST::FUNCTION:SRP
-SRP_Calc_A                              4576   EXIST::FUNCTION:SRP
-SRP_Verify_A_mod_N                      4577   EXIST::FUNCTION:SRP
-SRP_VBASE_init                          4578   EXIST::FUNCTION:SRP
-SRP_Verify_B_mod_N                      4579   EXIST::FUNCTION:SRP
-OPENSSL_strcasecmp                      4594   EXIST::FUNCTION:
+OPENSSL_strcasecmp                      4564   EXIST::FUNCTION:
+OPENSSL_memcmp                          4565   EXIST::FUNCTION:
+OPENSSL_strncasecmp                     4566   EXIST::FUNCTION:
+OPENSSL_gmtime                          4567   EXIST::FUNCTION:
+OPENSSL_gmtime_adj                      4568   EXIST::FUNCTION:
+SRP_VBASE_get_by_user                   4569   EXIST::FUNCTION:SRP
+SRP_Calc_server_key                     4570   EXIST::FUNCTION:SRP
+SRP_create_verifier                     4571   EXIST::FUNCTION:SRP
+SRP_create_verifier_BN                  4572   EXIST::FUNCTION:SRP
+SRP_Calc_u                              4573   EXIST::FUNCTION:SRP
+SRP_VBASE_free                          4574   EXIST::FUNCTION:SRP
+SRP_Calc_client_key                     4575   EXIST::FUNCTION:SRP
+SRP_get_default_gN                      4576   EXIST::FUNCTION:SRP
+SRP_Calc_x                              4577   EXIST::FUNCTION:SRP
+SRP_Calc_B                              4578   EXIST::FUNCTION:SRP
+SRP_VBASE_new                           4579   EXIST::FUNCTION:SRP
+SRP_check_known_gN_param                4580   EXIST::FUNCTION:SRP
+SRP_Calc_A                              4581   EXIST::FUNCTION:SRP
+SRP_Verify_A_mod_N                      4582   EXIST::FUNCTION:SRP
+SRP_VBASE_init                          4583   EXIST::FUNCTION:SRP
+SRP_Verify_B_mod_N                      4584   EXIST::FUNCTION:SRP
+EC_KEY_set_public_key_affine_coordinates 4585  EXIST:!VMS:FUNCTION:EC
+EC_KEY_set_pub_key_aff_coords           4585   EXIST:VMS:FUNCTION:EC
+EVP_aes_192_ctr                         4586   EXIST::FUNCTION:AES
+EVP_PKEY_meth_get0_info                 4587   EXIST::FUNCTION:
+EVP_PKEY_meth_copy                      4588   EXIST::FUNCTION:
+ERR_add_error_vdata                     4589   EXIST::FUNCTION:
+EVP_aes_128_ctr                         4590   EXIST::FUNCTION:AES
+EVP_aes_256_ctr                         4591   EXIST::FUNCTION:AES
+EC_GFp_nistp224_method                  4592   EXIST::FUNCTION:EC

diff --git a/util/ssleay.num b/util/ssleay.num
index 84108e023ed5bceb77190331ce6cfc4929e4cda8..561c937815dff09f6632ee2d42a0b502af1f2683 100755 (executable)
--- a/util/ssleay.num
+++ b/util/ssleay.num
@@ -264,17 +264,33 @@ SSL_renegotiate_abbreviated             312       EXIST::FUNCTION:
 TLSv1_1_method                          313    EXIST::FUNCTION:
 TLSv1_1_client_method                   314    EXIST::FUNCTION:
 TLSv1_1_server_method                   315    EXIST::FUNCTION:
 TLSv1_1_method                          313    EXIST::FUNCTION:
 TLSv1_1_client_method                   314    EXIST::FUNCTION:
 TLSv1_1_server_method                   315    EXIST::FUNCTION:

-SSL_CTX_set_srp_client_pwd_callback     316    EXIST::FUNCTION:SRP,TLSEXT
-SSL_get_srp_g                           317    EXIST::FUNCTION:SRP,TLSEXT
-SSL_CTX_set_srp_username_callback       318    EXIST::FUNCTION:SRP,TLSEXT
-SSL_get_srp_userinfo                    319    EXIST::FUNCTION:SRP,TLSEXT
-SSL_set_srp_server_param                320    EXIST::FUNCTION:SRP,TLSEXT
-SSL_set_srp_server_param_pw             321    EXIST::FUNCTION:SRP,TLSEXT
-SSL_get_srp_N                           322    EXIST::FUNCTION:SRP,TLSEXT
-SSL_get_srp_username                    323    EXIST::FUNCTION:SRP,TLSEXT
-SSL_CTX_set_srp_password                324    EXIST::FUNCTION:SRP,TLSEXT
-SSL_CTX_set_srp_strength                325    EXIST::FUNCTION:SRP,TLSEXT
-SSL_CTX_set_srp_verify_param_callback   326    EXIST::FUNCTION:SRP,TLSEXT
-SSL_CTX_set_srp_missing_srp_username_callback 327      EXIST::FUNCTION:SRP,TLSEXT
-SSL_CTX_set_srp_cb_arg                  328    EXIST::FUNCTION:SRP,TLSEXT
-SSL_CTX_set_srp_username                329    EXIST::FUNCTION:SRP,TLSEXT
+SSL_CTX_set_srp_client_pwd_callback     316    EXIST:!VMS:FUNCTION:SRP
+SSL_CTX_set_srp_client_pwd_cb           316    EXIST:VMS:FUNCTION:SRP
+SSL_get_srp_g                           317    EXIST::FUNCTION:SRP
+SSL_CTX_set_srp_username_callback       318    EXIST:!VMS:FUNCTION:SRP
+SSL_CTX_set_srp_un_cb                   318    EXIST:VMS:FUNCTION:SRP
+SSL_get_srp_userinfo                    319    EXIST::FUNCTION:SRP
+SSL_set_srp_server_param                320    EXIST::FUNCTION:SRP
+SSL_set_srp_server_param_pw             321    EXIST::FUNCTION:SRP
+SSL_get_srp_N                           322    EXIST::FUNCTION:SRP
+SSL_get_srp_username                    323    EXIST::FUNCTION:SRP
+SSL_CTX_set_srp_password                324    EXIST::FUNCTION:SRP
+SSL_CTX_set_srp_strength                325    EXIST::FUNCTION:SRP
+SSL_CTX_set_srp_verify_param_callback   326    EXIST:!VMS:FUNCTION:SRP
+SSL_CTX_set_srp_vfy_param_cb            326    EXIST:VMS:FUNCTION:SRP
+SSL_CTX_set_srp_missing_srp_username_callback 327      EXIST:!VMS:FUNCTION:SRP
+SSL_CTX_set_srp_miss_srp_un_cb          327    EXIST:VMS:FUNCTION:SRP
+SSL_CTX_set_srp_cb_arg                  328    EXIST::FUNCTION:SRP
+SSL_CTX_set_srp_username                329    EXIST::FUNCTION:SRP
+SSL_CTX_SRP_CTX_init                    330    EXIST::FUNCTION:SRP
+SSL_SRP_CTX_init                        331    EXIST::FUNCTION:SRP
+SRP_Calc_A_param                        332    EXIST::FUNCTION:SRP
+SRP_generate_server_master_secret       333    EXIST:!VMS:FUNCTION:SRP
+SRP_gen_server_master_secret            333    EXIST:VMS:FUNCTION:SRP
+SSL_CTX_SRP_CTX_free                    334    EXIST::FUNCTION:SRP
+SRP_generate_client_master_secret       335    EXIST:!VMS:FUNCTION:SRP
+SRP_gen_client_master_secret            335    EXIST:VMS:FUNCTION:SRP
+SSL_srp_server_param_with_username      336    EXIST:!VMS:FUNCTION:SRP
+SSL_srp_server_param_with_un            336    EXIST:VMS:FUNCTION:SRP
+SRP_have_to_put_srp_username            337    EXIST::FUNCTION:SRP
+SSL_SRP_CTX_free                        338    EXIST::FUNCTION:SRP