summaryrefslogtreecommitdiffstats
path: root/crypto/objects/objects.txt
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2017-02-04 12:42:57 +0000
committerDr. Stephen Henson <steve@openssl.org>2017-02-08 02:16:26 +0000
commit7114af3054c005d9ff587b78f193d75e4ddf1775 (patch)
tree30895b5e949d9f273a1bf2ebb4500077ccb22e65 /crypto/objects/objects.txt
parente5c4bf93a9b65652138ca0433b2d37d5113da5dd (diff)
Add NID_auth_any and NID_kx_any NIDs.
Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2550)
Diffstat (limited to 'crypto/objects/objects.txt')
-rw-r--r--crypto/objects/objects.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 5b1f2bdac5..0d189f8b4a 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -1472,6 +1472,7 @@ id-pkinit 5 : pkInitKDC : Signing KDC Response
: KxPSK : kx-psk
: KxSRP : kx-srp
: KxGOST : kx-gost
+ : KxANY : kx-any
# NIDs for cipher authentication
: AuthRSA : auth-rsa
@@ -1482,6 +1483,7 @@ id-pkinit 5 : pkInitKDC : Signing KDC Response
: AuthGOST12 : auth-gost12
: AuthSRP : auth-srp
: AuthNULL : auth-null
+ : AuthANY : auth-any
# NID for Poly1305
: Poly1305 : poly1305
# NID for SipHash