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 <soren@t.dk>
Reviewed by: Ralf S. Engelschall

diff --git a/CHANGES b/CHANGES
index c0962e8ecaa1608121edac248fbef2f81129a8f1..ecb697f3a1ccb31a50b9bc8c6f9c5ec91f942886 100644 (file)
--- 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 <soren@t.dk>]
+

  Changes between 0.9.1c and 0.9.2b
 
   *) Make SSL_get_peer_cert_chain() work in servers. Unfortunately, it still
  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 c21e50b653edc353455ef869998b4a4ab1836702..d2f81e524f147060afd6f8ddcc72f3b68beb57ed 100644 (file)
--- 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)
 
                (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);
 #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);
 
 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,
 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,