1 files changed, 8 insertions, 2 deletions

diff --git a/src/lib/libcrypto/asn1/d2i_r_pu.c b/src/lib/libcrypto/asn1/d2i_r_pu.c
index c4ae58b594..d1289f160e 100644
--- a/src/lib/libcrypto/asn1/d2i_r_pu.c
+++ b/src/lib/libcrypto/asn1/d2i_r_pu.c
@@ -81,7 +81,7 @@ RSA *d2i_RSAPublicKey(RSA **a, unsigned char **pp, long length)
         M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
         if ((ret->e=BN_bin2bn(bs->data,bs->length,ret->e)) == NULL) goto err_bn;
 
-        ASN1_INTEGER_free(bs);
+        M_ASN1_INTEGER_free(bs);
         bs=NULL;
 
         M_ASN1_D2I_Finish_2(a);
@@ -91,7 +91,13 @@ err_bn:
 err:
         ASN1err(ASN1_F_D2I_RSAPUBLICKEY,i);
         if ((ret != NULL) && ((a == NULL) || (*a != ret))) RSA_free(ret);
-        if (bs != NULL) ASN1_INTEGER_free(bs);
+        if (bs != NULL) M_ASN1_INTEGER_free(bs);
         return(NULL);
         }
+#else /* !NO_RSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif