diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index d8258274..d2fe8497 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt @@ -24,8 +24,7 @@ add_library( ssl_ecdh.cc ssl_file.cc ssl_lib.cc - ssl_privkey.c - ssl_privkey_cc.cc + ssl_privkey.cc ssl_session.c ssl_stat.c ssl_transcript.c diff --git a/ssl/ssl_privkey.c b/ssl/ssl_privkey.cc similarity index 97% rename from ssl/ssl_privkey.c rename to ssl/ssl_privkey.cc index 257d03e4..c5994c96 100644 --- a/ssl/ssl_privkey.c +++ b/ssl/ssl_privkey.cc @@ -119,6 +119,16 @@ int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa) { return ret; } +int SSL_use_RSAPrivateKey_ASN1(SSL *ssl, const uint8_t *der, size_t der_len) { + bssl::UniquePtr rsa(RSA_private_key_from_bytes(der, der_len)); + if (!rsa) { + OPENSSL_PUT_ERROR(SSL, ERR_R_ASN1_LIB); + return 0; + } + + return SSL_use_RSAPrivateKey(ssl, rsa.get()); +} + int SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey) { if (pkey == NULL) { OPENSSL_PUT_ERROR(SSL, ERR_R_PASSED_NULL_PARAMETER); @@ -228,7 +238,7 @@ static int set_algorithm_prefs(uint16_t **out_prefs, size_t *out_num_prefs, OPENSSL_free(*out_prefs); *out_num_prefs = 0; - *out_prefs = BUF_memdup(prefs, num_prefs * sizeof(prefs[0])); + *out_prefs = (uint16_t *)BUF_memdup(prefs, num_prefs * sizeof(prefs[0])); if (*out_prefs == NULL) { OPENSSL_PUT_ERROR(SSL, ERR_R_MALLOC_FAILURE); return 0; @@ -265,7 +275,8 @@ int SSL_set_private_key_digest_prefs(SSL *ssl, const int *digest_nids, digest_list_conversion_cannot_overflow); ssl->cert->num_sigalgs = 0; - ssl->cert->sigalgs = OPENSSL_malloc(sizeof(uint16_t) * 2 * num_digests); + ssl->cert->sigalgs = + (uint16_t *)OPENSSL_malloc(sizeof(uint16_t) * 2 * num_digests); if (ssl->cert->sigalgs == NULL) { OPENSSL_PUT_ERROR(SSL, ERR_R_MALLOC_FAILURE); return 0; diff --git a/ssl/ssl_privkey_cc.cc b/ssl/ssl_privkey_cc.cc deleted file mode 100644 index 653308c1..00000000 --- a/ssl/ssl_privkey_cc.cc +++ /dev/null @@ -1,76 +0,0 @@ -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] */ - -#include - -#include -#include - - -/* This function has been converted to C++ to check if all of libssl's - * consumers' toolchains are capable of handling C++11. Once all problems in - * consumer toolchains are found and fixed, we will convert the rest of - * libssl. */ - -int SSL_use_RSAPrivateKey_ASN1(SSL *ssl, const uint8_t *der, size_t der_len) { - bssl::UniquePtr rsa(RSA_private_key_from_bytes(der, der_len)); - if (!rsa) { - OPENSSL_PUT_ERROR(SSL, ERR_R_ASN1_LIB); - return 0; - } - - return SSL_use_RSAPrivateKey(ssl, rsa.get()); -}