42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
|
From aa0ad2011d3e7ad8a611da274ef7d9c7706e289b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Matt Caswell <matt@openssl.org>
|
||
|
|
Date: Wed, 11 Nov 2020 15:19:34 +0000
|
||
|
|
Subject: [PATCH 01/31] DirectoryString is a CHOICE type and therefore uses
|
||
|
|
explicit tagging
|
||
|
|
|
||
|
|
EDIPartyName has 2 fields that use a DirectoryString. However they were
|
||
|
|
marked as implicit tagging - which is not correct for a CHOICE type.
|
||
|
|
|
||
|
|
Additionally the partyName field was marked as Optional when, according to
|
||
|
|
RFC5280 it is not.
|
||
|
|
|
||
|
|
Many thanks to github user @filipnavara for reporting this issue. Also to
|
||
|
|
David Benjamin from Google who independently identified and reported it.
|
||
|
|
|
||
|
|
Fixes #6859
|
||
|
|
|
||
|
|
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
|
||
|
|
---
|
||
|
|
crypto/x509v3/v3_genn.c | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/crypto/x509v3/v3_genn.c b/crypto/x509v3/v3_genn.c
|
||
|
|
index 23e3bc4..b483f35 100644
|
||
|
|
--- a/crypto/x509v3/v3_genn.c
|
||
|
|
+++ b/crypto/x509v3/v3_genn.c
|
||
|
|
@@ -22,8 +22,9 @@ ASN1_SEQUENCE(OTHERNAME) = {
|
||
|
|
IMPLEMENT_ASN1_FUNCTIONS(OTHERNAME)
|
||
|
|
|
||
|
|
ASN1_SEQUENCE(EDIPARTYNAME) = {
|
||
|
|
- ASN1_IMP_OPT(EDIPARTYNAME, nameAssigner, DIRECTORYSTRING, 0),
|
||
|
|
- ASN1_IMP_OPT(EDIPARTYNAME, partyName, DIRECTORYSTRING, 1)
|
||
|
|
+ /* DirectoryString is a CHOICE type so use explicit tagging */
|
||
|
|
+ ASN1_EXP_OPT(EDIPARTYNAME, nameAssigner, DIRECTORYSTRING, 0),
|
||
|
|
+ ASN1_EXP(EDIPARTYNAME, partyName, DIRECTORYSTRING, 1)
|
||
|
|
} ASN1_SEQUENCE_END(EDIPARTYNAME)
|
||
|
|
|
||
|
|
IMPLEMENT_ASN1_FUNCTIONS(EDIPARTYNAME)
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|