sm2, ssl and license update

This commit is contained in:
Zhi Guan
2015-10-25 21:20:50 +08:00
parent cc316701af
commit 2563a4ed83
58 changed files with 3512 additions and 380 deletions

View File

@@ -61,7 +61,7 @@
#include <openssl/lhash.h>
#include "ssl_locl.h"
int SSL_library_init(void)
static int _SSL_library_init(void)
{
#ifndef OPENSSL_NO_DES
@@ -137,6 +137,7 @@ int SSL_library_init(void)
#ifndef OPENSSL_NO_ECDSA
EVP_add_digest(EVP_ecdsa());
#endif
/* If you want support for phased out ciphers, add the following */
#if 0
EVP_add_digest(EVP_sha());
@@ -153,3 +154,12 @@ int SSL_library_init(void)
ssl_load_ciphers();
return (1);
}
int SSL_library_init(void)
{
EVP_add_cipher(EVP_sms4_cbc());
EVP_add_digest(EVP_sm3());
return _SSL_library_init();
}