From 1711f8de45cdee01fdf21e55db5522d23b450867 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 4 Feb 2015 16:02:37 +0000 Subject: [PATCH] Rename record layer source files Reviewed-by: Richard Levitte --- ssl/Makefile | 16 ++++++++-------- ssl/record/{d1_pkt.c => rec_layer_d1.c} | 4 ++-- ssl/record/{s23_pkt.c => rec_layer_s23.c} | 2 +- ssl/record/{s3_pkt.c => rec_layer_s3.c} | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) rename ssl/record/{d1_pkt.c => rec_layer_d1.c} (99%) rename ssl/record/{s23_pkt.c => rec_layer_s23.c} (99%) rename ssl/record/{s3_pkt.c => rec_layer_s3.c} (99%) diff --git a/ssl/Makefile b/ssl/Makefile index ae644bc6c4..d508d3944b 100644 --- a/ssl/Makefile +++ b/ssl/Makefile @@ -21,11 +21,11 @@ APPS= LIB=$(TOP)/libssl.a SHARED_LIB= libssl$(SHLIB_EXT) LIBSRC= \ - s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c record/s3_pkt.c s3_both.c s3_cbc.c \ - s3_msg.c \ - s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c record/s23_pkt.c \ + s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c record/rec_layer_s3.c \ + s3_both.c s3_cbc.c s3_msg.c \ + s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c record/rec_layer_s23.c \ t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c t1_ext.c \ - d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c record/d1_pkt.c d1_msg.c \ + d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c record/rec_layer_d1.c d1_msg.c \ d1_both.c d1_srtp.c \ ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \ ssl_ciph.c ssl_stat.c ssl_rsa.c \ @@ -33,11 +33,11 @@ LIBSRC= \ bio_ssl.c ssl_err.c kssl.c t1_reneg.c tls_srp.c t1_trce.c ssl_utst.c \ record/ssl3_buffer.c record/ssl3_record.c record/dtls1_bitmap.c LIBOBJ= \ - s3_meth.o s3_srvr.o s3_clnt.o s3_lib.o s3_enc.o record/s3_pkt.o s3_both.o s3_cbc.o \ - s3_msg.o \ - s23_meth.o s23_srvr.o s23_clnt.o s23_lib.o record/s23_pkt.o \ + s3_meth.o s3_srvr.o s3_clnt.o s3_lib.o s3_enc.o record/rec_layer_s3.o \ + s3_both.o s3_cbc.o s3_msg.o \ + s23_meth.o s23_srvr.o s23_clnt.o s23_lib.o record/rec_layer_s23.o \ t1_meth.o t1_srvr.o t1_clnt.o t1_lib.o t1_enc.o t1_ext.o \ - d1_meth.o d1_srvr.o d1_clnt.o d1_lib.o record/d1_pkt.o d1_msg.o \ + d1_meth.o d1_srvr.o d1_clnt.o d1_lib.o record/rec_layer_d1.o d1_msg.o \ d1_both.o d1_srtp.o\ ssl_lib.o ssl_err2.o ssl_cert.o ssl_sess.o \ ssl_ciph.o ssl_stat.o ssl_rsa.o \ diff --git a/ssl/record/d1_pkt.c b/ssl/record/rec_layer_d1.c similarity index 99% rename from ssl/record/d1_pkt.c rename to ssl/record/rec_layer_d1.c index b409467455..bd3c0e8f3d 100644 --- a/ssl/record/d1_pkt.c +++ b/ssl/record/rec_layer_d1.c @@ -1,4 +1,4 @@ -/* ssl/d1_pkt.c */ +/* ssl/record/rec_layer_d1.c */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -121,7 +121,7 @@ #include #include #include -#include "rec_layer_locl.h" +#include "record_locl.h" int DTLS_RECORD_LAYER_new(RECORD_LAYER *rl) { diff --git a/ssl/record/s23_pkt.c b/ssl/record/rec_layer_s23.c similarity index 99% rename from ssl/record/s23_pkt.c rename to ssl/record/rec_layer_s23.c index 76267c5936..eb09be1e3a 100644 --- a/ssl/record/s23_pkt.c +++ b/ssl/record/rec_layer_s23.c @@ -1,4 +1,4 @@ -/* ssl/s23_pkt.c */ +/* ssl/record/rec_layer_s23.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * diff --git a/ssl/record/s3_pkt.c b/ssl/record/rec_layer_s3.c similarity index 99% rename from ssl/record/s3_pkt.c rename to ssl/record/rec_layer_s3.c index dd1f1484a0..dc89be8fbb 100644 --- a/ssl/record/s3_pkt.c +++ b/ssl/record/rec_layer_s3.c @@ -1,4 +1,4 @@ -/* ssl/s3_pkt.c */ +/* ssl/record/rec_layer_s3.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * -- 2.25.1