Change TLSEXT_IDX_* values into an enum

[openssl.git] / ssl / ssl_locl.h

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 3fc5b5f93cc970b8d817f43c2f3105223a8818c0..c18fec33a6f1aa900fe2196f9267afe14ca921e5 100644 (file)
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -1650,24 +1650,26 @@ typedef struct raw_extension_st {
  * Extension index values NOTE: Any updates to these defines should be mirrored
  * with equivalent updates to ext_defs in extensions.c
  */
-#define TLSEXT_IDX_renegotiate                                   0
-#define TLSEXT_IDX_server_name                                   1
-#define TLSEXT_IDX_srp                                           2
-#define TLSEXT_IDX_ec_point_formats                              3
-#define TLSEXT_IDX_supported_groups                              4
-#define TLSEXT_IDX_session_ticket                                5
-#define TLSEXT_IDX_signature_algorithms                          6
-#define TLSEXT_IDX_status_request                                7
-#define TLSEXT_IDX_next_proto_neg                                8
-#define TLSEXT_IDX_application_layer_protocol_negotiation        9
-#define TLSEXT_IDX_use_srtp                                     10
-#define TLSEXT_IDX_encrypt_then_mac                             11
-#define TLSEXT_IDX_signed_certificate_timestamp                 12
-#define TLSEXT_IDX_extended_master_secret                       13
-#define TLSEXT_IDX_supported_versions                           14
-#define TLSEXT_IDX_key_share                                    15
-#define TLSEXT_IDX_cryptopro_bug                                16
-#define TLSEXT_IDX_padding                                      17
+typedef enum tlsext_index_en {
+    TLSEXT_IDX_renegotiate,
+    TLSEXT_IDX_server_name,
+    TLSEXT_IDX_srp,
+    TLSEXT_IDX_ec_point_formats,
+    TLSEXT_IDX_supported_groups,
+    TLSEXT_IDX_session_ticket,
+    TLSEXT_IDX_signature_algorithms,
+    TLSEXT_IDX_status_request,
+    TLSEXT_IDX_next_proto_neg,
+    TLSEXT_IDX_application_layer_protocol_negotiation,
+    TLSEXT_IDX_use_srtp,
+    TLSEXT_IDX_encrypt_then_mac,
+    TLSEXT_IDX_signed_certificate_timestamp,
+    TLSEXT_IDX_extended_master_secret,
+    TLSEXT_IDX_supported_versions,
+    TLSEXT_IDX_key_share,
+    TLSEXT_IDX_cryptopro_bug,
+    TLSEXT_IDX_padding
+} TLSEXT_INDEX;
 
 #define MAX_COMPRESSIONS_SIZE   255
 
@@ -2103,7 +2105,6 @@ __owur  int tls1_get_curvelist(SSL *s, int sess, const unsigned char **pcurves,
 
 void ssl_set_default_md(SSL *s);
 __owur int tls1_set_server_sigalgs(SSL *s);
-__owur int ssl_parse_serverhello_tlsext(SSL *s, PACKET *pkt);
 __owur RAW_EXTENSION *tls_get_extension_by_type(RAW_EXTENSION *exts,
                                                 size_t numexts,
                                                 unsigned int type);