Skip to content

Commit d48a57c

Browse files
author
tb
committed
Make internal header file names consistent
Libcrypto currently has a mess of *_lcl.h, *_locl.h, and *_local.h names used for internal headers. Move all these headers we inherited from OpenSSL to *_local.h, reserving the name *_internal.h for our own code. Similarly, move dtls_locl.h and ssl_locl.h to dtls_local and ssl_local.h. constant_time_locl.h is moved to constant_time.h since it's special. Adjust all .c files in libcrypto, libssl and regress. The diff is mechanical with the exception of tls13_quic.c, where #include <ssl_locl.h> was fixed manually. discussed with jsing, no objection bcook
1 parent bb88c9a commit d48a57c

File tree

445 files changed

+1536
-970
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

445 files changed

+1536
-970
lines changed

src/lib/libcrypto/aes/aes_core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: aes_core.c,v 1.13 2015/11/05 21:59:13 miod Exp $ */
1+
/* $OpenBSD: aes_core.c,v 1.14 2022/11/26 16:08:50 tb Exp $ */
22
/**
33
* rijndael-alg-fst.c
44
*
@@ -36,7 +36,7 @@
3636

3737
#include <stdlib.h>
3838
#include <openssl/aes.h>
39-
#include "aes_locl.h"
39+
#include "aes_local.h"
4040

4141
#ifndef AES_ASM
4242
/*

src/lib/libcrypto/aes/aes_ecb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: aes_ecb.c,v 1.6 2015/02/10 09:46:30 miod Exp $ */
1+
/* $OpenBSD: aes_ecb.c,v 1.7 2022/11/26 16:08:50 tb Exp $ */
22
/* ====================================================================
33
* Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
44
*
@@ -56,7 +56,7 @@
5656
#endif
5757

5858
#include <openssl/aes.h>
59-
#include "aes_locl.h"
59+
#include "aes_local.h"
6060

6161
void
6262
AES_ecb_encrypt(const unsigned char *in, unsigned char *out,

src/lib/libcrypto/aes/aes_ige.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: aes_ige.c,v 1.8 2022/01/22 00:43:41 inoguchi Exp $ */
1+
/* $OpenBSD: aes_ige.c,v 1.9 2022/11/26 16:08:50 tb Exp $ */
22
/* ====================================================================
33
* Copyright (c) 2006 The OpenSSL Project. All rights reserved.
44
*
@@ -52,7 +52,7 @@
5252
#include <openssl/aes.h>
5353
#include <openssl/crypto.h>
5454

55-
#include "aes_locl.h"
55+
#include "aes_local.h"
5656

5757
#define N_WORDS (AES_BLOCK_SIZE / sizeof(unsigned long))
5858
typedef struct {

src/lib/libcrypto/aes/aes_locl.h renamed to src/lib/libcrypto/aes/aes_local.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: aes_locl.h,v 1.11 2016/12/21 15:49:29 jsing Exp $ */
1+
/* $OpenBSD: aes_local.h,v 1.1 2022/11/26 16:08:50 tb Exp $ */
22
/* ====================================================================
33
* Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
44
*

src/lib/libcrypto/aes/aes_misc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: aes_misc.c,v 1.10 2014/07/09 11:10:50 bcook Exp $ */
1+
/* $OpenBSD: aes_misc.c,v 1.11 2022/11/26 16:08:50 tb Exp $ */
22
/* ====================================================================
33
* Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
44
*
@@ -52,7 +52,7 @@
5252
#include <openssl/opensslv.h>
5353
#include <openssl/crypto.h>
5454
#include <openssl/aes.h>
55-
#include "aes_locl.h"
55+
#include "aes_local.h"
5656

5757
const char *
5858
AES_options(void)

src/lib/libcrypto/aes/aes_x86core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: aes_x86core.c,v 1.9 2018/04/03 21:59:37 tb Exp $ */
1+
/* $OpenBSD: aes_x86core.c,v 1.10 2022/11/26 16:08:50 tb Exp $ */
22
/**
33
* rijndael-alg-fst.c
44
*
@@ -43,7 +43,7 @@
4343

4444
#include <stdlib.h>
4545
#include <openssl/aes.h>
46-
#include "aes_locl.h"
46+
#include "aes_local.h"
4747

4848
/*
4949
* These two parameters control which table, 256-byte or 2KB, is

src/lib/libcrypto/asn1/a_enum.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: a_enum.c,v 1.27 2022/09/03 18:45:51 jsing Exp $ */
1+
/* $OpenBSD: a_enum.c,v 1.28 2022/11/26 16:08:50 tb Exp $ */
22
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
33
* All rights reserved.
44
*
@@ -65,7 +65,7 @@
6565
#include <openssl/buffer.h>
6666
#include <openssl/err.h>
6767

68-
#include "asn1_locl.h"
68+
#include "asn1_local.h"
6969
#include "bytestring.h"
7070

7171
/*

src/lib/libcrypto/asn1/a_mbstr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: a_mbstr.c,v 1.24 2021/12/25 13:17:48 jsing Exp $ */
1+
/* $OpenBSD: a_mbstr.c,v 1.25 2022/11/26 16:08:50 tb Exp $ */
22
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
33
* project 1999.
44
*/
@@ -63,7 +63,7 @@
6363
#include <openssl/asn1.h>
6464
#include <openssl/err.h>
6565

66-
#include "asn1_locl.h"
66+
#include "asn1_local.h"
6767

6868
static int traverse_string(const unsigned char *p, int len, int inform,
6969
int (*rfunc)(unsigned long value, void *in), void *arg);

src/lib/libcrypto/asn1/a_object.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: a_object.c,v 1.48 2022/05/13 16:32:10 tb Exp $ */
1+
/* $OpenBSD: a_object.c,v 1.49 2022/11/26 16:08:50 tb Exp $ */
22
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
33
* All rights reserved.
44
*
@@ -66,7 +66,7 @@
6666
#include <openssl/buffer.h>
6767
#include <openssl/objects.h>
6868

69-
#include "asn1_locl.h"
69+
#include "asn1_local.h"
7070

7171
const ASN1_ITEM ASN1_OBJECT_it = {
7272
.itype = ASN1_ITYPE_PRIMITIVE,

src/lib/libcrypto/asn1/a_pkey.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: a_pkey.c,v 1.3 2021/12/25 13:17:48 jsing Exp $ */
1+
/* $OpenBSD: a_pkey.c,v 1.4 2022/11/26 16:08:50 tb Exp $ */
22
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
33
* All rights reserved.
44
*
@@ -71,8 +71,8 @@
7171
#include <openssl/engine.h>
7272
#endif
7373

74-
#include "asn1_locl.h"
75-
#include "evp_locl.h"
74+
#include "asn1_local.h"
75+
#include "evp_local.h"
7676

7777
EVP_PKEY *
7878
d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp, long length)

0 commit comments

Comments
 (0)