Fix d4a4370050f7d72239b92a60ab9d4a2dd5e9fd84

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

diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index 4fc241908f6923b4f99e5e4e8d2ed0c1ba4a17bf..25b270d6e63fcbaf88bedd5609e7c6f1710bdb3e 100644 (file)
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -372,7 +372,7 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
                        arg->format = ASN1_GEN_FORMAT_BITLIST;
                else
                        {
-                       ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKOWN_FORMAT);
+                       ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKNOWN_FORMAT);
                        return -1;
                        }
                break;
@@ -852,3 +852,27 @@ static int bitstr_cb(const char *elem, int len, void *bitstr)
        return 1;
        }
 
+static int mask_cb(const char *elem, int len, void *arg)
+       {
+       unsigned long *pmask = arg, tmpmask;
+       int tag;
+       if (len == 3 && !strncmp(elem, "DIR", 3))
+               {
+               *pmask |= B_ASN1_DIRECTORYSTRING;
+               return 1;
+               }
+       tag = asn1_str2tag(elem, len);
+       if (!tag || (tag & ASN1_GEN_FLAG))
+               return 0;
+       tmpmask = ASN1_tag2bit(tag);
+       if (!tmpmask)
+               return 0;
+       *pmask |= tmpmask;
+       return 1;
+       }
+
+int ASN1_str2mask(const char *str, unsigned long *pmask)
+       {
+       *pmask = 0;
+       return CONF_parse_list(str, '|', 1, mask_cb, pmask);
+       }