Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md
This commit is contained in:
Zhi Guan
2017-02-14 16:12:29 +08:00
parent d2254170b8
commit 43fed1108d
3503 changed files with 320546 additions and 408546 deletions

View File

@@ -955,94 +955,106 @@ ct_cert_scts 954
jurisdictionLocalityName 955
jurisdictionStateOrProvinceName 956
jurisdictionCountryName 957
sm2p256v1 958
SM2_with_SM3 959
ISO_CN 960
oscca 961
sm3 962
hmac_sm3 963
sm4 964
sm2_with_sm3 965
sm2_with_SHA1 966
sm2_with_SHA256 967
sm 968
sm2 969
sm2sign 970
sm2keyagreement 971
sm2encrypt 972
sm2sign_with_sm3 973
sm2sign_with_sha1 974
sm2sign_with_sha256 975
sms4 976
sms4_ecb 977
sms4_cbc 978
sms4_cfb 979
sms4_ofb 980
sms4_ofb128 981
sms4_cfb128 982
ecies_recommendedParameters 983
ecies_specifiedParameters 984
x9_63_kdf 985
nist_concatenation_kdf 986
tls_kdf 987
ikev2_kdf 988
xor_in_ecies 989
aes128_cbc_in_ecies 990
aes192_cbc_in_ecies 991
aes256_cbc_in_ecies 992
aes128_ctr_in_ecies 993
aes192_ctr_in_ecies 994
aes256_ctr_in_ecies 995
hmac_full_ecies 996
hmac_half_ecies 997
cmac_aes128_ecies 998
cmac_aes192_ecies 999
zuc 1000
sm6 1001
sm1 1002
ssf33 1003
sm7 1004
sm8 1005
sm5 1006
sm9 1007
sm9sign 1008
sm9keyagreement 1009
sm9encrypt 1010
sms4_cbc_hmac_sm3 1011
sm6_ecb 1012
sm6_cbc 1013
sm6_ofb128 1014
sm6_cfb128 1015
sm1_ecb 1016
sm1_cbc 1017
sm1_ofb128 1018
sm1_cfb128 1019
ssf33_ecb 1020
ssf33_cbc 1021
ssf33_ofb128 1022
ssf33_cfb128 1023
id_sm_PublicKey 1024
id_sm9PublicKey 1025
sms4_ctr 1026
sms4_gcm 1027
sms4_ccm 1028
sms4_xts 1029
sm1_cfb 1030
sms4_cfb1 1031
sms4_cfb8 1032
sms4_wrap 1033
X9_62_id_ecSigType 1034
sm2encrypt_recommendedParameters 1035
sm2encrypt_specifiedParameters 1036
secg_scheme 1037
sm_scheme 1038
cbc_mac 1039
sm2sign_with_sha512 1040
sm2sign_with_sha224 1041
sm2sign_with_sha384 1042
sm2sign_with_rmd160 1043
wapip192v1 1044
sm1_cfb1 1045
sm1_cfb8 1046
ssf33_cfb1 1047
ssf33_cfb8 1048
aes_128_ocb 958
aes_192_ocb 959
aes_256_ocb 960
camellia_128_gcm 961
camellia_128_ccm 962
camellia_128_ctr 963
camellia_128_cmac 964
camellia_192_gcm 965
camellia_192_ccm 966
camellia_192_ctr 967
camellia_192_cmac 968
camellia_256_gcm 969
camellia_256_ccm 970
camellia_256_ctr 971
camellia_256_cmac 972
id_scrypt 973
id_tc26 974
gost89_cnt_12 975
gost_mac_12 976
id_tc26_algorithms 977
id_tc26_sign 978
id_GostR3410_2012_256 979
id_GostR3410_2012_512 980
id_tc26_digest 981
id_GostR3411_2012_256 982
id_GostR3411_2012_512 983
id_tc26_signwithdigest 984
id_tc26_signwithdigest_gost3410_2012_256 985
id_tc26_signwithdigest_gost3410_2012_512 986
id_tc26_mac 987
id_tc26_hmac_gost_3411_2012_256 988
id_tc26_hmac_gost_3411_2012_512 989
id_tc26_cipher 990
id_tc26_agreement 991
id_tc26_agreement_gost_3410_2012_256 992
id_tc26_agreement_gost_3410_2012_512 993
id_tc26_constants 994
id_tc26_sign_constants 995
id_tc26_gost_3410_2012_512_constants 996
id_tc26_gost_3410_2012_512_paramSetTest 997
id_tc26_gost_3410_2012_512_paramSetA 998
id_tc26_gost_3410_2012_512_paramSetB 999
id_tc26_digest_constants 1000
id_tc26_cipher_constants 1001
id_tc26_gost_28147_constants 1002
id_tc26_gost_28147_param_Z 1003
INN 1004
OGRN 1005
SNILS 1006
subjectSignTool 1007
issuerSignTool 1008
gost89_cbc 1009
gost89_ecb 1010
gost89_ctr 1011
grasshopper_ecb 1012
grasshopper_ctr 1013
grasshopper_ofb 1014
grasshopper_cbc 1015
grasshopper_cfb 1016
grasshopper_mac 1017
chacha20_poly1305 1018
chacha20 1019
tlsfeature 1020
tls1_prf 1021
ipsec_IKE 1022
capwapAC 1023
capwapWTP 1024
sshClient 1025
sshServer 1026
sendRouter 1027
sendProxiedRouter 1028
sendOwner 1029
sendProxiedOwner 1030
id_pkinit 1031
pkInitClientAuth 1032
pkInitKDC 1033
X25519 1034
X448 1035
hkdf 1036
kx_rsa 1037
kx_ecdhe 1038
kx_dhe 1039
kx_ecdhe_psk 1040
kx_dhe_psk 1041
kx_rsa_psk 1042
kx_psk 1043
kx_srp 1044
kx_gost 1045
auth_rsa 1046
auth_ecdsa 1047
auth_psk 1048
auth_dss 1049
auth_gost01 1050
auth_gost12 1051
auth_srp 1052
auth_null 1053
fips_none 1054
fips_140_2 1055
blake2b512 1056
blake2s256 1057
id_smime_ct_contentCollection 1058
id_smime_ct_authEnvelopedData 1059
id_ct_xml 1060