diff options
| author | David Benjamin <davidben@google.com> | 2023-03-10 17:23:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-10 17:23:33 +0000 |
| commit | cbc8883f58d922275eebb1e47e25c033e03209c7 (patch) | |
| tree | 5a0e2fc4ce090106fc122f6c2a5cc97fe712b114 | |
| parent | aa103dcdc8519d1686fe74ebcb9a015af74a7109 (diff) | |
| parent | 6ee8eaf2b321ebd4ac0720e470965eb87f2f6b63 (diff) | |
| download | boringssl-cbc8883f58d922275eebb1e47e25c033e03209c7.tar.gz | |
Fix the type of x400Address in GENERAL_NAME am: ab351f4a83 am: 6ee8eaf2b3
Original change: https://android-review.googlesource.com/c/platform/external/boringssl/+/2480395
Change-Id: I8c3dd42000720c81711253c28b2c1f348428ddce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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; |