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/stack/safestack.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'crypto/stack') 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