From: Richard Levitte <levitte@openssl.org>
Date: Thu, 23 Jul 2020 14:30:38 +0000 (+0200)
Subject: ASN1: Fix d2i_KeyParams() to advance |pp| like all other d2i functions do
X-Git-Tag: openssl-3.0.0-alpha7~407
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9556761418c432844d95e3988b41f19b7c7b56a;p=thirdparty%2Fopenssl.git

ASN1: Fix d2i_KeyParams() to advance |pp| like all other d2i functions do

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12587)
---

diff --git a/crypto/asn1/d2i_param.c b/crypto/asn1/d2i_param.c
index c82b4a8fa83..bd6ef1ce512 100644
--- a/crypto/asn1/d2i_param.c
+++ b/crypto/asn1/d2i_param.c
@@ -18,7 +18,6 @@ EVP_PKEY *d2i_KeyParams(int type, EVP_PKEY **a, const unsigned char **pp,
                         long length)
 {
     EVP_PKEY *ret = NULL;
-    const unsigned char *p = *pp;
 
     if ((a == NULL) || (*a == NULL)) {
         if ((ret = EVP_PKEY_new()) == NULL)
@@ -34,7 +33,7 @@ EVP_PKEY *d2i_KeyParams(int type, EVP_PKEY **a, const unsigned char **pp,
         goto err;
     }
 
-    if (!ret->ameth->param_decode(ret, &p, length))
+    if (!ret->ameth->param_decode(ret, pp, length))
         goto err;
 
     if (a != NULL)