From b443c845942289c831fe867ced1ef11574514385 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 4 Apr 2017 11:11:58 +0100 Subject: [PATCH] Move ssl/t1_ext.c to ssl/statem/extensions_cust.c Brings all the extensions code together. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/3139) --- ssl/build.info | 4 ++-- ssl/{t1_ext.c => statem/extensions_cust.c} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename ssl/{t1_ext.c => statem/extensions_cust.c} (99%) diff --git a/ssl/build.info b/ssl/build.info index f13c11f425..bb2f1deb53 100644 --- 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 \ - 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 \ 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 e3bcb63548..374fe1e55e 100644 --- a/ssl/t1_ext.c +++ b/ssl/statem/extensions_cust.c @@ -10,7 +10,7 @@ /* Custom extension utility functions */ #include -#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, -- 2.25.1