A few more Microsoft OIDs added

[openssl.git] / crypto / objects / objects.txt

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index b3eebada17d08a4b6b56db0ca2540ab540c3726b..3e4e9f23029a91eb7ef1ffbcb438b6dce308bb66 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -111,9 +111,16 @@ secg-ellipticCurve 39              : sect571r1
 # WAP/TLS curve OIDs (http://www.wapforum.org/)
 !Alias wap-wsg-idm-ecid wap-wsg 4
 wap-wsg-idm-ecid 1     : wap-wsg-idm-ecid-wtls1
 # WAP/TLS curve OIDs (http://www.wapforum.org/)
 !Alias wap-wsg-idm-ecid wap-wsg 4
 wap-wsg-idm-ecid 1     : wap-wsg-idm-ecid-wtls1

+wap-wsg-idm-ecid 3     : wap-wsg-idm-ecid-wtls3
+wap-wsg-idm-ecid 4     : wap-wsg-idm-ecid-wtls4
+wap-wsg-idm-ecid 5     : wap-wsg-idm-ecid-wtls5

 wap-wsg-idm-ecid 6     : wap-wsg-idm-ecid-wtls6
 wap-wsg-idm-ecid 6     : wap-wsg-idm-ecid-wtls6

+wap-wsg-idm-ecid 7     : wap-wsg-idm-ecid-wtls7

 wap-wsg-idm-ecid 8     : wap-wsg-idm-ecid-wtls8
 wap-wsg-idm-ecid 9     : wap-wsg-idm-ecid-wtls9
 wap-wsg-idm-ecid 8     : wap-wsg-idm-ecid-wtls8
 wap-wsg-idm-ecid 9     : wap-wsg-idm-ecid-wtls9

+wap-wsg-idm-ecid 10    : wap-wsg-idm-ecid-wtls10
+wap-wsg-idm-ecid 11    : wap-wsg-idm-ecid-wtls11
+wap-wsg-idm-ecid 12    : wap-wsg-idm-ecid-wtls12

 
 
 ISO-US 113533 7 66 10  : CAST5-CBC             : cast5-cbc
 
 
 ISO-US 113533 7 66 10  : CAST5-CBC             : cast5-cbc


@@ -348,6 +355,10 @@ rsadsi 3 8         : RC5-CBC               : rc5-cbc
 1 3 6 1 4 1 311 10 3 3 : msSGC                 : Microsoft Server Gated Crypto
 !Cname ms-efs
 1 3 6 1 4 1 311 10 3 4 : msEFS                 : Microsoft Encrypted File System
 1 3 6 1 4 1 311 10 3 3 : msSGC                 : Microsoft Server Gated Crypto
 !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
+!Cname ms-upn
+1 3 6 1 4 1 311 20 2 3 : msUPN                 : Microsoft Universal Principal Name

 
 1 3 6 1 4 1 188 7 1 1 2        : IDEA-CBC              : idea-cbc
                        : IDEA-ECB              : idea-ecb
 
 1 3 6 1 4 1 188 7 1 1 2        : IDEA-CBC              : idea-cbc
                        : IDEA-ECB              : idea-ecb