Make SSL_CIPHER_get_version return a const char *

[oweals/openssl.git] / include / openssl / obj_mac.h

diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
index aa640b03e599c42b46a48c1aed11a91da5472fd4..4725a6c5746411492db225389f2e37a7a5dfbb15 100644 (file)
--- a/include/openssl/obj_mac.h
+++ b/include/openssl/obj_mac.h
@@ -4511,6 +4511,10 @@
 #define LN_tls1_prf             "tls1-prf"
 #define NID_tls1_prf            1021
 
+#define SN_hkdf         "HKDF"
+#define LN_hkdf         "hkdf"
+#define NID_hkdf                1036
+
 #define SN_id_pkinit            "id-pkinit"
 #define NID_id_pkinit           1031
 #define OBJ_id_pkinit           1L,3L,6L,1L,5L,2L,3L
@@ -4525,18 +4529,78 @@
 #define NID_pkInitKDC           1033
 #define OBJ_pkInitKDC           OBJ_id_pkinit,5L
 
-#define SN_Curve25519           "Curve25519"
-#define NID_Curve25519          1034
-#define OBJ_Curve25519          1L,3L,6L,1L,4L,1L,11591L,15L,1L
+#define SN_X25519               "X25519"
+#define NID_X25519              1034
+#define OBJ_X25519              1L,3L,6L,1L,4L,1L,11591L,15L,1L
+
+#define SN_X448         "X448"
+#define NID_X448                1035
+#define OBJ_X448                1L,3L,6L,1L,4L,1L,11591L,15L,2L
+
+#define SN_kx_rsa               "KxRSA"
+#define LN_kx_rsa               "kx-rsa"
+#define NID_kx_rsa              1037
+
+#define SN_kx_ecdhe             "KxECDHE"
+#define LN_kx_ecdhe             "kx-ecdhe"
+#define NID_kx_ecdhe            1038
+
+#define SN_kx_dhe               "KxDHE"
+#define LN_kx_dhe               "kx-dhe"
+#define NID_kx_dhe              1039
+
+#define SN_kx_ecdhe_psk         "KxECDHE-PSK"
+#define LN_kx_ecdhe_psk         "kx-ecdhe-psk"
+#define NID_kx_ecdhe_psk                1040
+
+#define SN_kx_dhe_psk           "KxDHE-PSK"
+#define LN_kx_dhe_psk           "kx-dhe-psk"
+#define NID_kx_dhe_psk          1041
+
+#define SN_kx_rsa_psk           "KxRSA_PSK"
+#define LN_kx_rsa_psk           "kx-rsa-psk"
+#define NID_kx_rsa_psk          1042
+
+#define SN_kx_psk               "KxPSK"
+#define LN_kx_psk               "kx-psk"
+#define NID_kx_psk              1043
+
+#define SN_kx_srp               "KxSRP"
+#define LN_kx_srp               "kx-srp"
+#define NID_kx_srp              1044
+
+#define SN_kx_gost              "KxGOST"
+#define LN_kx_gost              "kx-gost"
+#define NID_kx_gost             1045
+
+#define SN_auth_rsa             "AuthRSA"
+#define LN_auth_rsa             "auth-rsa"
+#define NID_auth_rsa            1046
+
+#define SN_auth_ecdsa           "AuthECDSA"
+#define LN_auth_ecdsa           "auth-ecdsa"
+#define NID_auth_ecdsa          1047
+
+#define SN_auth_psk             "AuthPSK"
+#define LN_auth_psk             "auth-psk"
+#define NID_auth_psk            1048
+
+#define SN_auth_dss             "AuthDSS"
+#define LN_auth_dss             "auth-dss"
+#define NID_auth_dss            1049
+
+#define SN_auth_gost01          "AuthGOST01"
+#define LN_auth_gost01          "auth-gost01"
+#define NID_auth_gost01         1050
 
-#define SN_Curve448             "Curve448"
-#define NID_Curve448            1035
-#define OBJ_Curve448            1L,3L,6L,1L,4L,1L,11591L,15L,2L
+#define SN_auth_gost12          "AuthGOST12"
+#define LN_auth_gost12          "auth-gost12"
+#define NID_auth_gost12         1051
 
-#define SN_Curve25519ph         "Curve25519ph"
-#define NID_Curve25519ph                1036
-#define OBJ_Curve25519ph                1L,3L,6L,1L,4L,1L,11591L,15L,3L
+#define SN_auth_srp             "AuthSRP"
+#define LN_auth_srp             "auth-srp"
+#define NID_auth_srp            1052
 
-#define SN_Curve448ph           "Curve448ph"
-#define NID_Curve448ph          1037
-#define OBJ_Curve448ph          1L,3L,6L,1L,4L,1L,11591L,15L,4L
+#define SN_auth_null            "AuthNULL"
+#define LN_auth_null            "auth-null"
+#define NID_auth_null           1053