OpenSSL 0.9.4 merge

1 files changed, 10 insertions, 20 deletions

diff --git a/src/lib/libcrypto/bn/bn_print.c b/src/lib/libcrypto/bn/bn_print.c
index 2bcc11c852..2f5ab2617b 100644
--- a/src/lib/libcrypto/bn/bn_print.c
+++ b/src/lib/libcrypto/bn/bn_print.c
@@ -59,14 +59,13 @@
 #include <stdio.h>
 #include <ctype.h>
 #include "cryptlib.h"
-#include "buffer.h"
+#include <openssl/buffer.h>
 #include "bn_lcl.h"
 
-static char *Hex="0123456789ABCDEF";
+static const char *Hex="0123456789ABCDEF";
 
 /* Must 'Free' the returned data */
-char *BN_bn2hex(a)
-BIGNUM *a;
+char *BN_bn2hex(const BIGNUM *a)
         {
         int i,j,v,z=0;
         char *buf;
@@ -101,8 +100,7 @@ err:
         }
 
 /* Must 'Free' the returned data */
-char *BN_bn2dec(a)
-BIGNUM *a;
+char *BN_bn2dec(const BIGNUM *a)
         {
         int i=0,num;
         char *buf=NULL;
@@ -156,9 +154,7 @@ err:
         return(buf);
         }
 
-int BN_hex2bn(bn,a)
-BIGNUM **bn;
-char *a;
+int BN_hex2bn(BIGNUM **bn, const char *a)
         {
         BIGNUM *ret=NULL;
         BN_ULONG l=0;
@@ -169,7 +165,7 @@ char *a;
 
         if (*a == '-') { neg=1; a++; }
 
-        for (i=0; isxdigit(a[i]); i++)
+        for (i=0; isxdigit((unsigned char) a[i]); i++)
                 ;
 
         num=i+neg;
@@ -224,9 +220,7 @@ err:
         return(0);
         }
 
-int BN_dec2bn(bn,a)
-BIGNUM **bn;
-char *a;
+int BN_dec2bn(BIGNUM **bn, const char *a)
         {
         BIGNUM *ret=NULL;
         BN_ULONG l=0;
@@ -236,7 +230,7 @@ char *a;
         if ((a == NULL) || (*a == '\0')) return(0);
         if (*a == '-') { neg=1; a++; }
 
-        for (i=0; isdigit(a[i]); i++)
+        for (i=0; isdigit((unsigned char) a[i]); i++)
                 ;
 
         num=i+neg;
@@ -286,9 +280,7 @@ err:
 #ifndef NO_BIO
 
 #ifndef NO_FP_API
-int BN_print_fp(fp, a)
-FILE *fp;
-BIGNUM *a;
+int BN_print_fp(FILE *fp, BIGNUM *a)
         {
         BIO *b;
         int ret;
@@ -302,9 +294,7 @@ BIGNUM *a;
         }
 #endif
 
-int BN_print(bp, a)
-BIO *bp;
-BIGNUM *a;
+int BN_print(BIO *bp, const BIGNUM *a)
         {
         int i,j,v,z=0;
         int ret=0;