From: Ralf S. Engelschall Date: Wed, 24 Mar 1999 10:24:35 +0000 (+0000) Subject: Move definitions of IS_SET/IS_SEQUENCE inside crypto/asn1/asn1.h X-Git-Tag: OpenSSL_0_9_3beta1~404 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1b276f3012c9470d1f7ca0d5d20c3f40de47faf2;p=oweals%2Fopenssl.git Move definitions of IS_SET/IS_SEQUENCE inside crypto/asn1/asn1.h so they no longer are missing under -DNOPROTO. Submitted by: Soren S. Jorvang Reviewed by: Ralf S. Engelschall --- diff --git a/CHANGES b/CHANGES index c0962e8eca..ecb697f3a1 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,12 @@ _______________ + Changes between 0.9.2b and 0.9.3 + + *) Move definitions of IS_SET/IS_SEQUENCE inside crypto/asn1/asn1.h + so they no longer are missing under -DNOPROTO. + [Soren S. Jorvang ] + Changes between 0.9.1c and 0.9.2b *) Make SSL_get_peer_cert_chain() work in servers. Unfortunately, it still diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index c21e50b653..d2f81e524f 100644 --- a/crypto/asn1/asn1.h +++ b/crypto/asn1/asn1.h @@ -396,6 +396,10 @@ typedef struct asn1_header_st (ASN1_BMPSTRING *)d2i_ASN1_type_bytes\ ((ASN1_STRING **)a,pp,l,B_ASN1_BMPSTRING) + /* for the is_set parameter to i2d_ASN1_SET */ +#define IS_SEQUENCE 0 +#define IS_SET 1 + #ifndef NOPROTO ASN1_TYPE * ASN1_TYPE_new(void ); void ASN1_TYPE_free(ASN1_TYPE *a); @@ -475,10 +479,6 @@ int i2d_ASN1_TIME(ASN1_TIME *a,unsigned char **pp); ASN1_TIME * d2i_ASN1_TIME(ASN1_TIME **a,unsigned char **pp, long length); ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s,time_t t); - - /* for the is_set parameter to i2d_ASN1_SET */ -#define IS_SEQUENCE 0 -#define IS_SET 1 int i2d_ASN1_SET(STACK *a, unsigned char **pp, int (*func)(), int ex_tag, int ex_class, int is_set); STACK * d2i_ASN1_SET(STACK **a, unsigned char **pp, long length,