In asn1_d2i_read_bio, don't assume BIO_read will

[openssl.git] / crypto / asn1 / asn1_gen.c

diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index 62c2c154d1484d0bcf20037ed12a8fa0ce805738..097b4b8ecfe5223dedfff740f60953f3ad2df0fa 100644 (file)
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -67,7 +67,8 @@
 #define ASN1_GEN_FLAG_BITWRAP  (ASN1_GEN_FLAG|4)
 #define ASN1_GEN_FLAG_OCTWRAP  (ASN1_GEN_FLAG|5)
 #define ASN1_GEN_FLAG_SEQWRAP  (ASN1_GEN_FLAG|6)
-#define ASN1_GEN_FLAG_FORMAT   (ASN1_GEN_FLAG|7)
+#define ASN1_GEN_FLAG_SETWRAP  (ASN1_GEN_FLAG|7)
+#define ASN1_GEN_FLAG_FORMAT   (ASN1_GEN_FLAG|8)
 
 #define ASN1_GEN_STR(str,val)  {str, sizeof(str) - 1, val}
 
@@ -143,7 +144,7 @@ ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf)
        unsigned char *cpy_start, *p;
        int cpy_len;
        long hdr_len;
-       int hdr_constructed, hdr_tag, hdr_class;
+       int hdr_constructed = 0, hdr_tag, hdr_class;
        int r;
 
        asn1_tags.imp_tag = -1;
@@ -268,7 +269,7 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
        tag_exp_arg *arg = bitstr;
        int i;
        int utype;
-       int vlen;
+       int vlen = 0;
        const char *p, *vstart = NULL;
 
        int tmp_tag, tmp_class;
@@ -335,6 +336,11 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
                        return -1;
                break;
 
+               case ASN1_GEN_FLAG_SETWRAP:
+               if (!append_exp(arg, V_ASN1_SET, V_ASN1_UNIVERSAL, 1, 0, 1))
+                       return -1;
+               break;
+
                case ASN1_GEN_FLAG_BITWRAP:
                if (!append_exp(arg, V_ASN1_BIT_STRING, V_ASN1_UNIVERSAL, 0, 1, 1))
                        return -1;
@@ -588,6 +594,8 @@ static int asn1_str2tag(const char *tagstr, int len)
                ASN1_GEN_STR("OCTWRAP", ASN1_GEN_FLAG_OCTWRAP),
                /* SEQUENCE wrapper */
                ASN1_GEN_STR("SEQWRAP", ASN1_GEN_FLAG_SEQWRAP),
+               /* SET wrapper */
+               ASN1_GEN_STR("SETWRAP", ASN1_GEN_FLAG_SEQWRAP),
                /* BIT STRING wrapper */
                ASN1_GEN_STR("BITWRAP", ASN1_GEN_FLAG_BITWRAP),
                ASN1_GEN_STR("FORM", ASN1_GEN_FLAG_FORMAT),