[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Richard Levitte]

The branch OpenSSL_1_0_2-stable has been updated
       via  fb2345a1aeecb51a2426a5890102f402dceee618 (commit)
      from  60a70a510750f06007f92c22f5d130a1ce3150d2 (commit)


- Log -----------------------------------------------------------------
commit fb2345a1aeecb51a2426a5890102f402dceee618
Author: Alex Gaynor <alex.gaynor at gmail.com>
Date:   Sun Apr 23 21:09:12 2017 -0400

    Annotate ASN.1 attributes of the jurisdictionCountryName NID
    
    EV Guidelines section 9.2.5 says jurisdictionCountryName follows the
    same ASN.1 encoding rules as countryName.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3284)
    (cherry picked from commit 52c0c4d13e8220f19eb2b205dc0c30508c4a51a9)

-----------------------------------------------------------------------

Summary of changes:
 crypto/asn1/a_strnid.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/asn1/a_strnid.c b/crypto/asn1/a_strnid.c
index 2d2303d..99ffe73 100644
--- a/crypto/asn1/a_strnid.c
+++ b/crypto/asn1/a_strnid.c
@@ -192,7 +192,8 @@ static const ASN1_STRING_TABLE tbl_standard[] = {
     {NID_name, 1, ub_name, DIRSTRING_TYPE, 0},
     {NID_dnQualifier, -1, -1, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
     {NID_domainComponent, 1, -1, B_ASN1_IA5STRING, STABLE_NO_MASK},
-    {NID_ms_csp_name, -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK}
+    {NID_ms_csp_name, -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK},
+    {NID_jurisdictionCountryName, 2, 2, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK}
 };
 
 static int sk_table_cmp(const ASN1_STRING_TABLE *const *a,