diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-11 07:06:27 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-11 07:06:27 +0000 |
| commit | 55ecbde9023213fbba500002224cbbd681314ca6 (patch) | |
| tree | dfe7f68d956abf2fc6212987fb7caf48ae2c27e1 | |
| parent | efd8df3d6c6401edcf83d9d2dd66c90712affc5f (diff) | |
| parent | 720dbd6e353eb541dd5ea34d9cbcb3be83f51dfb (diff) | |
| download | boringssl-55ecbde9023213fbba500002224cbbd681314ca6.tar.gz | |
Snap for 9729681 from 720dbd6e353eb541dd5ea34d9cbcb3be83f51dfb to udc-d1-release
Change-Id: I5e62da795641495a8cd8d7166a656fdb1b57f0a8
| -rw-r--r-- | src/crypto/x509/x509_test.cc | 2 | ||||
| -rw-r--r-- | src/crypto/x509v3/v3_genn.c | 2 | ||||
| -rw-r--r-- | src/include/openssl/x509v3.h | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/crypto/x509/x509_test.cc b/src/crypto/x509/x509_test.cc index 5e089d4b..9f7bce8b 100644 --- a/src/crypto/x509/x509_test.cc +++ b/src/crypto/x509/x509_test.cc @@ -3497,6 +3497,8 @@ TEST(X509Test, GeneralName) { {0x82, 0x01, 0x61}, // [2 PRIMITIVE] { "b" } {0x82, 0x01, 0x62}, + // [3] {} + {0xa3, 0x00}, // [4] { // SEQUENCE { // SET { diff --git a/src/crypto/x509v3/v3_genn.c b/src/crypto/x509v3/v3_genn.c index fef02044..2153a1d0 100644 --- a/src/crypto/x509v3/v3_genn.c +++ b/src/crypto/x509v3/v3_genn.c @@ -130,7 +130,7 @@ int GENERAL_NAME_cmp(const GENERAL_NAME *a, const GENERAL_NAME *b) { switch (a->type) { case GEN_X400: - return ASN1_TYPE_cmp(a->d.x400Address, b->d.x400Address); + return ASN1_STRING_cmp(a->d.x400Address, b->d.x400Address); case GEN_EDIPARTY: return edipartyname_cmp(a->d.ediPartyName, b->d.ediPartyName); diff --git a/src/include/openssl/x509v3.h b/src/include/openssl/x509v3.h index 9db57e6f..56e44c81 100644 --- a/src/include/openssl/x509v3.h +++ b/src/include/openssl/x509v3.h @@ -186,7 +186,7 @@ typedef struct GENERAL_NAME_st { OTHERNAME *otherName; // otherName ASN1_IA5STRING *rfc822Name; ASN1_IA5STRING *dNSName; - ASN1_TYPE *x400Address; + ASN1_STRING *x400Address; X509_NAME *directoryName; EDIPARTYNAME *ediPartyName; ASN1_IA5STRING *uniformResourceIdentifier; @@ -198,7 +198,6 @@ typedef struct GENERAL_NAME_st { X509_NAME *dirn; // dirn ASN1_IA5STRING *ia5; // rfc822Name, dNSName, uniformResourceIdentifier ASN1_OBJECT *rid; // registeredID - ASN1_TYPE *other; // x400Address } d; } GENERAL_NAME; |