CryptoPkg/TlsLib: Change the return type of TlsInitialize().

V2:
* Correct the commit log.

Currently, the return code of OPENSSL_init_ssl(0 or 1) and RandomSeed
(TRUE or FALSE) are not checked in TlsInitialize(). Also "VOID" is used
as the return type of TlsInitialize(), which can't be used to capture
the returned value for error handling.

From Long Qin (CryptoPkg owner):
The early version of OPENSSL_init_ssl() use the "VOID" as the return
value, which was updated to "int" later because the function changes
can fail.

So, this patch is to change the return type of TlsInitialize() to
follow up the OPENSSL_init_ssl() update.

Cc: Ye Ting <ting.ye@intel.com>
Cc: Long Qin <qin.long@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Long Qin <qin.long@intel.com>
This commit is contained in:
Jiaxin Wu 2017-11-17 11:50:11 +08:00
parent c6c501654e
commit 0878771f0c
2 changed files with 19 additions and 8 deletions

View File

@ -1,7 +1,7 @@
/** @file /** @file
Defines TLS Library APIs. Defines TLS Library APIs.
Copyright (c) 2016, Intel Corporation. All rights reserved.<BR> Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -22,8 +22,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
by SSL/TLS, and initializes the readable error messages. by SSL/TLS, and initializes the readable error messages.
This function must be called before any other action takes places. This function must be called before any other action takes places.
@retval TRUE The OpenSSL library has been initialized.
@retval FALSE Failed to initialize the OpenSSL library.
**/ **/
VOID BOOLEAN
EFIAPI EFIAPI
TlsInitialize ( TlsInitialize (
VOID VOID

View File

@ -22,26 +22,34 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
by SSL/TLS, and initializes the readable error messages. by SSL/TLS, and initializes the readable error messages.
This function must be called before any other action takes places. This function must be called before any other action takes places.
@retval TRUE The OpenSSL library has been initialized.
@retval FALSE Failed to initialize the OpenSSL library.
**/ **/
VOID BOOLEAN
EFIAPI EFIAPI
TlsInitialize ( TlsInitialize (
VOID VOID
) )
{ {
INTN Ret;
// //
// Performs initialization of crypto and ssl library, and loads required // Performs initialization of crypto and ssl library, and loads required
// algorithms. // algorithms.
// //
OPENSSL_init_ssl ( Ret = OPENSSL_init_ssl (
OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS,
NULL NULL
); );
if (Ret != 1) {
return FALSE;
}
// //
// Initialize the pseudorandom number generator. // Initialize the pseudorandom number generator.
// //
RandomSeed (NULL, 0); return RandomSeed (NULL, 0);
} }
/** /**