diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2000-06-01 08:07:19 +0200 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2000-06-01 08:07:19 +0200 |
| commit | 7edd20916a35735f809bccd6d595c209814b1c2e (patch) | |
| tree | b3e4141c52bcc0e5a3b9126cde30aaebbb27291b | |
| parent | This change will cause builds (by default) to not use different STACK (diff) | |
| download | openssl-7edd20916a35735f809bccd6d595c209814b1c2e.tar.xz openssl-7edd20916a35735f809bccd6d595c209814b1c2e.zip | |
"make update" + stripping the type-specific stack functions out of
libeay.num and ssleay.num.
| -rw-r--r-- | crypto/asn1/asn1.h | 124 | ||||
| -rw-r--r-- | crypto/bio/bio.h | 31 | ||||
| -rw-r--r-- | crypto/conf/conf.h | 31 | ||||
| -rw-r--r-- | crypto/crypto.h | 31 | ||||
| -rw-r--r-- | crypto/objects/o_names.c | 31 | ||||
| -rw-r--r-- | crypto/pkcs12/pkcs12.h | 31 | ||||
| -rw-r--r-- | crypto/pkcs7/pk7_mime.c | 62 | ||||
| -rw-r--r-- | crypto/pkcs7/pkcs7.h | 93 | ||||
| -rw-r--r-- | crypto/x509/x509.h | 310 | ||||
| -rw-r--r-- | crypto/x509/x509_vfy.h | 31 | ||||
| -rw-r--r-- | crypto/x509v3/x509v3.h | 248 | ||||
| -rw-r--r-- | ssl/ssl.h | 62 | ||||
| -rwxr-xr-x | util/libeay.num | 570 | ||||
| -rwxr-xr-x | util/ssleay.num | 38 |
14 files changed, 1085 insertions, 608 deletions
diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index e137f6b7c7..50a0cfb162 100644 --- a/crypto/asn1/asn1.h +++ b/crypto/asn1/asn1.h @@ -245,6 +245,37 @@ typedef struct asn1_string_table_st { } ASN1_STRING_TABLE; DECLARE_STACK_OF(ASN1_STRING_TABLE) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_ASN1_STRING_TABLE_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_ASN1_STRING_TABLE_new_null() sk_new_null() + #define sk_ASN1_STRING_TABLE_free(a) sk_free(a) + #define sk_ASN1_STRING_TABLE_num(a) sk_num(a) + #define sk_ASN1_STRING_TABLE_value(a,b) ((ASN1_STRING_TABLE *) \ + sk_value((a),(b))) + #define sk_ASN1_STRING_TABLE_set(a,b,c) ((ASN1_STRING_TABLE *) \ + sk_set((a),(b),(char *)(c))) + #define sk_ASN1_STRING_TABLE_zero(a) sk_zero(a) + #define sk_ASN1_STRING_TABLE_push(a,b) sk_push((a),(char *)(b)) + #define sk_ASN1_STRING_TABLE_unshift(a,b) sk_unshift((a),(b)) + #define sk_ASN1_STRING_TABLE_find(a,b) sk_find((a), (char *)(b)) + #define sk_ASN1_STRING_TABLE_delete(a,b) ((ASN1_STRING_TABLE *) \ + sk_delete((a),(b))) + #define sk_ASN1_STRING_TABLE_delete_ptr(a,b) ((ASN1_STRING_TABLE *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_ASN1_STRING_TABLE_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_ASN1_STRING_TABLE_set_cmp_func(a,b) ((int (*) \ + (const ASN1_STRING_TABLE * const *,const ASN1_STRING_TABLE * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_ASN1_STRING_TABLE_dup(a) sk_dup(a) + #define sk_ASN1_STRING_TABLE_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_ASN1_STRING_TABLE_shift(a) ((ASN1_STRING_TABLE *)sk_shift(a)) + #define sk_ASN1_STRING_TABLE_pop(a) ((ASN1_STRING_TABLE *)sk_pop(a)) + #define sk_ASN1_STRING_TABLE_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ /* size limits: this stuff is taken straight from RFC2459 */ @@ -294,6 +325,37 @@ typedef struct asn1_string_st ASN1_UTF8STRING; typedef int ASN1_NULL; DECLARE_STACK_OF(ASN1_INTEGER) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_ASN1_INTEGER_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_ASN1_INTEGER_new_null() sk_new_null() + #define sk_ASN1_INTEGER_free(a) sk_free(a) + #define sk_ASN1_INTEGER_num(a) sk_num(a) + #define sk_ASN1_INTEGER_value(a,b) ((ASN1_INTEGER *) \ + sk_value((a),(b))) + #define sk_ASN1_INTEGER_set(a,b,c) ((ASN1_INTEGER *) \ + sk_set((a),(b),(char *)(c))) + #define sk_ASN1_INTEGER_zero(a) sk_zero(a) + #define sk_ASN1_INTEGER_push(a,b) sk_push((a),(char *)(b)) + #define sk_ASN1_INTEGER_unshift(a,b) sk_unshift((a),(b)) + #define sk_ASN1_INTEGER_find(a,b) sk_find((a), (char *)(b)) + #define sk_ASN1_INTEGER_delete(a,b) ((ASN1_INTEGER *) \ + sk_delete((a),(b))) + #define sk_ASN1_INTEGER_delete_ptr(a,b) ((ASN1_INTEGER *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_ASN1_INTEGER_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_ASN1_INTEGER_set_cmp_func(a,b) ((int (*) \ + (const ASN1_INTEGER * const *,const ASN1_INTEGER * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_ASN1_INTEGER_dup(a) sk_dup(a) + #define sk_ASN1_INTEGER_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_ASN1_INTEGER_shift(a) ((ASN1_INTEGER *)sk_shift(a)) + #define sk_ASN1_INTEGER_pop(a) ((ASN1_INTEGER *)sk_pop(a)) + #define sk_ASN1_INTEGER_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(ASN1_INTEGER) typedef struct asn1_type_st @@ -325,6 +387,37 @@ typedef struct asn1_type_st } ASN1_TYPE; DECLARE_STACK_OF(ASN1_TYPE) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_ASN1_TYPE_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_ASN1_TYPE_new_null() sk_new_null() + #define sk_ASN1_TYPE_free(a) sk_free(a) + #define sk_ASN1_TYPE_num(a) sk_num(a) + #define sk_ASN1_TYPE_value(a,b) ((ASN1_TYPE *) \ + sk_value((a),(b))) + #define sk_ASN1_TYPE_set(a,b,c) ((ASN1_TYPE *) \ + sk_set((a),(b),(char *)(c))) + #define sk_ASN1_TYPE_zero(a) sk_zero(a) + #define sk_ASN1_TYPE_push(a,b) sk_push((a),(char *)(b)) + #define sk_ASN1_TYPE_unshift(a,b) sk_unshift((a),(b)) + #define sk_ASN1_TYPE_find(a,b) sk_find((a), (char *)(b)) + #define sk_ASN1_TYPE_delete(a,b) ((ASN1_TYPE *) \ + sk_delete((a),(b))) + #define sk_ASN1_TYPE_delete_ptr(a,b) ((ASN1_TYPE *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_ASN1_TYPE_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_ASN1_TYPE_set_cmp_func(a,b) ((int (*) \ + (const ASN1_TYPE * const *,const ASN1_TYPE * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_ASN1_TYPE_dup(a) sk_dup(a) + #define sk_ASN1_TYPE_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_ASN1_TYPE_shift(a) ((ASN1_TYPE *)sk_shift(a)) + #define sk_ASN1_TYPE_pop(a) ((ASN1_TYPE *)sk_pop(a)) + #define sk_ASN1_TYPE_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(ASN1_TYPE) typedef struct asn1_method_st @@ -546,6 +639,37 @@ ASN1_OBJECT * d2i_ASN1_OBJECT(ASN1_OBJECT **a,unsigned char **pp, long length); DECLARE_STACK_OF(ASN1_OBJECT) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_ASN1_OBJECT_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_ASN1_OBJECT_new_null() sk_new_null() + #define sk_ASN1_OBJECT_free(a) sk_free(a) + #define sk_ASN1_OBJECT_num(a) sk_num(a) + #define sk_ASN1_OBJECT_value(a,b) ((ASN1_OBJECT *) \ + sk_value((a),(b))) + #define sk_ASN1_OBJECT_set(a,b,c) ((ASN1_OBJECT *) \ + sk_set((a),(b),(char *)(c))) + #define sk_ASN1_OBJECT_zero(a) sk_zero(a) + #define sk_ASN1_OBJECT_push(a,b) sk_push((a),(char *)(b)) + #define sk_ASN1_OBJECT_unshift(a,b) sk_unshift((a),(b)) + #define sk_ASN1_OBJECT_find(a,b) sk_find((a), (char *)(b)) + #define sk_ASN1_OBJECT_delete(a,b) ((ASN1_OBJECT *) \ + sk_delete((a),(b))) + #define sk_ASN1_OBJECT_delete_ptr(a,b) ((ASN1_OBJECT *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_ASN1_OBJECT_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_ASN1_OBJECT_set_cmp_func(a,b) ((int (*) \ + (const ASN1_OBJECT * const *,const ASN1_OBJECT * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_ASN1_OBJECT_dup(a) sk_dup(a) + #define sk_ASN1_OBJECT_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_ASN1_OBJECT_shift(a) ((ASN1_OBJECT *)sk_shift(a)) + #define sk_ASN1_OBJECT_pop(a) ((ASN1_OBJECT *)sk_pop(a)) + #define sk_ASN1_OBJECT_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(ASN1_OBJECT) ASN1_STRING * ASN1_STRING_new(void); diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h index 2e25516cf3..24d1bc8da9 100644 --- a/crypto/bio/bio.h +++ b/crypto/bio/bio.h @@ -262,6 +262,37 @@ struct bio_st }; DECLARE_STACK_OF(BIO) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_BIO_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_BIO_new_null() sk_new_null() + #define sk_BIO_free(a) sk_free(a) + #define sk_BIO_num(a) sk_num(a) + #define sk_BIO_value(a,b) ((BIO *) \ + sk_value((a),(b))) + #define sk_BIO_set(a,b,c) ((BIO *) \ + sk_set((a),(b),(char *)(c))) + #define sk_BIO_zero(a) sk_zero(a) + #define sk_BIO_push(a,b) sk_push((a),(char *)(b)) + #define sk_BIO_unshift(a,b) sk_unshift((a),(b)) + #define sk_BIO_find(a,b) sk_find((a), (char *)(b)) + #define sk_BIO_delete(a,b) ((BIO *) \ + sk_delete((a),(b))) + #define sk_BIO_delete_ptr(a,b) ((BIO *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_BIO_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_BIO_set_cmp_func(a,b) ((int (*) \ + (const BIO * const *,const BIO * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_BIO_dup(a) sk_dup(a) + #define sk_BIO_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_BIO_shift(a) ((BIO *)sk_shift(a)) + #define sk_BIO_pop(a) ((BIO *)sk_pop(a)) + #define sk_BIO_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ typedef struct bio_f_buffer_ctx_struct { diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h index 2f70634455..0adda45dd3 100644 --- a/crypto/conf/conf.h +++ b/crypto/conf/conf.h @@ -77,6 +77,37 @@ typedef struct } CONF_VALUE; DECLARE_STACK_OF(CONF_VALUE) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_CONF_VALUE_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_CONF_VALUE_new_null() sk_new_null() + #define sk_CONF_VALUE_free(a) sk_free(a) + #define sk_CONF_VALUE_num(a) sk_num(a) + #define sk_CONF_VALUE_value(a,b) ((CONF_VALUE *) \ + sk_value((a),(b))) + #define sk_CONF_VALUE_set(a,b,c) ((CONF_VALUE *) \ + sk_set((a),(b),(char *)(c))) + #define sk_CONF_VALUE_zero(a) sk_zero(a) + #define sk_CONF_VALUE_push(a,b) sk_push((a),(char *)(b)) + #define sk_CONF_VALUE_unshift(a,b) sk_unshift((a),(b)) + #define sk_CONF_VALUE_find(a,b) sk_find((a), (char *)(b)) + #define sk_CONF_VALUE_delete(a,b) ((CONF_VALUE *) \ + sk_delete((a),(b))) + #define sk_CONF_VALUE_delete_ptr(a,b) ((CONF_VALUE *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_CONF_VALUE_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_CONF_VALUE_set_cmp_func(a,b) ((int (*) \ + (const CONF_VALUE * const *,const CONF_VALUE * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_CONF_VALUE_dup(a) sk_dup(a) + #define sk_CONF_VALUE_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_CONF_VALUE_shift(a) ((CONF_VALUE *)sk_shift(a)) + #define sk_CONF_VALUE_pop(a) ((CONF_VALUE *)sk_pop(a)) + #define sk_CONF_VALUE_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ struct conf_st; typedef struct conf_st CONF; diff --git a/crypto/crypto.h b/crypto/crypto.h index 84894af56c..adb436f862 100644 --- a/crypto/crypto.h +++ b/crypto/crypto.h @@ -201,6 +201,37 @@ typedef struct crypto_ex_data_func_st } CRYPTO_EX_DATA_FUNCS; DECLARE_STACK_OF(CRYPTO_EX_DATA_FUNCS) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_CRYPTO_EX_DATA_FUNCS_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_CRYPTO_EX_DATA_FUNCS_new_null() sk_new_null() + #define sk_CRYPTO_EX_DATA_FUNCS_free(a) sk_free(a) + #define sk_CRYPTO_EX_DATA_FUNCS_num(a) sk_num(a) + #define sk_CRYPTO_EX_DATA_FUNCS_value(a,b) ((CRYPTO_EX_DATA_FUNCS *) \ + sk_value((a),(b))) + #define sk_CRYPTO_EX_DATA_FUNCS_set(a,b,c) ((CRYPTO_EX_DATA_FUNCS *) \ + sk_set((a),(b),(char *)(c))) + #define sk_CRYPTO_EX_DATA_FUNCS_zero(a) sk_zero(a) + #define sk_CRYPTO_EX_DATA_FUNCS_push(a,b) sk_push((a),(char *)(b)) + #define sk_CRYPTO_EX_DATA_FUNCS_unshift(a,b) sk_unshift((a),(b)) + #define sk_CRYPTO_EX_DATA_FUNCS_find(a,b) sk_find((a), (char *)(b)) + #define sk_CRYPTO_EX_DATA_FUNCS_delete(a,b) ((CRYPTO_EX_DATA_FUNCS *) \ + sk_delete((a),(b))) + #define sk_CRYPTO_EX_DATA_FUNCS_delete_ptr(a,b) ((CRYPTO_EX_DATA_FUNCS *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_CRYPTO_EX_DATA_FUNCS_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func(a,b) ((int (*) \ + (const CRYPTO_EX_DATA_FUNCS * const *,const CRYPTO_EX_DATA_FUNCS * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_CRYPTO_EX_DATA_FUNCS_dup(a) sk_dup(a) + #define sk_CRYPTO_EX_DATA_FUNCS_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_CRYPTO_EX_DATA_FUNCS_shift(a) ((CRYPTO_EX_DATA_FUNCS *)sk_shift(a)) + #define sk_CRYPTO_EX_DATA_FUNCS_pop(a) ((CRYPTO_EX_DATA_FUNCS *)sk_pop(a)) + #define sk_CRYPTO_EX_DATA_FUNCS_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ /* Per class, we have a STACK of CRYPTO_EX_DATA_FUNCS for each CRYPTO_EX_DATA * entry. diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c index d9389a5e5a..67cb7f1837 100644 --- a/crypto/objects/o_names.c +++ b/crypto/objects/o_names.c @@ -20,6 +20,37 @@ typedef struct name_funcs_st } NAME_FUNCS; DECLARE_STACK_OF(NAME_FUNCS) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_NAME_FUNCS_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_NAME_FUNCS_new_null() sk_new_null() + #define sk_NAME_FUNCS_free(a) sk_free(a) + #define sk_NAME_FUNCS_num(a) sk_num(a) + #define sk_NAME_FUNCS_value(a,b) ((NAME_FUNCS *) \ + sk_value((a),(b))) + #define sk_NAME_FUNCS_set(a,b,c) ((NAME_FUNCS *) \ + sk_set((a),(b),(char *)(c))) + #define sk_NAME_FUNCS_zero(a) sk_zero(a) + #define sk_NAME_FUNCS_push(a,b) sk_push((a),(char *)(b)) + #define sk_NAME_FUNCS_unshift(a,b) sk_unshift((a),(b)) + #define sk_NAME_FUNCS_find(a,b) sk_find((a), (char *)(b)) + #define sk_NAME_FUNCS_delete(a,b) ((NAME_FUNCS *) \ + sk_delete((a),(b))) + #define sk_NAME_FUNCS_delete_ptr(a,b) ((NAME_FUNCS *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_NAME_FUNCS_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_NAME_FUNCS_set_cmp_func(a,b) ((int (*) \ + (const NAME_FUNCS * const *,const NAME_FUNCS * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_NAME_FUNCS_dup(a) sk_dup(a) + #define sk_NAME_FUNCS_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_NAME_FUNCS_shift(a) ((NAME_FUNCS *)sk_shift(a)) + #define sk_NAME_FUNCS_pop(a) ((NAME_FUNCS *)sk_pop(a)) + #define sk_NAME_FUNCS_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ IMPLEMENT_STACK_OF(NAME_FUNCS) static STACK_OF(NAME_FUNCS) *name_funcs_stack; diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h index 4cf92b68ea..1e0dc3e189 100644 --- a/crypto/pkcs12/pkcs12.h +++ b/crypto/pkcs12/pkcs12.h @@ -124,6 +124,37 @@ ASN1_TYPE *rest; } PKCS12_SAFEBAG; DECLARE_STACK_OF(PKCS12_SAFEBAG) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_PKCS12_SAFEBAG_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_PKCS12_SAFEBAG_new_null() sk_new_null() + #define sk_PKCS12_SAFEBAG_free(a) sk_free(a) + #define sk_PKCS12_SAFEBAG_num(a) sk_num(a) + #define sk_PKCS12_SAFEBAG_value(a,b) ((PKCS12_SAFEBAG *) \ + sk_value((a),(b))) + #define sk_PKCS12_SAFEBAG_set(a,b,c) ((PKCS12_SAFEBAG *) \ + sk_set((a),(b),(char *)(c))) + #define sk_PKCS12_SAFEBAG_zero(a) sk_zero(a) + #define sk_PKCS12_SAFEBAG_push(a,b) sk_push((a),(char *)(b)) + #define sk_PKCS12_SAFEBAG_unshift(a,b) sk_unshift((a),(b)) + #define sk_PKCS12_SAFEBAG_find(a,b) sk_find((a), (char *)(b)) + #define sk_PKCS12_SAFEBAG_delete(a,b) ((PKCS12_SAFEBAG *) \ + sk_delete((a),(b))) + #define sk_PKCS12_SAFEBAG_delete_ptr(a,b) ((PKCS12_SAFEBAG *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_PKCS12_SAFEBAG_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_PKCS12_SAFEBAG_set_cmp_func(a,b) ((int (*) \ + (const PKCS12_SAFEBAG * const *,const PKCS12_SAFEBAG * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_PKCS12_SAFEBAG_dup(a) sk_dup(a) + #define sk_PKCS12_SAFEBAG_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_PKCS12_SAFEBAG_shift(a) ((PKCS12_SAFEBAG *)sk_shift(a)) + #define sk_PKCS12_SAFEBAG_pop(a) ((PKCS12_SAFEBAG *)sk_pop(a)) + #define sk_PKCS12_SAFEBAG_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(PKCS12_SAFEBAG) DECLARE_PKCS12_STACK_OF(PKCS12_SAFEBAG) diff --git a/crypto/pkcs7/pk7_mime.c b/crypto/pkcs7/pk7_mime.c index 36d47ef11c..0ba7d77462 100644 --- a/crypto/pkcs7/pk7_mime.c +++ b/crypto/pkcs7/pk7_mime.c @@ -75,6 +75,37 @@ char *param_value; /* Param value e.g. "sha1" */ } MIME_PARAM; DECLARE_STACK_OF(MIME_PARAM) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_MIME_PARAM_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_MIME_PARAM_new_null() sk_new_null() + #define sk_MIME_PARAM_free(a) sk_free(a) + #define sk_MIME_PARAM_num(a) sk_num(a) + #define sk_MIME_PARAM_value(a,b) ((MIME_PARAM *) \ + sk_value((a),(b))) + #define sk_MIME_PARAM_set(a,b,c) ((MIME_PARAM *) \ + sk_set((a),(b),(char *)(c))) + #define sk_MIME_PARAM_zero(a) sk_zero(a) + #define sk_MIME_PARAM_push(a,b) sk_push((a),(char *)(b)) + #define sk_MIME_PARAM_unshift(a,b) sk_unshift((a),(b)) + #define sk_MIME_PARAM_find(a,b) sk_find((a), (char *)(b)) + #define sk_MIME_PARAM_delete(a,b) ((MIME_PARAM *) \ + sk_delete((a),(b))) + #define sk_MIME_PARAM_delete_ptr(a,b) ((MIME_PARAM *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_MIME_PARAM_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_MIME_PARAM_set_cmp_func(a,b) ((int (*) \ + (const MIME_PARAM * const *,const MIME_PARAM * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_MIME_PARAM_dup(a) sk_dup(a) + #define sk_MIME_PARAM_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_MIME_PARAM_shift(a) ((MIME_PARAM *)sk_shift(a)) + #define sk_MIME_PARAM_pop(a) ((MIME_PARAM *)sk_pop(a)) + #define sk_MIME_PARAM_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ IMPLEMENT_STACK_OF(MIME_PARAM) typedef struct { @@ -84,6 +115,37 @@ STACK_OF(MIME_PARAM) *params; /* Zero or more parameters */ } MIME_HEADER; DECLARE_STACK_OF(MIME_HEADER) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_MIME_HEADER_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_MIME_HEADER_new_null() sk_new_null() + #define sk_MIME_HEADER_free(a) sk_free(a) + #define sk_MIME_HEADER_num(a) sk_num(a) + #define sk_MIME_HEADER_value(a,b) ((MIME_HEADER *) \ + sk_value((a),(b))) + #define sk_MIME_HEADER_set(a,b,c) ((MIME_HEADER *) \ + sk_set((a),(b),(char *)(c))) + #define sk_MIME_HEADER_zero(a) sk_zero(a) + #define sk_MIME_HEADER_push(a,b) sk_push((a),(char *)(b)) + #define sk_MIME_HEADER_unshift(a,b) sk_unshift((a),(b)) + #define sk_MIME_HEADER_find(a,b) sk_find((a), (char *)(b)) + #define sk_MIME_HEADER_delete(a,b) ((MIME_HEADER *) \ + sk_delete((a),(b))) + #define sk_MIME_HEADER_delete_ptr(a,b) ((MIME_HEADER *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_MIME_HEADER_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_MIME_HEADER_set_cmp_func(a,b) ((int (*) \ + (const MIME_HEADER * const *,const MIME_HEADER * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_MIME_HEADER_dup(a) sk_dup(a) + #define sk_MIME_HEADER_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_MIME_HEADER_shift(a) ((MIME_HEADER *)sk_shift(a)) + #define sk_MIME_HEADER_pop(a) ((MIME_HEADER *)sk_pop(a)) + #define sk_MIME_HEADER_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ IMPLEMENT_STACK_OF(MIME_HEADER) static int B64_write_PKCS7(BIO *bio, PKCS7 *p7); diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h index f3f85f57af..9916a3b1d9 100644 --- a/crypto/pkcs7/pkcs7.h +++ b/crypto/pkcs7/pkcs7.h @@ -104,6 +104,37 @@ typedef struct pkcs7_signer_info_st } PKCS7_SIGNER_INFO; DECLARE_STACK_OF(PKCS7_SIGNER_INFO) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_PKCS7_SIGNER_INFO_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_PKCS7_SIGNER_INFO_new_null() sk_new_null() + #define sk_PKCS7_SIGNER_INFO_free(a) sk_free(a) + #define sk_PKCS7_SIGNER_INFO_num(a) sk_num(a) + #define sk_PKCS7_SIGNER_INFO_value(a,b) ((PKCS7_SIGNER_INFO *) \ + sk_value((a),(b))) + #define sk_PKCS7_SIGNER_INFO_set(a,b,c) ((PKCS7_SIGNER_INFO *) \ + sk_set((a),(b),(char *)(c))) + #define sk_PKCS7_SIGNER_INFO_zero(a) sk_zero(a) + #define sk_PKCS7_SIGNER_INFO_push(a,b) sk_push((a),(char *)(b)) + #define sk_PKCS7_SIGNER_INFO_unshift(a,b) sk_unshift((a),(b)) + #define sk_PKCS7_SIGNER_INFO_find(a,b) sk_find((a), (char *)(b)) + #define sk_PKCS7_SIGNER_INFO_delete(a,b) ((PKCS7_SIGNER_INFO *) \ + sk_delete((a),(b))) + #define sk_PKCS7_SIGNER_INFO_delete_ptr(a,b) ((PKCS7_SIGNER_INFO *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_PKCS7_SIGNER_INFO_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_PKCS7_SIGNER_INFO_set_cmp_func(a,b) ((int (*) \ + (const PKCS7_SIGNER_INFO * const *,const PKCS7_SIGNER_INFO * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_PKCS7_SIGNER_INFO_dup(a) sk_dup(a) + #define sk_PKCS7_SIGNER_INFO_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_PKCS7_SIGNER_INFO_shift(a) ((PKCS7_SIGNER_INFO *)sk_shift(a)) + #define sk_PKCS7_SIGNER_INFO_pop(a) ((PKCS7_SIGNER_INFO *)sk_pop(a)) + #define sk_PKCS7_SIGNER_INFO_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO) typedef struct pkcs7_recip_info_st @@ -116,6 +147,37 @@ typedef struct pkcs7_recip_info_st } PKCS7_RECIP_INFO; DECLARE_STACK_OF(PKCS7_RECIP_INFO) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_PKCS7_RECIP_INFO_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_PKCS7_RECIP_INFO_new_null() sk_new_null() + #define sk_PKCS7_RECIP_INFO_free(a) sk_free(a) + #define sk_PKCS7_RECIP_INFO_num(a) sk_num(a) + #define sk_PKCS7_RECIP_INFO_value(a,b) ((PKCS7_RECIP_INFO *) \ + sk_value((a),(b))) + #define sk_PKCS7_RECIP_INFO_set(a,b,c) ((PKCS7_RECIP_INFO *) \ + sk_set((a),(b),(char *)(c))) + #define sk_PKCS7_RECIP_INFO_zero(a) sk_zero(a) + #define sk_PKCS7_RECIP_INFO_push(a,b) sk_push((a),(char *)(b)) + #define sk_PKCS7_RECIP_INFO_unshift(a,b) sk_unshift((a),(b)) + #define sk_PKCS7_RECIP_INFO_find(a,b) sk_find((a), (char *)(b)) + #define sk_PKCS7_RECIP_INFO_delete(a,b) ((PKCS7_RECIP_INFO *) \ + sk_delete((a),(b))) + #define sk_PKCS7_RECIP_INFO_delete_ptr(a,b) ((PKCS7_RECIP_INFO *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_PKCS7_RECIP_INFO_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_PKCS7_RECIP_INFO_set_cmp_func(a,b) ((int (*) \ + (const PKCS7_RECIP_INFO * const *,const PKCS7_RECIP_INFO * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_PKCS7_RECIP_INFO_dup(a) sk_dup(a) + #define sk_PKCS7_RECIP_INFO_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_PKCS7_RECIP_INFO_shift(a) ((PKCS7_RECIP_INFO *)sk_shift(a)) + #define sk_PKCS7_RECIP_INFO_pop(a) ((PKCS7_RECIP_INFO *)sk_pop(a)) + #define sk_PKCS7_RECIP_INFO_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO) typedef struct pkcs7_signed_st @@ -214,6 +276,37 @@ typedef struct pkcs7_st } PKCS7; DECLARE_STACK_OF(PKCS7) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_PKCS7_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_PKCS7_new_null() sk_new_null() + #define sk_PKCS7_free(a) sk_free(a) + #define sk_PKCS7_num(a) sk_num(a) + #define sk_PKCS7_value(a,b) ((PKCS7 *) \ + sk_value((a),(b))) + #define sk_PKCS7_set(a,b,c) ((PKCS7 *) \ + sk_set((a),(b),(char *)(c))) + #define sk_PKCS7_zero(a) sk_zero(a) + #define sk_PKCS7_push(a,b) sk_push((a),(char *)(b)) + #define sk_PKCS7_unshift(a,b) sk_unshift((a),(b)) + #define sk_PKCS7_find(a,b) sk_find((a), (char *)(b)) + #define sk_PKCS7_delete(a,b) ((PKCS7 *) \ + sk_delete((a),(b))) + #define sk_PKCS7_delete_ptr(a,b) ((PKCS7 *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_PKCS7_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_PKCS7_set_cmp_func(a,b) ((int (*) \ + (const PKCS7 * const *,const PKCS7 * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_PKCS7_dup(a) sk_dup(a) + #define sk_PKCS7_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_PKCS7_shift(a) ((PKCS7 *)sk_shift(a)) + #define sk_PKCS7_pop(a) ((PKCS7 *)sk_pop(a)) + #define sk_PKCS7_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(PKCS7) DECLARE_PKCS12_STACK_OF(PKCS7) diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h index a5cb555589..1dae31a233 100644 --- a/crypto/x509/x509.h +++ b/crypto/x509/x509.h @@ -143,6 +143,37 @@ typedef struct X509_algor_st } X509_ALGOR; DECLARE_STACK_OF(X509_ALGOR) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_X509_ALGOR_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_X509_ALGOR_new_null() sk_new_null() + #define sk_X509_ALGOR_free(a) sk_free(a) + #define sk_X509_ALGOR_num(a) sk_num(a) + #define sk_X509_ALGOR_value(a,b) ((X509_ALGOR *) \ + sk_value((a),(b))) + #define sk_X509_ALGOR_set(a,b,c) ((X509_ALGOR *) \ + sk_set((a),(b),(char *)(c))) + #define sk_X509_ALGOR_zero(a) sk_zero(a) + #define sk_X509_ALGOR_push(a,b) sk_push((a),(char *)(b)) + #define sk_X509_ALGOR_unshift(a,b) sk_unshift((a),(b)) + #define sk_X509_ALGOR_find(a,b) sk_find((a), (char *)(b)) + #define sk_X509_ALGOR_delete(a,b) ((X509_ALGOR *) \ + sk_delete((a),(b))) + #define sk_X509_ALGOR_delete_ptr(a,b) ((X509_ALGOR *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_X509_ALGOR_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_X509_ALGOR_set_cmp_func(a,b) ((int (*) \ + (const X509_ALGOR * const *,const X509_ALGOR * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_X509_ALGOR_dup(a) sk_dup(a) + #define sk_X509_ALGOR_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_X509_ALGOR_shift(a) ((X509_ALGOR *)sk_shift(a)) + #define sk_X509_ALGOR_pop(a) ((X509_ALGOR *)sk_pop(a)) + #define sk_X509_ALGOR_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(X509_ALGOR) typedef struct X509_val_st @@ -173,6 +204,37 @@ typedef struct X509_name_entry_st } X509_NAME_ENTRY; DECLARE_STACK_OF(X509_NAME_ENTRY) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_X509_NAME_ENTRY_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_X509_NAME_ENTRY_new_null() sk_new_null() + #define sk_X509_NAME_ENTRY_free(a) sk_free(a) + #define sk_X509_NAME_ENTRY_num(a) sk_num(a) + #define sk_X509_NAME_ENTRY_value(a,b) ((X509_NAME_ENTRY *) \ + sk_value((a),(b))) + #define sk_X509_NAME_ENTRY_set(a,b,c) ((X509_NAME_ENTRY *) \ + sk_set((a),(b),(char *)(c))) + #define sk_X509_NAME_ENTRY_zero(a) sk_zero(a) + #define sk_X509_NAME_ENTRY_push(a,b) sk_push((a),(char *)(b)) + #define sk_X509_NAME_ENTRY_unshift(a,b) sk_unshift((a),(b)) + #define sk_X509_NAME_ENTRY_find(a,b) sk_find((a), (char *)(b)) + #define sk_X509_NAME_ENTRY_delete(a,b) ((X509_NAME_ENTRY *) \ + sk_delete((a),(b))) + #define sk_X509_NAME_ENTRY_delete_ptr(a,b) ((X509_NAME_ENTRY *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_X509_NAME_ENTRY_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_X509_NAME_ENTRY_set_cmp_func(a,b) ((int (*) \ + (const X509_NAME_ENTRY * const *,const X509_NAME_ENTRY * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_X509_NAME_ENTRY_dup(a) sk_dup(a) + #define sk_X509_NAME_ENTRY_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_X509_NAME_ENTRY_shift(a) ((X509_NAME_ENTRY *)sk_shift(a)) + #define sk_X509_NAME_ENTRY_pop(a) ((X509_NAME_ENTRY *)sk_pop(a)) + #define sk_X509_NAME_ENTRY_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(X509_NAME_ENTRY) /* we always keep X509_NAMEs in 2 forms. */ @@ -189,6 +251,37 @@ typedef struct X509_name_st } X509_NAME; DECLARE_STACK_OF(X509_NAME) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_X509_NAME_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_X509_NAME_new_null() sk_new_null() + #define sk_X509_NAME_free(a) sk_free(a) + #define sk_X509_NAME_num(a) sk_num(a) + #define sk_X509_NAME_value(a,b) ((X509_NAME *) \ + sk_value((a),(b))) + #define sk_X509_NAME_set(a,b,c) ((X509_NAME *) \ + sk_set((a),(b),(char *)(c))) + #define sk_X509_NAME_zero(a) sk_zero(a) + #define sk_X509_NAME_push(a,b) sk_push((a),(char *)(b)) + #define sk_X509_NAME_unshift(a,b) sk_unshift((a),(b)) + #define sk_X509_NAME_find(a,b) sk_find((a), (char *)(b)) + #define sk_X509_NAME_delete(a,b) ((X509_NAME *) \ + sk_delete((a),(b))) + #define sk_X509_NAME_delete_ptr(a,b) ((X509_NAME *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_X509_NAME_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_X509_NAME_set_cmp_func(a,b) ((int (*) \ + (const X509_NAME * const *,const X509_NAME * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_X509_NAME_dup(a) sk_dup(a) + #define sk_X509_NAME_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_X509_NAME_shift(a) ((X509_NAME *)sk_shift(a)) + #define sk_X509_NAME_pop(a) ((X509_NAME *)sk_pop(a)) + #define sk_X509_NAME_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ #define X509_EX_V_NETSCAPE_HACK 0x8000 #define X509_EX_V_INIT 0x0001 @@ -203,6 +296,37 @@ typedef struct X509_extension_st } X509_EXTENSION; DECLARE_STACK_OF(X509_EXTENSION) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_X509_EXTENSION_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_X509_EXTENSION_new_null() sk_new_null() + #define sk_X509_EXTENSION_free(a) sk_free(a) + #define sk_X509_EXTENSION_num(a) sk_num(a) + #define sk_X509_EXTENSION_value(a,b) ((X509_EXTENSION *) \ + sk_value((a),(b))) + #define sk_X509_EXTENSION_set(a,b,c) ((X509_EXTENSION *) \ + sk_set((a),(b),(char *)(c))) + #define sk_X509_EXTENSION_zero(a) sk_zero(a) + #define sk_X509_EXTENSION_push(a,b) sk_push((a),(char *)(b)) + #define sk_X509_EXTENSION_unshift(a,b) sk_unshift((a),(b)) + #define sk_X509_EXTENSION_find(a,b) sk_find((a), (char *)(b)) + #define sk_X509_EXTENSION_delete(a,b) ((X509_EXTENSION *) \ + sk_delete((a),(b))) + #define sk_X509_EXTENSION_delete_ptr(a,b) ((X509_EXTENSION *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_X509_EXTENSION_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_X509_EXTENSION_set_cmp_func(a,b) ((int (*) \ + (const X509_EXTENSION * const *,const X509_EXTENSION * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_X509_EXTENSION_dup(a) sk_dup(a) + #define sk_X509_EXTENSION_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_X509_EXTENSION_shift(a) ((X509_EXTENSION *)sk_shift(a)) + #define sk_X509_EXTENSION_pop(a) ((X509_EXTENSION *)sk_pop(a)) + #define sk_X509_EXTENSION_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(X509_EXTENSION) /* a sequence of these are used */ @@ -218,6 +342,37 @@ typedef struct x509_attributes_st } X509_ATTRIBUTE; DECLARE_STACK_OF(X509_ATTRIBUTE) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_X509_ATTRIBUTE_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_X509_ATTRIBUTE_new_null() sk_new_null() + #define sk_X509_ATTRIBUTE_free(a) sk_free(a) + #define sk_X509_ATTRIBUTE_num(a) sk_num(a) + #define sk_X509_ATTRIBUTE_value(a,b) ((X509_ATTRIBUTE *) \ + sk_value((a),(b))) + #define sk_X509_ATTRIBUTE_set(a,b,c) ((X509_ATTRIBUTE *) \ + sk_set((a),(b),(char *)(c))) + #define sk_X509_ATTRIBUTE_zero(a) sk_zero(a) + #define sk_X509_ATTRIBUTE_push(a,b) sk_push((a),(char *)(b)) + #define sk_X509_ATTRIBUTE_unshift(a,b) sk_unshift((a),(b)) + #define sk_X509_ATTRIBUTE_find(a,b) sk_find((a), (char *)(b)) + #define sk_X509_ATTRIBUTE_delete(a,b) ((X509_ATTRIBUTE *) \ + sk_delete((a),(b))) + #define sk_X509_ATTRIBUTE_delete_ptr(a,b) ((X509_ATTRIBUTE *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_X509_ATTRIBUTE_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_X509_ATTRIBUTE_set_cmp_func(a,b) ((int (*) \ + (const X509_ATTRIBUTE * const *,const X509_ATTRIBUTE * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_X509_ATTRIBUTE_dup(a) sk_dup(a) + #define sk_X509_ATTRIBUTE_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_X509_ATTRIBUTE_shift(a) ((X509_ATTRIBUTE *)sk_shift(a)) + #define sk_X509_ATTRIBUTE_pop(a) ((X509_ATTRIBUTE *)sk_pop(a)) + #define sk_X509_ATTRIBUTE_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(X509_ATTRIBUTE) typedef struct X509_req_info_st @@ -289,6 +444,37 @@ typedef struct x509_st } X509; DECLARE_STACK_OF(X509) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_X509_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_X509_new_null() sk_new_null() + #define sk_X509_free(a) sk_free(a) + #define sk_X509_num(a) sk_num(a) + #define sk_X509_value(a,b) ((X509 *) \ + sk_value((a),(b))) + #define sk_X509_set(a,b,c) ((X509 *) \ + sk_set((a),(b),(char *)(c))) + #define sk_X509_zero(a) sk_zero(a) + #define sk_X509_push(a,b) sk_push((a),(char *)(b)) + #define sk_X509_unshift(a,b) sk_unshift((a),(b)) + #define sk_X509_find(a,b) sk_find((a), (char *)(b)) + #define sk_X509_delete(a,b) ((X509 *) \ + sk_delete((a),(b))) + #define sk_X509_delete_ptr(a,b) ((X509 *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_X509_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_X509_set_cmp_func(a,b) ((int (*) \ + (const X509 * const *,const X509 * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_X509_dup(a) sk_dup(a) + #define sk_X509_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_X509_shift(a) ((X509 *)sk_shift(a)) + #define sk_X509_pop(a) ((X509 *)sk_pop(a)) + #define sk_X509_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(X509) /* This is used for a table of trust checking functions */ @@ -303,6 +489,37 @@ typedef struct x509_trust_st { } X509_TRUST; DECLARE_STACK_OF(X509_TRUST) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_X509_TRUST_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_X509_TRUST_new_null() sk_new_null() + #define sk_X509_TRUST_free(a) sk_free(a) + #define sk_X509_TRUST_num(a) sk_num(a) + #define sk_X509_TRUST_value(a,b) ((X509_TRUST *) \ + sk_value((a),(b))) + #define sk_X509_TRUST_set(a,b,c) ((X509_TRUST *) \ + sk_set((a),(b),(char *)(c))) + #define sk_X509_TRUST_zero(a) sk_zero(a) + #define sk_X509_TRUST_push(a,b) sk_push((a),(char *)(b)) + #define sk_X509_TRUST_unshift(a,b) sk_unshift((a),(b)) + #define sk_X509_TRUST_find(a,b) sk_find((a), (char *)(b)) + #define sk_X509_TRUST_delete(a,b) ((X509_TRUST *) \ + sk_delete((a),(b))) + #define sk_X509_TRUST_delete_ptr(a,b) ((X509_TRUST *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_X509_TRUST_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_X509_TRUST_set_cmp_func(a,b) ((int (*) \ + (const X509_TRUST * const *,const X509_TRUST * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_X509_TRUST_dup(a) sk_dup(a) + #define sk_X509_TRUST_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_X509_TRUST_shift(a) ((X509_TRUST *)sk_shift(a)) + #define sk_X509_TRUST_pop(a) ((X509_TRUST *)sk_pop(a)) + #define sk_X509_TRUST_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ /* standard trust ids */ @@ -338,6 +555,37 @@ typedef struct X509_revoked_st } X509_REVOKED; DECLARE_STACK_OF(X509_REVOKED) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_X509_REVOKED_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_X509_REVOKED_new_null() sk_new_null() + #define sk_X509_REVOKED_free(a) sk_free(a) + #define sk_X509_REVOKED_num(a) sk_num(a) + #define sk_X509_REVOKED_value(a,b) ((X509_REVOKED *) \ + sk_value((a),(b))) + #define sk_X509_REVOKED_set(a,b,c) ((X509_REVOKED *) \ + sk_set((a),(b),(char *)(c))) + #define sk_X509_REVOKED_zero(a) sk_zero(a) + #define sk_X509_REVOKED_push(a,b) sk_push((a),(char *)(b)) + #define sk_X509_REVOKED_unshift(a,b) sk_unshift((a),(b)) + #define sk_X509_REVOKED_find(a,b) sk_find((a), (char *)(b)) + #define sk_X509_REVOKED_delete(a,b) ((X509_REVOKED *) \ + sk_delete((a),(b))) + #define sk_X509_REVOKED_delete_ptr(a,b) ((X509_REVOKED *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_X509_REVOKED_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_X509_REVOKED_set_cmp_func(a,b) ((int (*) \ + (const X509_REVOKED * const *,const X509_REVOKED * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_X509_REVOKED_dup(a) sk_dup(a) + #define sk_X509_REVOKED_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_X509_REVOKED_shift(a) ((X509_REVOKED *)sk_shift(a)) + #define sk_X509_REVOKED_pop(a) ((X509_REVOKED *)sk_pop(a)) + #define sk_X509_REVOKED_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(X509_REVOKED) typedef struct X509_crl_info_st @@ -361,6 +609,37 @@ typedef struct X509_crl_st } X509_CRL; DECLARE_STACK_OF(X509_CRL) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_X509_CRL_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_X509_CRL_new_null() sk_new_null() + #define sk_X509_CRL_free(a) sk_free(a) + #define sk_X509_CRL_num(a) sk_num(a) + #define sk_X509_CRL_value(a,b) ((X509_CRL *) \ + sk_value((a),(b))) + #define sk_X509_CRL_set(a,b,c) ((X509_CRL *) \ + sk_set((a),(b),(char *)(c))) + #define sk_X509_CRL_zero(a) sk_zero(a) + #define sk_X509_CRL_push(a,b) sk_push((a),(char *)(b)) + #define sk_X509_CRL_unshift(a,b) sk_unshift((a),(b)) + #define sk_X509_CRL_find(a,b) sk_find((a), (char *)(b)) + #define sk_X509_CRL_delete(a,b) ((X509_CRL *) \ + sk_delete((a),(b))) + #define sk_X509_CRL_delete_ptr(a,b) ((X509_CRL *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_X509_CRL_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_X509_CRL_set_cmp_func(a,b) ((int (*) \ + (const X509_CRL * const *,const X509_CRL * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_X509_CRL_dup(a) sk_dup(a) + #define sk_X509_CRL_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_X509_CRL_shift(a) ((X509_CRL *)sk_shift(a)) + #define sk_X509_CRL_pop(a) ((X509_CRL *)sk_pop(a)) + #define sk_X509_CRL_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(X509_CRL) typedef struct private_key_st @@ -399,6 +678,37 @@ typedef struct X509_info_st } X509_INFO; DECLARE_STACK_OF(X509_INFO) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_X509_INFO_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_X509_INFO_new_null() sk_new_null() + #define sk_X509_INFO_free(a) sk_free(a) + #define sk_X509_INFO_num(a) sk_num(a) + #define sk_X509_INFO_value(a,b) ((X509_INFO *) \ + sk_value((a),(b))) + #define sk_X509_INFO_set(a,b,c) ((X509_INFO *) \ + sk_set((a),(b),(char *)(c))) + #define sk_X509_INFO_zero(a) sk_zero(a) + #define sk_X509_INFO_push(a,b) sk_push((a),(char *)(b)) + #define sk_X509_INFO_unshift(a,b) sk_unshift((a),(b)) + #define sk_X509_INFO_find(a,b) sk_find((a), (char *)(b)) + #define sk_X509_INFO_delete(a,b) ((X509_INFO *) \ + sk_delete((a),(b))) + #define sk_X509_INFO_delete_ptr(a,b) ((X509_INFO *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_X509_INFO_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_X509_INFO_set_cmp_func(a,b) ((int (*) \ + (const X509_INFO * const *,const X509_INFO * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_X509_INFO_dup(a) sk_dup(a) + #define sk_X509_INFO_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_X509_INFO_shift(a) ((X509_INFO *)sk_shift(a)) + #define sk_X509_INFO_pop(a) ((X509_INFO *)sk_pop(a)) + #define sk_X509_INFO_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ #endif /* The next 2 structures and their 8 routines were sent to me by diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h index 9173943dcd..313b867802 100644 --- a/crypto/x509/x509_vfy.h +++ b/crypto/x509/x509_vfy.h @@ -128,6 +128,37 @@ typedef struct x509_object_st typedef struct x509_lookup_st X509_LOOKUP; DECLARE_STACK_OF(X509_LOOKUP) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_X509_LOOKUP_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_X509_LOOKUP_new_null() sk_new_null() + #define sk_X509_LOOKUP_free(a) sk_free(a) + #define sk_X509_LOOKUP_num(a) sk_num(a) + #define sk_X509_LOOKUP_value(a,b) ((X509_LOOKUP *) \ + sk_value((a),(b))) + #define sk_X509_LOOKUP_set(a,b,c) ((X509_LOOKUP *) \ + sk_set((a),(b),(char *)(c))) + #define sk_X509_LOOKUP_zero(a) sk_zero(a) + #define sk_X509_LOOKUP_push(a,b) sk_push((a),(char *)(b)) + #define sk_X509_LOOKUP_unshift(a,b) sk_unshift((a),(b)) + #define sk_X509_LOOKUP_find(a,b) sk_find((a), (char *)(b)) + #define sk_X509_LOOKUP_delete(a,b) ((X509_LOOKUP *) \ + sk_delete((a),(b))) + #define sk_X509_LOOKUP_delete_ptr(a,b) ((X509_LOOKUP *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_X509_LOOKUP_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_X509_LOOKUP_set_cmp_func(a,b) ((int (*) \ + (const X509_LOOKUP * const *,const X509_LOOKUP * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_X509_LOOKUP_dup(a) sk_dup(a) + #define sk_X509_LOOKUP_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_X509_LOOKUP_shift(a) ((X509_LOOKUP *)sk_shift(a)) + #define sk_X509_LOOKUP_pop(a) ((X509_LOOKUP *)sk_pop(a)) + #define sk_X509_LOOKUP_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ /* This is a static that defines the function interface */ typedef struct x509_lookup_method_st diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h index c04fc42da1..d3952c8977 100644 --- a/crypto/x509v3/x509v3.h +++ b/crypto/x509v3/x509v3.h @@ -132,6 +132,37 @@ typedef struct v3_ext_method X509V3_EXT_METHOD; typedef struct v3_ext_ctx X509V3_CTX; DECLARE_STACK_OF(X509V3_EXT_METHOD) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_X509V3_EXT_METHOD_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_X509V3_EXT_METHOD_new_null() sk_new_null() + #define sk_X509V3_EXT_METHOD_free(a) sk_free(a) + #define sk_X509V3_EXT_METHOD_num(a) sk_num(a) + #define sk_X509V3_EXT_METHOD_value(a,b) ((X509V3_EXT_METHOD *) \ + sk_value((a),(b))) + #define sk_X509V3_EXT_METHOD_set(a,b,c) ((X509V3_EXT_METHOD *) \ + sk_set((a),(b),(char *)(c))) + #define sk_X509V3_EXT_METHOD_zero(a) sk_zero(a) + #define sk_X509V3_EXT_METHOD_push(a,b) sk_push((a),(char *)(b)) + #define sk_X509V3_EXT_METHOD_unshift(a,b) sk_unshift((a),(b)) + #define sk_X509V3_EXT_METHOD_find(a,b) sk_find((a), (char *)(b)) + #define sk_X509V3_EXT_METHOD_delete(a,b) ((X509V3_EXT_METHOD *) \ + sk_delete((a),(b))) + #define sk_X509V3_EXT_METHOD_delete_ptr(a,b) ((X509V3_EXT_METHOD *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_X509V3_EXT_METHOD_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_X509V3_EXT_METHOD_set_cmp_func(a,b) ((int (*) \ + (const X509V3_EXT_METHOD * const *,const X509V3_EXT_METHOD * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_X509V3_EXT_METHOD_dup(a) sk_dup(a) + #define sk_X509V3_EXT_METHOD_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_X509V3_EXT_METHOD_shift(a) ((X509V3_EXT_METHOD *)sk_shift(a)) + #define sk_X509V3_EXT_METHOD_pop(a) ((X509V3_EXT_METHOD *)sk_pop(a)) + #define sk_X509V3_EXT_METHOD_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ /* ext_flags values */ #define X509V3_EXT_DYNAMIC 0x1 @@ -186,9 +217,71 @@ typedef struct ACCESS_DESCRIPTION_st { } ACCESS_DESCRIPTION; DECLARE_STACK_OF(GENERAL_NAME) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_GENERAL_NAME_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_GENERAL_NAME_new_null() sk_new_null() + #define sk_GENERAL_NAME_free(a) sk_free(a) + #define sk_GENERAL_NAME_num(a) sk_num(a) + #define sk_GENERAL_NAME_value(a,b) ((GENERAL_NAME *) \ + sk_value((a),(b))) + #define sk_GENERAL_NAME_set(a,b,c) ((GENERAL_NAME *) \ + sk_set((a),(b),(char *)(c))) + #define sk_GENERAL_NAME_zero(a) sk_zero(a) + #define sk_GENERAL_NAME_push(a,b) sk_push((a),(char *)(b)) + #define sk_GENERAL_NAME_unshift(a,b) sk_unshift((a),(b)) + #define sk_GENERAL_NAME_find(a,b) sk_find((a), (char *)(b)) + #define sk_GENERAL_NAME_delete(a,b) ((GENERAL_NAME *) \ + sk_delete((a),(b))) + #define sk_GENERAL_NAME_delete_ptr(a,b) ((GENERAL_NAME *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_GENERAL_NAME_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_GENERAL_NAME_set_cmp_func(a,b) ((int (*) \ + (const GENERAL_NAME * const *,const GENERAL_NAME * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_GENERAL_NAME_dup(a) sk_dup(a) + #define sk_GENERAL_NAME_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_GENERAL_NAME_shift(a) ((GENERAL_NAME *)sk_shift(a)) + #define sk_GENERAL_NAME_pop(a) ((GENERAL_NAME *)sk_pop(a)) + #define sk_GENERAL_NAME_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(GENERAL_NAME) DECLARE_STACK_OF(ACCESS_DESCRIPTION) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_ACCESS_DESCRIPTION_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_ACCESS_DESCRIPTION_new_null() sk_new_null() + #define sk_ACCESS_DESCRIPTION_free(a) sk_free(a) + #define sk_ACCESS_DESCRIPTION_num(a) sk_num(a) + #define sk_ACCESS_DESCRIPTION_value(a,b) ((ACCESS_DESCRIPTION *) \ + sk_value((a),(b))) + #define sk_ACCESS_DESCRIPTION_set(a,b,c) ((ACCESS_DESCRIPTION *) \ + sk_set((a),(b),(char *)(c))) + #define sk_ACCESS_DESCRIPTION_zero(a) sk_zero(a) + #define sk_ACCESS_DESCRIPTION_push(a,b) sk_push((a),(char *)(b)) + #define sk_ACCESS_DESCRIPTION_unshift(a,b) sk_unshift((a),(b)) + #define sk_ACCESS_DESCRIPTION_find(a,b) sk_find((a), (char *)(b)) + #define sk_ACCESS_DESCRIPTION_delete(a,b) ((ACCESS_DESCRIPTION *) \ + sk_delete((a),(b))) + #define sk_ACCESS_DESCRIPTION_delete_ptr(a,b) ((ACCESS_DESCRIPTION *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_ACCESS_DESCRIPTION_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_ACCESS_DESCRIPTION_set_cmp_func(a,b) ((int (*) \ + (const ACCESS_DESCRIPTION * const *,const ACCESS_DESCRIPTION * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_ACCESS_DESCRIPTION_dup(a) sk_dup(a) + #define sk_ACCESS_DESCRIPTION_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_ACCESS_DESCRIPTION_shift(a) ((ACCESS_DESCRIPTION *)sk_shift(a)) + #define sk_ACCESS_DESCRIPTION_pop(a) ((ACCESS_DESCRIPTION *)sk_pop(a)) + #define sk_ACCESS_DESCRIPTION_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(ACCESS_DESCRIPTION) typedef struct DIST_POINT_NAME_st { @@ -204,6 +297,37 @@ STACK_OF(GENERAL_NAME) *CRLissuer; } DIST_POINT; DECLARE_STACK_OF(DIST_POINT) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_DIST_POINT_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_DIST_POINT_new_null() sk_new_null() + #define sk_DIST_POINT_free(a) sk_free(a) + #define sk_DIST_POINT_num(a) sk_num(a) + #define sk_DIST_POINT_value(a,b) ((DIST_POINT *) \ + sk_value((a),(b))) + #define sk_DIST_POINT_set(a,b,c) ((DIST_POINT *) \ + sk_set((a),(b),(char *)(c))) + #define sk_DIST_POINT_zero(a) sk_zero(a) + #define sk_DIST_POINT_push(a,b) sk_push((a),(char *)(b)) + #define sk_DIST_POINT_unshift(a,b) sk_unshift((a),(b)) + #define sk_DIST_POINT_find(a,b) sk_find((a), (char *)(b)) + #define sk_DIST_POINT_delete(a,b) ((DIST_POINT *) \ + sk_delete((a),(b))) + #define sk_DIST_POINT_delete_ptr(a,b) ((DIST_POINT *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_DIST_POINT_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_DIST_POINT_set_cmp_func(a,b) ((int (*) \ + (const DIST_POINT * const *,const DIST_POINT * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_DIST_POINT_dup(a) sk_dup(a) + #define sk_DIST_POINT_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_DIST_POINT_shift(a) ((DIST_POINT *)sk_shift(a)) + #define sk_DIST_POINT_pop(a) ((DIST_POINT *)sk_pop(a)) + #define sk_DIST_POINT_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(DIST_POINT) typedef struct AUTHORITY_KEYID_st { @@ -220,6 +344,37 @@ typedef struct SXNET_ID_st { } SXNETID; DECLARE_STACK_OF(SXNETID) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_SXNETID_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_SXNETID_new_null() sk_new_null() + #define sk_SXNETID_free(a) sk_free(a) + #define sk_SXNETID_num(a) sk_num(a) + #define sk_SXNETID_value(a,b) ((SXNETID *) \ + sk_value((a),(b))) + #define sk_SXNETID_set(a,b,c) ((SXNETID *) \ + sk_set((a),(b),(char *)(c))) + #define sk_SXNETID_zero(a) sk_zero(a) + #define sk_SXNETID_push(a,b) sk_push((a),(char *)(b)) + #define sk_SXNETID_unshift(a,b) sk_unshift((a),(b)) + #define sk_SXNETID_find(a,b) sk_find((a), (char *)(b)) + #define sk_SXNETID_delete(a,b) ((SXNETID *) \ + sk_delete((a),(b))) + #define sk_SXNETID_delete_ptr(a,b) ((SXNETID *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_SXNETID_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_SXNETID_set_cmp_func(a,b) ((int (*) \ + (const SXNETID * const *,const SXNETID * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_SXNETID_dup(a) sk_dup(a) + #define sk_SXNETID_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_SXNETID_shift(a) ((SXNETID *)sk_shift(a)) + #define sk_SXNETID_pop(a) ((SXNETID *)sk_pop(a)) + #define sk_SXNETID_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(SXNETID) typedef struct SXNET_st { @@ -247,6 +402,37 @@ typedef struct POLICYQUALINFO_st { } POLICYQUALINFO; DECLARE_STACK_OF(POLICYQUALINFO) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_POLICYQUALINFO_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_POLICYQUALINFO_new_null() sk_new_null() + #define sk_POLICYQUALINFO_free(a) sk_free(a) + #define sk_POLICYQUALINFO_num(a) sk_num(a) + #define sk_POLICYQUALINFO_value(a,b) ((POLICYQUALINFO *) \ + sk_value((a),(b))) + #define sk_POLICYQUALINFO_set(a,b,c) ((POLICYQUALINFO *) \ + sk_set((a),(b),(char *)(c))) + #define sk_POLICYQUALINFO_zero(a) sk_zero(a) + #define sk_POLICYQUALINFO_push(a,b) sk_push((a),(char *)(b)) + #define sk_POLICYQUALINFO_unshift(a,b) sk_unshift((a),(b)) + #define sk_POLICYQUALINFO_find(a,b) sk_find((a), (char *)(b)) + #define sk_POLICYQUALINFO_delete(a,b) ((POLICYQUALINFO *) \ + sk_delete((a),(b))) + #define sk_POLICYQUALINFO_delete_ptr(a,b) ((POLICYQUALINFO *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_POLICYQUALINFO_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_POLICYQUALINFO_set_cmp_func(a,b) ((int (*) \ + (const POLICYQUALINFO * const *,const POLICYQUALINFO * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_POLICYQUALINFO_dup(a) sk_dup(a) + #define sk_POLICYQUALINFO_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_POLICYQUALINFO_shift(a) ((POLICYQUALINFO *)sk_shift(a)) + #define sk_POLICYQUALINFO_pop(a) ((POLICYQUALINFO *)sk_pop(a)) + #define sk_POLICYQUALINFO_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(POLICYQUALINFO) typedef struct POLICYINFO_st { @@ -255,6 +441,37 @@ typedef struct POLICYINFO_st { } POLICYINFO; DECLARE_STACK_OF(POLICYINFO) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_POLICYINFO_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_POLICYINFO_new_null() sk_new_null() + #define sk_POLICYINFO_free(a) sk_free(a) + #define sk_POLICYINFO_num(a) sk_num(a) + #define sk_POLICYINFO_value(a,b) ((POLICYINFO *) \ + sk_value((a),(b))) + #define sk_POLICYINFO_set(a,b,c) ((POLICYINFO *) \ + sk_set((a),(b),(char *)(c))) + #define sk_POLICYINFO_zero(a) sk_zero(a) + #define sk_POLICYINFO_push(a,b) sk_push((a),(char *)(b)) + #define sk_POLICYINFO_unshift(a,b) sk_unshift((a),(b)) + #define sk_POLICYINFO_find(a,b) sk_find((a), (char *)(b)) + #define sk_POLICYINFO_delete(a,b) ((POLICYINFO *) \ + sk_delete((a),(b))) + #define sk_POLICYINFO_delete_ptr(a,b) ((POLICYINFO *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_POLICYINFO_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_POLICYINFO_set_cmp_func(a,b) ((int (*) \ + (const POLICYINFO * const *,const POLICYINFO * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_POLICYINFO_dup(a) sk_dup(a) + #define sk_POLICYINFO_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_POLICYINFO_shift(a) ((POLICYINFO *)sk_shift(a)) + #define sk_POLICYINFO_pop(a) ((POLICYINFO *)sk_pop(a)) + #define sk_POLICYINFO_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ DECLARE_ASN1_SET_OF(POLICYINFO) #define X509V3_conf_err(val) ERR_add_error_data(6, "section:", val->section, \ @@ -353,6 +570,37 @@ typedef struct x509_purpose_st { #define X509_PURPOSE_MAX 7 DECLARE_STACK_OF(X509_PURPOSE) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_X509_PURPOSE_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_X509_PURPOSE_new_null() sk_new_null() + #define sk_X509_PURPOSE_free(a) sk_free(a) + #define sk_X509_PURPOSE_num(a) sk_num(a) + #define sk_X509_PURPOSE_value(a,b) ((X509_PURPOSE *) \ + sk_value((a),(b))) + #define sk_X509_PURPOSE_set(a,b,c) ((X509_PURPOSE *) \ + sk_set((a),(b),(char *)(c))) + #define sk_X509_PURPOSE_zero(a) sk_zero(a) + #define sk_X509_PURPOSE_push(a,b) sk_push((a),(char *)(b)) + #define sk_X509_PURPOSE_unshift(a,b) sk_unshift((a),(b)) + #define sk_X509_PURPOSE_find(a,b) sk_find((a), (char *)(b)) + #define sk_X509_PURPOSE_delete(a,b) ((X509_PURPOSE *) \ + sk_delete((a),(b))) + #define sk_X509_PURPOSE_delete_ptr(a,b) ((X509_PURPOSE *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_X509_PURPOSE_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_X509_PURPOSE_set_cmp_func(a,b) ((int (*) \ + (const X509_PURPOSE * const *,const X509_PURPOSE * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_X509_PURPOSE_dup(a) sk_dup(a) + #define sk_X509_PURPOSE_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_X509_PURPOSE_shift(a) ((X509_PURPOSE *)sk_shift(a)) + #define sk_X509_PURPOSE_pop(a) ((X509_PURPOSE *)sk_pop(a)) + #define sk_X509_PURPOSE_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ void ERR_load_X509V3_strings(void); int i2d_BASIC_CONSTRAINTS(BASIC_CONSTRAINTS *a, unsigned char **pp); @@ -183,6 +183,37 @@ typedef struct ssl_cipher_st } SSL_CIPHER; DECLARE_STACK_OF(SSL_CIPHER) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_SSL_CIPHER_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_SSL_CIPHER_new_null() sk_new_null() + #define sk_SSL_CIPHER_free(a) sk_free(a) + #define sk_SSL_CIPHER_num(a) sk_num(a) + #define sk_SSL_CIPHER_value(a,b) ((SSL_CIPHER *) \ + sk_value((a),(b))) + #define sk_SSL_CIPHER_set(a,b,c) ((SSL_CIPHER *) \ + sk_set((a),(b),(char *)(c))) + #define sk_SSL_CIPHER_zero(a) sk_zero(a) + #define sk_SSL_CIPHER_push(a,b) sk_push((a),(char *)(b)) + #define sk_SSL_CIPHER_unshift(a,b) sk_unshift((a),(b)) + #define sk_SSL_CIPHER_find(a,b) sk_find((a), (char *)(b)) + #define sk_SSL_CIPHER_delete(a,b) ((SSL_CIPHER *) \ + sk_delete((a),(b))) + #define sk_SSL_CIPHER_delete_ptr(a,b) ((SSL_CIPHER *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_SSL_CIPHER_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_SSL_CIPHER_set_cmp_func(a,b) ((int (*) \ + (const SSL_CIPHER * const *,const SSL_CIPHER * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_SSL_CIPHER_dup(a) sk_dup(a) + #define sk_SSL_CIPHER_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_SSL_CIPHER_shift(a) ((SSL_CIPHER *)sk_shift(a)) + #define sk_SSL_CIPHER_pop(a) ((SSL_CIPHER *)sk_pop(a)) + #define sk_SSL_CIPHER_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ typedef struct ssl_st SSL; typedef struct ssl_ctx_st SSL_CTX; @@ -362,6 +393,37 @@ typedef struct ssl_comp_st } SSL_COMP; DECLARE_STACK_OF(SSL_COMP) +/* This block of defines is updated by a perl script, please do not touch! */ +#ifndef DEBUG_SAFESTACK + #define sk_SSL_COMP_new(a) sk_new((int (*) \ + (const char * const *, const char * const *))(a)) + #define sk_SSL_COMP_new_null() sk_new_null() + #define sk_SSL_COMP_free(a) sk_free(a) + #define sk_SSL_COMP_num(a) sk_num(a) + #define sk_SSL_COMP_value(a,b) ((SSL_COMP *) \ + sk_value((a),(b))) + #define sk_SSL_COMP_set(a,b,c) ((SSL_COMP *) \ + sk_set((a),(b),(char *)(c))) + #define sk_SSL_COMP_zero(a) sk_zero(a) + #define sk_SSL_COMP_push(a,b) sk_push((a),(char *)(b)) + #define sk_SSL_COMP_unshift(a,b) sk_unshift((a),(b)) + #define sk_SSL_COMP_find(a,b) sk_find((a), (char *)(b)) + #define sk_SSL_COMP_delete(a,b) ((SSL_COMP *) \ + sk_delete((a),(b))) + #define sk_SSL_COMP_delete_ptr(a,b) ((SSL_COMP *) \ + sk_delete_ptr((a),(char *)(b))) + #define sk_SSL_COMP_insert(a,b,c) sk_insert((a),(char *)(b),(c)) + #define sk_SSL_COMP_set_cmp_func(a,b) ((int (*) \ + (const SSL_COMP * const *,const SSL_COMP * const *)) \ + sk_set_cmp_func((a),(int (*) \ + (const char * const *, const char * const *))(b))) + #define sk_SSL_COMP_dup(a) sk_dup(a) + #define sk_SSL_COMP_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) + #define sk_SSL_COMP_shift(a) ((SSL_COMP *)sk_shift(a)) + #define sk_SSL_COMP_pop(a) ((SSL_COMP *)sk_pop(a)) + #define sk_SSL_COMP_sort(a) sk_sort(a) +#endif /* !DEBUG_SAFESTACK */ +/* End of perl script block, you may now edit :-) */ struct ssl_ctx_st { diff --git a/util/libeay.num b/util/libeay.num index 5f64d034f8..f798b828e1 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -1318,56 +1318,8 @@ i2d_DIRECTORYSTRING 1343 d2i_DIRECTORYSTRING 1344 i2d_DISPLAYTEXT 1345 d2i_DISPLAYTEXT 1346 -sk_X509_NAME_new 1347 -sk_X509_NAME_new_null 1348 -sk_X509_NAME_free 1349 -sk_X509_NAME_num 1350 -sk_X509_NAME_value 1351 -sk_X509_NAME_set 1352 -sk_X509_NAME_zero 1353 -sk_X509_NAME_push 1354 -sk_X509_NAME_pop 1355 -sk_X509_NAME_find 1356 -sk_X509_NAME_delete 1357 -sk_X509_NAME_delete_ptr 1358 -sk_X509_NAME_set_cmp_func 1359 -sk_X509_NAME_dup 1360 -sk_X509_NAME_pop_free 1361 -sk_X509_NAME_shift 1362 -sk_X509_new 1363 -sk_X509_new_null 1364 -sk_X509_free 1365 -sk_X509_num 1366 -sk_X509_value 1367 -sk_X509_set 1368 -sk_X509_zero 1369 -sk_X509_push 1370 -sk_X509_pop 1371 -sk_X509_find 1372 -sk_X509_delete 1373 -sk_X509_delete_ptr 1374 -sk_X509_set_cmp_func 1375 -sk_X509_dup 1376 -sk_X509_pop_free 1377 -sk_X509_shift 1378 d2i_ASN1_SET_OF_X509 1379 i2d_ASN1_SET_OF_X509 1380 -sk_X509_ATTRIBUTE_new 1381 -sk_X509_ATTRIBUTE_new_null 1382 -sk_X509_ATTRIBUTE_free 1383 -sk_X509_ATTRIBUTE_num 1384 -sk_X509_ATTRIBUTE_value 1385 -sk_X509_ATTRIBUTE_set 1386 -sk_X509_ATTRIBUTE_zero 1387 -sk_X509_ATTRIBUTE_push 1388 -sk_X509_ATTRIBUTE_pop 1389 -sk_X509_ATTRIBUTE_find 1390 -sk_X509_ATTRIBUTE_delete 1391 -sk_X509_ATTRIBUTE_delete_ptr 1392 -sk_X509_ATTRIBUTE_set_cmp_func 1393 -sk_X509_ATTRIBUTE_dup 1394 -sk_X509_ATTRIBUTE_pop_free 1395 -sk_X509_ATTRIBUTE_shift 1396 i2d_PBKDF2PARAM 1397 PBKDF2PARAM_new 1398 d2i_PBKDF2PARAM 1399 @@ -1376,76 +1328,12 @@ i2d_PBE2PARAM 1401 PBE2PARAM_new 1402 d2i_PBE2PARAM 1403 PBE2PARAM_free 1404 -sk_GENERAL_NAME_new 1405 -sk_GENERAL_NAME_new_null 1406 -sk_GENERAL_NAME_free 1407 -sk_GENERAL_NAME_num 1408 -sk_GENERAL_NAME_value 1409 -sk_GENERAL_NAME_set 1410 -sk_GENERAL_NAME_zero 1411 -sk_GENERAL_NAME_push 1412 -sk_GENERAL_NAME_pop 1413 -sk_GENERAL_NAME_find 1414 -sk_GENERAL_NAME_delete 1415 -sk_GENERAL_NAME_delete_ptr 1416 -sk_GENERAL_NAME_set_cmp_func 1417 -sk_GENERAL_NAME_dup 1418 -sk_GENERAL_NAME_pop_free 1419 -sk_GENERAL_NAME_shift 1420 d2i_ASN1_SET_OF_GENERAL_NAME 1421 i2d_ASN1_SET_OF_GENERAL_NAME 1422 -sk_SXNETID_new 1423 -sk_SXNETID_new_null 1424 -sk_SXNETID_free 1425 -sk_SXNETID_num 1426 -sk_SXNETID_value 1427 -sk_SXNETID_set 1428 -sk_SXNETID_zero 1429 -sk_SXNETID_push 1430 -sk_SXNETID_pop 1431 -sk_SXNETID_find 1432 -sk_SXNETID_delete 1433 -sk_SXNETID_delete_ptr 1434 -sk_SXNETID_set_cmp_func 1435 -sk_SXNETID_dup 1436 -sk_SXNETID_pop_free 1437 -sk_SXNETID_shift 1438 d2i_ASN1_SET_OF_SXNETID 1439 i2d_ASN1_SET_OF_SXNETID 1440 -sk_POLICYQUALINFO_new 1441 -sk_POLICYQUALINFO_new_null 1442 -sk_POLICYQUALINFO_free 1443 -sk_POLICYQUALINFO_num 1444 -sk_POLICYQUALINFO_value 1445 -sk_POLICYQUALINFO_set 1446 -sk_POLICYQUALINFO_zero 1447 -sk_POLICYQUALINFO_push 1448 -sk_POLICYQUALINFO_pop 1449 -sk_POLICYQUALINFO_find 1450 -sk_POLICYQUALINFO_delete 1451 -sk_POLICYQUALINFO_delete_ptr 1452 -sk_POLICYQUALINFO_set_cmp_func 1453 -sk_POLICYQUALINFO_dup 1454 -sk_POLICYQUALINFO_pop_free 1455 -sk_POLICYQUALINFO_shift 1456 d2i_ASN1_SET_OF_POLICYQUALINFO 1457 i2d_ASN1_SET_OF_POLICYQUALINFO 1458 -sk_POLICYINFO_new 1459 -sk_POLICYINFO_new_null 1460 -sk_POLICYINFO_free 1461 -sk_POLICYINFO_num 1462 -sk_POLICYINFO_value 1463 -sk_POLICYINFO_set 1464 -sk_POLICYINFO_zero 1465 -sk_POLICYINFO_push 1466 -sk_POLICYINFO_pop 1467 -sk_POLICYINFO_find 1468 -sk_POLICYINFO_delete 1469 -sk_POLICYINFO_delete_ptr 1470 -sk_POLICYINFO_set_cmp_func 1471 -sk_POLICYINFO_dup 1472 -sk_POLICYINFO_pop_free 1473 -sk_POLICYINFO_shift 1474 d2i_ASN1_SET_OF_POLICYINFO 1475 i2d_ASN1_SET_OF_POLICYINFO 1476 SXNET_add_id_asc 1477 @@ -1490,22 +1378,6 @@ ERR_get_error_line_data 1515 ERR_peek_error_line_data 1516 PKCS12_PBE_keyivgen 1517 X509_ALGOR_dup 1518 -sk_DIST_POINT_new 1519 -sk_DIST_POINT_new_null 1520 -sk_DIST_POINT_free 1521 -sk_DIST_POINT_num 1522 -sk_DIST_POINT_value 1523 -sk_DIST_POINT_set 1524 -sk_DIST_POINT_zero 1525 -sk_DIST_POINT_push 1526 -sk_DIST_POINT_pop 1527 -sk_DIST_POINT_find 1528 -sk_DIST_POINT_delete 1529 -sk_DIST_POINT_delete_ptr 1530 -sk_DIST_POINT_set_cmp_func 1531 -sk_DIST_POINT_dup 1532 -sk_DIST_POINT_pop_free 1533 -sk_DIST_POINT_shift 1534 d2i_ASN1_SET_OF_DIST_POINT 1535 i2d_ASN1_SET_OF_DIST_POINT 1536 i2d_CRL_DIST_POINTS 1537 @@ -1521,102 +1393,14 @@ DIST_POINT_NAME_new 1546 DIST_POINT_NAME_free 1547 d2i_DIST_POINT_NAME 1548 X509V3_add_value_uchar 1549 -sk_X509_INFO_new 1550 -sk_X509_EXTENSION_new 1551 -sk_X509_NAME_ENTRY_unshift 1552 -sk_ASN1_TYPE_value 1553 -sk_X509_EXTENSION_find 1554 d2i_ASN1_SET_OF_X509_ATTRIBUTE 1555 -sk_ASN1_TYPE_pop 1556 -sk_X509_EXTENSION_set_cmp_func 1557 -sk_ASN1_TYPE_new_null 1558 -sk_X509_NAME_ENTRY_delete 1559 i2d_ASN1_SET_OF_ASN1_TYPE 1560 -sk_X509_NAME_ENTRY_dup 1561 -sk_X509_unshift 1562 -sk_X509_NAME_unshift 1563 -sk_ASN1_TYPE_num 1564 -sk_X509_EXTENSION_new_null 1565 -sk_X509_INFO_value 1566 d2i_ASN1_SET_OF_X509_EXTENSION 1567 -sk_X509_INFO_delete_ptr 1568 -sk_X509_NAME_ENTRY_new 1569 -sk_DIST_POINT_insert 1570 -sk_ASN1_TYPE_set_cmp_func 1571 -sk_X509_EXTENSION_value 1572 -sk_DIST_POINT_unshift 1573 d2i_ASN1_SET_OF_X509_NAME_ENTRY 1574 -sk_X509_INFO_pop 1575 -sk_X509_EXTENSION_pop 1576 -sk_X509_NAME_ENTRY_shift 1577 -sk_X509_INFO_num 1578 -sk_X509_EXTENSION_num 1579 -sk_X509_INFO_pop_free 1580 -sk_POLICYQUALINFO_unshift 1581 -sk_POLICYINFO_unshift 1582 -sk_X509_NAME_ENTRY_new_null 1583 -sk_X509_NAME_ENTRY_pop 1584 -sk_X509_ATTRIBUTE_unshift 1585 -sk_X509_NAME_ENTRY_num 1586 -sk_GENERAL_NAME_unshift 1587 -sk_X509_INFO_free 1588 d2i_ASN1_SET_OF_ASN1_TYPE 1589 -sk_X509_INFO_insert 1590 -sk_X509_NAME_ENTRY_value 1591 -sk_POLICYQUALINFO_insert 1592 -sk_ASN1_TYPE_set 1593 -sk_X509_EXTENSION_delete_ptr 1594 -sk_X509_INFO_unshift 1595 -sk_ASN1_TYPE_unshift 1596 -sk_ASN1_TYPE_free 1597 -sk_ASN1_TYPE_delete_ptr 1598 -sk_ASN1_TYPE_pop_free 1599 -sk_X509_EXTENSION_unshift 1600 -sk_X509_EXTENSION_pop_free 1601 -sk_X509_NAME_ENTRY_set_cmp_func 1602 -sk_ASN1_TYPE_insert 1603 -sk_X509_NAME_ENTRY_free 1604 -sk_SXNETID_insert 1605 -sk_X509_NAME_insert 1606 -sk_X509_insert 1607 -sk_X509_INFO_delete 1608 -sk_X509_INFO_set_cmp_func 1609 -sk_X509_ATTRIBUTE_insert 1610 -sk_X509_INFO_zero 1611 -sk_X509_INFO_set 1612 -sk_X509_EXTENSION_set 1613 -sk_X509_EXTENSION_free 1614 i2d_ASN1_SET_OF_X509_ATTRIBUTE 1615 -sk_SXNETID_unshift 1616 -sk_X509_INFO_push 1617 -sk_X509_EXTENSION_insert 1618 -sk_X509_INFO_new_null 1619 -sk_ASN1_TYPE_dup 1620 -sk_X509_INFO_find 1621 -sk_POLICYINFO_insert 1622 -sk_ASN1_TYPE_zero 1623 i2d_ASN1_SET_OF_X509_EXTENSION 1624 -sk_X509_NAME_ENTRY_set 1625 -sk_ASN1_TYPE_push 1626 -sk_X509_NAME_ENTRY_insert 1627 -sk_ASN1_TYPE_new 1628 -sk_GENERAL_NAME_insert 1629 -sk_ASN1_TYPE_shift 1630 -sk_ASN1_TYPE_delete 1631 -sk_X509_NAME_ENTRY_pop_free 1632 i2d_ASN1_SET_OF_X509_NAME_ENTRY 1633 -sk_X509_NAME_ENTRY_zero 1634 -sk_ASN1_TYPE_find 1635 -sk_X509_NAME_ENTRY_delete_ptr 1636 -sk_X509_NAME_ENTRY_push 1637 -sk_X509_EXTENSION_zero 1638 -sk_X509_INFO_shift 1639 -sk_X509_INFO_dup 1640 -sk_X509_EXTENSION_dup 1641 -sk_X509_EXTENSION_delete 1642 -sk_X509_EXTENSION_shift 1643 -sk_X509_EXTENSION_push 1644 -sk_X509_NAME_ENTRY_find 1645 X509V3_EXT_i2d 1646 X509V3_EXT_val_prn 1647 X509V3_EXT_add_list 1648 @@ -1627,125 +1411,17 @@ d2i_ASN1_UINTEGER 1652 sk_value 1653 sk_num 1654 sk_set 1655 -sk_X509_REVOKED_set_cmp_func 1656 -sk_X509_REVOKED_unshift 1657 -sk_X509_REVOKED_dup 1658 -sk_X509_REVOKED_free 1659 -sk_X509_REVOKED_new 1660 i2d_ASN1_SET_OF_X509_REVOKED 1661 -sk_X509_REVOKED_shift 1662 -sk_X509_REVOKED_delete_ptr 1663 -sk_X509_REVOKED_pop_free 1664 -sk_X509_REVOKED_insert 1665 -sk_X509_REVOKED_zero 1666 -sk_X509_REVOKED_pop 1667 -sk_X509_REVOKED_value 1668 -sk_X509_REVOKED_num 1669 -sk_X509_REVOKED_push 1670 sk_sort 1671 -sk_X509_REVOKED_find 1672 -sk_X509_REVOKED_delete 1673 d2i_ASN1_SET_OF_X509_REVOKED 1674 -sk_X509_REVOKED_new_null 1675 -sk_X509_REVOKED_set 1676 -sk_X509_ALGOR_new 1677 -sk_X509_CRL_set_cmp_func 1678 -sk_X509_CRL_set 1679 -sk_X509_ALGOR_unshift 1680 -sk_X509_CRL_free 1681 i2d_ASN1_SET_OF_X509_ALGOR 1682 -sk_X509_ALGOR_pop 1683 -sk_X509_CRL_unshift 1684 i2d_ASN1_SET_OF_X509_CRL 1685 -sk_X509_ALGOR_num 1686 -sk_X509_CRL_insert 1687 -sk_X509_CRL_pop_free 1688 -sk_X509_CRL_delete_ptr 1689 -sk_X509_ALGOR_insert 1690 -sk_X509_CRL_dup 1691 -sk_X509_CRL_zero 1692 -sk_X509_CRL_new 1693 -sk_X509_CRL_push 1694 -sk_X509_ALGOR_new_null 1695 d2i_ASN1_SET_OF_X509_ALGOR 1696 -sk_X509_CRL_shift 1697 -sk_X509_CRL_find 1698 -sk_X509_CRL_delete 1699 -sk_X509_ALGOR_free 1700 -sk_X509_ALGOR_delete 1701 d2i_ASN1_SET_OF_X509_CRL 1702 -sk_X509_ALGOR_delete_ptr 1703 -sk_X509_CRL_pop 1704 -sk_X509_ALGOR_set 1705 -sk_X509_CRL_num 1706 -sk_X509_CRL_value 1707 -sk_X509_ALGOR_shift 1708 -sk_X509_ALGOR_zero 1709 -sk_X509_CRL_new_null 1710 -sk_X509_ALGOR_push 1711 -sk_X509_ALGOR_value 1712 -sk_X509_ALGOR_find 1713 -sk_X509_ALGOR_set_cmp_func 1714 -sk_X509_ALGOR_dup 1715 -sk_X509_ALGOR_pop_free 1716 -sk_PKCS7_SIGNER_INFO_new 1717 -sk_PKCS7_SIGNER_INFO_zero 1718 -sk_PKCS7_SIGNER_INFO_unshift 1719 -sk_PKCS7_RECIP_INFO_dup 1720 -sk_PKCS7_SIGNER_INFO_insert 1721 -sk_PKCS7_SIGNER_INFO_push 1722 i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO 1723 -sk_PKCS7_RECIP_INFO_new 1724 -sk_X509_LOOKUP_new_null 1725 -sk_PKCS7_SIGNER_INFO_find 1726 -sk_PKCS7_SIGNER_INFO_set_cmp_func 1727 -sk_X509_LOOKUP_zero 1728 -sk_PKCS7_RECIP_INFO_shift 1729 -sk_PKCS7_RECIP_INFO_new_null 1730 -sk_PKCS7_SIGNER_INFO_shift 1731 -sk_PKCS7_SIGNER_INFO_pop 1732 -sk_PKCS7_SIGNER_INFO_pop_free 1733 -sk_X509_LOOKUP_push 1734 -sk_X509_LOOKUP_dup 1735 -sk_PKCS7_SIGNER_INFO_num 1736 -sk_X509_LOOKUP_find 1737 i2d_ASN1_SET_OF_PKCS7_RECIP_INFO 1738 -sk_X509_LOOKUP_new 1739 -sk_PKCS7_SIGNER_INFO_delete 1740 -sk_PKCS7_RECIP_INFO_set_cmp_func 1741 -sk_PKCS7_SIGNER_INFO_delete_ptr 1742 -sk_PKCS7_RECIP_INFO_pop 1743 -sk_X509_LOOKUP_insert 1744 -sk_PKCS7_RECIP_INFO_value 1745 -sk_PKCS7_RECIP_INFO_num 1746 -sk_PKCS7_SIGNER_INFO_value 1747 d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO 1748 -sk_X509_LOOKUP_pop 1749 -sk_X509_LOOKUP_num 1750 -sk_X509_LOOKUP_delete 1751 -sk_PKCS7_RECIP_INFO_free 1752 d2i_ASN1_SET_OF_PKCS7_RECIP_INFO 1753 -sk_PKCS7_SIGNER_INFO_set 1754 -sk_X509_LOOKUP_pop_free 1755 -sk_X509_LOOKUP_shift 1756 -sk_X509_LOOKUP_unshift 1757 -sk_PKCS7_SIGNER_INFO_new_null 1758 -sk_PKCS7_RECIP_INFO_delete_ptr 1759 -sk_PKCS7_RECIP_INFO_pop_free 1760 -sk_PKCS7_RECIP_INFO_insert 1761 -sk_PKCS7_SIGNER_INFO_free 1762 -sk_PKCS7_RECIP_INFO_set 1763 -sk_PKCS7_RECIP_INFO_zero 1764 -sk_X509_LOOKUP_value 1765 -sk_PKCS7_RECIP_INFO_push 1766 -sk_PKCS7_RECIP_INFO_unshift 1767 -sk_X509_LOOKUP_set_cmp_func 1768 -sk_X509_LOOKUP_free 1769 -sk_PKCS7_SIGNER_INFO_dup 1770 -sk_X509_LOOKUP_delete_ptr 1771 -sk_X509_LOOKUP_set 1772 -sk_PKCS7_RECIP_INFO_find 1773 -sk_PKCS7_RECIP_INFO_delete 1774 PKCS5_PBE_add 1775 PEM_write_bio_PKCS8 1776 i2d_PKCS8_fp 1777 @@ -1778,68 +1454,12 @@ BIO_ctrl_get_write_guarantee 1803 CRYPTO_num_locks 1804 CONF_load_bio 1805 CONF_load_fp 1806 -sk_CONF_VALUE_delete 1807 -sk_CONF_VALUE_pop 1808 -sk_CONF_VALUE_num 1809 -sk_CONF_VALUE_pop_free 1810 -sk_CONF_VALUE_free 1811 -sk_CONF_VALUE_shift 1812 -sk_CONF_VALUE_unshift 1813 -sk_CONF_VALUE_value 1814 -sk_CONF_VALUE_set 1815 -sk_CONF_VALUE_zero 1816 -sk_CONF_VALUE_push 1817 -sk_CONF_VALUE_delete_ptr 1818 -sk_CONF_VALUE_find 1819 -sk_CONF_VALUE_set_cmp_func 1820 -sk_CONF_VALUE_new_null 1821 -sk_CONF_VALUE_dup 1822 -sk_CONF_VALUE_insert 1823 -sk_CONF_VALUE_new 1824 -sk_ASN1_OBJECT_find 1825 -sk_ASN1_OBJECT_pop_free 1826 -sk_ASN1_OBJECT_dup 1827 -sk_ASN1_OBJECT_delete_ptr 1828 -sk_ASN1_OBJECT_new 1829 -sk_ASN1_OBJECT_unshift 1830 -sk_ASN1_OBJECT_delete 1831 -sk_ASN1_OBJECT_shift 1832 -sk_ASN1_OBJECT_pop 1833 -sk_ASN1_OBJECT_num 1834 -sk_ASN1_OBJECT_value 1835 -sk_ASN1_OBJECT_new_null 1836 i2d_ASN1_SET_OF_ASN1_OBJECT 1837 -sk_ASN1_OBJECT_free 1838 -sk_ASN1_OBJECT_set 1839 -sk_ASN1_OBJECT_set_cmp_func 1840 -sk_ASN1_OBJECT_zero 1841 -sk_ASN1_OBJECT_insert 1842 -sk_ASN1_OBJECT_push 1843 d2i_ASN1_SET_OF_ASN1_OBJECT 1844 PKCS7_signatureVerify 1845 RSA_set_method 1846 RSA_get_method 1847 RSA_get_default_method 1848 -sk_CONF_VALUE_sort 1849 -sk_X509_REVOKED_sort 1850 -sk_X509_ATTRIBUTE_sort 1851 -sk_X509_INFO_sort 1852 -sk_POLICYINFO_sort 1853 -sk_GENERAL_NAME_sort 1854 -sk_X509_sort 1855 -sk_X509_NAME_sort 1856 -sk_ASN1_TYPE_sort 1857 -sk_X509_ALGOR_sort 1858 -sk_PKCS7_RECIP_INFO_sort 1859 -sk_X509_NAME_ENTRY_sort 1860 -sk_X509_EXTENSION_sort 1861 -sk_SXNETID_sort 1862 -sk_ASN1_OBJECT_sort 1863 -sk_PKCS7_SIGNER_INFO_sort 1864 -sk_X509_LOOKUP_sort 1865 -sk_POLICYQUALINFO_sort 1866 -sk_X509_CRL_sort 1867 -sk_DIST_POINT_sort 1868 RSA_check_key 1869 OBJ_obj2txt 1870 DSA_dup_DH 1871 @@ -1884,24 +1504,15 @@ X509_REVOKED_get_ext_d2i 1909 X509_set_ex_data 1910 X509_reject_set_bit_asc 1911 X509_NAME_add_entry_by_txt 1912 -sk_X509_TRUST_pop 1913 X509_NAME_add_entry_by_NID 1914 X509_PURPOSE_get0 1915 -sk_ACCESS_DESCRIPTION_shift 1916 PEM_read_X509_AUX 1917 d2i_AUTHORITY_INFO_ACCESS 1918 -sk_X509_TRUST_set_cmp_func 1919 -sk_X509_TRUST_free 1920 PEM_write_PUBKEY 1921 -sk_X509_TRUST_num 1922 -sk_ACCESS_DESCRIPTION_delete 1923 -sk_ASN1_STRING_TABLE_value 1924 ACCESS_DESCRIPTION_new 1925 X509_CERT_AUX_free 1926 d2i_ACCESS_DESCRIPTION 1927 X509_trust_clear 1928 -sk_X509_PURPOSE_value 1929 -sk_X509_PURPOSE_zero 1930 X509_TRUST_add 1931 ASN1_VISIBLESTRING_new 1932 X509_alias_set1 1933 @@ -1910,34 +1521,22 @@ EVP_PKEY_get1_DSA 1935 ASN1_BMPSTRING_new 1936 ASN1_mbstring_copy 1937 ASN1_UTF8STRING_new 1938 -sk_ACCESS_DESCRIPTION_set 1939 -sk_X509_PURPOSE_pop 1940 DSA_get_default_method 1941 -sk_X509_PURPOSE_push 1942 -sk_X509_PURPOSE_delete 1943 -sk_X509_PURPOSE_num 1944 i2d_ASN1_SET_OF_ACCESS_DESCRIPTION 1945 ASN1_T61STRING_free 1946 -sk_ACCESS_DESCRIPTION_free 1947 -sk_ASN1_STRING_TABLE_pop 1948 DSA_set_method 1949 X509_get_ex_data 1950 ASN1_STRING_type 1951 X509_PURPOSE_get_by_sname 1952 -sk_X509_PURPOSE_find 1953 ASN1_TIME_free 1954 ASN1_OCTET_STRING_cmp 1955 -sk_ACCESS_DESCRIPTION_value 1956 ASN1_BIT_STRING_new 1957 X509_get_ext_d2i 1958 PEM_read_bio_X509_AUX 1959 ASN1_STRING_set_default_mask_asc 1960 PEM_write_bio_RSA_PUBKEY 1961 -sk_ASN1_STRING_TABLE_num 1962 ASN1_INTEGER_cmp 1963 d2i_RSA_PUBKEY_fp 1964 -sk_ACCESS_DESCRIPTION_unshift 1965 -sk_ASN1_STRING_TABLE_delete_ptr 1966 X509_trust_set_bit_asc 1967 PEM_write_bio_DSA_PUBKEY 1968 X509_STORE_CTX_free 1969 @@ -1946,15 +1545,11 @@ i2d_DSA_PUBKEY_fp 1971 X509_load_cert_crl_file 1972 ASN1_TIME_new 1973 i2d_RSA_PUBKEY 1974 -sk_X509_TRUST_pop_free 1975 X509_STORE_CTX_purpose_inherit 1976 PEM_read_RSA_PUBKEY 1977 -sk_X509_TRUST_zero 1978 -sk_ACCESS_DESCRIPTION_pop_free 1979 d2i_X509_AUX 1980 i2d_DSA_PUBKEY 1981 X509_CERT_AUX_print 1982 -sk_X509_PURPOSE_new_null 1983 PEM_read_DSA_PUBKEY 1984 i2d_RSA_PUBKEY_bio 1985 ASN1_BIT_STRING_num_asc 1986 @@ -1962,34 +1557,22 @@ i2d_PUBKEY 1987 ASN1_UTCTIME_free 1988 DSA_set_default_method 1989 X509_PURPOSE_get_by_id 1990 -sk_X509_TRUST_push 1991 -sk_ASN1_STRING_TABLE_sort 1992 -sk_X509_PURPOSE_set_cmp_func 1993 ACCESS_DESCRIPTION_free 1994 PEM_read_bio_PUBKEY 1995 ASN1_STRING_set_by_NID 1996 X509_PURPOSE_get_id 1997 DISPLAYTEXT_free 1998 OTHERNAME_new 1999 -sk_X509_TRUST_find 2000 X509_CERT_AUX_new 2001 -sk_ACCESS_DESCRIPTION_dup 2002 -sk_ASN1_STRING_TABLE_pop_free 2003 -sk_ASN1_STRING_TABLE_unshift 2004 -sk_X509_TRUST_shift 2005 -sk_ACCESS_DESCRIPTION_zero 2006 X509_TRUST_cleanup 2007 X509_NAME_add_entry_by_OBJ 2008 X509_CRL_get_ext_d2i 2009 -sk_X509_TRUST_set 2010 X509_PURPOSE_get0_name 2011 PEM_read_PUBKEY 2012 -sk_ACCESS_DESCRIPTION_new 2013 i2d_DSA_PUBKEY_bio 2014 i2d_OTHERNAME 2015 ASN1_OCTET_STRING_free 2016 ASN1_BIT_STRING_set_asc 2017 -sk_ACCESS_DESCRIPTION_push 2018 X509_get_ex_new_index 2019 ASN1_STRING_TABLE_cleanup 2020 X509_TRUST_get_by_id 2021 @@ -2000,23 +1583,15 @@ ASN1_PRINTABLESTRING_new 2025 X509V3_get_d2i 2026 ASN1_ENUMERATED_free 2027 i2d_X509_CERT_AUX 2028 -sk_ACCESS_DESCRIPTION_find 2029 X509_STORE_CTX_set_trust 2030 -sk_X509_PURPOSE_unshift 2031 ASN1_STRING_set_default_mask 2032 X509_STORE_CTX_new 2033 EVP_PKEY_get1_RSA 2034 -sk_X509_PURPOSE_set 2035 -sk_ASN1_STRING_TABLE_insert 2036 -sk_X509_PURPOSE_sort 2037 DIRECTORYSTRING_free 2038 PEM_write_X509_AUX 2039 ASN1_OCTET_STRING_set 2040 d2i_DSA_PUBKEY_fp 2041 -sk_ASN1_STRING_TABLE_free 2042 -sk_X509_TRUST_value 2043 d2i_RSA_PUBKEY 2044 -sk_ASN1_STRING_TABLE_set 2045 X509_TRUST_get0_name 2046 X509_TRUST_get0 2047 AUTHORITY_INFO_ACCESS_free 2048 @@ -2030,9 +1605,7 @@ X509_TRUST_get_trust 2055 X509_TRUST_get_flags 2056 ASN1_BMPSTRING_free 2057 ASN1_T61STRING_new 2058 -sk_X509_TRUST_unshift 2059 ASN1_UTCTIME_new 2060 -sk_ACCESS_DESCRIPTION_pop 2061 i2d_AUTHORITY_INFO_ACCESS 2062 EVP_PKEY_set1_RSA 2063 X509_STORE_CTX_set_purpose 2064 @@ -2040,44 +1613,26 @@ ASN1_IA5STRING_free 2065 PEM_write_bio_X509_AUX 2066 X509_PURPOSE_get_count 2067 CRYPTO_add_info 2068 -sk_ACCESS_DESCRIPTION_num 2069 -sk_ASN1_STRING_TABLE_set_cmp_func 2070 X509_NAME_ENTRY_create_by_txt 2071 ASN1_STRING_get_default_mask 2072 -sk_X509_TRUST_dup 2073 X509_alias_get0 2074 ASN1_STRING_data 2075 -sk_X509_TRUST_insert 2076 i2d_ACCESS_DESCRIPTION 2077 X509_trust_set_bit 2078 -sk_X509_PURPOSE_delete_ptr 2079 ASN1_BIT_STRING_free 2080 PEM_read_bio_RSA_PUBKEY 2081 X509_add1_reject_object 2082 X509_check_trust 2083 -sk_X509_TRUST_new_null 2084 -sk_ACCESS_DESCRIPTION_new_null 2085 -sk_ACCESS_DESCRIPTION_delete_ptr 2086 -sk_X509_TRUST_sort 2087 PEM_read_bio_DSA_PUBKEY 2088 -sk_X509_TRUST_new 2089 X509_PURPOSE_add 2090 ASN1_STRING_TABLE_get 2091 ASN1_UTF8STRING_free 2092 d2i_DSA_PUBKEY_bio 2093 -sk_ASN1_STRING_TABLE_delete 2094 PEM_write_RSA_PUBKEY 2095 d2i_OTHERNAME 2096 -sk_ACCESS_DESCRIPTION_insert 2097 X509_reject_set_bit 2098 -sk_X509_TRUST_delete_ptr 2099 -sk_X509_PURPOSE_pop_free 2100 PEM_write_DSA_PUBKEY 2101 -sk_X509_PURPOSE_free 2102 -sk_X509_PURPOSE_dup 2103 -sk_ASN1_STRING_TABLE_zero 2104 X509_PURPOSE_get0_sname 2105 -sk_ASN1_STRING_TABLE_shift 2106 EVP_PKEY_set1_DH 2107 ASN1_OCTET_STRING_dup 2108 ASN1_BIT_STRING_set 2109 @@ -2087,30 +1642,19 @@ OTHERNAME_free 2112 i2d_RSA_PUBKEY_fp 2113 ASN1_INTEGER_dup 2114 d2i_X509_CERT_AUX 2115 -sk_ASN1_STRING_TABLE_new_null 2116 PEM_write_bio_PUBKEY 2117 ASN1_VISIBLESTRING_free 2118 X509_PURPOSE_cleanup 2119 -sk_ASN1_STRING_TABLE_push 2120 -sk_ASN1_STRING_TABLE_dup 2121 -sk_X509_PURPOSE_shift 2122 ASN1_mbstring_ncopy 2123 -sk_X509_PURPOSE_new 2124 -sk_X509_PURPOSE_insert 2125 ASN1_GENERALIZEDTIME_new 2126 -sk_ACCESS_DESCRIPTION_sort 2127 EVP_PKEY_get1_DH 2128 -sk_ACCESS_DESCRIPTION_set_cmp_func 2129 ASN1_OCTET_STRING_new 2130 ASN1_INTEGER_new 2131 i2d_X509_AUX 2132 -sk_ASN1_STRING_TABLE_find 2133 ASN1_BIT_STRING_name_print 2134 X509_cmp 2135 ASN1_STRING_length_set 2136 DIRECTORYSTRING_new 2137 -sk_ASN1_STRING_TABLE_new 2138 -sk_X509_TRUST_delete 2139 X509_add1_trust_object 2140 PKCS12_newpass 2141 SMIME_write_PKCS7 2142 @@ -2191,25 +1735,6 @@ X509at_add1_attr_by_OBJ 2216 X509_REQ_add1_attr_by_txt 2217 X509_ATTRIBUTE_create_by_txt 2218 X509at_add1_attr_by_txt 2219 -sk_CRYPTO_EX_DATA_FUNCS_delete 2220 -sk_CRYPTO_EX_DATA_FUNCS_set 2221 -sk_CRYPTO_EX_DATA_FUNCS_unshift 2222 -sk_CRYPTO_EX_DATA_FUNCS_new_null 2223 -sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func 2224 -sk_CRYPTO_EX_DATA_FUNCS_sort 2225 -sk_CRYPTO_EX_DATA_FUNCS_dup 2226 -sk_CRYPTO_EX_DATA_FUNCS_shift 2227 -sk_CRYPTO_EX_DATA_FUNCS_value 2228 -sk_CRYPTO_EX_DATA_FUNCS_pop 2229 -sk_CRYPTO_EX_DATA_FUNCS_push 2230 -sk_CRYPTO_EX_DATA_FUNCS_find 2231 -sk_CRYPTO_EX_DATA_FUNCS_new 2232 -sk_CRYPTO_EX_DATA_FUNCS_free 2233 -sk_CRYPTO_EX_DATA_FUNCS_delete_ptr 2234 -sk_CRYPTO_EX_DATA_FUNCS_num 2235 -sk_CRYPTO_EX_DATA_FUNCS_pop_free 2236 -sk_CRYPTO_EX_DATA_FUNCS_insert 2237 -sk_CRYPTO_EX_DATA_FUNCS_zero 2238 BN_pseudo_rand 2239 BN_is_prime_fasttest 2240 BN_CTX_end 2241 @@ -2264,110 +1789,15 @@ CONF_set_default_method 2290 ERR_error_string_n 2291 BIO_snprintf 2292 DSO_ctrl 2293 -sk_PKCS7_num 2294 -sk_PKCS12_SAFEBAG_set 2295 -sk_BIO_delete 2296 -sk_PKCS7_new_null 2297 -sk_BIO_delete_ptr 2298 -sk_ASN1_INTEGER_dup 2299 -sk_BIO_value 2300 -sk_PKCS7_delete_ptr 2301 -sk_X509V3_EXT_METHOD_pop 2302 -sk_PKCS12_SAFEBAG_new_null 2303 -sk_ASN1_INTEGER_delete 2304 -sk_BIO_sort 2305 -sk_ASN1_INTEGER_sort 2306 -sk_PKCS7_free 2307 -sk_PKCS12_SAFEBAG_dup 2308 -sk_X509V3_EXT_METHOD_sort 2309 -sk_X509V3_EXT_METHOD_pop_free 2310 -sk_X509V3_EXT_METHOD_shift 2311 -sk_ASN1_INTEGER_pop_free 2312 -sk_X509V3_EXT_METHOD_unshift 2313 -sk_ASN1_INTEGER_pop 2314 -sk_BIO_new_null 2315 -sk_PKCS7_set 2316 i2d_ASN1_SET_OF_ASN1_INTEGER 2317 -sk_PKCS12_SAFEBAG_push 2318 -sk_X509V3_EXT_METHOD_value 2319 i2d_ASN1_SET_OF_PKCS12_SAFEBAG 2320 -sk_PKCS7_zero 2321 -sk_ASN1_INTEGER_shift 2322 -sk_PKCS12_SAFEBAG_insert 2323 -sk_PKCS12_SAFEBAG_find 2324 -sk_PKCS12_SAFEBAG_unshift 2325 -sk_ASN1_INTEGER_unshift 2326 -sk_PKCS12_SAFEBAG_pop 2327 i2d_ASN1_SET_OF_PKCS7 2328 -sk_ASN1_INTEGER_delete_ptr 2329 -sk_PKCS7_dup 2330 -sk_BIO_new 2331 -sk_ASN1_INTEGER_value 2332 -sk_PKCS12_SAFEBAG_delete 2333 BIO_vfree 2334 -sk_X509V3_EXT_METHOD_new_null 2335 -sk_BIO_push 2336 -sk_ASN1_INTEGER_new_null 2337 -sk_PKCS12_SAFEBAG_set_cmp_func 2338 d2i_ASN1_SET_OF_ASN1_INTEGER 2339 -sk_ASN1_INTEGER_push 2340 d2i_ASN1_SET_OF_PKCS12_SAFEBAG 2341 -sk_BIO_find 2342 -sk_X509V3_EXT_METHOD_push 2343 -sk_BIO_set_cmp_func 2344 -sk_ASN1_INTEGER_find 2345 -sk_X509V3_EXT_METHOD_find 2346 -sk_PKCS12_SAFEBAG_delete_ptr 2347 -sk_X509V3_EXT_METHOD_new 2348 -sk_BIO_num 2349 ASN1_UTCTIME_get 2350 -sk_PKCS7_pop 2351 -sk_PKCS7_insert 2352 -sk_PKCS7_sort 2353 -sk_X509V3_EXT_METHOD_insert 2354 -sk_ASN1_INTEGER_new 2355 -sk_PKCS12_SAFEBAG_free 2356 -sk_X509V3_EXT_METHOD_num 2357 -sk_PKCS7_delete 2358 -sk_X509V3_EXT_METHOD_delete 2359 -sk_BIO_set 2360 -sk_PKCS12_SAFEBAG_new 2361 X509_REQ_digest 2362 -sk_ASN1_INTEGER_num 2363 -sk_PKCS7_set_cmp_func 2364 -sk_PKCS7_shift 2365 -sk_PKCS12_SAFEBAG_zero 2366 -sk_BIO_free 2367 -sk_ASN1_INTEGER_free 2368 -sk_X509V3_EXT_METHOD_set_cmp_func 2369 -sk_PKCS7_push 2370 -sk_X509V3_EXT_METHOD_free 2371 -sk_PKCS7_pop_free 2372 -sk_PKCS7_value 2373 -sk_X509V3_EXT_METHOD_delete_ptr 2374 -sk_X509V3_EXT_METHOD_set 2375 -sk_PKCS12_SAFEBAG_num 2376 -sk_PKCS7_find 2377 -sk_ASN1_INTEGER_set_cmp_func 2378 -sk_PKCS12_SAFEBAG_shift 2379 -sk_BIO_dup 2380 -sk_PKCS7_unshift 2381 -sk_PKCS12_SAFEBAG_pop_free 2382 -sk_BIO_zero 2383 -sk_PKCS7_new 2384 -sk_ASN1_INTEGER_zero 2385 -sk_BIO_unshift 2386 -sk_ASN1_INTEGER_set 2387 -sk_BIO_insert 2388 -sk_X509V3_EXT_METHOD_zero 2389 -sk_PKCS12_SAFEBAG_value 2390 X509_CRL_digest 2391 -sk_X509V3_EXT_METHOD_dup 2392 -sk_BIO_shift 2393 -sk_PKCS12_SAFEBAG_sort 2394 -sk_BIO_pop 2395 -sk_BIO_pop_free 2396 d2i_ASN1_SET_OF_PKCS7 2397 -sk_ASN1_INTEGER_insert 2398 EVP_CIPHER_CTX_set_key_length 2399 EVP_CIPHER_CTX_ctrl 2400 diff --git a/util/ssleay.num b/util/ssleay.num index 32b2e960c4..047950d899 100755 --- a/util/ssleay.num +++ b/util/ssleay.num @@ -169,51 +169,13 @@ SSL_set_tmp_rsa_callback 186 SSL_set_tmp_dh_callback 187 SSL_add_dir_cert_subjects_to_stack 188 SSL_set_session_id_context 189 -sk_SSL_CIPHER_new 190 -sk_SSL_CIPHER_new_null 191 -sk_SSL_CIPHER_free 192 -sk_SSL_CIPHER_num 193 -sk_SSL_CIPHER_value 194 -sk_SSL_CIPHER_set 195 -sk_SSL_CIPHER_zero 196 -sk_SSL_CIPHER_push 197 -sk_SSL_CIPHER_pop 198 -sk_SSL_CIPHER_find 199 -sk_SSL_CIPHER_delete 200 -sk_SSL_CIPHER_delete_ptr 201 -sk_SSL_CIPHER_set_cmp_func 202 -sk_SSL_CIPHER_dup 203 -sk_SSL_CIPHER_pop_free 204 -sk_SSL_CIPHER_shift 205 -sk_SSL_COMP_new 206 -sk_SSL_COMP_new_null 207 -sk_SSL_COMP_free 208 -sk_SSL_COMP_num 209 -sk_SSL_COMP_value 210 -sk_SSL_COMP_set 211 -sk_SSL_COMP_zero 212 -sk_SSL_COMP_push 213 -sk_SSL_COMP_pop 214 -sk_SSL_COMP_find 215 -sk_SSL_COMP_delete 216 -sk_SSL_COMP_delete_ptr 217 -sk_SSL_COMP_set_cmp_func 218 -sk_SSL_COMP_dup 219 -sk_SSL_COMP_pop_free 220 -sk_SSL_COMP_shift 221 SSL_CTX_use_certificate_chain_file 222 -sk_SSL_COMP_insert 223 -sk_SSL_CIPHER_insert 224 SSL_CTX_set_verify_depth 225 SSL_set_verify_depth 226 -sk_SSL_CIPHER_unshift 227 SSL_CTX_get_verify_depth 228 SSL_get_verify_depth 229 -sk_SSL_COMP_unshift 230 SSL_CTX_set_session_id_context 231 SSL_CTX_set_cert_verify_callback 232 -sk_SSL_COMP_sort 233 -sk_SSL_CIPHER_sort 234 SSL_CTX_set_default_passwd_cb_userdata 235 SSL_set_purpose 236 SSL_CTX_set_trust 237 |