[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  e8d542121b10158c1bdd5fbe02e0d17c59470cae (commit)
      from  757264207ad8650a89ea903d48ad89f61d56ea9c (commit)


- Log -----------------------------------------------------------------
commit e8d542121b10158c1bdd5fbe02e0d17c59470cae
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)

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

Summary of changes:
 crypto/asn1/tbl_standard.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/asn1/tbl_standard.h b/crypto/asn1/tbl_standard.h
index 7fb04f8..a5a5bc8 100644
--- a/crypto/asn1/tbl_standard.h
+++ b/crypto/asn1/tbl_standard.h
@@ -50,6 +50,7 @@ static const ASN1_STRING_TABLE tbl_standard[] = {
     {NID_ms_csp_name, -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK},
     {NID_rfc822Mailbox, 1, ub_rfc822_mailbox, B_ASN1_IA5STRING,
      STABLE_NO_MASK},
+    {NID_jurisdictionCountryName, 2, 2, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
     {NID_INN, 1, 12, B_ASN1_NUMERICSTRING, STABLE_NO_MASK},
     {NID_OGRN, 1, 13, B_ASN1_NUMERICSTRING, STABLE_NO_MASK},
     {NID_SNILS, 1, 11, B_ASN1_NUMERICSTRING, STABLE_NO_MASK}