mirror of
https://github.com/opnsense/src.git
synced 2026-06-13 18:50:31 -04:00
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
180 lines
4.3 KiB
C
180 lines
4.3 KiB
C
/*
|
|
* Copyright 1995-2020 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
|
|
*/
|
|
|
|
/* We need to use the deprecated RSA low level calls */
|
|
#define OPENSSL_SUPPRESS_DEPRECATED
|
|
|
|
#include <openssl/err.h>
|
|
#include <openssl/rsa.h>
|
|
#include <openssl/ssl.h>
|
|
|
|
int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa)
|
|
{
|
|
EVP_PKEY *pkey;
|
|
int ret;
|
|
|
|
if (rsa == NULL) {
|
|
ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_NULL_PARAMETER);
|
|
return 0;
|
|
}
|
|
if ((pkey = EVP_PKEY_new()) == NULL) {
|
|
ERR_raise(ERR_LIB_SSL, ERR_R_EVP_LIB);
|
|
return 0;
|
|
}
|
|
|
|
RSA_up_ref(rsa);
|
|
if (EVP_PKEY_assign_RSA(pkey, rsa) <= 0) {
|
|
RSA_free(rsa);
|
|
EVP_PKEY_free(pkey);
|
|
return 0;
|
|
}
|
|
|
|
ret = SSL_use_PrivateKey(ssl, pkey);
|
|
EVP_PKEY_free(pkey);
|
|
return ret;
|
|
}
|
|
|
|
int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type)
|
|
{
|
|
int j, ret = 0;
|
|
BIO *in;
|
|
RSA *rsa = NULL;
|
|
|
|
in = BIO_new(BIO_s_file());
|
|
if (in == NULL) {
|
|
ERR_raise(ERR_LIB_SSL, ERR_R_BUF_LIB);
|
|
goto end;
|
|
}
|
|
|
|
if (BIO_read_filename(in, file) <= 0) {
|
|
ERR_raise(ERR_LIB_SSL, ERR_R_SYS_LIB);
|
|
goto end;
|
|
}
|
|
if (type == SSL_FILETYPE_ASN1) {
|
|
j = ERR_R_ASN1_LIB;
|
|
rsa = d2i_RSAPrivateKey_bio(in, NULL);
|
|
} else if (type == SSL_FILETYPE_PEM) {
|
|
j = ERR_R_PEM_LIB;
|
|
rsa = PEM_read_bio_RSAPrivateKey(in, NULL,
|
|
SSL_get_default_passwd_cb(ssl),
|
|
SSL_get_default_passwd_cb_userdata(ssl));
|
|
} else {
|
|
ERR_raise(ERR_LIB_SSL, SSL_R_BAD_SSL_FILETYPE);
|
|
goto end;
|
|
}
|
|
if (rsa == NULL) {
|
|
ERR_raise(ERR_LIB_SSL, j);
|
|
goto end;
|
|
}
|
|
ret = SSL_use_RSAPrivateKey(ssl, rsa);
|
|
RSA_free(rsa);
|
|
end:
|
|
BIO_free(in);
|
|
return ret;
|
|
}
|
|
|
|
int SSL_use_RSAPrivateKey_ASN1(SSL *ssl, const unsigned char *d, long len)
|
|
{
|
|
int ret;
|
|
const unsigned char *p;
|
|
RSA *rsa;
|
|
|
|
p = d;
|
|
if ((rsa = d2i_RSAPrivateKey(NULL, &p, (long)len)) == NULL) {
|
|
ERR_raise(ERR_LIB_SSL, ERR_R_ASN1_LIB);
|
|
return 0;
|
|
}
|
|
|
|
ret = SSL_use_RSAPrivateKey(ssl, rsa);
|
|
RSA_free(rsa);
|
|
return ret;
|
|
}
|
|
|
|
int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa)
|
|
{
|
|
int ret;
|
|
EVP_PKEY *pkey;
|
|
|
|
if (rsa == NULL) {
|
|
ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_NULL_PARAMETER);
|
|
return 0;
|
|
}
|
|
if ((pkey = EVP_PKEY_new()) == NULL) {
|
|
ERR_raise(ERR_LIB_SSL, ERR_R_EVP_LIB);
|
|
return 0;
|
|
}
|
|
|
|
RSA_up_ref(rsa);
|
|
if (EVP_PKEY_assign_RSA(pkey, rsa) <= 0) {
|
|
RSA_free(rsa);
|
|
EVP_PKEY_free(pkey);
|
|
return 0;
|
|
}
|
|
|
|
ret = SSL_CTX_use_PrivateKey(ctx, pkey);
|
|
EVP_PKEY_free(pkey);
|
|
return ret;
|
|
}
|
|
|
|
int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type)
|
|
{
|
|
int j, ret = 0;
|
|
BIO *in;
|
|
RSA *rsa = NULL;
|
|
|
|
in = BIO_new(BIO_s_file());
|
|
if (in == NULL) {
|
|
ERR_raise(ERR_LIB_SSL, ERR_R_BUF_LIB);
|
|
goto end;
|
|
}
|
|
|
|
if (BIO_read_filename(in, file) <= 0) {
|
|
ERR_raise(ERR_LIB_SSL, ERR_R_SYS_LIB);
|
|
goto end;
|
|
}
|
|
if (type == SSL_FILETYPE_ASN1) {
|
|
j = ERR_R_ASN1_LIB;
|
|
rsa = d2i_RSAPrivateKey_bio(in, NULL);
|
|
} else if (type == SSL_FILETYPE_PEM) {
|
|
j = ERR_R_PEM_LIB;
|
|
rsa = PEM_read_bio_RSAPrivateKey(in, NULL,
|
|
SSL_CTX_get_default_passwd_cb(ctx),
|
|
SSL_CTX_get_default_passwd_cb_userdata(ctx));
|
|
} else {
|
|
ERR_raise(ERR_LIB_SSL, SSL_R_BAD_SSL_FILETYPE);
|
|
goto end;
|
|
}
|
|
if (rsa == NULL) {
|
|
ERR_raise(ERR_LIB_SSL, j);
|
|
goto end;
|
|
}
|
|
ret = SSL_CTX_use_RSAPrivateKey(ctx, rsa);
|
|
RSA_free(rsa);
|
|
end:
|
|
BIO_free(in);
|
|
return ret;
|
|
}
|
|
|
|
int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, const unsigned char *d,
|
|
long len)
|
|
{
|
|
int ret;
|
|
const unsigned char *p;
|
|
RSA *rsa;
|
|
|
|
p = d;
|
|
if ((rsa = d2i_RSAPrivateKey(NULL, &p, (long)len)) == NULL) {
|
|
ERR_raise(ERR_LIB_SSL, ERR_R_ASN1_LIB);
|
|
return 0;
|
|
}
|
|
|
|
ret = SSL_CTX_use_RSAPrivateKey(ctx, rsa);
|
|
RSA_free(rsa);
|
|
return ret;
|
|
}
|