fix tab-space mixed indentation

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 9f5f6c4e507163f5946057616a5a4a756a4dfe41..ba8891dfd72c7eff79c92e580946182710c663cc 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -472,6 +472,7 @@ id-pe 10            : ac-proxying
 !Cname sinfo-access
 id-pe 11               : subjectInfoAccess     : Subject Information Access
 id-pe 14               : proxyCertInfo         : Proxy Certificate Information
+id-pe 24               : tlsfeature            : TLS Feature
 
 # PKIX policyQualifiers for Internet policy qualifiers
 id-qt 1                        : id-qt-cps             : Policy Qualifier CPS
@@ -496,6 +497,18 @@ id-kp 8                    : timeStamping          : Time Stamping
 !Cname OCSP-sign
 id-kp 9                        : OCSPSigning           : OCSP Signing
 id-kp 10               : DVCS                  : dvcs
+!Cname ipsec-IKE
+id-kp 17                : ipsecIKE              : ipsec Internet Key Exchange
+id-kp 18                : capwapAC              : Ctrl/provision WAP Access
+id-kp 19                : capwapWTP             : Ctrl/Provision WAP Termination
+!Cname sshClient
+id-kp 21                : secureShellClient     : SSH Client
+!Cname sshServer
+id-kp 22                : secureShellServer     : SSH Server
+id-kp 23                : sendRouter            : Send Router
+id-kp 24                : sendProxiedRouter     : Send Proxied Router
+id-kp 25                : sendOwner             : Send Owner
+id-kp 26                : sendProxiedOwner      : Send Proxied Owner
 
 # CMP information types
 id-it 1                        : id-it-caProtEncCert
@@ -658,6 +671,9 @@ algorithm 29                : RSA-SHA1-2            : sha1WithRSA
 1 3 36 3 2 1           : RIPEMD160             : ripemd160
 1 3 36 3 3 1 2         : RSA-RIPEMD160         : ripemd160WithRSA
 
+1 3 6 1 4 1 1722 12 2 1 16 : BLAKE2b512        : blake2b512
+1 3 6 1 4 1 1722 12 2 2 8  : BLAKE2s256        : blake2s256
+
 !Cname sxnet
 1 3 101 1 4 1          : SXNetID               : Strong Extranet ID
 
@@ -1368,6 +1384,8 @@ kisa 1 6                : SEED-OFB      : seed-ofb
                        : AES-128-CBC-HMAC-SHA256       : aes-128-cbc-hmac-sha256
                        : AES-192-CBC-HMAC-SHA256       : aes-192-cbc-hmac-sha256
                        : AES-256-CBC-HMAC-SHA256       : aes-256-cbc-hmac-sha256
+                       : ChaCha20-Poly1305             : chacha20-poly1305
+                       : ChaCha20                      : chacha20
 
 ISO-US 10046 2 1       : dhpublicnumber                : X9.42 DH
 
@@ -1425,3 +1443,41 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme
 
 # SCRYPT algorithm
 1 3 6 1 4 1 11591 4 11         : id-scrypt
+
+# NID for TLS1 PRF
+                            : TLS1-PRF          : tls1-prf
+
+# NID for HKDF
+                            : HKDF              : hkdf
+
+# RFC 4556
+1 3 6 1 5 2 3 : id-pkinit
+id-pkinit 4                     : pkInitClientAuth      : PKINIT Client Auth
+id-pkinit 5                     : pkInitKDC             : Signing KDC Response
+
+# New curves from draft-josefsson-pkix-newcurves
+
+1 3 6 1 4 1 11591 15 1      : X25519
+1 3 6 1 4 1 11591 15 2      : X448
+
+# NIDs for cipher key exchange
+                            : KxRSA        : kx-rsa
+                            : KxECDHE      : kx-ecdhe
+                            : KxDHE        : kx-dhe
+                            : KxECDHE-PSK  : kx-ecdhe-psk
+                            : KxDHE-PSK    : kx-dhe-psk
+                            : KxRSA_PSK    : kx-rsa-psk
+                            : KxPSK        : kx-psk
+                            : KxSRP        : kx-srp
+                            : KxGOST       : kx-gost
+
+# NIDs for cipher authentication
+                            : AuthRSA      : auth-rsa
+                            : AuthECDSA    : auth-ecdsa
+                            : AuthPSK      : auth-psk
+                            : AuthDSS      : auth-dss
+                            : AuthGOST01   : auth-gost01
+                            : AuthGOST12   : auth-gost12
+                            : AuthSRP      : auth-srp
+                            : AuthNULL     : auth-null
+