From a0c7c079b8e878d563bb025864ae82201ab45d72 Mon Sep 17 00:00:00 2001 From: John Safranek Date: Mon, 25 Oct 2021 21:57:28 -0700 Subject: [PATCH] Revert "Make NID's consistent" --- src/internal.c | 4 +- src/ssl.c | 168 ++++++++++++++++++++-------------------- tests/api.c | 14 ++-- wolfssl/internal.h | 4 - wolfssl/openssl/ec.h | 2 +- wolfssl/openssl/evp.h | 15 +--- wolfssl/wolfcrypt/asn.h | 3 +- 7 files changed, 97 insertions(+), 113 deletions(-) diff --git a/src/internal.c b/src/internal.c index 0bc9b608e..2ff7db3da 100644 --- a/src/internal.c +++ b/src/internal.c @@ -10574,7 +10574,7 @@ int CopyDecodedToX509(WOLFSSL_X509* x509, DecodedCert* dCert) ret = MEMORY_E; } else { if (!(x509->key.algor->algorithm = - wolfSSL_OBJ_nid2obj(oid2nid(dCert->keyOID, oidKeyType)))) { + wolfSSL_OBJ_nid2obj(dCert->keyOID))) { ret = PUBLIC_KEY_E; } } @@ -10604,7 +10604,7 @@ int CopyDecodedToX509(WOLFSSL_X509* x509, DecodedCert* dCert) #if defined(OPENSSL_ALL) wolfSSL_ASN1_OBJECT_free(x509->algor.algorithm); if (!(x509->algor.algorithm = - wolfSSL_OBJ_nid2obj(oid2nid(dCert->signatureOID, oidSigType)))) { + wolfSSL_OBJ_nid2obj(dCert->signatureOID))) { ret = PUBLIC_KEY_E; } #endif diff --git a/src/ssl.c b/src/ssl.c index 7b08bdc84..d2295cb31 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -135,6 +135,8 @@ #include int SetIndividualInternal(WOLFSSL_BIGNUM* bn, mp_int* mpi); int SetIndividualExternal(WOLFSSL_BIGNUM** bn, mp_int* mpi); + int oid2nid(word32 oid, int grp); + word32 nid2oid(int nid, int grp); #endif #if defined(WOLFSSL_QT) @@ -16602,7 +16604,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) int wolfSSL_add_all_algorithms(void) { WOLFSSL_ENTER("wolfSSL_add_all_algorithms"); - if (initRefCount != 0 || wolfSSL_Init() == WOLFSSL_SUCCESS) + if (wolfSSL_Init() == WOLFSSL_SUCCESS) return WOLFSSL_SUCCESS; else return WOLFSSL_FATAL_ERROR; @@ -28826,17 +28828,17 @@ int wolfSSL_X509_PUBKEY_set(WOLFSSL_X509_PUBKEY **x, WOLFSSL_EVP_PKEY *key) switch (key->type) { #ifndef NO_RSA case EVP_PKEY_RSA: - pk->algor->algorithm= wolfSSL_OBJ_nid2obj(NID_rsaEncryption); + pk->algor->algorithm= wolfSSL_OBJ_nid2obj(RSAk); break; #endif #ifndef NO_DSA case EVP_PKEY_DSA: - pk->algor->algorithm = wolfSSL_OBJ_nid2obj(NID_dsa); + pk->algor->algorithm = wolfSSL_OBJ_nid2obj(DSAk); break; #endif #ifdef HAVE_ECC case EVP_PKEY_EC: - pk->algor->algorithm = wolfSSL_OBJ_nid2obj(NID_X9_62_id_ecPublicKey); + pk->algor->algorithm = wolfSSL_OBJ_nid2obj(ECDSAk); break; #endif default: @@ -31434,103 +31436,106 @@ const WOLFSSL_ObjectInfo wolfssl_object_info[] = { /* oidSigType */ #ifndef NO_DSA #ifndef NO_SHA - { NID_dsaWithSHA1, CTC_SHAwDSA, oidSigType, "DSA-SHA1", "dsaWithSHA1"}, - { NID_dsa_with_SHA256, CTC_SHA256wDSA, oidSigType, "dsa_with_SHA256", + { CTC_SHAwDSA, CTC_SHAwDSA, oidSigType, "DSA-SHA1", "dsaWithSHA1"}, + { CTC_SHA256wDSA, CTC_SHA256wDSA, oidSigType, "dsa_with_SHA256", "dsa_with_SHA256"}, #endif #endif /* NO_DSA */ #ifndef NO_RSA #ifdef WOLFSSL_MD2 - { NID_md2WithRSAEncryption, CTC_MD2wRSA, oidSigType, "RSA-MD2", + { CTC_MD2wRSA, CTC_MD2wRSA, oidSigType, "RSA-MD2", "md2WithRSAEncryption"}, #endif #ifndef NO_MD5 - { NID_md5WithRSAEncryption, CTC_MD5wRSA, oidSigType, "RSA-MD5", + { CTC_MD5wRSA, CTC_MD5wRSA, oidSigType, "RSA-MD5", "md5WithRSAEncryption"}, #endif #ifndef NO_SHA - { NID_sha1WithRSAEncryption, CTC_SHAwRSA, oidSigType, "RSA-SHA1", + { CTC_SHAwRSA, CTC_SHAwRSA, oidSigType, "RSA-SHA1", "sha1WithRSAEncryption"}, #endif #ifdef WOLFSSL_SHA224 - { NID_sha224WithRSAEncryption, CTC_SHA224wRSA, oidSigType, "RSA-SHA224", + { CTC_SHA224wRSA, CTC_SHA224wRSA, oidSigType, "RSA-SHA224", "sha224WithRSAEncryption"}, #endif #ifndef NO_SHA256 - { NID_sha256WithRSAEncryption, CTC_SHA256wRSA, oidSigType, "RSA-SHA256", + { CTC_SHA256wRSA, CTC_SHA256wRSA, oidSigType, "RSA-SHA256", "sha256WithRSAEncryption"}, #endif #ifdef WOLFSSL_SHA384 - { NID_sha384WithRSAEncryption, CTC_SHA384wRSA, oidSigType, "RSA-SHA384", + { CTC_SHA384wRSA, CTC_SHA384wRSA, oidSigType, "RSA-SHA384", "sha384WithRSAEncryption"}, #endif #ifdef WOLFSSL_SHA512 - { NID_sha512WithRSAEncryption, CTC_SHA512wRSA, oidSigType, "RSA-SHA512", + { CTC_SHA512wRSA, CTC_SHA512wRSA, oidSigType, "RSA-SHA512", "sha512WithRSAEncryption"}, #endif #ifdef WOLFSSL_SHA3 #ifndef WOLFSSL_NOSHA3_224 - { NID_RSA_SHA3_224, CTC_SHA3_224wRSA, oidSigType, "RSA-SHA3-224", + { CTC_SHA3_224wRSA, CTC_SHA3_224wRSA, oidSigType, "RSA-SHA3-224", "sha3-224WithRSAEncryption"}, #endif #ifndef WOLFSSL_NOSHA3_256 - { NID_RSA_SHA3_256, CTC_SHA3_256wRSA, oidSigType, "RSA-SHA3-256", + { CTC_SHA3_256wRSA, CTC_SHA3_256wRSA, oidSigType, "RSA-SHA3-256", "sha3-256WithRSAEncryption"}, #endif #ifndef WOLFSSL_NOSHA3_384 - { NID_RSA_SHA3_384, CTC_SHA3_384wRSA, oidSigType, "RSA-SHA3-384", + { CTC_SHA3_384wRSA, CTC_SHA3_384wRSA, oidSigType, "RSA-SHA3-384", "sha3-384WithRSAEncryption"}, #endif #ifndef WOLFSSL_NOSHA3_512 - { NID_RSA_SHA3_512, CTC_SHA3_512wRSA, oidSigType, "RSA-SHA3-512", + { CTC_SHA3_512wRSA, CTC_SHA3_512wRSA, oidSigType, "RSA-SHA3-512", "sha3-512WithRSAEncryption"}, #endif #endif #endif /* NO_RSA */ #ifdef HAVE_ECC #ifndef NO_SHA - { NID_ecdsa_with_SHA1, CTC_SHAwECDSA, oidSigType, "ecdsa-with-SHA1", "shaWithECDSA"}, + { CTC_SHAwECDSA, CTC_SHAwECDSA, oidSigType, "ecdsa-with-SHA1", "shaWithECDSA"}, #endif #ifdef WOLFSSL_SHA224 - { NID_ecdsa_with_SHA224, CTC_SHA224wECDSA, oidSigType, "ecdsa-with-SHA224","sha224WithECDSA"}, + { CTC_SHA224wECDSA, CTC_SHA224wECDSA, oidSigType, "ecdsa-with-SHA224","sha224WithECDSA"}, #endif #ifndef NO_SHA256 - { NID_ecdsa_with_SHA256, CTC_SHA256wECDSA, oidSigType, "ecdsa-with-SHA256","sha256WithECDSA"}, + { CTC_SHA256wECDSA, CTC_SHA256wECDSA, oidSigType, "ecdsa-with-SHA256","sha256WithECDSA"}, #endif #ifdef WOLFSSL_SHA384 - { NID_ecdsa_with_SHA384, CTC_SHA384wECDSA, oidSigType, "ecdsa-with-SHA384","sha384WithECDSA"}, + { CTC_SHA384wECDSA, CTC_SHA384wECDSA, oidSigType, "ecdsa-with-SHA384","sha384WithECDSA"}, #endif #ifdef WOLFSSL_SHA512 - { NID_ecdsa_with_SHA512, CTC_SHA512wECDSA, oidSigType, "ecdsa-with-SHA512","sha512WithECDSA"}, + { CTC_SHA512wECDSA, CTC_SHA512wECDSA, oidSigType, "ecdsa-with-SHA512","sha512WithECDSA"}, #endif #ifdef WOLFSSL_SHA3 #ifndef WOLFSSL_NOSHA3_224 - { NID_ecdsa_with_SHA3_224, CTC_SHA3_224wECDSA, oidSigType, "id-ecdsa-with-SHA3-224", - "ecdsa_with_SHA3-224"}, + { CTC_SHA3_224wECDSA, CTC_SHA3_224wECDSA, oidSigType, "ecdsa-with-SHA3-224", + "sha3-224WithECDSA"}, #endif #ifndef WOLFSSL_NOSHA3_256 - { NID_ecdsa_with_SHA3_256, CTC_SHA3_256wECDSA, oidSigType, "id-ecdsa-with-SHA3-256", - "ecdsa_with_SHA3-256"}, + { CTC_SHA3_256wECDSA, CTC_SHA3_256wECDSA, oidSigType, "ecdsa-with-SHA3-256", + "sha3-256WithECDSA"}, #endif #ifndef WOLFSSL_NOSHA3_384 - { NID_ecdsa_with_SHA3_384, CTC_SHA3_384wECDSA, oidSigType, "id-ecdsa-with-SHA3-384", - "ecdsa_with_SHA3-384"}, + { CTC_SHA3_384wECDSA, CTC_SHA3_384wECDSA, oidSigType, "ecdsa-with-SHA3-384", + "sha3-384WithECDSA"}, #endif #ifndef WOLFSSL_NOSHA3_512 - { NID_ecdsa_with_SHA3_512, CTC_SHA3_512wECDSA, oidSigType, "id-ecdsa-with-SHA3-512", - "ecdsa_with_SHA3-512"}, + { CTC_SHA3_512wECDSA, CTC_SHA3_512wECDSA, oidSigType, "ecdsa-with-SHA3-512", + "sha3-512WithECDSA"}, #endif #endif #endif /* HAVE_ECC */ /* oidKeyType */ #ifndef NO_DSA + { DSAk, DSAk, oidKeyType, "DSA", "dsaEncryption"}, { NID_dsa, DSAk, oidKeyType, "DSA", "dsaEncryption"}, #endif /* NO_DSA */ #ifndef NO_RSA + { RSAk, RSAk, oidKeyType, "rsaEncryption", "rsaEncryption"}, { NID_rsaEncryption, RSAk, oidKeyType, "rsaEncryption", "rsaEncryption"}, #endif /* NO_RSA */ #ifdef HAVE_ECC + { ECDSAk, ECDSAk, oidKeyType, "ECDSA", "ecdsaEncryption"}, { NID_X9_62_id_ecPublicKey, ECDSAk, oidKeyType, "id-ecPublicKey", "id-ecPublicKey"}, #endif /* HAVE_ECC */ @@ -44240,7 +44245,6 @@ err: WOLFSSL_ASN1_OBJECT* arg_obj) { word32 oidSz = 0; - int nid = 0; const byte* oid; word32 type = 0; WOLFSSL_ASN1_OBJECT* obj = arg_obj; @@ -44255,7 +44259,6 @@ err: for (i = 0; i < (int)WOLFSSL_OBJECT_INFO_SZ; i++) { if (wolfssl_object_info[i].nid == id) { - nid = id; id = wolfssl_object_info[i].id; sName = wolfssl_object_info[i].sName; type = wolfssl_object_info[i].type; @@ -44295,7 +44298,6 @@ err: return NULL; } } - obj->nid = nid; obj->type = id; obj->grp = type; @@ -50520,56 +50522,54 @@ word32 nid2oid(int nid, int grp) case oidSigType: switch (nid) { #ifndef NO_DSA - case NID_dsaWithSHA1: + case CTC_SHAwDSA: return CTC_SHAwDSA; - case NID_dsa_with_SHA256: - return CTC_SHA256wDSA; #endif /* NO_DSA */ #ifndef NO_RSA - case NID_md2WithRSAEncryption: + case CTC_MD2wRSA: return CTC_MD2wRSA; - case NID_md5WithRSAEncryption: + case CTC_MD5wRSA: return CTC_MD5wRSA; - case NID_sha1WithRSAEncryption: + case CTC_SHAwRSA: return CTC_SHAwRSA; - case NID_sha224WithRSAEncryption: + case CTC_SHA224wRSA: return CTC_SHA224wRSA; - case NID_sha256WithRSAEncryption: + case CTC_SHA256wRSA: return CTC_SHA256wRSA; - case NID_sha384WithRSAEncryption: + case CTC_SHA384wRSA: return CTC_SHA384wRSA; - case NID_sha512WithRSAEncryption: + case CTC_SHA512wRSA: return CTC_SHA512wRSA; #ifdef WOLFSSL_SHA3 - case NID_RSA_SHA3_224: + case CTC_SHA3_224wRSA: return CTC_SHA3_224wRSA; - case NID_RSA_SHA3_256: + case CTC_SHA3_256wRSA: return CTC_SHA3_256wRSA; - case NID_RSA_SHA3_384: + case CTC_SHA3_384wRSA: return CTC_SHA3_384wRSA; - case NID_RSA_SHA3_512: + case CTC_SHA3_512wRSA: return CTC_SHA3_512wRSA; #endif #endif /* NO_RSA */ #ifdef HAVE_ECC - case NID_ecdsa_with_SHA1: + case CTC_SHAwECDSA: return CTC_SHAwECDSA; - case NID_ecdsa_with_SHA224: + case CTC_SHA224wECDSA: return CTC_SHA224wECDSA; - case NID_ecdsa_with_SHA256: + case CTC_SHA256wECDSA: return CTC_SHA256wECDSA; - case NID_ecdsa_with_SHA384: + case CTC_SHA384wECDSA: return CTC_SHA384wECDSA; - case NID_ecdsa_with_SHA512: + case CTC_SHA512wECDSA: return CTC_SHA512wECDSA; #ifdef WOLFSSL_SHA3 - case NID_ecdsa_with_SHA3_224: + case CTC_SHA3_224wECDSA: return CTC_SHA3_224wECDSA; - case NID_ecdsa_with_SHA3_256: + case CTC_SHA3_256wECDSA: return CTC_SHA3_256wECDSA; - case NID_ecdsa_with_SHA3_384: + case CTC_SHA3_384wECDSA: return CTC_SHA3_384wECDSA; - case NID_ecdsa_with_SHA3_512: + case CTC_SHA3_512wECDSA: return CTC_SHA3_512wECDSA; #endif #endif /* HAVE_ECC */ @@ -50580,15 +50580,15 @@ word32 nid2oid(int nid, int grp) case oidKeyType: switch (nid) { #ifndef NO_DSA - case NID_dsa: + case DSAk: return DSAk; #endif /* NO_DSA */ #ifndef NO_RSA - case NID_rsaEncryption: + case RSAk: return RSAk; #endif /* NO_RSA */ #ifdef HAVE_ECC - case NID_X9_62_id_ecPublicKey: + case ECDSAk: return ECDSAk; #endif /* HAVE_ECC */ } @@ -50873,56 +50873,56 @@ int oid2nid(word32 oid, int grp) switch (oid) { #ifndef NO_DSA case CTC_SHAwDSA: - return NID_dsaWithSHA1; + return CTC_SHAwDSA; case CTC_SHA256wDSA: - return NID_dsa_with_SHA256; + return CTC_SHA256wDSA; #endif /* NO_DSA */ #ifndef NO_RSA case CTC_MD2wRSA: - return NID_md2WithRSAEncryption; + return CTC_MD2wRSA; case CTC_MD5wRSA: - return NID_md5WithRSAEncryption; + return CTC_MD5wRSA; case CTC_SHAwRSA: - return NID_sha1WithRSAEncryption; + return CTC_SHAwRSA; case CTC_SHA224wRSA: - return NID_sha224WithRSAEncryption; + return CTC_SHA224wRSA; case CTC_SHA256wRSA: - return NID_sha256WithRSAEncryption; + return CTC_SHA256wRSA; case CTC_SHA384wRSA: - return NID_sha384WithRSAEncryption; + return CTC_SHA384wRSA; case CTC_SHA512wRSA: - return NID_sha512WithRSAEncryption; + return CTC_SHA512wRSA; #ifdef WOLFSSL_SHA3 case CTC_SHA3_224wRSA: - return NID_RSA_SHA3_224; + return CTC_SHA3_224wRSA; case CTC_SHA3_256wRSA: - return NID_RSA_SHA3_256; + return CTC_SHA3_256wRSA; case CTC_SHA3_384wRSA: - return NID_RSA_SHA3_384; + return CTC_SHA3_384wRSA; case CTC_SHA3_512wRSA: - return NID_RSA_SHA3_512; + return CTC_SHA3_512wRSA; #endif #endif /* NO_RSA */ #ifdef HAVE_ECC case CTC_SHAwECDSA: - return NID_ecdsa_with_SHA1; + return CTC_SHAwECDSA; case CTC_SHA224wECDSA: - return NID_ecdsa_with_SHA224; + return CTC_SHA224wECDSA; case CTC_SHA256wECDSA: - return NID_ecdsa_with_SHA256; + return CTC_SHA256wECDSA; case CTC_SHA384wECDSA: - return NID_ecdsa_with_SHA384; + return CTC_SHA384wECDSA; case CTC_SHA512wECDSA: - return NID_ecdsa_with_SHA512; + return CTC_SHA512wECDSA; #ifdef WOLFSSL_SHA3 case CTC_SHA3_224wECDSA: - return NID_ecdsa_with_SHA3_224; + return CTC_SHA3_224wECDSA; case CTC_SHA3_256wECDSA: - return NID_ecdsa_with_SHA3_256; + return CTC_SHA3_256wECDSA; case CTC_SHA3_384wECDSA: - return NID_ecdsa_with_SHA3_384; + return CTC_SHA3_384wECDSA; case CTC_SHA3_512wECDSA: - return NID_ecdsa_with_SHA3_512; + return CTC_SHA3_512wECDSA; #endif #endif /* HAVE_ECC */ } @@ -50933,15 +50933,15 @@ int oid2nid(word32 oid, int grp) switch (oid) { #ifndef NO_DSA case DSAk: - return NID_dsa; + return DSAk; #endif /* NO_DSA */ #ifndef NO_RSA case RSAk: - return NID_rsaEncryption; + return RSAk; #endif /* NO_RSA */ #ifdef HAVE_ECC case ECDSAk: - return NID_X9_62_id_ecPublicKey; + return ECDSAk; #endif /* HAVE_ECC */ } break; diff --git a/tests/api.c b/tests/api.c index 21014b0df..727cf4948 100644 --- a/tests/api.c +++ b/tests/api.c @@ -33994,11 +33994,6 @@ static void test_wolfSSL_X509_STORE_load_locations(void) AssertIntEQ(X509_STORE_load_locations(store, client_pem_file, NULL), WOLFSSL_SUCCESS); AssertIntEQ(X509_STORE_load_locations(store, NULL, certs_path), WOLFSSL_SUCCESS); -#if defined(OPENSSL_EXTRA) || defined(DEBUG_WOLFSSL_VERBOSE) - /* Clear nodes */ - ERR_clear_error(); -#endif - SSL_CTX_free(ctx); printf(resultFmt, passed); #endif @@ -36055,7 +36050,7 @@ static void test_wolfSSL_X509_ALGOR_get0(void) AssertNotNull(ppval); AssertIntNE(pptype, 0); /* Make sure NID of X509_ALGOR is Sha256 with RSA */ - AssertIntEQ(OBJ_obj2nid(obj), NID_sha256WithRSAEncryption); + AssertIntEQ(OBJ_obj2nid(obj), CTC_SHA256wRSA); X509_free(x509); @@ -36246,7 +36241,7 @@ static void test_wolfSSL_X509_PUBKEY(void) AssertNotNull(pubKey); AssertIntGT(ppklen, 0); - AssertIntEQ(OBJ_obj2nid(obj), NID_rsaEncryption); + AssertIntEQ(OBJ_obj2nid(obj), RSAk); AssertNotNull(evpKey = X509_PUBKEY_get(pubKey)); AssertNotNull(pubKey2 = X509_PUBKEY_new()); @@ -40865,10 +40860,13 @@ static void test_wolfSSL_OpenSSL_add_all_algorithms(void){ printf(testingFmt, "wolfSSL_OpenSSL_add_all_algorithms()"); AssertIntEQ(wolfSSL_add_all_algorithms(),WOLFSSL_SUCCESS); + wolfSSL_Cleanup(); AssertIntEQ(wolfSSL_OpenSSL_add_all_algorithms_noconf(),WOLFSSL_SUCCESS); + wolfSSL_Cleanup(); AssertIntEQ(wolfSSL_OpenSSL_add_all_algorithms_conf(),WOLFSSL_SUCCESS); + wolfSSL_Cleanup(); printf(resultFmt, passed); #endif @@ -45677,7 +45675,7 @@ static void test_X509_get_signature_nid(void) AssertIntEQ(X509_get_signature_nid(NULL), 0); AssertNotNull(x509 = wolfSSL_X509_load_certificate_file(svrCertFile, SSL_FILETYPE_PEM)); - AssertIntEQ(X509_get_signature_nid(x509), NID_sha256WithRSAEncryption); + AssertIntEQ(X509_get_signature_nid(x509), CTC_SHA256wRSA); X509_free(x509); printf(resultFmt, passed); diff --git a/wolfssl/internal.h b/wolfssl/internal.h index 85cf2af5b..14ca12d32 100644 --- a/wolfssl/internal.h +++ b/wolfssl/internal.h @@ -4964,10 +4964,6 @@ WOLFSSL_LOCAL void wolfSSL_sk_BY_DIR_entry_free(WOLF_STACK_OF(wolfSSL_BY_DIR_ent WOLFSSL_LOCAL int wolfSSL_sk_BY_DIR_entry_push(WOLF_STACK_OF(wolfSSL_BY_DIR_entry)* sk, WOLFSSL_BY_DIR_entry* in); #endif /* OPENSSL_ALL && !NO_FILESYSTEM && !NO_WOLFSSL_DIR */ -#if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL) -WOLFSSL_LOCAL int oid2nid(word32 oid, int grp); -WOLFSSL_LOCAL word32 nid2oid(int nid, int grp); -#endif #ifdef __cplusplus } /* extern "C" */ diff --git a/wolfssl/openssl/ec.h b/wolfssl/openssl/ec.h index 253f808d2..cfc3bdb7f 100644 --- a/wolfssl/openssl/ec.h +++ b/wolfssl/openssl/ec.h @@ -45,7 +45,7 @@ enum { NID_X9_62_prime192v3 = 411, NID_X9_62_prime239v1 = 412, NID_X9_62_prime239v2 = 413, - NID_X9_62_prime239v3 = 418, /* Previous value conflicted with AES128CBCb */ + NID_X9_62_prime239v3 = 414, NID_X9_62_prime256v1 = 415, NID_secp112r1 = 704, NID_secp112r2 = 705, diff --git a/wolfssl/openssl/evp.h b/wolfssl/openssl/evp.h index 985e00b16..2a2e7ed7a 100644 --- a/wolfssl/openssl/evp.h +++ b/wolfssl/openssl/evp.h @@ -237,10 +237,10 @@ enum { AES_192_GCM_TYPE = 22, AES_256_GCM_TYPE = 23, NID_sha1 = 64, - NID_sha224 = 675, + NID_sha224 = 65, NID_md2 = 77, NID_md4 = 257, - NID_md5 = 40, + NID_md5 = 4, NID_hmac = 855, NID_cmac = 894, NID_dhKeyAgreement= 28, @@ -265,8 +265,7 @@ enum { enum { NID_md5WithRSA = 104, - NID_md2WithRSAEncryption = 9, - NID_md5WithRSAEncryption = 99, + NID_md5WithRSAEncryption = 8, NID_dsaWithSHA1 = 113, NID_dsaWithSHA1_2 = 70, NID_sha1WithRSA = 115, @@ -275,19 +274,11 @@ enum { NID_sha256WithRSAEncryption = 668, NID_sha384WithRSAEncryption = 669, NID_sha512WithRSAEncryption = 670, - NID_RSA_SHA3_224 = 1116, - NID_RSA_SHA3_256 = 1117, - NID_RSA_SHA3_384 = 1118, - NID_RSA_SHA3_512 = 1119, NID_ecdsa_with_SHA1 = 416, NID_ecdsa_with_SHA224 = 793, NID_ecdsa_with_SHA256 = 794, NID_ecdsa_with_SHA384 = 795, NID_ecdsa_with_SHA512 = 796, - NID_ecdsa_with_SHA3_224 = 1112, - NID_ecdsa_with_SHA3_256 = 1113, - NID_ecdsa_with_SHA3_384 = 1114, - NID_ecdsa_with_SHA3_512 = 1115, NID_dsa_with_SHA224 = 802, NID_dsa_with_SHA256 = 803, NID_sha3_224 = 1096, diff --git a/wolfssl/wolfcrypt/asn.h b/wolfssl/wolfcrypt/asn.h index b7b241a85..7713abcdc 100644 --- a/wolfssl/wolfcrypt/asn.h +++ b/wolfssl/wolfcrypt/asn.h @@ -705,11 +705,10 @@ enum NID_policy_constraints = 150, NID_inhibit_any_policy = 168, /* 2.5.29.54 */ NID_tlsfeature = 1020, /* id-pe 24 */ + NID_commonName = 0x03, /* matches ASN_COMMON_NAME in asn.h */ NID_buildingName = 1494, - NID_commonName = 14, /* CN Changed to not conflict - * with PBE_SHA1_DES3 */ NID_surname = 0x04, /* SN */ NID_serialNumber = 0x05, /* serialNumber */ NID_countryName = 0x06, /* C */