OpenSSL 0.9.4 merge

1 files changed, 45 insertions, 76 deletions

diff --git a/src/lib/libcrypto/asn1/asn1_lib.c b/src/lib/libcrypto/asn1/asn1_lib.c
index ff30b25836..95e54ed626 100644
--- a/src/lib/libcrypto/asn1/asn1_lib.c
+++ b/src/lib/libcrypto/asn1/asn1_lib.c
@@ -58,22 +58,14 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1.h"
-#include "asn1_mac.h"
+#include <openssl/asn1.h>
+#include <openssl/asn1_mac.h>
 
-#ifndef NOPROTO
 static int asn1_get_length(unsigned char **pp,int *inf,long *rl,int max);
 static void asn1_put_length(unsigned char **pp, int length);
-#else
-static int asn1_get_length();
-static void asn1_put_length();
-#endif
-
-char *ASN1_version="ASN1 part of SSLeay 0.9.0b 29-Jun-1998";
+const char *ASN1_version="ASN.1" OPENSSL_VERSION_PTEXT;
 
-int ASN1_check_infinite_end(p,len)
-unsigned char **p;
-long len;
+int ASN1_check_infinite_end(unsigned char **p, long len)
         {
         /* If there is 0 or 1 byte left, the length check should pick
          * things up */
@@ -88,12 +80,8 @@ long len;
         }
 
 
-int ASN1_get_object(pp, plength, ptag, pclass, omax)
-unsigned char **pp;
-long *plength;
-int *ptag;
-int *pclass;
-long omax;
+int ASN1_get_object(unsigned char **pp, long *plength, int *ptag, int *pclass,
+             long omax)
         {
         int i,ret;
         long l;
@@ -104,8 +92,8 @@ long omax;
         if (!max) goto err;
         ret=(*p&V_ASN1_CONSTRUCTED);
         xclass=(*p&V_ASN1_PRIVATE);
-        i= *p&V_ASN1_PRIMATIVE_TAG;
-        if (i == V_ASN1_PRIMATIVE_TAG)
+        i= *p&V_ASN1_PRIMITIVE_TAG;
+        if (i == V_ASN1_PRIMITIVE_TAG)
                 {               /* high-tag */
                 p++;
                 if (--max == 0) goto err;
@@ -130,11 +118,13 @@ long omax;
         *pclass=xclass;
         if (!asn1_get_length(&p,&inf,plength,(int)max)) goto err;
 
-#ifdef undef
-        fprintf(stderr,"p=%d + *plength=%d > omax=%d + *pp=%d  (%d > %d)\n", 
-                p,*plength,omax,*pp,(p+ *plength),omax+ *pp);
+#if 0
+        fprintf(stderr,"p=%d + *plength=%ld > omax=%ld + *pp=%d  (%d > %d)\n", 
+                (int)p,*plength,omax,(int)*pp,(int)(p+ *plength),
+                (int)(omax+ *pp));
 
 #endif
+#if 0
         if ((p+ *plength) > (omax+ *pp))
                 {
                 ASN1err(ASN1_F_ASN1_GET_OBJECT,ASN1_R_TOO_LONG);
@@ -142,18 +132,15 @@ long omax;
                  * the values are set correctly */
                 ret|=0x80;
                 }
+#endif
         *pp=p;
-        return(ret+inf);
+        return(ret|inf);
 err:
         ASN1err(ASN1_F_ASN1_GET_OBJECT,ASN1_R_HEADER_TOO_LONG);
         return(0x80);
         }
 
-static int asn1_get_length(pp,inf,rl,max)
-unsigned char **pp;
-int *inf;
-long *rl;
-int max;
+static int asn1_get_length(unsigned char **pp, int *inf, long *rl, int max)
         {
         unsigned char *p= *pp;
         long ret=0;
@@ -190,12 +177,8 @@ int max;
 
 /* class 0 is constructed
  * constructed == 2 for indefinitle length constructed */
-void ASN1_put_object(pp,constructed,length,tag,xclass)
-unsigned char **pp;
-int constructed;
-int length;
-int tag;
-int xclass;
+void ASN1_put_object(unsigned char **pp, int constructed, int length, int tag,
+             int xclass)
         {
         unsigned char *p= *pp;
         int i;
@@ -203,10 +186,10 @@ int xclass;
         i=(constructed)?V_ASN1_CONSTRUCTED:0;
         i|=(xclass&V_ASN1_PRIVATE);
         if (tag < 31)
-                *(p++)=i|(tag&V_ASN1_PRIMATIVE_TAG);
+                *(p++)=i|(tag&V_ASN1_PRIMITIVE_TAG);
         else
                 {
-                *(p++)=i|V_ASN1_PRIMATIVE_TAG;
+                *(p++)=i|V_ASN1_PRIMITIVE_TAG;
                 while (tag > 0x7f)
                         {
                         *(p++)=(tag&0x7f)|0x80;
@@ -221,9 +204,7 @@ int xclass;
         *pp=p;
         }
 
-static void asn1_put_length(pp, length)
-unsigned char **pp;
-int length;
+static void asn1_put_length(unsigned char **pp, int length)
         {
         unsigned char *p= *pp;
         int i,l;
@@ -246,10 +227,7 @@ int length;
         *pp=p;
         }
 
-int ASN1_object_size(constructed, length, tag)
-int constructed;
-int length;
-int tag;
+int ASN1_object_size(int constructed, int length, int tag)
         {
         int ret;
 
@@ -277,29 +255,26 @@ int tag;
         return(ret);
         }
 
-int asn1_Finish(c)
-ASN1_CTX *c;
+int asn1_Finish(ASN1_CTX *c)
         {
         if ((c->inf == (1|V_ASN1_CONSTRUCTED)) && (!c->eos))
                 {
                 if (!ASN1_check_infinite_end(&c->p,c->slen))
                         {
-                        c->error=ASN1_R_MISSING_EOS;
+                        c->error=ERR_R_MISSING_ASN1_EOS;
                         return(0);
                         }
                 }
         if (    ((c->slen != 0) && !(c->inf & 1)) ||
                 ((c->slen < 0) && (c->inf & 1)))
                 {
-                c->error=ASN1_R_LENGTH_MISMATCH;
+                c->error=ERR_R_ASN1_LENGTH_MISMATCH;
                 return(0);
                 }
         return(1);
         }
 
-int asn1_GetSequence(c,length)
-ASN1_CTX *c;
-long *length;
+int asn1_GetSequence(ASN1_CTX *c, long *length)
         {
         unsigned char *q;
 
@@ -308,18 +283,18 @@ long *length;
                 *length);
         if (c->inf & 0x80)
                 {
-                c->error=ASN1_R_BAD_GET_OBJECT;
+                c->error=ERR_R_BAD_GET_ASN1_OBJECT_CALL;
                 return(0);
                 }
         if (c->tag != V_ASN1_SEQUENCE)
                 {
-                c->error=ASN1_R_EXPECTING_A_SEQUENCE;
+                c->error=ERR_R_EXPECTING_AN_ASN1_SEQUENCE;
                 return(0);
                 }
         (*length)-=(c->p-q);
         if (c->max && (*length < 0))
                 {
-                c->error=ASN1_R_LENGTH_MISMATCH;
+                c->error=ERR_R_ASN1_LENGTH_MISMATCH;
                 return(0);
                 }
         if (c->inf == (1|V_ASN1_CONSTRUCTED))
@@ -328,8 +303,7 @@ long *length;
         return(1);
         }
 
-ASN1_STRING *ASN1_STRING_dup(str)
-ASN1_STRING *str;
+ASN1_STRING *ASN1_STRING_dup(ASN1_STRING *str)
         {
         ASN1_STRING *ret;
 
@@ -341,34 +315,33 @@ ASN1_STRING *str;
                 ASN1_STRING_free(ret);
                 return(NULL);
                 }
+        ret->flags = str->flags;
         return(ret);
         }
 
-int ASN1_STRING_set(str,data,len)
-ASN1_STRING *str;
-unsigned char *data;
-int len;
+int ASN1_STRING_set(ASN1_STRING *str, const void *_data, int len)
         {
-        char *c;
+        unsigned char *c;
+        const char *data=_data;
 
         if (len < 0)
                 {
                 if (data == NULL)
                         return(0);
                 else
-                        len=strlen((char *)data);
+                        len=strlen(data);
                 }
         if ((str->length < len) || (str->data == NULL))
                 {
-                c=(char *)str->data;
+                c=str->data;
                 if (c == NULL)
-                        str->data=(unsigned char *)Malloc(len+1);
+                        str->data=Malloc(len+1);
                 else
-                        str->data=(unsigned char *)Realloc(c,len+1);
+                        str->data=Realloc(c,len+1);
 
                 if (str->data == NULL)
                         {
-                        str->data=(unsigned char *)c;
+                        str->data=c;
                         return(0);
                         }
                 }
@@ -382,14 +355,13 @@ int len;
         return(1);
         }
 
-ASN1_STRING *ASN1_STRING_new()
+ASN1_STRING *ASN1_STRING_new(void)
         {
         return(ASN1_STRING_type_new(V_ASN1_OCTET_STRING));
         }
 
 
-ASN1_STRING *ASN1_STRING_type_new(type)
-int type;
+ASN1_STRING *ASN1_STRING_type_new(int type)
         {
         ASN1_STRING *ret;
 
@@ -402,19 +374,18 @@ int type;
         ret->length=0;
         ret->type=type;
         ret->data=NULL;
+        ret->flags=0;
         return(ret);
         }
 
-void ASN1_STRING_free(a)
-ASN1_STRING *a;
+void ASN1_STRING_free(ASN1_STRING *a)
         {
         if (a == NULL) return;
         if (a->data != NULL) Free((char *)a->data);
         Free((char *)a);
         }
 
-int ASN1_STRING_cmp(a,b)
-ASN1_STRING *a,*b;
+int ASN1_STRING_cmp(ASN1_STRING *a, ASN1_STRING *b)
         {
         int i;
 
@@ -431,9 +402,7 @@ ASN1_STRING *a,*b;
                 return(i);
         }
 
-void asn1_add_error(address,offset)
-unsigned char *address;
-int offset;
+void asn1_add_error(unsigned char *address, int offset)
         {
         char buf1[16],buf2[16];