{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1752666573, "reponame":"openssl", "desc":"OpenSSL", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/openssl", "f":3, "items": [ {"schema":"libjg2-1", "cid":"731077834dfb961d3a89e5b948b28014", "commit": {"type":"commit", "time": 1570055187, "time_ofs": 600, "oid_tree": { "oid": "ed650a00cb9d74d23a0d416a3723ff1de8b81bec", "alias": []}, "oid":{ "oid": "9e2747646de3de12179a2635da9f6c76ab0ed6fb", "alias": []}, "msg": "Fix long name of some Microsoft objects", "sig_commit": { "git_time": { "time": 1570055187, "offset": 600 }, "name": "Pauli", "email": "paul.dale@oracle.com", "md5": "4616f8cb80bd6ce4dab75d05e07cd125" }, "sig_author": { "git_time": { "time": 1569567893, "offset": 120 }, "name": "Michael Osipov", "email": "michael.osipov@siemens.com", "md5": "04f3d8c4112872438c5f25777e76e5cb" }}, "body": "Fix long name of some Microsoft objects\n\nCLA: trivial\n\nReviewed-by: Richard Levitte \u003clevitte@openssl.org\u003e\nReviewed-by: Matt Caswell \u003cmatt@openssl.org\u003e\nReviewed-by: Paul Dale \u003cpaul.dale@oracle.com\u003e\n(Merged from https://github.com/openssl/openssl/pull/10029)\n\n(cherry picked from commit 648b53b88ea55b4c2f2c8c57d041075731db5f95)\n" , "diff": "diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h\nindex ea91db6..3cb0de7 100644\n--- a/crypto/objects/obj_dat.h\n+++ b/crypto/objects/obj_dat.h\n@@ -1728,8 +1728,8 @@ static const ASN1_OBJECT nid_objs[NUM_NID] \u003d {\n {\u0022ITU-T\u0022, \u0022itu-t\u0022, NID_itu_t},\n {\u0022JOINT-ISO-ITU-T\u0022, \u0022joint-iso-itu-t\u0022, NID_joint_iso_itu_t},\n {\u0022international-organizations\u0022, \u0022International Organizations\u0022, NID_international_organizations, 1, \u0026so[4439]},\n- {\u0022msSmartcardLogin\u0022, \u0022Microsoft Smartcardlogin\u0022, NID_ms_smartcard_login, 10, \u0026so[4440]},\n- {\u0022msUPN\u0022, \u0022Microsoft Universal Principal Name\u0022, NID_ms_upn, 10, \u0026so[4450]},\n+ {\u0022msSmartcardLogin\u0022, \u0022Microsoft Smartcard Login\u0022, NID_ms_smartcard_login, 10, \u0026so[4440]},\n+ {\u0022msUPN\u0022, \u0022Microsoft User Principal Name\u0022, NID_ms_upn, 10, \u0026so[4450]},\n {\u0022AES-128-CFB1\u0022, \u0022aes-128-cfb1\u0022, NID_aes_128_cfb1},\n {\u0022AES-192-CFB1\u0022, \u0022aes-192-cfb1\u0022, NID_aes_192_cfb1},\n {\u0022AES-256-CFB1\u0022, \u0022aes-256-cfb1\u0022, NID_aes_256_cfb1},\n@@ -3578,9 +3578,9 @@ static const unsigned int ln_objs[NUM_LN] \u003d {\n 134, /* \u0022Microsoft Individual Code Signing\u0022 */\n 856, /* \u0022Microsoft Local Key set\u0022 */\n 137, /* \u0022Microsoft Server Gated Crypto\u0022 */\n- 648, /* \u0022Microsoft Smartcardlogin\u0022 */\n+ 648, /* \u0022Microsoft Smartcard Login\u0022 */\n 136, /* \u0022Microsoft Trust List Signing\u0022 */\n- 649, /* \u0022Microsoft Universal Principal Name\u0022 */\n+ 649, /* \u0022Microsoft User Principal Name\u0022 */\n 393, /* \u0022NULL\u0022 */\n 404, /* \u0022NULL\u0022 */\n 72, /* \u0022Netscape Base Url\u0022 */\ndiff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt\nindex 5b2bb54..c49d4c5 100644\n--- a/crypto/objects/objects.txt\n+++ b/crypto/objects/objects.txt\n@@ -426,9 +426,9 @@ rsadsi 3 8\t\t: RC5-CBC\t\t: rc5-cbc\n !Cname ms-efs\n 1 3 6 1 4 1 311 10 3 4\t: msEFS\t\t\t: Microsoft Encrypted File System\n !Cname ms-smartcard-login\n-1 3 6 1 4 1 311 20 2 2\t: msSmartcardLogin\t: Microsoft Smartcardlogin\n+1 3 6 1 4 1 311 20 2 2\t: msSmartcardLogin\t: Microsoft Smartcard Login\n !Cname ms-upn\n-1 3 6 1 4 1 311 20 2 3\t: msUPN\t\t\t: Microsoft Universal Principal Name\n+1 3 6 1 4 1 311 20 2 3\t: msUPN\t\t\t: Microsoft User Principal Name\n \n 1 3 6 1 4 1 188 7 1 1 2\t: IDEA-CBC\t\t: idea-cbc\n \t\t\t: IDEA-ECB\t\t: idea-ecb\ndiff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h\nindex 47dafe4..ac2ac32 100644\n--- a/include/openssl/obj_mac.h\n+++ b/include/openssl/obj_mac.h\n@@ -1290,12 +1290,12 @@\n #define OBJ_ms_efs 1L,3L,6L,1L,4L,1L,311L,10L,3L,4L\n \n #define SN_ms_smartcard_login \u0022msSmartcardLogin\u0022\n-#define LN_ms_smartcard_login \u0022Microsoft Smartcardlogin\u0022\n+#define LN_ms_smartcard_login \u0022Microsoft Smartcard Login\u0022\n #define NID_ms_smartcard_login 648\n #define OBJ_ms_smartcard_login 1L,3L,6L,1L,4L,1L,311L,20L,2L,2L\n \n #define SN_ms_upn \u0022msUPN\u0022\n-#define LN_ms_upn \u0022Microsoft Universal Principal Name\u0022\n+#define LN_ms_upn \u0022Microsoft User Principal Name\u0022\n #define NID_ms_upn 649\n #define OBJ_ms_upn 1L,3L,6L,1L,4L,1L,311L,20L,2L,3L\n \n","s":{"c":1752666573,"u": 49160}} ],"g": 50428,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}