From c99c4c11a202ed71d4c232075668a876f352d71a Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 4 Feb 2015 15:52:05 +0000 Subject: [PATCH] Renamed record layer header files Reviewed-by: Richard Levitte --- ssl/record/dtls1_bitmap.c | 1 + ssl/record/{rec_layer.h => record.h} | 2 +- ssl/record/{rec_layer_locl.h => record_locl.h} | 2 +- ssl/record/s3_pkt.c | 2 +- ssl/record/ssl3_buffer.c | 1 + ssl/record/ssl3_record.c | 1 + ssl/ssl_locl.h | 2 +- 7 files changed, 7 insertions(+), 4 deletions(-) rename ssl/record/{rec_layer.h => record.h} (99%) rename ssl/record/{rec_layer_locl.h => record_locl.h} (99%) diff --git a/ssl/record/dtls1_bitmap.c b/ssl/record/dtls1_bitmap.c index 174ba4990c..eef6b246e0 100644 --- a/ssl/record/dtls1_bitmap.c +++ b/ssl/record/dtls1_bitmap.c @@ -114,6 +114,7 @@ */ #include "../ssl_locl.h" +#include "record_locl.h" /* mod 128 saturating subtract of two 64-bit values in big-endian order */ static int satsub64be(const unsigned char *v1, const unsigned char *v2) diff --git a/ssl/record/rec_layer.h b/ssl/record/record.h similarity index 99% rename from ssl/record/rec_layer.h rename to ssl/record/record.h index 05e55840c3..29fc752e6a 100644 --- a/ssl/record/rec_layer.h +++ b/ssl/record/record.h @@ -1,4 +1,4 @@ -/* ssl/record/rec_layer.h */ +/* ssl/record/record.h */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * diff --git a/ssl/record/rec_layer_locl.h b/ssl/record/record_locl.h similarity index 99% rename from ssl/record/rec_layer_locl.h rename to ssl/record/record_locl.h index 05cc7fda32..26b5a1546f 100644 --- a/ssl/record/rec_layer_locl.h +++ b/ssl/record/record_locl.h @@ -1,4 +1,4 @@ -/* ssl/record/rec_layer_locl.h */ +/* ssl/record/record_locl.h */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * diff --git a/ssl/record/s3_pkt.c b/ssl/record/s3_pkt.c index 608fe74b04..dd1f1484a0 100644 --- a/ssl/record/s3_pkt.c +++ b/ssl/record/s3_pkt.c @@ -117,7 +117,7 @@ #include #include #include -#include "rec_layer_locl.h" +#include "record_locl.h" #ifndef EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK # define EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0 diff --git a/ssl/record/ssl3_buffer.c b/ssl/record/ssl3_buffer.c index 9afd747e51..79a7636e07 100644 --- a/ssl/record/ssl3_buffer.c +++ b/ssl/record/ssl3_buffer.c @@ -110,6 +110,7 @@ */ #include "../ssl_locl.h" +#include "record_locl.h" void SSL3_BUFFER_set_data(SSL3_BUFFER *b, const unsigned char *d, int n) { diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c index be5bb22ae0..8bad125780 100644 --- a/ssl/record/ssl3_record.c +++ b/ssl/record/ssl3_record.c @@ -112,6 +112,7 @@ #include "../ssl_locl.h" #include "../../crypto/constant_time_locl.h" #include +#include "record_locl.h" static const unsigned char ssl3_pad_1[48] = { 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 569988ed71..8b4c6150ef 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -165,7 +165,7 @@ # include # include -#include "record/rec_layer.h" +#include "record/record.h" # ifdef OPENSSL_BUILD_SHLIBSSL # undef OPENSSL_EXTERN -- 2.25.1