paillier pen support

and some bug fixes

crypto/asn1/asn1_err.c

@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -95,6 +95,7 @@ static ERR_STRING_DATA ASN1_str_functs[] = {
     {ERR_FUNC(ASN1_F_I2D_ASN1_BIO_STREAM), "i2d_ASN1_bio_stream"},
     {ERR_FUNC(ASN1_F_I2D_DSA_PUBKEY), "i2d_DSA_PUBKEY"},
     {ERR_FUNC(ASN1_F_I2D_EC_PUBKEY), "i2d_EC_PUBKEY"},
+    {ERR_FUNC(ASN1_F_I2D_PAILLIER_PUBKEY), "i2d_PAILLIER_PUBKEY"},
     {ERR_FUNC(ASN1_F_I2D_PRIVATEKEY), "i2d_PrivateKey"},
     {ERR_FUNC(ASN1_F_I2D_PUBLICKEY), "i2d_PublicKey"},
     {ERR_FUNC(ASN1_F_I2D_RSA_PUBKEY), "i2d_RSA_PUBKEY"},

crypto/evp/evp_err.c

@@ -68,6 +68,7 @@ static ERR_STRING_DATA EVP_str_functs[] = {
     {ERR_FUNC(EVP_F_EVP_PKEY_GET0_DSA), "EVP_PKEY_get0_DSA"},
     {ERR_FUNC(EVP_F_EVP_PKEY_GET0_EC_KEY), "EVP_PKEY_get0_EC_KEY"},
     {ERR_FUNC(EVP_F_EVP_PKEY_GET0_HMAC), "EVP_PKEY_get0_hmac"},
+    {ERR_FUNC(EVP_F_EVP_PKEY_GET0_PAILLIER), "EVP_PKEY_get0_PAILLIER"},
     {ERR_FUNC(EVP_F_EVP_PKEY_GET0_RSA), "EVP_PKEY_get0_RSA"},
     {ERR_FUNC(EVP_F_EVP_PKEY_KEYGEN), "EVP_PKEY_keygen"},
     {ERR_FUNC(EVP_F_EVP_PKEY_KEYGEN_INIT), "EVP_PKEY_keygen_init"},
@@ -118,6 +119,7 @@ static ERR_STRING_DATA EVP_str_reasons[] = {
     {ERR_REASON(EVP_R_EXPECTING_A_DH_KEY), "expecting a dh key"},
     {ERR_REASON(EVP_R_EXPECTING_A_DSA_KEY), "expecting a dsa key"},
     {ERR_REASON(EVP_R_EXPECTING_A_EC_KEY), "expecting a ec key"},
+    {ERR_REASON(EVP_R_EXPECTING_A_PAILLIER), "expecting a paillier"},
     {ERR_REASON(EVP_R_FIPS_MODE_NOT_SUPPORTED), "fips mode not supported"},
     {ERR_REASON(EVP_R_ILLEGAL_SCRYPT_PARAMETERS),
      "illegal scrypt parameters"},

crypto/evp/p_lib.c

@@ -17,6 +17,7 @@
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
 #include <openssl/dh.h>
+#include <openssl/paillier.h>
 #include <openssl/engine.h>
 
 #include "internal/asn1_int.h"
@@ -331,6 +332,34 @@ EC_KEY *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey)
 }
 #endif
 
+#ifndef OPENSSL_NO_PAILLIER
+
+int EVP_PKEY_set1_PAILLIER(EVP_PKEY *pkey, PAILLIER *key)
+{
+    int ret = EVP_PKEY_assign_PAILLIER(pkey, key);
+    if (ret)
+        PAILLIER_up_ref(key);
+    return ret;
+}
+
+PAILLIER *EVP_PKEY_get0_PAILLIER(EVP_PKEY *pkey)
+{
+    if (pkey->type != EVP_PKEY_PAILLIER) {
+        EVPerr(EVP_F_EVP_PKEY_GET0_PAILLIER, EVP_R_EXPECTING_A_PAILLIER);
+        return NULL;
+    }
+    return pkey->pkey.paillier;
+}
+
+PAILLIER *EVP_PKEY_get1_PAILLIER(EVP_PKEY *pkey)
+{
+    PAILLIER *ret = EVP_PKEY_get0_PAILLIER(pkey);
+    if (ret != NULL)
+        PAILLIER_up_ref(ret);
+    return ret;
+}
+#endif
+
 #ifndef OPENSSL_NO_DH
 
 int EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key)

crypto/include/internal/evp_int.h

@@ -369,6 +369,9 @@ struct evp_pkey_st {
 # endif
 # ifndef OPENSSL_NO_EC
         struct ec_key_st *ec;   /* ECC */
+# endif
+# ifndef OPENSSL_NO_PAILLIER
+        struct paillier_st *paillier;
 # endif
     } pkey;
     int save_parameters;

crypto/paillier/pai_asn1.c

@@ -70,15 +70,15 @@ static int paillier_cb(int operation, ASN1_VALUE **pval,
 	return 1;
 }
 
-ASN1_SEQUENCE_cb(PAILLIER_PRIVATE_KEY, paillier_cb) = {
+ASN1_SEQUENCE_cb(PaillierPrivateKey, paillier_cb) = {
 	ASN1_SIMPLE(PAILLIER, n, BIGNUM),
 	ASN1_SIMPLE(PAILLIER, lambda, BIGNUM),
 	ASN1_SIMPLE(PAILLIER, x, BIGNUM)
-} ASN1_SEQUENCE_END_cb(PAILLIER, PAILLIER_PRIVATE_KEY)
+} ASN1_SEQUENCE_END_cb(PAILLIER, PaillierPrivateKey)
 
-ASN1_SEQUENCE_cb(PAILLIER_PUBLIC_KEY, paillier_cb) = {
+ASN1_SEQUENCE_cb(PaillierPublicKey, paillier_cb) = {
 	ASN1_SIMPLE(PAILLIER, n, BIGNUM)
-} ASN1_SEQUENCE_END_cb(PAILLIER, PAILLIER_PUBLIC_KEY)
+} ASN1_SEQUENCE_END_cb(PAILLIER, PaillierPublicKey)
 
-IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(PAILLIER, PAILLIER_PRIVATE_KEY, PAILLIER_PRIVATE_KEY)
-IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(PAILLIER, PAILLIER_PUBLIC_KEY, PAILLIER_PUBLIC_KEY)
+IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(PAILLIER, PaillierPrivateKey, PaillierPrivateKey)
+IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(PAILLIER, PaillierPublicKey, PaillierPublicKey)

crypto/paillier/pai_lcl.h

@@ -50,6 +50,8 @@
 #ifndef HEADER_PAI_LCL_H
 #define HEADER_PAI_LCL_H
 
+#include "e_os.h"
+
 struct paillier_st {
 	int bits;
 	BIGNUM *n;		/* public key */
@@ -57,6 +59,11 @@ struct paillier_st {
 	BIGNUM *n_squared;	/* online */
 	BIGNUM *n_plusone;	/* online */
 	BIGNUM *x;		/* online */
+
+	int references;
+	int flags;
+	CRYPTO_EX_DATA ex_data;
+	CRYPTO_RWLOCK *lock;
 };
 
 #endif

crypto/paillier/pai_lib.c

@@ -145,6 +145,8 @@ int PAILLIER_generate_key(PAILLIER *key, int bits)
 
 	} while (0);
 
+	ret = 1;
+
 end:
 	BN_clear_free(p);
 	BN_clear_free(q);
@@ -345,3 +347,14 @@ end:
 	return 0;
 }
 
+int PAILLIER_up_ref(PAILLIER *r)
+{
+	int i;
+
+	if (CRYPTO_atomic_add(&r->references, 1, &i, r->lock) <= 0)
+		return 0;
+
+	REF_PRINT_COUNT("PAILLIER", r);
+	REF_ASSERT_ISNT(i < 2);
+	return ((i > 1) ? 1 : 0);
+}

crypto/pem/build.info

@@ -1,4 +1,5 @@
 LIBS=../../libcrypto
 SOURCE[../../libcrypto]=\
         pem_sign.c pem_info.c pem_lib.c pem_all.c pem_err.c \
-        pem_x509.c pem_xaux.c pem_oth.c pem_pk8.c pem_pkey.c pvkfmt.c
+        pem_x509.c pem_xaux.c pem_oth.c pem_pk8.c pem_pkey.c pvkfmt.c \
+	pem3.c

crypto/pem/pem3.c

@@ -0,0 +1,108 @@
+/* ====================================================================
+ * Copyright (c) 2014 - 2017 The GmSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include <stdio.h>
+#include "internal/cryptlib.h"
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pkcs7.h>
+#include <openssl/pem.h>
+#include <openssl/pem3.h>
+#include <openssl/paillier.h>
+
+/*
+extern PAILLIER *EVP_PKEY_get1_PAILLIER(EVP_PKEY *key);
+extern int i2d_PAILLIER_PUBKEY(PAILLIER *a, unsigned char **p);
+extern PAILLIER *d2i_PAILLIER_PUBKEY(PAILLIER **a, const unsigned char **p, long len);
+*/
+
+#ifndef OPENSSL_NO_PAILLIER
+static PAILLIER *pkey_get_paillier(EVP_PKEY *key, PAILLIER **paillier)
+{
+	PAILLIER *rtmp;
+	if (!key)
+		return NULL;
+	rtmp = EVP_PKEY_get1_PAILLIER(key);
+	EVP_PKEY_free(key);
+	if (!rtmp)
+		return NULL;
+	if (paillier) {
+		PAILLIER_free(*paillier);
+		*paillier = rtmp;
+	}
+	return rtmp;
+}
+
+PAILLIER *PEM_read_bio_PaillierPrivateKey(BIO *bp, PAILLIER **paillier,
+	pem_password_cb *cb, void *u)
+{
+	EVP_PKEY *pktmp;
+	pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u);
+	return pkey_get_paillier(pktmp, paillier);
+}
+
+# ifndef OPENSSL_NO_STDIO
+PAILLIER *PEM_read_PaillierPrivateKey(FILE *fp, PAILLIER **paillier,
+	pem_password_cb *cb, void *u)
+{
+	EVP_PKEY *pktmp;
+	pktmp = PEM_read_PrivateKey(fp, NULL, cb, u);
+	return pkey_get_paillier(pktmp, paillier);
+}
+
+# endif
+
+IMPLEMENT_PEM_write_cb_const(PaillierPrivateKey, PAILLIER, PEM_STRING_PAILLIER,
+	PaillierPrivateKey)
+IMPLEMENT_PEM_rw_const(PaillierPublicKey, PAILLIER, PEM_STRING_PAILLIER_PUBLIC,
+	PaillierPublicKey)
+IMPLEMENT_PEM_rw(PAILLIER_PUBKEY, PAILLIER, PEM_STRING_PUBLIC, PAILLIER_PUBKEY)
+
+#endif

crypto/saf/saf_ec.c

@@ -622,5 +622,3 @@ int SAF_EccVerifySignFile(
 {
 	return SAR_OK;
 }
-
-

crypto/sm2/sm2_enc.c

@@ -238,7 +238,7 @@ SM2_CIPHERTEXT_VALUE *SM2_CIPHERTEXT_VALUE_decode(
 		goto end;
 	}
 
-	if (buflen <= fixlen) {
+	if (buflen <= (size_t)fixlen) {
 		ECerr(EC_F_SM2_CIPHERTEXT_VALUE_DECODE, EC_R_BUFFER_TOO_SMALL);
 		goto end;
 	}
@@ -260,7 +260,7 @@ SM2_CIPHERTEXT_VALUE *SM2_CIPHERTEXT_VALUE_decode(
 	//FIXME
 	ptlen = fixlen - SM2_ENC_PARAMS_mactag_size(params);
 #endif
-	ptlen = fixlen; //FIXME
+	ptlen = (int)fixlen; //FIXME
 	if (!EC_POINT_oct2point(ec_group, ret->ephem_point, buf, ptlen, bn_ctx)) {
 		ECerr(EC_F_SM2_CIPHERTEXT_VALUE_DECODE, EC_R_OCT2POINT_FAILED);
 		goto end;
@@ -290,7 +290,7 @@ int SM2_CIPHERTEXT_VALUE_print(BIO *out, const EC_GROUP *ec_group,
 	int ret = 0;
 	char *hex = NULL;
 	BN_CTX *ctx = BN_CTX_new();
-	int i;
+	size_t i;
 
 	if (!ctx) {
 		goto end;
@@ -382,7 +382,7 @@ SM2_CIPHERTEXT_VALUE *SM2_do_encrypt(const SM2_ENC_PARAMS *params,
 	unsigned int dgstlen;
 	int mactag_size;
 	size_t len;
-	int i;
+	size_t i;
 
 	if (!ec_group || !pub_key) {
 		ECerr(EC_F_SM2_DO_ENCRYPT, EC_R_INVALID_EC_KEY);
@@ -513,7 +513,7 @@ SM2_CIPHERTEXT_VALUE *SM2_do_encrypt(const SM2_ENC_PARAMS *params,
 		}
 
 		/* GmSSL specific: reduce mactag size */
-		if (mactag_size > dgstlen) {
+		if (mactag_size > dgstlen) {                    
 			ECerr(EC_F_SM2_DO_ENCRYPT, EC_R_ERROR);
 			goto end;
 		}
@@ -554,7 +554,7 @@ int SM2_decrypt(const SM2_ENC_PARAMS *params,
 		ECerr(EC_F_SM2_DECRYPT, EC_R_ERROR);
 		goto end;
 	}
-	if (inlen <= len) {
+	if (inlen <= len) {                
 		ECerr(EC_F_SM2_DECRYPT, EC_R_ERROR);
 		goto end;
 	}
@@ -673,7 +673,7 @@ int SM2_do_decrypt(const SM2_ENC_PARAMS *params,
 
 
 	/* B5: compute M = C2 xor t */
-	for (i = 0; i < cv->ciphertext_size; i++) {
+	for (i = 0; i < cv->ciphertext_size; i++) {              
 		out[i] ^= cv->ciphertext[i];
 	}
 	*outlen = cv->ciphertext_size;
@@ -704,7 +704,7 @@ int SM2_do_decrypt(const SM2_ENC_PARAMS *params,
 		}
 
 		/* GmSSL specific */
-		if (mactag_size > maclen) {
+		if (mactag_size > (int)maclen) {             
 			ECerr(EC_F_SM2_DO_DECRYPT, EC_R_ERROR);
 			goto end;
 		}
@@ -742,4 +742,3 @@ int SM2_decrypt_with_recommended(const unsigned char *in, size_t inlen,
 	SM2_ENC_PARAMS_init_with_recommended(&params);
 	return SM2_decrypt(&params, in, inlen, out, outlen, ec_key);
 }
-

crypto/sm2/sm2_kap.c

@@ -60,6 +60,7 @@ int SM2_KAP_CTX_init(SM2_KAP_CTX *ctx,
 {
 	int ret = 0;
 	int w;
+	size_t len;
 
 	if (!ctx || !ec_key || !remote_pubkey) {
 		ECerr(EC_F_SM2_KAP_CTX_INIT, ERR_R_PASSED_NULL_PARAMETER);
@@ -87,22 +88,26 @@ int SM2_KAP_CTX_init(SM2_KAP_CTX *ctx,
 		goto end;
 	}
 
+	len = ctx->id_dgstlen;
 	if (!SM2_compute_id_digest(ctx->id_dgst_md, id, idlen,
-		ctx->id_dgst, &ctx->id_dgstlen, ec_key)) {
+		ctx->id_dgst, &len, ec_key)) {
 		ECerr(EC_F_SM2_KAP_CTX_INIT, 0);
 		goto end;
 	}
+	ctx->id_dgstlen = len;
 
 	if (!(ctx->ec_key = EC_KEY_dup(ec_key))) {
 		ECerr(EC_F_SM2_KAP_CTX_INIT, ERR_R_EC_LIB);
 		goto end;
 	}
 
+	len = ctx->remote_id_dgstlen;
 	if (!SM2_compute_id_digest(ctx->id_dgst_md, rid, ridlen,
-		ctx->remote_id_dgst, &ctx->remote_id_dgstlen, remote_pubkey)) {
+		ctx->remote_id_dgst, &len, remote_pubkey)) {
 		ECerr(EC_F_SM2_KAP_CTX_INIT, 0);
 		goto end;
 	}
+	ctx->remote_id_dgstlen = len;
 
 	if (!(ctx->remote_pubkey = EC_KEY_dup(remote_pubkey))) {
 		ECerr(EC_F_SM2_KAP_CTX_INIT, 0);

crypto/sm9/sm9_enc.c

@@ -431,7 +431,7 @@ int SM9_unwrap_key(SM9PublicParameters *mpk, size_t keylen,
 	}
 
 	/* is outkey is all zero, return failed */
-	for (i = 0; (i < keylen) && (outkey[i] == 0); i++) {
+	for (i = 0; (i < keylen) && (outkey[i] == 0); i++) {           
 	}
 	if (i == keylen) {
 		SM9err(SM9_F_SM9_UNWRAP_KEY, ERR_R_EC_LIB);
@@ -630,7 +630,7 @@ static int SM9EncParameters_decrypt(const SM9EncParameters *encparams,
 		/* output iv */
 		iv = in;
 		ivlen = EVP_CIPHER_iv_length(encparams->enc_cipher);
-		if (inlen <= ivlen) {
+		if (inlen <= (size_t)ivlen) {
 			SM9err(SM9_F_SM9ENCPARAMETERS_DECRYPT, SM9_R_INVALID_CIPHERTEXT);
 			goto end;
 		}
@@ -948,7 +948,7 @@ int SM9_do_decrypt(SM9PublicParameters *mpk, const SM9EncParameters *encparams,
 		*outlen = in->c2->length;
 		return 1;
 	}
-	if (*outlen < in->c2->length) {
+	if (*outlen < in->c2->length) {             
 		SM9err(SM9_F_SM9_DO_DECRYPT, SM9_R_BUFFER_TOO_SMALL);
 		return 0;
 	}
@@ -1065,7 +1065,7 @@ int SM9_decrypt(SM9PublicParameters *mpk, const SM9EncParameters *encparams,
 		return 0;
 	}
 
-	p = &in;
+	p = in;
 	if (!(c = d2i_SM9Ciphertext(NULL, &p, inlen))) {
 		SM9err(SM9_F_SM9_DECRYPT, ERR_R_SM9_LIB);
 		goto end;

crypto/sm9/sm9_sign.c

@@ -457,7 +457,7 @@ int SM9_sign(SM9PublicParameters *mpk, const unsigned char *dgst,
 		return 0;
 	}
 
-	p = &sig;
+	p = sig;
 	if (i2d_SM9Signature(sigobj, &p) < 0) {
 		SM9err(SM9_F_SM9_SIGN, ERR_R_SM9_LIB);
 		goto end;
@@ -493,10 +493,10 @@ int SM9_verify(SM9PublicParameters *mpk, const unsigned char *dgst,
 		return 0;
 	}
 
-	p = &sig;
+	p = sig;
 	if (!(sigobj = d2i_SM9Signature(NULL, &p, siglen))) {
 		SM9err(SM9_F_SM9_VERIFY, ERR_R_SM9_LIB);
-		return 0;
+		goto end;
 	}
 
 	ret = SM9_do_verify(mpk, dgst, dgstlen, sigobj, id, idlen);
@@ -504,6 +504,5 @@ int SM9_verify(SM9PublicParameters *mpk, const unsigned char *dgst,
 
 end:
 	SM9Signature_free(sigobj);
-	return 0;
+	return ret;
 }
-

crypto/x509/x_pubkey.c

@@ -16,6 +16,7 @@
 #include "internal/x509_int.h"
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
+#include <openssl/paillier.h>
 
 struct X509_pubkey_st {
     X509_ALGOR *algor;
@@ -255,6 +256,46 @@ int i2d_RSA_PUBKEY(RSA *a, unsigned char **pp)
 }
 #endif
 
+#ifndef OPENSSL_NO_PAILLIER
+PAILLIER *d2i_PAILLIER_PUBKEY(PAILLIER **a, const unsigned char **pp, long length)
+{
+    EVP_PKEY *pkey;
+    PAILLIER *key;
+    const unsigned char *q;
+    q = *pp;
+    pkey = d2i_PUBKEY(NULL, &q, length);
+    if (!pkey)
+        return NULL;
+    key = EVP_PKEY_get1_PAILLIER(pkey);
+    EVP_PKEY_free(pkey);
+    if (!key)
+        return NULL;
+    *pp = q;
+    if (a) {
+        PAILLIER_free(*a);
+        *a = key;
+    }
+    return key;
+}
+
+int i2d_PAILLIER_PUBKEY(PAILLIER *a, unsigned char **pp)
+{
+    EVP_PKEY *pktmp;
+    int ret;
+    if (!a)
+        return 0;
+    pktmp = EVP_PKEY_new();
+    if (pktmp == NULL) {
+        ASN1err(ASN1_F_I2D_PAILLIER_PUBKEY, ERR_R_MALLOC_FAILURE);
+        return 0;
+    }
+    EVP_PKEY_set1_PAILLIER(pktmp, a);
+    ret = i2d_PUBKEY(pktmp, pp);
+    EVP_PKEY_free(pktmp);
+    return ret;
+}
+#endif
+
 #ifndef OPENSSL_NO_DSA
 DSA *d2i_DSA_PUBKEY(DSA **a, const unsigned char **pp, long length)
 {