OpenSSL 0.9.4 merge

1 files changed, 51 insertions, 33 deletions

diff --git a/src/lib/libcrypto/asn1/asn1_par.c b/src/lib/libcrypto/asn1/asn1_par.c
index 3906227d21..86886606ef 100644
--- a/src/lib/libcrypto/asn1/asn1_par.c
+++ b/src/lib/libcrypto/asn1/asn1_par.c
@@ -58,30 +58,21 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "buffer.h"
-#include "objects.h"
-#include "x509.h"
+#include <openssl/buffer.h>
+#include <openssl/objects.h>
+#include <openssl/asn1.h>
 
-#ifndef NOPROTO
 static int asn1_print_info(BIO *bp, int tag, int xclass,int constructed,
         int indent);
 static int asn1_parse2(BIO *bp, unsigned char **pp, long length,
         int offset, int depth, int indent);
-#else
-static int asn1_print_info();
-static int asn1_parse2();
-#endif
-
-static int asn1_print_info(bp, tag, xclass, constructed,indent)
-BIO *bp;
-int tag;
-int xclass;
-int constructed;
-int indent;
+static int asn1_print_info(BIO *bp, int tag, int xclass, int constructed,
+             int indent)
         {
-        static char *fmt="%-18s";
-        static char *fmt2="%2d %-15s";
-        char *p,str[128],*p2=NULL;
+        static const char fmt[]="%-18s";
+        static const char fmt2[]="%2d %-15s";
+        char str[128];
+        const char *p,*p2=NULL;
 
         if (constructed & V_ASN1_CONSTRUCTED)
                 p="cons: ";
@@ -108,6 +99,8 @@ int indent;
                 p="BOOLEAN";
         else if (tag == V_ASN1_INTEGER)
                 p="INTEGER";
+        else if (tag == V_ASN1_ENUMERATED)
+                p="ENUMERATED";
         else if (tag == V_ASN1_BIT_STRING)
                 p="BIT STRING";
         else if (tag == V_ASN1_OCTET_STRING)
@@ -138,8 +131,8 @@ int indent;
                 p="GENERALIZEDTIME";
         else if (tag == V_ASN1_GRAPHICSTRING)
                 p="GRAPHICSTRING";
-        else if (tag == V_ASN1_ISO64STRING)
-                p="ISO64STRING";
+        else if (tag == V_ASN1_VISIBLESTRING)
+                p="VISIBLESTRING";
         else if (tag == V_ASN1_GENERALSTRING)
                 p="GENERALSTRING";
         else if (tag == V_ASN1_UNIVERSALSTRING)
@@ -162,22 +155,13 @@ err:
         return(0);
         }
 
-int ASN1_parse(bp, pp, len, indent)
-BIO *bp;
-unsigned char *pp;
-long len;
-int indent;
+int ASN1_parse(BIO *bp, unsigned char *pp, long len, int indent)
         {
         return(asn1_parse2(bp,&pp,len,0,0,indent));
         }
 
-static int asn1_parse2(bp, pp, length, offset, depth, indent)
-BIO *bp;
-unsigned char **pp;
-long length;
-int offset;
-int depth;
-int indent;
+static int asn1_parse2(BIO *bp, unsigned char **pp, long length, int offset,
+             int depth, int indent)
         {
         unsigned char *p,*ep,*tot,*op,*opp;
         long len;
@@ -266,7 +250,9 @@ int indent;
                         if (    (tag == V_ASN1_PRINTABLESTRING) ||
                                 (tag == V_ASN1_T61STRING) ||
                                 (tag == V_ASN1_IA5STRING) ||
-                                (tag == V_ASN1_UTCTIME))
+                                (tag == V_ASN1_VISIBLESTRING) ||
+                                (tag == V_ASN1_UTCTIME) ||
+                                (tag == V_ASN1_GENERALIZEDTIME))
                                 {
                                 if (BIO_write(bp,":",1) <= 0) goto end;
                                 if ((len > 0) &&
@@ -370,6 +356,38 @@ int indent;
                                         }
                                 ASN1_INTEGER_free(bs);
                                 }
+                        else if (tag == V_ASN1_ENUMERATED)
+                                {
+                                ASN1_ENUMERATED *bs;
+                                int i;
+
+                                opp=op;
+                                bs=d2i_ASN1_ENUMERATED(NULL,&opp,len+hl);
+                                if (bs != NULL)
+                                        {
+                                        if (BIO_write(bp,":",1) <= 0) goto end;
+                                        if (bs->type == V_ASN1_NEG_ENUMERATED)
+                                                if (BIO_write(bp,"-",1) <= 0)
+                                                        goto end;
+                                        for (i=0; i<bs->length; i++)
+                                                {
+                                                if (BIO_printf(bp,"%02X",
+                                                        bs->data[i]) <= 0)
+                                                        goto end;
+                                                }
+                                        if (bs->length == 0)
+                                                {
+                                                if (BIO_write(bp,"00",2) <= 0)
+                                                        goto end;
+                                                }
+                                        }
+                                else
+                                        {
+                                        if (BIO_write(bp,"BAD ENUMERATED",11) <= 0)
+                                                goto end;
+                                        }
+                                ASN1_ENUMERATED_free(bs);
+                                }
 
                         if (!nl) 
                                 {