]> git.ipfire.org Git - thirdparty/openssl.git/blame - crypto/asn1/d2i_pu.c
Fix d2i_PublicKey() for EC keys
[thirdparty/openssl.git] / crypto / asn1 / d2i_pu.c
CommitLineData
2039c421
RS
1/*
2 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
d02b48c6 3 *
365a2d99 4 * Licensed under the Apache License 2.0 (the "License"). You may not use
2039c421
RS
5 * this file except in compliance with the License. You can obtain a copy
6 * in the file LICENSE in the source distribution or at
7 * https://www.openssl.org/source/license.html
d02b48c6
RE
8 */
9
10#include <stdio.h>
b39fc560 11#include "internal/cryptlib.h"
ec577822
BM
12#include <openssl/bn.h>
13#include <openssl/evp.h>
14#include <openssl/objects.h>
f66c3032 15#include <openssl/asn1.h>
3c27208f
RS
16#include <openssl/rsa.h>
17#include <openssl/dsa.h>
18#include <openssl/ec.h>
d02b48c6 19
3aeb9348
DSH
20#include "internal/evp_int.h"
21
875a644a 22EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
0f113f3e
MC
23 long length)
24{
25 EVP_PKEY *ret;
d02b48c6 26
0f113f3e
MC
27 if ((a == NULL) || (*a == NULL)) {
28 if ((ret = EVP_PKEY_new()) == NULL) {
29 ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_EVP_LIB);
26a7d938 30 return NULL;
0f113f3e
MC
31 }
32 } else
33 ret = *a;
d02b48c6 34
2aa2beb0 35 if (type != EVP_PKEY_id(ret) && !EVP_PKEY_set_type(ret, type)) {
0f113f3e
MC
36 ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_EVP_LIB);
37 goto err;
38 }
c18e51ba 39
0f113f3e 40 switch (EVP_PKEY_id(ret)) {
cf1b7d96 41#ifndef OPENSSL_NO_RSA
0f113f3e 42 case EVP_PKEY_RSA:
3aeb9348 43 if ((ret->pkey.rsa = d2i_RSAPublicKey(NULL, pp, length)) == NULL) {
0f113f3e
MC
44 ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
45 goto err;
46 }
47 break;
d02b48c6 48#endif
cf1b7d96 49#ifndef OPENSSL_NO_DSA
0f113f3e
MC
50 case EVP_PKEY_DSA:
51 /* TMP UGLY CAST */
3aeb9348 52 if (!d2i_DSAPublicKey(&ret->pkey.dsa, pp, length)) {
0f113f3e
MC
53 ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
54 goto err;
55 }
56 break;
4d94ae00 57#endif
14a7cfb3 58#ifndef OPENSSL_NO_EC
0f113f3e 59 case EVP_PKEY_EC:
3aeb9348 60 if (!o2i_ECPublicKey(&ret->pkey.ec, pp, length)) {
0f113f3e
MC
61 ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
62 goto err;
63 }
64 break;
d02b48c6 65#endif
0f113f3e
MC
66 default:
67 ASN1err(ASN1_F_D2I_PUBLICKEY, ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE);
68 goto err;
0f113f3e
MC
69 }
70 if (a != NULL)
71 (*a) = ret;
26a7d938 72 return ret;
0f113f3e 73 err:
c5ba2d99 74 if (a == NULL || *a != ret)
0f113f3e 75 EVP_PKEY_free(ret);
26a7d938 76 return NULL;
0f113f3e 77}