wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix NID conflicts

Browse Source 
- `NID_sha224` conflicted with `NID_sha1WithRSAEncryption`
- `NID_commonName` conflicted with `PBE-SHA1-3DES`
- `NID_X9_62_prime239v3` conflicted with `AES128CBCb`
- `NID_md5` conflicted with `NID_surname`
- `NID_md2WithRSAEncryption` conflicted with `NID_localityName`
- `NID_md5WithRSAEncryption` conflicted with `NID_stateOrProvinceName`

NID conflicts found by examining the runtime values in `wolfssl_object_info`
This commit is contained in:
Juliusz Sosinowicz
2021-10-08 13:26:28 +02:00
parent 57b9170ac0
commit fa3cf590d5
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfssl/openssl/ec.h
View File

@@ -45,7 +45,7 @@ enum {
NID_X9_62_prime192v3 = 411, NID_X9_62_prime192v3 = 411,
NID_X9_62_prime239v1 = 412, NID_X9_62_prime239v1 = 412,
NID_X9_62_prime239v2 = 413, NID_X9_62_prime239v2 = 413,
NID_X9_62_prime239v3 = 414, NID_X9_62_prime239v3 = 418, /* Previous value conflicted with AES128CBCb */
NID_X9_62_prime256v1 = 415, NID_X9_62_prime256v1 = 415,
NID_secp112r1 = 704, NID_secp112r1 = 704,
NID_secp112r2 = 705, NID_secp112r2 = 705,

8
wolfssl/openssl/evp.h
View File

@@ -237,10 +237,10 @@ enum {
AES_192_GCM_TYPE = 22, AES_192_GCM_TYPE = 22,
AES_256_GCM_TYPE = 23, AES_256_GCM_TYPE = 23,
NID_sha1 = 64, NID_sha1 = 64,
NID_sha224 = 65, NID_sha224 = 675,
NID_md2 = 77, NID_md2 = 77,
NID_md4 = 257, NID_md4 = 257,
NID_md5 = 4, NID_md5 = 40,
NID_hmac = 855, NID_hmac = 855,
NID_cmac = 894, NID_cmac = 894,
NID_dhKeyAgreement= 28, NID_dhKeyAgreement= 28,
@@ -265,8 +265,8 @@ enum {
enum { enum {
NID_md5WithRSA = 104, NID_md5WithRSA = 104,
NID_md2WithRSAEncryption = 7, NID_md2WithRSAEncryption = 9,
NID_md5WithRSAEncryption = 8, NID_md5WithRSAEncryption = 99,
NID_dsaWithSHA1 = 113, NID_dsaWithSHA1 = 113,
NID_dsaWithSHA1_2 = 70, NID_dsaWithSHA1_2 = 70,
NID_sha1WithRSA = 115, NID_sha1WithRSA = 115,

3
wolfssl/wolfcrypt/asn.h
View File

@@ -705,10 +705,11 @@ enum
NID_policy_constraints = 150, NID_policy_constraints = 150,
NID_inhibit_any_policy = 168, /* 2.5.29.54 */ NID_inhibit_any_policy = 168, /* 2.5.29.54 */
NID_tlsfeature = 1020, /* id-pe 24 */ NID_tlsfeature = 1020, /* id-pe 24 */
NID_commonName = 0x03, /* matches ASN_COMMON_NAME in asn.h */
NID_buildingName = 1494, NID_buildingName = 1494,
NID_commonName = 14, /* CN Changed to not conflict
* with PBE_SHA1_DES3 */
NID_surname = 0x04, /* SN */ NID_surname = 0x04, /* SN */
NID_serialNumber = 0x05, /* serialNumber */ NID_serialNumber = 0x05, /* serialNumber */
NID_countryName = 0x06, /* C */ NID_countryName = 0x06, /* C */