[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  648b53b88ea55b4c2f2c8c57d041075731db5f95 (commit)
      from  8dc57d76c99dffd91e88622e2ca2b4bd7de5e1aa (commit)


- Log -----------------------------------------------------------------
commit 648b53b88ea55b4c2f2c8c57d041075731db5f95
Author: Michael Osipov <michael.osipov at siemens.com>
Date:   Fri Sep 27 09:04:53 2019 +0200

    Fix long name of some Microsoft objects
    
    CLA: trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/10029)

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

Summary of changes:
 crypto/objects/obj_dat.h   | 8 ++++----
 crypto/objects/objects.txt | 4 ++--
 include/openssl/obj_mac.h  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index 86e307d74d..a719df8e3d 100644
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -1737,8 +1737,8 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
     {"ITU-T", "itu-t", NID_itu_t},
     {"JOINT-ISO-ITU-T", "joint-iso-itu-t", NID_joint_iso_itu_t},
     {"international-organizations", "International Organizations", NID_international_organizations, 1, &so[4439]},
-    {"msSmartcardLogin", "Microsoft Smartcardlogin", NID_ms_smartcard_login, 10, &so[4440]},
-    {"msUPN", "Microsoft Universal Principal Name", NID_ms_upn, 10, &so[4450]},
+    {"msSmartcardLogin", "Microsoft Smartcard Login", NID_ms_smartcard_login, 10, &so[4440]},
+    {"msUPN", "Microsoft User Principal Name", NID_ms_upn, 10, &so[4450]},
     {"AES-128-CFB1", "aes-128-cfb1", NID_aes_128_cfb1},
     {"AES-192-CFB1", "aes-192-cfb1", NID_aes_192_cfb1},
     {"AES-256-CFB1", "aes-256-cfb1", NID_aes_256_cfb1},
@@ -3619,9 +3619,9 @@ static const unsigned int ln_objs[NUM_LN] = {
      134,    /* "Microsoft Individual Code Signing" */
      856,    /* "Microsoft Local Key set" */
      137,    /* "Microsoft Server Gated Crypto" */
-     648,    /* "Microsoft Smartcardlogin" */
+     648,    /* "Microsoft Smartcard Login" */
      136,    /* "Microsoft Trust List Signing" */
-     649,    /* "Microsoft Universal Principal Name" */
+     649,    /* "Microsoft User Principal Name" */
      393,    /* "NULL" */
      404,    /* "NULL" */
       72,    /* "Netscape Base Url" */
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index bff6714fd6..8833acd500 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -431,9 +431,9 @@ rsadsi 3 8		: RC5-CBC		: rc5-cbc
 !Cname ms-efs
 1 3 6 1 4 1 311 10 3 4	: msEFS			: Microsoft Encrypted File System
 !Cname ms-smartcard-login
-1 3 6 1 4 1 311 20 2 2	: msSmartcardLogin	: Microsoft Smartcardlogin
+1 3 6 1 4 1 311 20 2 2	: msSmartcardLogin	: Microsoft Smartcard Login
 !Cname ms-upn
-1 3 6 1 4 1 311 20 2 3	: msUPN			: Microsoft Universal Principal Name
+1 3 6 1 4 1 311 20 2 3	: msUPN			: Microsoft User Principal Name
 
 1 3 6 1 4 1 188 7 1 1 2	: IDEA-CBC		: idea-cbc
 			: IDEA-ECB		: idea-ecb
diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
index df461e50cf..4fb8601bf1 100644
--- a/include/openssl/obj_mac.h
+++ b/include/openssl/obj_mac.h
@@ -1300,12 +1300,12 @@
 #define OBJ_ms_efs              1L,3L,6L,1L,4L,1L,311L,10L,3L,4L
 
 #define SN_ms_smartcard_login           "msSmartcardLogin"
-#define LN_ms_smartcard_login           "Microsoft Smartcardlogin"
+#define LN_ms_smartcard_login           "Microsoft Smartcard Login"
 #define NID_ms_smartcard_login          648
 #define OBJ_ms_smartcard_login          1L,3L,6L,1L,4L,1L,311L,20L,2L,2L
 
 #define SN_ms_upn               "msUPN"
-#define LN_ms_upn               "Microsoft Universal Principal Name"
+#define LN_ms_upn               "Microsoft User Principal Name"
 #define NID_ms_upn              649
 #define OBJ_ms_upn              1L,3L,6L,1L,4L,1L,311L,20L,2L,3L