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
150 lines
4.5 KiB
C
150 lines
4.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
|
|
*/
|
|
|
|
/*
|
|
* 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/evp.h>
|
|
#include <openssl/encoder.h>
|
|
#include <openssl/buffer.h>
|
|
#include <openssl/x509.h>
|
|
#include <openssl/rsa.h> /* For i2d_RSAPublicKey */
|
|
#include <openssl/dsa.h> /* For i2d_DSAPublicKey */
|
|
#include <openssl/ec.h> /* For i2o_ECPublicKey */
|
|
#include "crypto/asn1.h"
|
|
#include "crypto/evp.h"
|
|
|
|
struct type_and_structure_st {
|
|
const char *output_type;
|
|
const char *output_structure;
|
|
};
|
|
|
|
static int i2d_provided(const EVP_PKEY *a, int selection,
|
|
const struct type_and_structure_st *output_info,
|
|
unsigned char **pp)
|
|
{
|
|
OSSL_ENCODER_CTX *ctx = NULL;
|
|
int ret;
|
|
|
|
for (ret = -1;
|
|
ret == -1 && output_info->output_type != NULL;
|
|
output_info++) {
|
|
/*
|
|
* The i2d_ calls don't take a boundary length for *pp. However,
|
|
* OSSL_ENCODER_to_data() needs one, so we make one up. Because
|
|
* OSSL_ENCODER_to_data() decrements this number by the amount of
|
|
* bytes written, we need to calculate the length written further
|
|
* down, when pp != NULL.
|
|
*/
|
|
size_t len = INT_MAX;
|
|
int pp_was_NULL = (pp == NULL || *pp == NULL);
|
|
|
|
ctx = OSSL_ENCODER_CTX_new_for_pkey(a, selection,
|
|
output_info->output_type,
|
|
output_info->output_structure,
|
|
NULL);
|
|
if (ctx == NULL)
|
|
return -1;
|
|
if (OSSL_ENCODER_to_data(ctx, pp, &len)) {
|
|
if (pp_was_NULL)
|
|
ret = (int)len;
|
|
else
|
|
ret = INT_MAX - (int)len;
|
|
}
|
|
OSSL_ENCODER_CTX_free(ctx);
|
|
ctx = NULL;
|
|
}
|
|
|
|
if (ret == -1)
|
|
ERR_raise(ERR_LIB_ASN1, ASN1_R_UNSUPPORTED_TYPE);
|
|
return ret;
|
|
}
|
|
|
|
int i2d_KeyParams(const EVP_PKEY *a, unsigned char **pp)
|
|
{
|
|
if (evp_pkey_is_provided(a)) {
|
|
static const struct type_and_structure_st output_info[] = {
|
|
{ "DER", "type-specific" },
|
|
{ NULL, }
|
|
};
|
|
|
|
return i2d_provided(a, EVP_PKEY_KEY_PARAMETERS, output_info, pp);
|
|
}
|
|
if (a->ameth != NULL && a->ameth->param_encode != NULL)
|
|
return a->ameth->param_encode(a, pp);
|
|
ERR_raise(ERR_LIB_ASN1, ASN1_R_UNSUPPORTED_TYPE);
|
|
return -1;
|
|
}
|
|
|
|
int i2d_KeyParams_bio(BIO *bp, const EVP_PKEY *pkey)
|
|
{
|
|
return ASN1_i2d_bio_of(EVP_PKEY, i2d_KeyParams, bp, pkey);
|
|
}
|
|
|
|
int i2d_PrivateKey(const EVP_PKEY *a, unsigned char **pp)
|
|
{
|
|
if (evp_pkey_is_provided(a)) {
|
|
static const struct type_and_structure_st output_info[] = {
|
|
{ "DER", "type-specific" },
|
|
{ "DER", "PrivateKeyInfo" },
|
|
{ NULL, }
|
|
};
|
|
|
|
return i2d_provided(a, EVP_PKEY_KEYPAIR, output_info, pp);
|
|
}
|
|
if (a->ameth != NULL && a->ameth->old_priv_encode != NULL) {
|
|
return a->ameth->old_priv_encode(a, pp);
|
|
}
|
|
if (a->ameth != NULL && a->ameth->priv_encode != NULL) {
|
|
PKCS8_PRIV_KEY_INFO *p8 = EVP_PKEY2PKCS8(a);
|
|
int ret = 0;
|
|
|
|
if (p8 != NULL) {
|
|
ret = i2d_PKCS8_PRIV_KEY_INFO(p8, pp);
|
|
PKCS8_PRIV_KEY_INFO_free(p8);
|
|
}
|
|
return ret;
|
|
}
|
|
ERR_raise(ERR_LIB_ASN1, ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE);
|
|
return -1;
|
|
}
|
|
|
|
int i2d_PublicKey(const EVP_PKEY *a, unsigned char **pp)
|
|
{
|
|
if (evp_pkey_is_provided(a)) {
|
|
static const struct type_and_structure_st output_info[] = {
|
|
{ "DER", "type-specific" },
|
|
{ "blob", NULL }, /* for EC */
|
|
{ NULL, }
|
|
};
|
|
|
|
return i2d_provided(a, EVP_PKEY_PUBLIC_KEY, output_info, pp);
|
|
}
|
|
switch (EVP_PKEY_get_base_id(a)) {
|
|
case EVP_PKEY_RSA:
|
|
return i2d_RSAPublicKey(EVP_PKEY_get0_RSA(a), pp);
|
|
#ifndef OPENSSL_NO_DSA
|
|
case EVP_PKEY_DSA:
|
|
return i2d_DSAPublicKey(EVP_PKEY_get0_DSA(a), pp);
|
|
#endif
|
|
#ifndef OPENSSL_NO_EC
|
|
case EVP_PKEY_EC:
|
|
return i2o_ECPublicKey(EVP_PKEY_get0_EC_KEY(a), pp);
|
|
#endif
|
|
default:
|
|
ERR_raise(ERR_LIB_ASN1, ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE);
|
|
return -1;
|
|
}
|
|
}
|