From 487b023f3d30114cad2118be70a47171ea4d65cd Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 23 Mar 2011 00:11:32 +0000 Subject: make update (1.1.0-dev) This meant alarger renumbering in util/libeay.num due to symbols appearing in 1.0.0-stable and 1.0.1-stable. However, since there's been no release on this branch yet, it should be harmless. --- crypto/dso/Makefile | 2 +- crypto/ec/Makefile | 1 + crypto/engine/Makefile | 2 -- crypto/evp/Makefile | 1 + crypto/stack/safestack.h | 12 +++++++++--- 5 files changed, 12 insertions(+), 6 deletions(-) (limited to 'crypto') diff --git a/crypto/dso/Makefile b/crypto/dso/Makefile index e3df4c4d3d..dfb88aa789 100644 --- 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: ../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 diff --git a/crypto/ec/Makefile b/crypto/ec/Makefile index 4491fb5e36..1d7d1dcbed 100644 --- a/crypto/ec/Makefile +++ b/crypto/ec/Makefile @@ -239,6 +239,7 @@ ecp_nist.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h ecp_nist.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h ecp_nist.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h ecp_nist.o: ../../include/openssl/symhacks.h ec_lcl.h ecp_nist.c +ecp_nistp224.o: ecp_nistp224.c ecp_oct.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h ecp_oct.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h ecp_oct.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h diff --git a/crypto/engine/Makefile b/crypto/engine/Makefile index 5a2e4efb3d..c8a71b7c64 100644 --- a/crypto/engine/Makefile +++ b/crypto/engine/Makefile @@ -126,8 +126,6 @@ eng_cnf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h eng_cnf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h eng_cnf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h eng_cnf.o: ../cryptlib.h eng_cnf.c eng_int.h -eng_cryptodev.o: ../../crypto/dh/dh.h ../../crypto/dsa/dsa.h -eng_cryptodev.o: ../../crypto/err/err.h ../../crypto/rsa/rsa.h eng_cryptodev.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h eng_cryptodev.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h eng_cryptodev.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile index 62e995458c..871c031412 100644 --- a/crypto/evp/Makefile +++ b/crypto/evp/Makefile @@ -262,6 +262,7 @@ e_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h e_null.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h e_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h e_null.o: ../cryptlib.h e_null.c +e_old.o: e_old.c e_rc2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h e_rc2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h e_rc2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h index 7c5ebe064b..401cc220db 100644 --- 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_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)) @@ -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_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)) @@ -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_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)) @@ -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_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)) @@ -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_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)) @@ -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_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)) @@ -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_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) -- cgit v1.2.3