Move ssl/t1_ext.c to ssl/statem/extensions_cust.c

Brings all the extensions code together.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3139)

diff --git a/ssl/build.info b/ssl/build.info
index f13c11f42586a9e3eea4237622d5f147fd78f6e7..bb2f1deb530066a7aae8c3e71e079975b446b74c 100644 (file)
--- a/ssl/build.info
+++ b/ssl/build.info
@@ -3,8 +3,8 @@ SOURCE[../libssl]=\
         pqueue.c packet.c \
         statem/statem_srvr.c statem/statem_clnt.c  s3_lib.c  s3_enc.c record/rec_layer_s3.c \
         statem/statem_lib.c statem/extensions.c statem/extensions_srvr.c \
         pqueue.c packet.c \
         statem/statem_srvr.c statem/statem_clnt.c  s3_lib.c  s3_enc.c record/rec_layer_s3.c \
         statem/statem_lib.c statem/extensions.c statem/extensions_srvr.c \

-        statem/extensions_clnt.c s3_cbc.c s3_msg.c \
-        methods.c   t1_lib.c  t1_enc.c tls13_enc.c t1_ext.c \
+        statem/extensions_clnt.c statem/extensions_cust.c s3_cbc.c s3_msg.c \
+        methods.c   t1_lib.c  t1_enc.c tls13_enc.c \

         d1_lib.c  record/rec_layer_d1.c d1_msg.c \
         statem/statem_dtls.c d1_srtp.c \
         ssl_lib.c ssl_cert.c ssl_sess.c \
         d1_lib.c  record/rec_layer_d1.c d1_msg.c \
         statem/statem_dtls.c d1_srtp.c \
         ssl_lib.c ssl_cert.c ssl_sess.c \

diff --git a/ssl/t1_ext.c b/ssl/statem/extensions_cust.c
similarity index 99%
rename from ssl/t1_ext.c
rename to ssl/statem/extensions_cust.c
index e3bcb635482e13842720d0ee830c73805eca0b71..374fe1e55e6b89689fb588db4daf154fd3373945 100644 (file)
--- a/ssl/t1_ext.c
+++ b/ssl/statem/extensions_cust.c
@@ -10,7 +10,7 @@
 /* Custom extension utility functions */
 
 #include <openssl/ct.h>
 /* Custom extension utility functions */
 
 #include <openssl/ct.h>

-#include "ssl_locl.h"
+#include "../ssl_locl.h"

 
 /* Find a custom extension from the list. */
 static custom_ext_method *custom_ext_find(const custom_ext_methods *exts,
 
 /* Find a custom extension from the list. */
 static custom_ext_method *custom_ext_find(const custom_ext_methods *exts,