mirror of
https://github.com/openssl/openssl.git
synced 2025-03-07 19:38:33 +08:00
6a2b8ff392
This has us switch from the 'structure' "pkcs8" to "PrivateKeyInfo", which is sensible considering we already have "SubjectPublicKeyInfo". We also add "EncryptedPrivateKeyInfo", and use it for a special decoder that detects and decrypts an EncryptedPrivateKeyInfo structured DER blob into a PrivateKeyInfo structured DER blob and passes that on to the next decoder implementation. The result of this change is that PKCS#8 decryption should only happen once per decoding instead of once for every expected key type. Furthermore, this new decoder implementation sets the data type to the OID of the algorithmIdentifier field, thus reducing how many decoder implementations are tentativaly run further down the call chain. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15498)
90 lines
4.4 KiB
PHP
90 lines
4.4 KiB
PHP
/*
|
|
* Copyright 2020-2021 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
|
|
*/
|
|
|
|
#ifndef DECODER_PROVIDER
|
|
# error Macro DECODER_PROVIDER undefined
|
|
#endif
|
|
|
|
#define DECODER_STRUCTURE_type_specific_keypair "type-specific"
|
|
#define DECODER_STRUCTURE_type_specific_params "type-specific"
|
|
#define DECODER_STRUCTURE_type_specific "type-specific"
|
|
#define DECODER_STRUCTURE_type_specific_no_pub "type-specific"
|
|
#define DECODER_STRUCTURE_EncryptedPrivateKeyInfo "EncryptedPrivateKeyInfo"
|
|
#define DECODER_STRUCTURE_PrivateKeyInfo "PrivateKeyInfo"
|
|
#define DECODER_STRUCTURE_SubjectPublicKeyInfo "SubjectPublicKeyInfo"
|
|
#define DECODER_STRUCTURE_DH "dh"
|
|
#define DECODER_STRUCTURE_DHX "dhx"
|
|
#define DECODER_STRUCTURE_DSA "dsa"
|
|
#define DECODER_STRUCTURE_EC "ec"
|
|
#define DECODER_STRUCTURE_RSA "rsa"
|
|
|
|
/* Arguments are prefixed with '_' to avoid build breaks on certain platforms */
|
|
#define DECODER(_name, _input, _output, _fips) \
|
|
{ _name, \
|
|
"provider=" DECODER_PROVIDER ",fips=" #_fips ",input=" #_input, \
|
|
(ossl_##_input##_to_##_output##_decoder_functions) }
|
|
#define DECODER_w_structure(_name, _input, _structure, _output, _fips) \
|
|
{ _name, \
|
|
"provider=" DECODER_PROVIDER ",fips=" #_fips ",input=" #_input \
|
|
",structure=" DECODER_STRUCTURE_##_structure, \
|
|
(ossl_##_structure##_##_input##_to_##_output##_decoder_functions) }
|
|
|
|
#ifndef OPENSSL_NO_DH
|
|
DECODER_w_structure("DH", der, PrivateKeyInfo, dh, yes),
|
|
DECODER_w_structure("DH", der, SubjectPublicKeyInfo, dh, yes),
|
|
DECODER_w_structure("DH", der, type_specific_params, dh, yes),
|
|
DECODER_w_structure("DH", der, DH, dh, yes),
|
|
DECODER_w_structure("DHX", der, PrivateKeyInfo, dhx, yes),
|
|
DECODER_w_structure("DHX", der, SubjectPublicKeyInfo, dhx, yes),
|
|
DECODER_w_structure("DHX", der, type_specific_params, dhx, yes),
|
|
DECODER_w_structure("DHX", der, DHX, dhx, yes),
|
|
#endif
|
|
#ifndef OPENSSL_NO_DSA
|
|
DECODER_w_structure("DSA", der, PrivateKeyInfo, dsa, yes),
|
|
DECODER_w_structure("DSA", der, SubjectPublicKeyInfo, dsa, yes),
|
|
DECODER_w_structure("DSA", der, type_specific, dsa, yes),
|
|
DECODER_w_structure("DSA", der, DSA, dsa, yes),
|
|
DECODER("DSA", msblob, dsa, yes),
|
|
DECODER("DSA", pvk, dsa, yes),
|
|
#endif
|
|
#ifndef OPENSSL_NO_EC
|
|
DECODER_w_structure("EC", der, PrivateKeyInfo, ec, yes),
|
|
DECODER_w_structure("EC", der, SubjectPublicKeyInfo, ec, yes),
|
|
DECODER_w_structure("EC", der, type_specific_no_pub, ec, yes),
|
|
DECODER_w_structure("EC", der, EC, ec, yes),
|
|
DECODER_w_structure("ED25519", der, PrivateKeyInfo, ed25519, yes),
|
|
DECODER_w_structure("ED25519", der, SubjectPublicKeyInfo, ed25519, yes),
|
|
DECODER_w_structure("ED448", der, PrivateKeyInfo, ed448, yes),
|
|
DECODER_w_structure("ED448", der, SubjectPublicKeyInfo, ed448, yes),
|
|
DECODER_w_structure("X25519", der, PrivateKeyInfo, x25519, yes),
|
|
DECODER_w_structure("X25519", der, SubjectPublicKeyInfo, x25519, yes),
|
|
DECODER_w_structure("X448", der, PrivateKeyInfo, x448, yes),
|
|
DECODER_w_structure("X448", der, SubjectPublicKeyInfo, x448, yes),
|
|
# ifndef OPENSSL_NO_SM2
|
|
DECODER_w_structure("SM2", der, PrivateKeyInfo, sm2, yes),
|
|
DECODER_w_structure("SM2", der, SubjectPublicKeyInfo, sm2, yes),
|
|
# endif
|
|
#endif
|
|
DECODER_w_structure("RSA", der, PrivateKeyInfo, rsa, yes),
|
|
DECODER_w_structure("RSA", der, SubjectPublicKeyInfo, rsa, yes),
|
|
DECODER_w_structure("RSA", der, type_specific_keypair, rsa, yes),
|
|
DECODER_w_structure("RSA", der, RSA, rsa, yes),
|
|
DECODER_w_structure("RSA-PSS", der, PrivateKeyInfo, rsapss, yes),
|
|
DECODER_w_structure("RSA-PSS", der, SubjectPublicKeyInfo, rsapss, yes),
|
|
DECODER("RSA", msblob, rsa, yes),
|
|
DECODER("RSA", pvk, rsa, yes),
|
|
|
|
DECODER("DER", pem, der, yes),
|
|
/*
|
|
* A decoder that recognises PKCS#8 EncryptedPrivateKeyInfo structure
|
|
* and decrypts it, passing on the unencrypted PrivateKeyInfo in DER
|
|
* form to the next decoder.
|
|
*/
|
|
DECODER_w_structure("DER", der, EncryptedPrivateKeyInfo, der, yes),
|