#endif
/* If placed in pkcs12.h, we end up with a circular depency with pkcs7.h */
-#define DECLARE_PKCS12_STACK_OF(type) \
-STACK_OF(type) *PKCS12_decrypt_d2i_##type(struct X509_algor_st *algor, \
- type *(*d2i)(type **, \
- unsigned char **, \
- long), \
- void (*free_func)(type *), \
- const char *pass, int passlen, \
- ASN1_STRING *oct, int seq);
-
-#define IMPLEMENT_PKCS12_STACK_OF(type) \
-STACK_OF(type) *PKCS12_decrypt_d2i_##type(struct X509_algor_st *algor, \
- type *(*d2i)(type **, \
- unsigned char **, \
- long), \
- void (*free_func)(type *), \
- const char *pass, int passlen, \
- ASN1_STRING *oct, int seq) \
- { return (STACK_OF(type) *)PKCS12_decrypt_d2i(algor,(char *(*)())d2i, \
- (void(*)(void *))free_func, \
- pass,passlen,oct,seq); }
+#define DECLARE_PKCS12_STACK_OF(type) /* Nothing */
+#define IMPLEMENT_PKCS12_STACK_OF(type) /* Nothing */
#define X509_FILETYPE_PEM 1
#define X509_FILETYPE_ASN1 2
} 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
{
- ASN1_UTCTIME *notBefore;
- ASN1_UTCTIME *notAfter;
+ ASN1_TIME *notBefore;
+ ASN1_TIME *notAfter;
} X509_VAL;
typedef struct X509_pubkey_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. */
} 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
} 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 */
} 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
} 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 */
} 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 */
#define X509_TRUST_REJECTED 2
#define X509_TRUST_UNTRUSTED 3
+/* Flags specific to X509_NAME_print_ex() */
+
+/* The field separator information */
+
+#define XN_FLAG_SEP_MASK (0xf << 16)
+
+#define XN_FLAG_COMPAT 0 /* Traditional SSLeay: use old X509_NAME_print */
+#define XN_FLAG_SEP_COMMA_PLUS (1 << 16) /* RFC2253 ,+ */
+#define XN_FLAG_SEP_CPLUS_SPC (2 << 16) /* ,+ spaced: more readable */
+#define XN_FLAG_SEP_SPLUS_SPC (3 << 16) /* ;+ spaced */
+#define XN_FLAG_SEP_MULTILINE (4 << 16) /* One line per field */
+
+#define XN_FLAG_DN_REV (1 << 20) /* Reverse DN order */
+
+/* How the field name is shown */
+
+#define XN_FLAG_FN_MASK (0x3 << 21)
+
+#define XN_FLAG_FN_NONE 0 /* No field names */
+#define XN_FLAG_FN_SN (1 << 21) /* Object short name */
+#define XN_FLAG_FN_LN (2 << 21) /* Object long name */
+#define XN_FLAG_FN_OID (3 << 21) /* Always use OIDs */
+
+#define XN_FLAG_SPC_EQ (1 << 23) /* Put spaces round '=' */
+
+/* This determines if we dump fields we don't recognise:
+ * RFC2253 requires this.
+ */
+
+#define XN_FLAG_DUMP_UNKNOWN_FIELDS (1 << 24)
+
+/* Complete set of RFC2253 flags */
+
+#define XN_FLAG_RFC2253 (ASN1_STRFLGS_RFC2253 | \
+ XN_FLAG_SEP_COMMA_PLUS | \
+ XN_FLAG_DN_REV | \
+ XN_FLAG_FN_SN | \
+ XN_FLAG_DUMP_UNKNOWN_FIELDS)
+
+/* readable oneline form */
+
+#define XN_FLAG_ONELINE (ASN1_STRFLGS_RFC2253 | \
+ ASN1_STRFLGS_ESC_QUOTE | \
+ XN_FLAG_SEP_CPLUS_SPC | \
+ XN_FLAG_SPC_EQ | \
+ XN_FLAG_FN_SN)
+
+/* readable multiline form */
+
+#define XN_FLAG_MULTILINE (ASN1_STRFLGS_ESC_CTRL | \
+ ASN1_STRFLGS_ESC_MSB | \
+ XN_FLAG_SEP_MULTILINE | \
+ XN_FLAG_SPC_EQ | \
+ XN_FLAG_FN_LN)
+
typedef struct X509_revoked_st
{
ASN1_INTEGER *serialNumber;
- ASN1_UTCTIME *revocationDate;
+ ASN1_TIME *revocationDate;
STACK_OF(X509_EXTENSION) /* optional */ *extensions;
int sequence; /* load sequence */
} 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
ASN1_INTEGER *version;
X509_ALGOR *sig_alg;
X509_NAME *issuer;
- ASN1_UTCTIME *lastUpdate;
- ASN1_UTCTIME *nextUpdate;
+ ASN1_TIME *lastUpdate;
+ ASN1_TIME *nextUpdate;
STACK_OF(X509_REVOKED) *revoked;
STACK_OF(X509_EXTENSION) /* [0] */ *extensions;
} X509_CRL_INFO;
} 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
} 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
#endif /* !SSLEAY_MACROS */
-int X509_cmp_current_time(ASN1_UTCTIME *s);
-ASN1_UTCTIME * X509_gmtime_adj(ASN1_UTCTIME *s, long adj);
+int X509_cmp_current_time(ASN1_TIME *s);
+ASN1_TIME * X509_gmtime_adj(ASN1_TIME *s, long adj);
const char * X509_get_default_cert_area(void );
const char * X509_get_default_cert_dir(void );
X509_NAME * X509_get_issuer_name(X509 *a);
int X509_set_subject_name(X509 *x, X509_NAME *name);
X509_NAME * X509_get_subject_name(X509 *a);
-int X509_set_notBefore(X509 *x, ASN1_UTCTIME *tm);
-int X509_set_notAfter(X509 *x, ASN1_UTCTIME *tm);
+int X509_set_notBefore(X509 *x, ASN1_TIME *tm);
+int X509_set_notAfter(X509 *x, ASN1_TIME *tm);
int X509_set_pubkey(X509 *x, EVP_PKEY *pkey);
EVP_PKEY * X509_get_pubkey(X509 *x);
int X509_certificate_type(X509 *x,EVP_PKEY *pubkey /* optional */);
int X509_print_fp(FILE *bp,X509 *x);
int X509_CRL_print_fp(FILE *bp,X509_CRL *x);
int X509_REQ_print_fp(FILE *bp,X509_REQ *req);
+int X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent, unsigned long flags);
#endif
#ifndef NO_BIO
int X509_NAME_print(BIO *bp, X509_NAME *name, int obase);
+int X509_NAME_print_ex(BIO *out, X509_NAME *nm, int indent, unsigned long flags);
int X509_print(BIO *bp,X509 *x);
int X509_CERT_AUX_print(BIO *bp,X509_CERT_AUX *x, int indent);
int X509_CRL_print(BIO *bp,X509_CRL *x);
projects / openssl.git / blobdiff