unified build scheme: add build.info files

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 9f5f6c4e507163f5946057616a5a4a756a4dfe41..1de8e79e5b0dfe220f7dfbe78cc98f7efea0e6dc 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
@@ -1368,6 +1369,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 +1428,6 @@ 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