update to tassl-1.1.1b_v1.3

update by TASS Gujq
FISCO-BCOS · Jun 7, 2020 · df590be · df590be
1 parent cf9b04c
commit df590be
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/crypto/bn/bn_prime.h b/crypto/bn/bn_prime.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by crypto/bn/bn_prime.pl
  *
- * Copyright 1998-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1998-2020 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy

diff --git a/crypto/conf/conf_def.h b/crypto/conf/conf_def.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by crypto/conf/keysets.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
  * Licensed under the OpenSSL license (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

diff --git a/crypto/err/openssl.txt.old b/crypto/err/openssl.txt.old
@@ -1269,6 +1269,8 @@ SSL_F_SSL_CTX_SET_TLSEXT_MAX_FRAGMENT_LENGTH:551:\
 SSL_F_SSL_CTX_USE_CERTIFICATE:171:SSL_CTX_use_certificate
 SSL_F_SSL_CTX_USE_CERTIFICATE_ASN1:172:SSL_CTX_use_certificate_ASN1
 SSL_F_SSL_CTX_USE_CERTIFICATE_FILE:173:SSL_CTX_use_certificate_file
+SSL_F_SSL_CTX_USE_ENC_CERTIFICATE:653:SSL_CTX_use_enc_certificate
+SSL_F_SSL_CTX_USE_ENC_CERTIFICATE_FILE:654:SSL_CTX_use_enc_certificate_file
 SSL_F_SSL_CTX_USE_ENC_PRIVATEKEY:645:SSL_CTX_use_enc_PrivateKey
 SSL_F_SSL_CTX_USE_ENC_PRIVATEKEY_FILE:646:SSL_CTX_use_enc_PrivateKey_file
 SSL_F_SSL_CTX_USE_PRIVATEKEY:174:SSL_CTX_use_PrivateKey
@@ -1331,6 +1333,7 @@ SSL_F_SSL_SET_CERT:191:ssl_set_cert
 SSL_F_SSL_SET_CERT_AND_KEY:621:ssl_set_cert_and_key
 SSL_F_SSL_SET_CIPHER_LIST:271:SSL_set_cipher_list
 SSL_F_SSL_SET_CT_VALIDATION_CALLBACK:399:SSL_set_ct_validation_callback
+SSL_F_SSL_SET_ENC_CERT:655:ssl_set_enc_cert
 SSL_F_SSL_SET_ENC_PKEY:648:ssl_set_enc_pkey
 SSL_F_SSL_SET_FD:192:SSL_set_fd
 SSL_F_SSL_SET_PKEY:193:ssl_set_pkey
@@ -2686,6 +2689,7 @@ SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG:148:dh public value length is wrong
 SSL_R_DIGEST_CHECK_FAILED:149:digest check failed
 SSL_R_DTLS_MESSAGE_TOO_BIG:334:dtls message too big
 SSL_R_DUPLICATE_COMPRESSION_ID:309:duplicate compression id
+SSL_R_ECC_CERT_NOT_FOR_ENCING:294:ecc cert not for encing
 SSL_R_ECC_CERT_NOT_FOR_SIGNING:318:ecc cert not for signing
 SSL_R_ECDH_REQUIRED_FOR_SUITEB_MODE:374:ecdh required for suiteb mode
 SSL_R_EE_KEY_TOO_SMALL:399:ee key too small

diff --git a/fuzz/oids.txt b/fuzz/oids.txt
@@ -1064,3 +1064,11 @@ OBJ_id_tc26_gost_3410_2012_256_paramSetD="\x2A\x85\x03\x07\x01\x02\x01\x01\x04"
 OBJ_hmacWithSHA512_224="\x2A\x86\x48\x86\xF7\x0D\x02\x0C"
 OBJ_hmacWithSHA512_256="\x2A\x86\x48\x86\xF7\x0D\x02\x0D"
 OBJ_sm3WithSM2Sign="\x2A\x81\x1C\xCF\x55\x01\x83\x75"
+OBJ_sm_pkcs="\x2A\x81\x1C\xCF\x55\x06"
+OBJ_sm_pkcs7="\x2A\x81\x1C\xCF\x55\x06\x01\x04\x02"
+OBJ_pkcs7_sm2_data="\x2A\x81\x1C\xCF\x55\x06\x01\x04\x02\x01"
+OBJ_pkcs7_sm2_signed="\x2A\x81\x1C\xCF\x55\x06\x01\x04\x02\x02"
+OBJ_pkcs7_sm2_enveloped="\x2A\x81\x1C\xCF\x55\x06\x01\x04\x02\x03"
+OBJ_pkcs7_sm2_signedAndEnveloped="\x2A\x81\x1C\xCF\x55\x06\x01\x04\x02\x04"
+OBJ_pkcs7_sm2_encryptedData="\x2A\x81\x1C\xCF\x55\x06\x01\x04\x02\x05"
+OBJ_pkcs7_sm2_keyAgreementInfo="\x2A\x81\x1C\xCF\x55\x06\x01\x04\x02\x06"