e4520c8bd1
Summary: Release notes can be found at https://www.openssl.org/news/openssl-3.0-notes.html . Obtained from: https://www.openssl.org/source/openssl-3.0.8.tar.gz Differential Revision: https://reviews.freebsd.org/D38835 Test Plan: ``` $ git status On branch vendor/openssl-3.0 nothing to commit, working tree clean $ (cd ..; fetch http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz.asc) openssl-3.0.8.tar.gz 14 MB 4507 kBps 04s openssl-3.0.8.tar.gz.asc 833 B 10 MBps 00s $ set | egrep '(XLIST|OSSLVER)=' OSSLVER=3.0.8 XLIST=FREEBSD-Xlist $ gpg --list-keys /home/ngie/.gnupg/pubring.kbx ----------------------------- pub rsa4096 2014-10-04 [SC] 7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C uid [ unknown] Richard Levitte <richard@levitte.org> uid [ unknown] Richard Levitte <levitte@lp.se> uid [ unknown] Richard Levitte <levitte@openssl.org> sub rsa4096 2014-10-04 [E] $ gpg --verify openssl-${OSSLVER}.tar.gz.asc openssl-${OSSLVER}.tar.gz gpg: Signature made Tue Feb 7 05:43:55 2023 PST gpg: using RSA key 7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C gpg: Good signature from "Richard Levitte <richard@levitte.org>" [unknown] gpg: aka "Richard Levitte <levitte@lp.se>" [unknown] gpg: aka "Richard Levitte <levitte@openssl.org>" [unknown] gpg: WARNING: This key is not certified with a trusted signature! gpg: There is no indication that the signature belongs to the owner. Primary key fingerprint: 7953 AC1F BC3D C8B3 B292 393E D5E9 E43F 7DF9 EE8C $ (cd vendor.checkout/; git status; find . -type f -or -type l | cut -c 3- | sort > ../old) On branch vendor/openssl-3.0 nothing to commit, working tree clean $ tar -x -X $XLIST -f ../openssl-${OSSLVER}.tar.gz -C .. $ rsync --exclude FREEBSD.* --delete -avzz ../openssl-${OSSLVER}/* . $ cat .git gitdir: /home/ngie/git/freebsd-src/.git/worktrees/vendor.checkout $ diff -arq ../openssl-3.0.8 . Only in .: .git Only in .: FREEBSD-Xlist Only in .: FREEBSD-upgrade $ git status FREEBSD* On branch vendor/openssl-3.0 nothing to commit, working tree clean $ ``` Reviewers: emaste, jkim Subscribers: imp, andrew, dab Differential Revision: https://reviews.freebsd.org/D38835
99 lines
2.5 KiB
C
99 lines
2.5 KiB
C
/*
|
|
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
/*
|
|
* DSA low level APIs are deprecated for public use, but still ok for
|
|
* internal use.
|
|
*/
|
|
#include "internal/deprecated.h"
|
|
|
|
#include <stdio.h>
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/bn.h>
|
|
#include <openssl/evp.h>
|
|
#include <openssl/objects.h>
|
|
#include <openssl/asn1.h>
|
|
#include <openssl/rsa.h>
|
|
#include <openssl/dsa.h>
|
|
#include <openssl/ec.h>
|
|
|
|
#include "crypto/evp.h"
|
|
|
|
EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
|
|
long length)
|
|
{
|
|
EVP_PKEY *ret;
|
|
EVP_PKEY *copy = NULL;
|
|
|
|
if ((a == NULL) || (*a == NULL)) {
|
|
if ((ret = EVP_PKEY_new()) == NULL) {
|
|
ERR_raise(ERR_LIB_ASN1, ERR_R_EVP_LIB);
|
|
return NULL;
|
|
}
|
|
} else {
|
|
ret = *a;
|
|
|
|
#ifndef OPENSSL_NO_EC
|
|
if (evp_pkey_is_provided(ret)
|
|
&& EVP_PKEY_get_base_id(ret) == EVP_PKEY_EC) {
|
|
if (!evp_pkey_copy_downgraded(©, ret))
|
|
goto err;
|
|
}
|
|
#endif
|
|
}
|
|
|
|
if ((type != EVP_PKEY_get_id(ret) || copy != NULL)
|
|
&& !EVP_PKEY_set_type(ret, type)) {
|
|
ERR_raise(ERR_LIB_ASN1, ERR_R_EVP_LIB);
|
|
goto err;
|
|
}
|
|
|
|
switch (EVP_PKEY_get_base_id(ret)) {
|
|
case EVP_PKEY_RSA:
|
|
if ((ret->pkey.rsa = d2i_RSAPublicKey(NULL, pp, length)) == NULL) {
|
|
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
|
|
goto err;
|
|
}
|
|
break;
|
|
#ifndef OPENSSL_NO_DSA
|
|
case EVP_PKEY_DSA:
|
|
if (!d2i_DSAPublicKey(&ret->pkey.dsa, pp, length)) {
|
|
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
|
|
goto err;
|
|
}
|
|
break;
|
|
#endif
|
|
#ifndef OPENSSL_NO_EC
|
|
case EVP_PKEY_EC:
|
|
if (copy != NULL) {
|
|
/* use downgraded parameters from copy */
|
|
ret->pkey.ec = copy->pkey.ec;
|
|
copy->pkey.ec = NULL;
|
|
}
|
|
if (!o2i_ECPublicKey(&ret->pkey.ec, pp, length)) {
|
|
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
|
|
goto err;
|
|
}
|
|
break;
|
|
#endif
|
|
default:
|
|
ERR_raise(ERR_LIB_ASN1, ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE);
|
|
goto err;
|
|
}
|
|
if (a != NULL)
|
|
(*a) = ret;
|
|
EVP_PKEY_free(copy);
|
|
return ret;
|
|
err:
|
|
if (a == NULL || *a != ret)
|
|
EVP_PKEY_free(ret);
|
|
EVP_PKEY_free(copy);
|
|
return NULL;
|
|
}
|