import openssl-0.9.7-beta1

1 files changed, 33 insertions, 34 deletions

diff --git a/src/lib/libcrypto/bn/bn_print.c b/src/lib/libcrypto/bn/bn_print.c
index 2bcc11c852..5f46b1826c 100644
--- a/src/lib/libcrypto/bn/bn_print.c
+++ b/src/lib/libcrypto/bn/bn_print.c
@@ -59,20 +59,19 @@
 #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;
+/* Must 'OPENSSL_free' the returned data */
+char *BN_bn2hex(const BIGNUM *a)
         {
         int i,j,v,z=0;
         char *buf;
         char *p;
 
-        buf=(char *)Malloc(a->top*BN_BYTES*2+2);
+        buf=(char *)OPENSSL_malloc(a->top*BN_BYTES*2+2);
         if (buf == NULL)
                 {
                 BNerr(BN_F_BN_BN2HEX,ERR_R_MALLOC_FAILURE);
@@ -100,9 +99,8 @@ err:
         return(buf);
         }
 
-/* Must 'Free' the returned data */
-char *BN_bn2dec(a)
-BIGNUM *a;
+/* Must 'OPENSSL_free' the returned data */
+char *BN_bn2dec(const BIGNUM *a)
         {
         int i=0,num;
         char *buf=NULL;
@@ -112,8 +110,8 @@ BIGNUM *a;
 
         i=BN_num_bits(a)*3;
         num=(i/10+i/1000+3)+1;
-        bn_data=(BN_ULONG *)Malloc((num/BN_DEC_NUM+1)*sizeof(BN_ULONG));
-        buf=(char *)Malloc(num+3);
+        bn_data=(BN_ULONG *)OPENSSL_malloc((num/BN_DEC_NUM+1)*sizeof(BN_ULONG));
+        buf=(char *)OPENSSL_malloc(num+3);
         if ((buf == NULL) || (bn_data == NULL))
                 {
                 BNerr(BN_F_BN_BN2DEC,ERR_R_MALLOC_FAILURE);
@@ -139,7 +137,7 @@ BIGNUM *a;
                         }
                 lp--;
                 /* We now have a series of blocks, BN_DEC_NUM chars
-                 * in length, where the last one needs trucation.
+                 * in length, where the last one needs truncation.
                  * The blocks need to be reversed in order. */
                 sprintf(p,BN_DEC_FMT1,*lp);
                 while (*p) p++;
@@ -151,14 +149,12 @@ BIGNUM *a;
                         }
                 }
 err:
-        if (bn_data != NULL) Free(bn_data);
+        if (bn_data != NULL) OPENSSL_free(bn_data);
         if (t != NULL) BN_free(t);
         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,13 +165,13 @@ 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;
         if (bn == NULL) return(num);
 
-        /* a is the start of the hex digets, and it is 'i' long */
+        /* a is the start of the hex digits, and it is 'i' long */
         if (*bn == NULL)
                 {
                 if ((ret=BN_new()) == NULL) return(0);
@@ -189,7 +185,7 @@ char *a;
         /* i is the number of hex digests; */
         if (bn_expand(ret,i*4) == NULL) goto err;
 
-        j=i; /* least significate 'hex' */
+        j=i; /* least significant 'hex' */
         m=0;
         h=0;
         while (j > 0)
@@ -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,14 +230,14 @@ 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;
         if (bn == NULL) return(num);
 
-        /* a is the start of the digets, and it is 'i' long.
-         * We chop it into BN_DEC_NUM digets at a time */
+        /* a is the start of the digits, and it is 'i' long.
+         * We chop it into BN_DEC_NUM digits at a time */
         if (*bn == NULL)
                 {
                 if ((ret=BN_new()) == NULL) return(0);
@@ -283,12 +277,9 @@ err:
         return(0);
         }
 
-#ifndef NO_BIO
-
-#ifndef NO_FP_API
-int BN_print_fp(fp, a)
-FILE *fp;
-BIGNUM *a;
+#ifndef OPENSSL_NO_BIO
+#ifndef OPENSSL_NO_FP_API
+int BN_print_fp(FILE *fp, const BIGNUM *a)
         {
         BIO *b;
         int ret;
@@ -302,9 +293,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;
@@ -329,5 +318,15 @@ BIGNUM *a;
 end:
         return(ret);
         }
+#endif
 
+#ifdef BN_DEBUG
+void bn_dump1(FILE *o, const char *a, const BN_ULONG *b,int n)
+        {
+        int i;
+        fprintf(o, "%s=", a);
+        for (i=n-1;i>=0;i--)
+                fprintf(o, "%08lX", b[i]); /* assumes 32-bit BN_ULONG */
+        fprintf(o, "\n");
+        }
 #endif