Merge pull request #6204 from JacobBarthelmeh/name

Fix for value of givenName and name
This commit is contained in:
Sean Parkinson
2023-03-20 10:59:47 +10:00
committed by GitHub
2 changed files with 26 additions and 2 deletions

View File

@ -30728,6 +30728,30 @@ static int test_wolfSSL_X509_NAME(void)
AssertIntGT((sz = i2d_X509_NAME((X509_NAME*)b, &tmp)), 0);
XFREE(tmp, NULL, DYNAMIC_TYPE_OPENSSL);
#ifdef WOLFSSL_CERT_NAME_ALL
/* test for givenName and name */
{
WOLFSSL_X509_NAME_ENTRY* entry;
const byte gName[] = "test-given-name";
const byte name[] = "test-name";
entry = wolfSSL_X509_NAME_ENTRY_create_by_NID(NULL, NID_givenName,
ASN_UTF8STRING, gName, sizeof(gName));
AssertNotNull(entry);
wolfSSL_X509_NAME_add_entry((X509_NAME*)b, entry, -1, 0);
wolfSSL_X509_NAME_ENTRY_free(entry);
entry = wolfSSL_X509_NAME_ENTRY_create_by_NID(NULL, NID_name,
ASN_UTF8STRING, name, sizeof(name));
AssertNotNull(entry);
wolfSSL_X509_NAME_add_entry((X509_NAME*)b, entry, -1, 0);
wolfSSL_X509_NAME_ENTRY_free(entry);
tmp = NULL;
AssertIntGT((sz = i2d_X509_NAME((X509_NAME*)b, &tmp)), 0);
XFREE(tmp, NULL, DYNAMIC_TYPE_OPENSSL);
}
#endif
AssertNotNull(b = X509_NAME_dup((X509_NAME*)a));
#ifndef OPENSSL_EXTRA_X509_SMALL

View File

@ -675,8 +675,8 @@ enum DN_Tags {
ASN_POSTAL_CODE = 0x11, /* postalCode */
ASN_USER_ID = 0x12, /* UserID */
#ifdef WOLFSSL_CERT_NAME_ALL
ASN_NAME = 0x2a, /* name */
ASN_GIVEN_NAME = 0x29, /* GN */
ASN_NAME = 0x29, /* name */
ASN_GIVEN_NAME = 0x2a, /* GN */
ASN_INITIALS = 0x2b, /* initials */
ASN_DNQUALIFIER = 0x2e, /* dnQualifier */
#endif /* WOLFSSL_CERT_NAME_ALL */