mirror of
https://github.com/openssl/openssl.git
synced 2024-12-15 06:01:37 +08:00
4ce1025a8a
PEM_write_bio_PrivateKey_traditional() didn't handle provider-native keys very well. Originally, it would simply use the corresponding encoder, which is likely to output modern PEM (not "traditional"). PEM_write_bio_PrivateKey_traditional() is now changed to try and get a legacy copy of the input EVP_PKEY, and use that copy for traditional output, if it has such support. Internally, evp_pkey_copy_downgraded() is added, to be used when evp_pkey_downgrade() is too intrusive for what it's needed for. Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12738)
330 lines
9.7 KiB
C
330 lines
9.7 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 some STORE deprecated APIs */
|
|
#define OPENSSL_SUPPRESS_DEPRECATED
|
|
|
|
#include <stdio.h>
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/buffer.h>
|
|
#include <openssl/objects.h>
|
|
#include <openssl/evp.h>
|
|
#include <openssl/x509.h>
|
|
#include <openssl/pkcs12.h>
|
|
#include <openssl/pem.h>
|
|
#include <openssl/engine.h>
|
|
#include <openssl/dh.h>
|
|
#include <openssl/store.h>
|
|
#include <openssl/ui.h>
|
|
#include "crypto/store.h"
|
|
#include "crypto/asn1.h"
|
|
#include "crypto/evp.h"
|
|
#include "pem_local.h"
|
|
|
|
int pem_check_suffix(const char *pem_str, const char *suffix);
|
|
|
|
static EVP_PKEY *pem_read_bio_key(BIO *bp, EVP_PKEY **x,
|
|
pem_password_cb *cb, void *u,
|
|
OPENSSL_CTX *libctx, const char *propq,
|
|
int expected_store_info_type,
|
|
int try_secure)
|
|
{
|
|
EVP_PKEY *ret = NULL;
|
|
OSSL_STORE_CTX *ctx = NULL;
|
|
OSSL_STORE_INFO *info = NULL;
|
|
const UI_METHOD *ui_method = NULL;
|
|
UI_METHOD *allocated_ui_method = NULL;
|
|
|
|
if (expected_store_info_type != OSSL_STORE_INFO_PKEY
|
|
&& expected_store_info_type != OSSL_STORE_INFO_PUBKEY
|
|
&& expected_store_info_type != OSSL_STORE_INFO_PARAMS) {
|
|
ERR_raise(ERR_LIB_PEM, ERR_R_PASSED_INVALID_ARGUMENT);
|
|
return NULL;
|
|
}
|
|
|
|
if (u != NULL && cb == NULL)
|
|
cb = PEM_def_callback;
|
|
if (cb == NULL)
|
|
ui_method = UI_null();
|
|
else
|
|
ui_method = allocated_ui_method = UI_UTIL_wrap_read_pem_callback(cb, 0);
|
|
if (ui_method == NULL)
|
|
return NULL;
|
|
|
|
if ((ctx = OSSL_STORE_attach(bp, "file", libctx, propq, ui_method, u,
|
|
NULL, NULL)) == NULL)
|
|
goto err;
|
|
#ifndef OPENSSL_NO_SECURE_HEAP
|
|
# ifndef OPENSSL_NO_DEPRECATED_3_0
|
|
if (try_secure) {
|
|
int on = 1;
|
|
if (!OSSL_STORE_ctrl(ctx, OSSL_STORE_C_USE_SECMEM, &on))
|
|
goto err;
|
|
}
|
|
# endif
|
|
#endif
|
|
|
|
while (!OSSL_STORE_eof(ctx)
|
|
&& (info = OSSL_STORE_load(ctx)) != NULL) {
|
|
if (OSSL_STORE_INFO_get_type(info) == expected_store_info_type) {
|
|
switch (expected_store_info_type) {
|
|
case OSSL_STORE_INFO_PKEY:
|
|
ret = OSSL_STORE_INFO_get1_PKEY(info);
|
|
break;
|
|
case OSSL_STORE_INFO_PUBKEY:
|
|
ret = OSSL_STORE_INFO_get1_PUBKEY(info);
|
|
break;
|
|
case OSSL_STORE_INFO_PARAMS:
|
|
ret = OSSL_STORE_INFO_get1_PARAMS(info);
|
|
break;
|
|
}
|
|
}
|
|
OSSL_STORE_INFO_free(info);
|
|
info = NULL;
|
|
}
|
|
|
|
if (ret != NULL && x != NULL)
|
|
*x = ret;
|
|
|
|
err:
|
|
OSSL_STORE_close(ctx);
|
|
UI_destroy_method(allocated_ui_method);
|
|
OSSL_STORE_INFO_free(info);
|
|
return ret;
|
|
}
|
|
|
|
EVP_PKEY *PEM_read_bio_PUBKEY_ex(BIO *bp, EVP_PKEY **x,
|
|
pem_password_cb *cb, void *u,
|
|
OPENSSL_CTX *libctx, const char *propq)
|
|
{
|
|
return pem_read_bio_key(bp, x, cb, u, libctx, propq,
|
|
OSSL_STORE_INFO_PUBKEY, 0);
|
|
}
|
|
|
|
EVP_PKEY *PEM_read_bio_PUBKEY(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
|
|
void *u)
|
|
{
|
|
return PEM_read_bio_PUBKEY_ex(bp, x, cb, u, NULL, NULL);
|
|
}
|
|
|
|
#ifndef OPENSSL_NO_STDIO
|
|
EVP_PKEY *PEM_read_PUBKEY_ex(FILE *fp, EVP_PKEY **x,
|
|
pem_password_cb *cb, void *u,
|
|
OPENSSL_CTX *libctx, const char *propq)
|
|
{
|
|
BIO *b;
|
|
EVP_PKEY *ret;
|
|
|
|
if ((b = BIO_new(BIO_s_file())) == NULL) {
|
|
PEMerr(0, ERR_R_BUF_LIB);
|
|
return 0;
|
|
}
|
|
BIO_set_fp(b, fp, BIO_NOCLOSE);
|
|
ret = PEM_read_bio_PUBKEY_ex(b, x, cb, u, libctx, propq);
|
|
BIO_free(b);
|
|
return ret;
|
|
}
|
|
|
|
EVP_PKEY *PEM_read_PUBKEY(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u)
|
|
{
|
|
return PEM_read_PUBKEY_ex(fp, x, cb, u, NULL, NULL);
|
|
}
|
|
#endif
|
|
|
|
EVP_PKEY *PEM_read_bio_PrivateKey_ex(BIO *bp, EVP_PKEY **x,
|
|
pem_password_cb *cb, void *u,
|
|
OPENSSL_CTX *libctx, const char *propq)
|
|
{
|
|
return pem_read_bio_key(bp, x, cb, u, libctx, propq,
|
|
OSSL_STORE_INFO_PKEY, 1);
|
|
}
|
|
|
|
EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
|
|
void *u)
|
|
{
|
|
return PEM_read_bio_PrivateKey_ex(bp, x, cb, u, NULL, NULL);
|
|
}
|
|
|
|
PEM_write_cb_fnsig(PrivateKey, EVP_PKEY, BIO, write_bio)
|
|
{
|
|
IMPLEMENT_PEM_provided_write_body_vars(EVP_PKEY, PrivateKey);
|
|
|
|
IMPLEMENT_PEM_provided_write_body_pass();
|
|
IMPLEMENT_PEM_provided_write_body_main(EVP_PKEY, bio);
|
|
|
|
legacy:
|
|
if (x->ameth == NULL || x->ameth->priv_encode != NULL)
|
|
return PEM_write_bio_PKCS8PrivateKey(out, x, enc,
|
|
(const char *)kstr, klen, cb, u);
|
|
return PEM_write_bio_PrivateKey_traditional(out, x, enc, kstr, klen, cb, u);
|
|
}
|
|
|
|
/*
|
|
* Note: there is no way to tell a provided pkey encoder to use "traditional"
|
|
* encoding. Therefore, if the pkey is provided, we try to take a copy
|
|
* TODO: when #legacy keys are gone, this function will not be possible any
|
|
* more and should be removed.
|
|
*/
|
|
int PEM_write_bio_PrivateKey_traditional(BIO *bp, const EVP_PKEY *x,
|
|
const EVP_CIPHER *enc,
|
|
const unsigned char *kstr, int klen,
|
|
pem_password_cb *cb, void *u)
|
|
{
|
|
char pem_str[80];
|
|
EVP_PKEY *copy = NULL;
|
|
int ret;
|
|
|
|
if (evp_pkey_is_assigned(x)
|
|
&& evp_pkey_is_provided(x)
|
|
&& evp_pkey_copy_downgraded(©, x))
|
|
x = copy;
|
|
|
|
if (x->ameth == NULL || x->ameth->old_priv_encode == NULL) {
|
|
ERR_raise(ERR_LIB_PEM, PEM_R_UNSUPPORTED_PUBLIC_KEY_TYPE);
|
|
return 0;
|
|
}
|
|
BIO_snprintf(pem_str, 80, "%s PRIVATE KEY", x->ameth->pem_str);
|
|
ret = PEM_ASN1_write_bio((i2d_of_void *)i2d_PrivateKey,
|
|
pem_str, bp, x, enc, kstr, klen, cb, u);
|
|
|
|
EVP_PKEY_free(copy);
|
|
return ret;
|
|
}
|
|
|
|
EVP_PKEY *PEM_read_bio_Parameters_ex(BIO *bp, EVP_PKEY **x,
|
|
OPENSSL_CTX *libctx, const char *propq)
|
|
{
|
|
return pem_read_bio_key(bp, x, NULL, NULL, libctx, propq,
|
|
OSSL_STORE_INFO_PARAMS, 0);
|
|
}
|
|
|
|
EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x)
|
|
{
|
|
return PEM_read_bio_Parameters_ex(bp, x, NULL, NULL);
|
|
}
|
|
|
|
PEM_write_fnsig(Parameters, EVP_PKEY, BIO, write_bio)
|
|
{
|
|
char pem_str[80];
|
|
IMPLEMENT_PEM_provided_write_body_vars(EVP_PKEY, Parameters);
|
|
|
|
IMPLEMENT_PEM_provided_write_body_main(EVP_PKEY, bio);
|
|
|
|
legacy:
|
|
if (!x->ameth || !x->ameth->param_encode)
|
|
return 0;
|
|
|
|
BIO_snprintf(pem_str, 80, "%s PARAMETERS", x->ameth->pem_str);
|
|
return PEM_ASN1_write_bio((i2d_of_void *)x->ameth->param_encode,
|
|
pem_str, out, x, NULL, NULL, 0, 0, NULL);
|
|
}
|
|
|
|
#ifndef OPENSSL_NO_STDIO
|
|
EVP_PKEY *PEM_read_PrivateKey_ex(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
|
|
void *u, OPENSSL_CTX *libctx,
|
|
const char *propq)
|
|
{
|
|
BIO *b;
|
|
EVP_PKEY *ret;
|
|
|
|
if ((b = BIO_new(BIO_s_file())) == NULL) {
|
|
PEMerr(0, ERR_R_BUF_LIB);
|
|
return 0;
|
|
}
|
|
BIO_set_fp(b, fp, BIO_NOCLOSE);
|
|
ret = PEM_read_bio_PrivateKey_ex(b, x, cb, u, libctx, propq);
|
|
BIO_free(b);
|
|
return ret;
|
|
}
|
|
|
|
EVP_PKEY *PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
|
|
void *u)
|
|
{
|
|
return PEM_read_PrivateKey_ex(fp, x, cb, u, NULL, NULL);
|
|
}
|
|
|
|
int PEM_write_PrivateKey(FILE *fp, const EVP_PKEY *x, const EVP_CIPHER *enc,
|
|
const unsigned char *kstr, int klen,
|
|
pem_password_cb *cb, void *u)
|
|
{
|
|
BIO *b;
|
|
int ret;
|
|
|
|
if ((b = BIO_new_fp(fp, BIO_NOCLOSE)) == NULL) {
|
|
PEMerr(PEM_F_PEM_WRITE_PRIVATEKEY, ERR_R_BUF_LIB);
|
|
return 0;
|
|
}
|
|
ret = PEM_write_bio_PrivateKey(b, x, enc, kstr, klen, cb, u);
|
|
BIO_free(b);
|
|
return ret;
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifndef OPENSSL_NO_DH
|
|
|
|
/* Transparently read in PKCS#3 or X9.42 DH parameters */
|
|
|
|
DH *PEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u)
|
|
{
|
|
DH *ret = NULL;
|
|
EVP_PKEY *pkey = NULL;
|
|
OSSL_STORE_CTX *ctx = NULL;
|
|
OSSL_STORE_INFO *info = NULL;
|
|
UI_METHOD *ui_method = NULL;
|
|
|
|
if ((ui_method = UI_UTIL_wrap_read_pem_callback(cb, 0)) == NULL)
|
|
return NULL;
|
|
|
|
if ((ctx = OSSL_STORE_attach(bp, "file", NULL, NULL, ui_method, u,
|
|
NULL, NULL)) == NULL)
|
|
goto err;
|
|
|
|
while (!OSSL_STORE_eof(ctx) && (info = OSSL_STORE_load(ctx)) != NULL) {
|
|
if (OSSL_STORE_INFO_get_type(info) == OSSL_STORE_INFO_PARAMS) {
|
|
pkey = OSSL_STORE_INFO_get0_PARAMS(info);
|
|
if (EVP_PKEY_id(pkey) == EVP_PKEY_DHX
|
|
|| EVP_PKEY_id(pkey) == EVP_PKEY_DH) {
|
|
ret = EVP_PKEY_get1_DH(pkey);
|
|
break;
|
|
}
|
|
}
|
|
OSSL_STORE_INFO_free(info);
|
|
info = NULL;
|
|
}
|
|
|
|
if (ret != NULL && x != NULL)
|
|
*x = ret;
|
|
|
|
err:
|
|
OSSL_STORE_close(ctx);
|
|
UI_destroy_method(ui_method);
|
|
OSSL_STORE_INFO_free(info);
|
|
return ret;
|
|
}
|
|
|
|
# ifndef OPENSSL_NO_STDIO
|
|
DH *PEM_read_DHparams(FILE *fp, DH **x, pem_password_cb *cb, void *u)
|
|
{
|
|
BIO *b;
|
|
DH *ret;
|
|
|
|
if ((b = BIO_new(BIO_s_file())) == NULL) {
|
|
PEMerr(PEM_F_PEM_READ_DHPARAMS, ERR_R_BUF_LIB);
|
|
return 0;
|
|
}
|
|
BIO_set_fp(b, fp, BIO_NOCLOSE);
|
|
ret = PEM_read_bio_DHparams(b, x, cb, u);
|
|
BIO_free(b);
|
|
return ret;
|
|
}
|
|
# endif
|
|
|
|
#endif
|