OpenSSL 0.9.4 merge

1 files changed, 14 insertions, 12 deletions

diff --git a/src/lib/libcrypto/asn1/f_string.c b/src/lib/libcrypto/asn1/f_string.c
index ab2837824e..5d0cf5a46d 100644
--- a/src/lib/libcrypto/asn1/f_string.c
+++ b/src/lib/libcrypto/asn1/f_string.c
@@ -58,16 +58,13 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "buffer.h"
-#include "x509.h"
+#include <openssl/buffer.h>
+#include <openssl/asn1.h>
 
-int i2a_ASN1_STRING(bp, a, type)
-BIO *bp;
-ASN1_STRING *a;
-int type;
+int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type)
         {
         int i,n=0;
-        static char *h="0123456789ABCDEF";
+        static const char *h="0123456789ABCDEF";
         char buf[2];
 
         if (a == NULL) return(0);
@@ -97,11 +94,7 @@ err:
         return(-1);
         }
 
-int a2i_ASN1_STRING(bp,bs,buf,size)
-BIO *bp;
-ASN1_STRING *bs;
-char *buf;
-int size;
+int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
         {
         int ret=0;
         int i,j,k,m,n,again,bufsize;
@@ -130,9 +123,18 @@ int size;
 
                 for (j=i-1; j>0; j--)
                         {
+#ifndef CHARSET_EBCDIC
                         if (!(  ((buf[j] >= '0') && (buf[j] <= '9')) ||
                                 ((buf[j] >= 'a') && (buf[j] <= 'f')) ||
                                 ((buf[j] >= 'A') && (buf[j] <= 'F'))))
+#else
+                        /* This #ifdef is not strictly necessary, since
+                         * the characters A...F a...f 0...9 are contiguous
+                         * (yes, even in EBCDIC - but not the whole alphabet).
+                         * Nevertheless, isxdigit() is faster.
+                         */
+                        if (!isxdigit(buf[j]))
+#endif
                                 {
                                 i=j;
                                 break;