[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  f60e35d01e8b0116c53575774dbf26dcd2d2311d (commit)
      from  a7a7e6e3a647688be389b7d9c977b7fc74142fca (commit)


- Log -----------------------------------------------------------------
commit f60e35d01e8b0116c53575774dbf26dcd2d2311d
Author: Michael Richardson <mcr at sandelman.ca>
Date:   Wed Apr 14 11:44:41 2021 -0400

    reduce surprise in choice of CASE/String/STRING by allowing all inputs to be in any case
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14877)

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

Summary of changes:
 crypto/asn1/asn1_gen.c           | 3 ++-
 doc/man3/ASN1_generate_nconf.pod | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index 3c003ee103..8c3a2bd970 100644
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -10,6 +10,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/asn1.h>
 #include <openssl/x509v3.h>
+#include "e_os.h" /* strncasecmp() */
 
 #define ASN1_GEN_FLAG           0x10000
 #define ASN1_GEN_FLAG_IMP       (ASN1_GEN_FLAG|1)
@@ -564,7 +565,7 @@ static int asn1_str2tag(const char *tagstr, int len)
 
     tntmp = tnst;
     for (i = 0; i < OSSL_NELEM(tnst); i++, tntmp++) {
-        if ((len == tntmp->len) && (strncmp(tntmp->strnam, tagstr, len) == 0))
+        if ((len == tntmp->len) && (strncasecmp(tntmp->strnam, tagstr, len) == 0))
             return tntmp->tag;
     }
 
diff --git a/doc/man3/ASN1_generate_nconf.pod b/doc/man3/ASN1_generate_nconf.pod
index bf22e3624c..256ed9f99c 100644
--- a/doc/man3/ASN1_generate_nconf.pod
+++ b/doc/man3/ASN1_generate_nconf.pod
@@ -42,8 +42,9 @@ I<value> and I<modifier> are explained below.
 
 =head2 Supported Types
 
-The supported types are listed below. Unless otherwise specified
-only the B<ASCII> format is permissible.
+The supported types are listed below.
+Case is not significant in the type names.
+Unless otherwise specified only the B<ASCII> format is permissible.
 
 =over 4