Fixes for Win32 build.

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

diff --git a/crypto/asn1/a_mbstr.c b/crypto/asn1/a_mbstr.c
index b83e3ee35e446bc7006f3826db955eb16a537e27..42f5d3b01e2f89b63985117ebbcd4a1fb268b9b6 100644 (file)
--- a/crypto/asn1/a_mbstr.c
+++ b/crypto/asn1/a_mbstr.c
@@ -57,10 +57,11 @@
  */
 
 #include <stdio.h>
+#include <ctype.h>
 #include "cryptlib.h"
 #include <openssl/asn1.h>
 
-static int traverse_string(unsigned char *p, int len, int inform,
+static int traverse_string(const unsigned char *p, int len, int inform,
                 int (*rfunc)(unsigned long value, void *in), void *arg);
 static int in_utf8(unsigned long value, void *arg);
 static int out_utf8(unsigned long value, void *arg);
@@ -71,15 +72,23 @@ static int cpy_univ(unsigned long value, void *arg);
 static int cpy_utf8(unsigned long value, void *arg);
 static int is_printable(unsigned long value);
 
-/* This function takes a string in UTF8, ASCII or multibyte form and
+/* These functions take a string in UTF8, ASCII or multibyte form and
  * a mask of permissible ASN1 string types. It then works out the minimal
  * type (using the order Printable < IA5 < T61 < BMP < Universal < UTF8)
  * and creates a string of the correct type with the supplied data.
  * Yes this is horrible: it has to be :-(
+ * The 'ncopy' form checks minimum and maximum size limits too.
  */
 
-int ASN1_mbstring_copy(ASN1_STRING **out, unsigned char *in, int len,
+int ASN1_mbstring_copy(ASN1_STRING **out, const unsigned char *in, int len,
                                        int inform, unsigned long mask)
+{
+       return ASN1_mbstring_ncopy(out, in, len, inform, mask, 0, 0);
+}
+
+int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
+                                       int inform, unsigned long mask, 
+                                       long minsize, long maxsize)
 {
        int str_type;
        int ret;
@@ -87,8 +96,10 @@ int ASN1_mbstring_copy(ASN1_STRING **out, unsigned char *in, int len,
        ASN1_STRING *dest;
        unsigned char *p;
        int nchar;
-       int (*cpyfunc)(unsigned long value, void *in) = NULL;
-       if(len == -1) len = strlen(in);
+       char strbuf[32];
+       int (*cpyfunc)(unsigned long,void *) = NULL;
+       if(len == -1) len = strlen((const char *)in);
+       if(!mask) mask = DIRSTRING_TYPE;
 
        /* First do a string check and work out the number of characters */
        switch(inform) {
@@ -113,6 +124,7 @@ int ASN1_mbstring_copy(ASN1_STRING **out, unsigned char *in, int len,
 
                case MBSTRING_UTF8:
                nchar = 0;
+               /* This counts the characters and does utf8 syntax checking */
                ret = traverse_string(in, len, MBSTRING_UTF8, in_utf8, &nchar);
                if(ret < 0) {
                        ASN1err(ASN1_F_ASN1_MBSTRING_COPY,
@@ -130,12 +142,27 @@ int ASN1_mbstring_copy(ASN1_STRING **out, unsigned char *in, int len,
                return -1;
        }
 
+       if((minsize > 0) && (nchar < minsize)) {
+               ASN1err(ASN1_F_ASN1_MBSTRING_COPY, ASN1_R_STRING_TOO_SHORT);
+               sprintf(strbuf, "%ld", minsize);
+               ERR_add_error_data(2, "minsize=", strbuf);
+               return -1;
+       }
+
+       if((maxsize > 0) && (nchar > maxsize)) {
+               ASN1err(ASN1_F_ASN1_MBSTRING_COPY, ASN1_R_STRING_TOO_LONG);
+               sprintf(strbuf, "%ld", maxsize);
+               ERR_add_error_data(2, "maxsize=", strbuf);
+               return -1;
+       }
+
        /* Now work out minimal type (if any) */
        if(traverse_string(in, len, inform, type_str, &mask) < 0) {
                ASN1err(ASN1_F_ASN1_MBSTRING_COPY, ASN1_R_ILLEGAL_CHARACTERS);
                return -1;
        }
 
+
        /* Now work out output format and string type */
        outform = MBSTRING_ASC;
        if(mask & B_ASN1_PRINTABLESTRING) str_type = V_ASN1_PRINTABLESTRING;
@@ -152,15 +179,26 @@ int ASN1_mbstring_copy(ASN1_STRING **out, unsigned char *in, int len,
                outform = MBSTRING_UTF8;
        }
        if(!out) return str_type;
-       if(!(dest = ASN1_STRING_type_new(str_type))) {
-               ASN1err(ASN1_F_ASN1_MBSTRING_COPY, ERR_R_MALLOC_FAILURE);
-               return -1;
+       if(*out) {
+               dest = *out;
+               if(dest->data) {
+                       dest->length = 0;
+                       OPENSSL_free(dest->data);
+                       dest->data = NULL;
+               }
+               dest->type = str_type;
+       } else {
+               dest = ASN1_STRING_type_new(str_type);
+               if(!dest) {
+                       ASN1err(ASN1_F_ASN1_MBSTRING_COPY,
+                                                       ERR_R_MALLOC_FAILURE);
+                       return -1;
+               }
+               *out = dest;
        }
-       *out = dest;
        /* If both the same type just copy across */
        if(inform == outform) {
                if(!ASN1_STRING_set(dest, in, len)) {
-                       ASN1_STRING_free(dest);
                        ASN1err(ASN1_F_ASN1_MBSTRING_COPY,ERR_R_MALLOC_FAILURE);
                        return -1;
                }
@@ -190,7 +228,7 @@ int ASN1_mbstring_copy(ASN1_STRING **out, unsigned char *in, int len,
                cpyfunc = cpy_utf8;
                break;
        }
-       if(!(p = Malloc(outlen + 1))) {
+       if(!(p = OPENSSL_malloc(outlen + 1))) {
                ASN1_STRING_free(dest);
                ASN1err(ASN1_F_ASN1_MBSTRING_COPY,ERR_R_MALLOC_FAILURE);
                return -1;
@@ -206,7 +244,7 @@ int ASN1_mbstring_copy(ASN1_STRING **out, unsigned char *in, int len,
  * to an optional function along with a void * argument.
  */
 
-static int traverse_string(unsigned char *p, int len, int inform,
+static int traverse_string(const unsigned char *p, int len, int inform,
                 int (*rfunc)(unsigned long value, void *in), void *arg)
 {
        unsigned long value;
@@ -220,8 +258,8 @@ static int traverse_string(unsigned char *p, int len, int inform,
                        value |= *p++;
                        len -= 2;
                } else if(inform == MBSTRING_UNIV) {
-                       value = *p++ << 24;
-                       value |= *p++ << 16;
+                       value = ((unsigned long)*p++) << 24;
+                       value |= ((unsigned long)*p++) << 16;
                        value |= *p++ << 8;
                        value |= *p++;
                        len -= 4;