diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-07-23 16:30:38 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-09-03 17:48:31 +0200 |
| commit | a9556761418c432844d95e3988b41f19b7c7b56a (patch) | |
| tree | b6d7c5b3fa6d5c99224ac59b7c72bce436c4a616 /crypto/asn1 | |
| parent | Ensure EVP_MAC_update() passes the length even if it is 0 (diff) | |
| download | openssl-a9556761418c432844d95e3988b41f19b7c7b56a.tar.xz openssl-a9556761418c432844d95e3988b41f19b7c7b56a.zip | |
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)
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/d2i_param.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/asn1/d2i_param.c b/crypto/asn1/d2i_param.c index c82b4a8fa8..bd6ef1ce51 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) |