openssl-engine-0.9.6 merge

1 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/libcrypto/asn1/i2d_r_pr.c b/src/lib/libcrypto/asn1/i2d_r_pr.c
index 1250fa4b2d..88b1aac989 100644
--- a/src/lib/libcrypto/asn1/i2d_r_pr.c
+++ b/src/lib/libcrypto/asn1/i2d_r_pr.c
@@ -107,7 +107,7 @@ int i2d_RSAPrivateKey(RSA *a, unsigned char **pp)
 
         i2d_ASN1_INTEGER(&bs,&p);
 
-        bs.data=(unsigned char *)Malloc(max+4);
+        bs.data=(unsigned char *)OPENSSL_malloc(max+4);
         if (bs.data == NULL)
                 {
                 ASN1err(ASN1_F_I2D_RSAPRIVATEKEY,ERR_R_MALLOC_FAILURE);
@@ -119,7 +119,7 @@ int i2d_RSAPrivateKey(RSA *a, unsigned char **pp)
                 bs.length=BN_bn2bin(num[i],bs.data);
                 i2d_ASN1_INTEGER(&bs,&p);
                 }
-        Free(bs.data);
+        OPENSSL_free(bs.data);
         *pp=p;
         return(t);
         }