OpenSSL 0.9.4 merge

1 files changed, 3 insertions, 8 deletions

diff --git a/src/lib/libcrypto/bn/bn_mpi.c b/src/lib/libcrypto/bn/bn_mpi.c
index 53945c1057..80e1dca6b7 100644
--- a/src/lib/libcrypto/bn/bn_mpi.c
+++ b/src/lib/libcrypto/bn/bn_mpi.c
@@ -60,9 +60,7 @@
 #include "cryptlib.h"
 #include "bn_lcl.h"
 
-int BN_bn2mpi(a,d)
-BIGNUM *a;
-unsigned char *d;
+int BN_bn2mpi(const BIGNUM *a, unsigned char *d)
         {
         int bits;
         int num=0;
@@ -90,10 +88,7 @@ unsigned char *d;
         return(num+4+ext);
         }
 
-BIGNUM *BN_mpi2bn(d,n,a)
-unsigned char *d;
-int n;
-BIGNUM *a;
+BIGNUM *BN_mpi2bn(unsigned char *d, int n, BIGNUM *a)
         {
         long len;
         int neg=0;
@@ -103,7 +98,7 @@ BIGNUM *a;
                 BNerr(BN_F_BN_MPI2BN,BN_R_INVALID_LENGTH);
                 return(NULL);
                 }
-        len=(d[0]<<24)|(d[1]<<16)|(d[2]<<8)|d[3];
+        len=((long)d[0]<<24)|((long)d[1]<<16)|((int)d[2]<<8)|(int)d[3];
         if ((len+4) != n)
                 {
                 BNerr(BN_F_BN_MPI2BN,BN_R_ENCODING_ERROR);