summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/evp')
-rw-r--r--src/lib/libcrypto/evp/bio_b64.c4
-rw-r--r--src/lib/libcrypto/evp/bio_enc.c4
-rw-r--r--src/lib/libcrypto/evp/bio_md.c4
-rw-r--r--src/lib/libcrypto/evp/digest.c4
-rw-r--r--src/lib/libcrypto/evp/e_aes.c6
-rw-r--r--src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c6
-rw-r--r--src/lib/libcrypto/evp/e_bf.c4
-rw-r--r--src/lib/libcrypto/evp/e_camellia.c4
-rw-r--r--src/lib/libcrypto/evp/e_cast.c4
-rw-r--r--src/lib/libcrypto/evp/e_chacha.c4
-rw-r--r--src/lib/libcrypto/evp/e_chacha20poly1305.c4
-rw-r--r--src/lib/libcrypto/evp/e_des.c4
-rw-r--r--src/lib/libcrypto/evp/e_des3.c4
-rw-r--r--src/lib/libcrypto/evp/e_gost2814789.c4
-rw-r--r--src/lib/libcrypto/evp/e_idea.c4
-rw-r--r--src/lib/libcrypto/evp/e_null.c4
-rw-r--r--src/lib/libcrypto/evp/e_rc2.c4
-rw-r--r--src/lib/libcrypto/evp/e_rc4.c4
-rw-r--r--src/lib/libcrypto/evp/e_rc4_hmac_md5.c4
-rw-r--r--src/lib/libcrypto/evp/e_sm4.c4
-rw-r--r--src/lib/libcrypto/evp/e_xcbc_d.c4
-rw-r--r--src/lib/libcrypto/evp/encode.c4
-rw-r--r--src/lib/libcrypto/evp/evp_aead.c4
-rw-r--r--src/lib/libcrypto/evp/evp_enc.c4
-rw-r--r--src/lib/libcrypto/evp/evp_key.c4
-rw-r--r--src/lib/libcrypto/evp/evp_lib.c6
-rw-r--r--src/lib/libcrypto/evp/evp_local.h (renamed from src/lib/libcrypto/evp/evp_locl.h)2
-rw-r--r--src/lib/libcrypto/evp/evp_pbe.c4
-rw-r--r--src/lib/libcrypto/evp/evp_pkey.c6
-rw-r--r--src/lib/libcrypto/evp/m_gost2814789.c4
-rw-r--r--src/lib/libcrypto/evp/m_gostr341194.c4
-rw-r--r--src/lib/libcrypto/evp/m_md4.c4
-rw-r--r--src/lib/libcrypto/evp/m_md5.c4
-rw-r--r--src/lib/libcrypto/evp/m_md5_sha1.c4
-rw-r--r--src/lib/libcrypto/evp/m_null.c4
-rw-r--r--src/lib/libcrypto/evp/m_ripemd.c4
-rw-r--r--src/lib/libcrypto/evp/m_sha1.c4
-rw-r--r--src/lib/libcrypto/evp/m_sigver.c4
-rw-r--r--src/lib/libcrypto/evp/m_sm3.c4
-rw-r--r--src/lib/libcrypto/evp/m_streebog.c4
-rw-r--r--src/lib/libcrypto/evp/m_wp.c4
-rw-r--r--src/lib/libcrypto/evp/names.c4
-rw-r--r--src/lib/libcrypto/evp/p5_crpt.c4
-rw-r--r--src/lib/libcrypto/evp/p5_crpt2.c4
-rw-r--r--src/lib/libcrypto/evp/p_dec.c4
-rw-r--r--src/lib/libcrypto/evp/p_enc.c4
-rw-r--r--src/lib/libcrypto/evp/p_lib.c6
-rw-r--r--src/lib/libcrypto/evp/p_open.c4
-rw-r--r--src/lib/libcrypto/evp/p_sign.c4
-rw-r--r--src/lib/libcrypto/evp/p_verify.c4
-rw-r--r--src/lib/libcrypto/evp/pmeth_fn.c4
-rw-r--r--src/lib/libcrypto/evp/pmeth_gn.c8
-rw-r--r--src/lib/libcrypto/evp/pmeth_lib.c6
53 files changed, 113 insertions, 113 deletions
diff --git a/src/lib/libcrypto/evp/bio_b64.c b/src/lib/libcrypto/evp/bio_b64.c
index b61a342a3e..8880a28375 100644
--- a/src/lib/libcrypto/evp/bio_b64.c
+++ b/src/lib/libcrypto/evp/bio_b64.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bio_b64.c,v 1.25 2022/01/14 08:40:57 tb Exp $ */ 1/* $OpenBSD: bio_b64.c,v 1.26 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -64,7 +64,7 @@
64#include <openssl/evp.h> 64#include <openssl/evp.h>
65 65
66#include "bio_local.h" 66#include "bio_local.h"
67#include "evp_locl.h" 67#include "evp_local.h"
68 68
69static int b64_write(BIO *h, const char *buf, int num); 69static int b64_write(BIO *h, const char *buf, int num);
70static int b64_read(BIO *h, char *buf, int size); 70static int b64_read(BIO *h, char *buf, int size);
diff --git a/src/lib/libcrypto/evp/bio_enc.c b/src/lib/libcrypto/evp/bio_enc.c
index 2a0f76fcbe..098b1ea32b 100644
--- a/src/lib/libcrypto/evp/bio_enc.c
+++ b/src/lib/libcrypto/evp/bio_enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bio_enc.c,v 1.26 2022/01/14 08:40:57 tb Exp $ */ 1/* $OpenBSD: bio_enc.c,v 1.27 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -64,7 +64,7 @@
64#include <openssl/evp.h> 64#include <openssl/evp.h>
65 65
66#include "bio_local.h" 66#include "bio_local.h"
67#include "evp_locl.h" 67#include "evp_local.h"
68 68
69static int enc_write(BIO *h, const char *buf, int num); 69static int enc_write(BIO *h, const char *buf, int num);
70static int enc_read(BIO *h, char *buf, int size); 70static int enc_read(BIO *h, char *buf, int size);
diff --git a/src/lib/libcrypto/evp/bio_md.c b/src/lib/libcrypto/evp/bio_md.c
index 4ae5f1f496..4b7ca44551 100644
--- a/src/lib/libcrypto/evp/bio_md.c
+++ b/src/lib/libcrypto/evp/bio_md.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bio_md.c,v 1.18 2022/01/14 08:40:57 tb Exp $ */ 1/* $OpenBSD: bio_md.c,v 1.19 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -63,7 +63,7 @@
63#include <openssl/evp.h> 63#include <openssl/evp.h>
64 64
65#include "bio_local.h" 65#include "bio_local.h"
66#include "evp_locl.h" 66#include "evp_local.h"
67 67
68/* BIO_put and BIO_get both add to the digest, 68/* BIO_put and BIO_get both add to the digest,
69 * BIO_gets returns the digest */ 69 * BIO_gets returns the digest */
diff --git a/src/lib/libcrypto/evp/digest.c b/src/lib/libcrypto/evp/digest.c
index ecb5292532..1fa25cd4fb 100644
--- a/src/lib/libcrypto/evp/digest.c
+++ b/src/lib/libcrypto/evp/digest.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: digest.c,v 1.34 2022/01/10 10:51:31 tb Exp $ */ 1/* $OpenBSD: digest.c,v 1.35 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -122,7 +122,7 @@
122#include <openssl/engine.h> 122#include <openssl/engine.h>
123#endif 123#endif
124 124
125#include "evp_locl.h" 125#include "evp_local.h"
126 126
127int 127int
128EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type) 128EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type)
diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c
index d674be3843..0d7daf43e3 100644
--- a/src/lib/libcrypto/evp/e_aes.c
+++ b/src/lib/libcrypto/evp/e_aes.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_aes.c,v 1.49 2022/09/13 04:59:18 jsing Exp $ */ 1/* $OpenBSD: e_aes.c,v 1.50 2022/11/26 16:08:52 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -60,8 +60,8 @@
60#include <openssl/err.h> 60#include <openssl/err.h>
61#include <openssl/evp.h> 61#include <openssl/evp.h>
62 62
63#include "evp_locl.h" 63#include "evp_local.h"
64#include "modes_lcl.h" 64#include "modes_local.h"
65 65
66typedef struct { 66typedef struct {
67 AES_KEY ks; 67 AES_KEY ks;
diff --git a/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c b/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c
index eef9c28096..9cde386150 100644
--- a/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c
+++ b/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_aes_cbc_hmac_sha1.c,v 1.16 2021/12/12 21:30:13 tb Exp $ */ 1/* $OpenBSD: e_aes_cbc_hmac_sha1.c,v 1.17 2022/11/26 16:08:52 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2011-2013 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2011-2013 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -60,8 +60,8 @@
60#include <openssl/aes.h> 60#include <openssl/aes.h>
61#include <openssl/sha.h> 61#include <openssl/sha.h>
62 62
63#include "constant_time_locl.h" 63#include "constant_time.h"
64#include "evp_locl.h" 64#include "evp_local.h"
65 65
66#define TLS1_1_VERSION 0x0302 66#define TLS1_1_VERSION 0x0302
67 67
diff --git a/src/lib/libcrypto/evp/e_bf.c b/src/lib/libcrypto/evp/e_bf.c
index 4632b523e2..c2ab3178a5 100644
--- a/src/lib/libcrypto/evp/e_bf.c
+++ b/src/lib/libcrypto/evp/e_bf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_bf.c,v 1.14 2022/09/15 07:04:19 jsing Exp $ */ 1/* $OpenBSD: e_bf.c,v 1.15 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -67,7 +67,7 @@
67#include <openssl/evp.h> 67#include <openssl/evp.h>
68#include <openssl/objects.h> 68#include <openssl/objects.h>
69 69
70#include "evp_locl.h" 70#include "evp_local.h"
71 71
72typedef struct { 72typedef struct {
73 BF_KEY ks; 73 BF_KEY ks;
diff --git a/src/lib/libcrypto/evp/e_camellia.c b/src/lib/libcrypto/evp/e_camellia.c
index 3976baaa48..884f8cef2a 100644
--- a/src/lib/libcrypto/evp/e_camellia.c
+++ b/src/lib/libcrypto/evp/e_camellia.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_camellia.c,v 1.15 2022/09/10 17:39:47 jsing Exp $ */ 1/* $OpenBSD: e_camellia.c,v 1.16 2022/11/26 16:08:52 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2006 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2006 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -62,7 +62,7 @@
62#include <openssl/err.h> 62#include <openssl/err.h>
63#include <openssl/camellia.h> 63#include <openssl/camellia.h>
64 64
65#include "evp_locl.h" 65#include "evp_local.h"
66 66
67/* Camellia subkey Structure */ 67/* Camellia subkey Structure */
68typedef struct { 68typedef struct {
diff --git a/src/lib/libcrypto/evp/e_cast.c b/src/lib/libcrypto/evp/e_cast.c
index 702c26e0c3..98683e1d01 100644
--- a/src/lib/libcrypto/evp/e_cast.c
+++ b/src/lib/libcrypto/evp/e_cast.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_cast.c,v 1.13 2022/09/15 07:04:19 jsing Exp $ */ 1/* $OpenBSD: e_cast.c,v 1.14 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -67,7 +67,7 @@
67#include <openssl/evp.h> 67#include <openssl/evp.h>
68#include <openssl/objects.h> 68#include <openssl/objects.h>
69 69
70#include "evp_locl.h" 70#include "evp_local.h"
71 71
72typedef struct { 72typedef struct {
73 CAST_KEY ks; 73 CAST_KEY ks;
diff --git a/src/lib/libcrypto/evp/e_chacha.c b/src/lib/libcrypto/evp/e_chacha.c
index 447ce7e9e2..f27ed1d37d 100644
--- a/src/lib/libcrypto/evp/e_chacha.c
+++ b/src/lib/libcrypto/evp/e_chacha.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_chacha.c,v 1.9 2022/07/30 17:11:38 jsing Exp $ */ 1/* $OpenBSD: e_chacha.c,v 1.10 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -23,7 +23,7 @@
23#include <openssl/evp.h> 23#include <openssl/evp.h>
24#include <openssl/objects.h> 24#include <openssl/objects.h>
25 25
26#include "evp_locl.h" 26#include "evp_local.h"
27 27
28static int 28static int
29chacha_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, 29chacha_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
diff --git a/src/lib/libcrypto/evp/e_chacha20poly1305.c b/src/lib/libcrypto/evp/e_chacha20poly1305.c
index 450264846b..2635b6f675 100644
--- a/src/lib/libcrypto/evp/e_chacha20poly1305.c
+++ b/src/lib/libcrypto/evp/e_chacha20poly1305.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_chacha20poly1305.c,v 1.26 2022/09/13 04:59:18 jsing Exp $ */ 1/* $OpenBSD: e_chacha20poly1305.c,v 1.27 2022/11/26 16:08:52 tb Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2022 Joel Sing <jsing@openbsd.org> 4 * Copyright (c) 2022 Joel Sing <jsing@openbsd.org>
@@ -31,7 +31,7 @@
31#include <openssl/poly1305.h> 31#include <openssl/poly1305.h>
32 32
33#include "bytestring.h" 33#include "bytestring.h"
34#include "evp_locl.h" 34#include "evp_local.h"
35 35
36#define POLY1305_TAG_LEN 16 36#define POLY1305_TAG_LEN 16
37 37
diff --git a/src/lib/libcrypto/evp/e_des.c b/src/lib/libcrypto/evp/e_des.c
index 8fcab72e6b..dffabc8125 100644
--- a/src/lib/libcrypto/evp/e_des.c
+++ b/src/lib/libcrypto/evp/e_des.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_des.c,v 1.19 2022/09/15 07:04:19 jsing Exp $ */ 1/* $OpenBSD: e_des.c,v 1.20 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -67,7 +67,7 @@
67#include <openssl/des.h> 67#include <openssl/des.h>
68#include <openssl/objects.h> 68#include <openssl/objects.h>
69 69
70#include "evp_locl.h" 70#include "evp_local.h"
71 71
72static int 72static int
73des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 73des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
diff --git a/src/lib/libcrypto/evp/e_des3.c b/src/lib/libcrypto/evp/e_des3.c
index 6a5d03fe99..d6c7537aea 100644
--- a/src/lib/libcrypto/evp/e_des3.c
+++ b/src/lib/libcrypto/evp/e_des3.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_des3.c,v 1.25 2022/09/15 07:04:19 jsing Exp $ */ 1/* $OpenBSD: e_des3.c,v 1.26 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -68,7 +68,7 @@
68#include <openssl/evp.h> 68#include <openssl/evp.h>
69#include <openssl/objects.h> 69#include <openssl/objects.h>
70 70
71#include "evp_locl.h" 71#include "evp_local.h"
72 72
73typedef struct { 73typedef struct {
74 DES_key_schedule ks1;/* key schedule */ 74 DES_key_schedule ks1;/* key schedule */
diff --git a/src/lib/libcrypto/evp/e_gost2814789.c b/src/lib/libcrypto/evp/e_gost2814789.c
index cff66e8c79..6344a11e9b 100644
--- a/src/lib/libcrypto/evp/e_gost2814789.c
+++ b/src/lib/libcrypto/evp/e_gost2814789.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_gost2814789.c,v 1.10 2022/09/10 17:39:47 jsing Exp $ */ 1/* $OpenBSD: e_gost2814789.c,v 1.11 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> 3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
4 * Copyright (c) 2005-2006 Cryptocom LTD 4 * Copyright (c) 2005-2006 Cryptocom LTD
@@ -58,7 +58,7 @@
58#include <openssl/err.h> 58#include <openssl/err.h>
59#include <openssl/gost.h> 59#include <openssl/gost.h>
60 60
61#include "evp_locl.h" 61#include "evp_local.h"
62 62
63typedef struct { 63typedef struct {
64 GOST2814789_KEY ks; 64 GOST2814789_KEY ks;
diff --git a/src/lib/libcrypto/evp/e_idea.c b/src/lib/libcrypto/evp/e_idea.c
index b45ffd5696..b8349ee9cb 100644
--- a/src/lib/libcrypto/evp/e_idea.c
+++ b/src/lib/libcrypto/evp/e_idea.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_idea.c,v 1.17 2022/09/15 07:04:19 jsing Exp $ */ 1/* $OpenBSD: e_idea.c,v 1.18 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -68,7 +68,7 @@
68#include <openssl/idea.h> 68#include <openssl/idea.h>
69#include <openssl/objects.h> 69#include <openssl/objects.h>
70 70
71#include "evp_locl.h" 71#include "evp_local.h"
72 72
73/* NB idea_ecb_encrypt doesn't take an 'encrypt' argument so we treat it as a special 73/* NB idea_ecb_encrypt doesn't take an 'encrypt' argument so we treat it as a special
74 * case 74 * case
diff --git a/src/lib/libcrypto/evp/e_null.c b/src/lib/libcrypto/evp/e_null.c
index db79e1ec5f..ddd633dc7c 100644
--- a/src/lib/libcrypto/evp/e_null.c
+++ b/src/lib/libcrypto/evp/e_null.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_null.c,v 1.15 2021/12/12 21:30:13 tb Exp $ */ 1/* $OpenBSD: e_null.c,v 1.16 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -62,7 +62,7 @@
62#include <openssl/evp.h> 62#include <openssl/evp.h>
63#include <openssl/objects.h> 63#include <openssl/objects.h>
64 64
65#include "evp_locl.h" 65#include "evp_local.h"
66 66
67static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 67static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
68 const unsigned char *iv, int enc); 68 const unsigned char *iv, int enc);
diff --git a/src/lib/libcrypto/evp/e_rc2.c b/src/lib/libcrypto/evp/e_rc2.c
index 1af17a7c41..78697d08c6 100644
--- a/src/lib/libcrypto/evp/e_rc2.c
+++ b/src/lib/libcrypto/evp/e_rc2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_rc2.c,v 1.19 2022/09/15 07:04:19 jsing Exp $ */ 1/* $OpenBSD: e_rc2.c,v 1.20 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -68,7 +68,7 @@
68#include <openssl/objects.h> 68#include <openssl/objects.h>
69#include <openssl/rc2.h> 69#include <openssl/rc2.h>
70 70
71#include "evp_locl.h" 71#include "evp_local.h"
72 72
73static int rc2_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 73static int rc2_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
74 const unsigned char *iv, int enc); 74 const unsigned char *iv, int enc);
diff --git a/src/lib/libcrypto/evp/e_rc4.c b/src/lib/libcrypto/evp/e_rc4.c
index e77a293141..7afc6af9cd 100644
--- a/src/lib/libcrypto/evp/e_rc4.c
+++ b/src/lib/libcrypto/evp/e_rc4.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_rc4.c,v 1.14 2014/07/11 08:44:48 jsing Exp $ */ 1/* $OpenBSD: e_rc4.c,v 1.15 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -66,7 +66,7 @@
66#include <openssl/objects.h> 66#include <openssl/objects.h>
67#include <openssl/rc4.h> 67#include <openssl/rc4.h>
68 68
69#include "evp_locl.h" 69#include "evp_local.h"
70 70
71/* FIXME: surely this is available elsewhere? */ 71/* FIXME: surely this is available elsewhere? */
72#define EVP_RC4_KEY_SIZE 16 72#define EVP_RC4_KEY_SIZE 16
diff --git a/src/lib/libcrypto/evp/e_rc4_hmac_md5.c b/src/lib/libcrypto/evp/e_rc4_hmac_md5.c
index b8a6b4492e..b3be57d5f2 100644
--- a/src/lib/libcrypto/evp/e_rc4_hmac_md5.c
+++ b/src/lib/libcrypto/evp/e_rc4_hmac_md5.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_rc4_hmac_md5.c,v 1.9 2021/12/12 21:30:13 tb Exp $ */ 1/* $OpenBSD: e_rc4_hmac_md5.c,v 1.10 2022/11/26 16:08:52 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2011 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2011 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -60,7 +60,7 @@
60#include <openssl/rc4.h> 60#include <openssl/rc4.h>
61#include <openssl/md5.h> 61#include <openssl/md5.h>
62 62
63#include "evp_locl.h" 63#include "evp_local.h"
64 64
65/* FIXME: surely this is available elsewhere? */ 65/* FIXME: surely this is available elsewhere? */
66#define EVP_RC4_KEY_SIZE 16 66#define EVP_RC4_KEY_SIZE 16
diff --git a/src/lib/libcrypto/evp/e_sm4.c b/src/lib/libcrypto/evp/e_sm4.c
index 11e9a74d69..0d37448109 100644
--- a/src/lib/libcrypto/evp/e_sm4.c
+++ b/src/lib/libcrypto/evp/e_sm4.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_sm4.c,v 1.6 2022/09/10 17:39:47 jsing Exp $ */ 1/* $OpenBSD: e_sm4.c,v 1.7 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2017, 2019 Ribose Inc 3 * Copyright (c) 2017, 2019 Ribose Inc
4 * 4 *
@@ -22,7 +22,7 @@
22#include <openssl/modes.h> 22#include <openssl/modes.h>
23#include <openssl/sm4.h> 23#include <openssl/sm4.h>
24 24
25#include "evp_locl.h" 25#include "evp_local.h"
26 26
27typedef struct { 27typedef struct {
28 SM4_KEY ks; 28 SM4_KEY ks;
diff --git a/src/lib/libcrypto/evp/e_xcbc_d.c b/src/lib/libcrypto/evp/e_xcbc_d.c
index 2aae0a9151..bbbc3a1ee9 100644
--- a/src/lib/libcrypto/evp/e_xcbc_d.c
+++ b/src/lib/libcrypto/evp/e_xcbc_d.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_xcbc_d.c,v 1.12 2014/07/11 08:44:48 jsing Exp $ */ 1/* $OpenBSD: e_xcbc_d.c,v 1.13 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -67,7 +67,7 @@
67#include <openssl/evp.h> 67#include <openssl/evp.h>
68#include <openssl/objects.h> 68#include <openssl/objects.h>
69 69
70#include "evp_locl.h" 70#include "evp_local.h"
71 71
72static int desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 72static int desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
73 const unsigned char *iv, int enc); 73 const unsigned char *iv, int enc);
diff --git a/src/lib/libcrypto/evp/encode.c b/src/lib/libcrypto/evp/encode.c
index 30fcd858cf..718bdb5fc4 100644
--- a/src/lib/libcrypto/evp/encode.c
+++ b/src/lib/libcrypto/evp/encode.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: encode.c,v 1.29 2021/12/12 21:30:13 tb Exp $ */ 1/* $OpenBSD: encode.c,v 1.30 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -62,7 +62,7 @@
62 62
63#include <openssl/evp.h> 63#include <openssl/evp.h>
64 64
65#include "evp_locl.h" 65#include "evp_local.h"
66 66
67static unsigned char conv_ascii2bin(unsigned char a); 67static unsigned char conv_ascii2bin(unsigned char a);
68#define conv_bin2ascii(a) (data_bin2ascii[(a)&0x3f]) 68#define conv_bin2ascii(a) (data_bin2ascii[(a)&0x3f])
diff --git a/src/lib/libcrypto/evp/evp_aead.c b/src/lib/libcrypto/evp/evp_aead.c
index 93d523af7c..58f1c8722d 100644
--- a/src/lib/libcrypto/evp/evp_aead.c
+++ b/src/lib/libcrypto/evp/evp_aead.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp_aead.c,v 1.7 2022/01/07 21:58:17 tb Exp $ */ 1/* $OpenBSD: evp_aead.c,v 1.8 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2014, Google Inc. 3 * Copyright (c) 2014, Google Inc.
4 * 4 *
@@ -21,7 +21,7 @@
21#include <openssl/evp.h> 21#include <openssl/evp.h>
22#include <openssl/err.h> 22#include <openssl/err.h>
23 23
24#include "evp_locl.h" 24#include "evp_local.h"
25 25
26size_t 26size_t
27EVP_AEAD_key_length(const EVP_AEAD *aead) 27EVP_AEAD_key_length(const EVP_AEAD *aead)
diff --git a/src/lib/libcrypto/evp/evp_enc.c b/src/lib/libcrypto/evp/evp_enc.c
index 49e0ffa144..d1defc4643 100644
--- a/src/lib/libcrypto/evp/evp_enc.c
+++ b/src/lib/libcrypto/evp/evp_enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp_enc.c,v 1.47 2022/09/13 04:59:18 jsing Exp $ */ 1/* $OpenBSD: evp_enc.c,v 1.48 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -72,7 +72,7 @@
72#include <openssl/engine.h> 72#include <openssl/engine.h>
73#endif 73#endif
74 74
75#include "evp_locl.h" 75#include "evp_local.h"
76 76
77int 77int
78EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, 78EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
diff --git a/src/lib/libcrypto/evp/evp_key.c b/src/lib/libcrypto/evp/evp_key.c
index dcfb94e301..6fc8588cde 100644
--- a/src/lib/libcrypto/evp/evp_key.c
+++ b/src/lib/libcrypto/evp/evp_key.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp_key.c,v 1.27 2021/12/12 21:30:13 tb Exp $ */ 1/* $OpenBSD: evp_key.c,v 1.28 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -65,7 +65,7 @@
65#include <openssl/ui.h> 65#include <openssl/ui.h>
66#include <openssl/x509.h> 66#include <openssl/x509.h>
67 67
68#include "evp_locl.h" 68#include "evp_local.h"
69 69
70/* should be init to zeros. */ 70/* should be init to zeros. */
71static char prompt_string[80]; 71static char prompt_string[80];
diff --git a/src/lib/libcrypto/evp/evp_lib.c b/src/lib/libcrypto/evp/evp_lib.c
index 0e354d6272..f64842b86f 100644
--- a/src/lib/libcrypto/evp/evp_lib.c
+++ b/src/lib/libcrypto/evp/evp_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp_lib.c,v 1.24 2022/01/10 13:42:28 tb Exp $ */ 1/* $OpenBSD: evp_lib.c,v 1.25 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -63,8 +63,8 @@
63#include <openssl/evp.h> 63#include <openssl/evp.h>
64#include <openssl/objects.h> 64#include <openssl/objects.h>
65 65
66#include "asn1_locl.h" 66#include "asn1_local.h"
67#include "evp_locl.h" 67#include "evp_local.h"
68 68
69int 69int
70EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type) 70EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
diff --git a/src/lib/libcrypto/evp/evp_locl.h b/src/lib/libcrypto/evp/evp_local.h
index 2bfcc6448e..ba34a7949d 100644
--- a/src/lib/libcrypto/evp/evp_locl.h
+++ b/src/lib/libcrypto/evp/evp_local.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp_locl.h,v 1.31 2022/11/18 14:45:10 tb Exp $ */ 1/* $OpenBSD: evp_local.h,v 1.1 2022/11/26 16:08:52 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
diff --git a/src/lib/libcrypto/evp/evp_pbe.c b/src/lib/libcrypto/evp/evp_pbe.c
index 65e9e45ea8..565955524a 100644
--- a/src/lib/libcrypto/evp/evp_pbe.c
+++ b/src/lib/libcrypto/evp/evp_pbe.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp_pbe.c,v 1.26 2020/06/05 17:30:41 jsing Exp $ */ 1/* $OpenBSD: evp_pbe.c,v 1.27 2022/11/26 16:08:52 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -66,7 +66,7 @@
66#include <openssl/pkcs12.h> 66#include <openssl/pkcs12.h>
67#include <openssl/x509.h> 67#include <openssl/x509.h>
68 68
69#include "evp_locl.h" 69#include "evp_local.h"
70 70
71/* Password based encryption (PBE) functions */ 71/* Password based encryption (PBE) functions */
72 72
diff --git a/src/lib/libcrypto/evp/evp_pkey.c b/src/lib/libcrypto/evp/evp_pkey.c
index 3ba0e1dd51..d2fbdee46c 100644
--- a/src/lib/libcrypto/evp/evp_pkey.c
+++ b/src/lib/libcrypto/evp/evp_pkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp_pkey.c,v 1.24 2021/12/12 21:30:13 tb Exp $ */ 1/* $OpenBSD: evp_pkey.c,v 1.25 2022/11/26 16:08:52 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -62,8 +62,8 @@
62#include <openssl/err.h> 62#include <openssl/err.h>
63#include <openssl/x509.h> 63#include <openssl/x509.h>
64 64
65#include "asn1_locl.h" 65#include "asn1_local.h"
66#include "evp_locl.h" 66#include "evp_local.h"
67 67
68/* Extract a private key from a PKCS8 structure */ 68/* Extract a private key from a PKCS8 structure */
69 69
diff --git a/src/lib/libcrypto/evp/m_gost2814789.c b/src/lib/libcrypto/evp/m_gost2814789.c
index 7d11ec8c89..ca303dab9f 100644
--- a/src/lib/libcrypto/evp/m_gost2814789.c
+++ b/src/lib/libcrypto/evp/m_gost2814789.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_gost2814789.c,v 1.3 2021/12/12 21:30:13 tb Exp $ */ 1/* $OpenBSD: m_gost2814789.c,v 1.4 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> 3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
4 * Copyright (c) 2005-2006 Cryptocom LTD 4 * Copyright (c) 2005-2006 Cryptocom LTD
@@ -57,7 +57,7 @@
57#include <openssl/gost.h> 57#include <openssl/gost.h>
58#include <openssl/objects.h> 58#include <openssl/objects.h>
59 59
60#include "evp_locl.h" 60#include "evp_local.h"
61 61
62static int 62static int
63gost2814789_init(EVP_MD_CTX *ctx) 63gost2814789_init(EVP_MD_CTX *ctx)
diff --git a/src/lib/libcrypto/evp/m_gostr341194.c b/src/lib/libcrypto/evp/m_gostr341194.c
index f479675baa..33e96a5a2c 100644
--- a/src/lib/libcrypto/evp/m_gostr341194.c
+++ b/src/lib/libcrypto/evp/m_gostr341194.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_gostr341194.c,v 1.4 2022/01/14 08:38:05 tb Exp $ */ 1/* $OpenBSD: m_gostr341194.c,v 1.5 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> 3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
4 * Copyright (c) 2005-2006 Cryptocom LTD 4 * Copyright (c) 2005-2006 Cryptocom LTD
@@ -59,7 +59,7 @@
59#include <openssl/gost.h> 59#include <openssl/gost.h>
60#include <openssl/objects.h> 60#include <openssl/objects.h>
61 61
62#include "evp_locl.h" 62#include "evp_local.h"
63 63
64static int 64static int
65gostr341194_init(EVP_MD_CTX *ctx) 65gostr341194_init(EVP_MD_CTX *ctx)
diff --git a/src/lib/libcrypto/evp/m_md4.c b/src/lib/libcrypto/evp/m_md4.c
index 977565283f..c1e0256b38 100644
--- a/src/lib/libcrypto/evp/m_md4.c
+++ b/src/lib/libcrypto/evp/m_md4.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_md4.c,v 1.18 2022/01/14 08:38:05 tb Exp $ */ 1/* $OpenBSD: m_md4.c,v 1.19 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -71,7 +71,7 @@
71#include <openssl/rsa.h> 71#include <openssl/rsa.h>
72#endif 72#endif
73 73
74#include "evp_locl.h" 74#include "evp_local.h"
75 75
76static int 76static int
77init(EVP_MD_CTX *ctx) 77init(EVP_MD_CTX *ctx)
diff --git a/src/lib/libcrypto/evp/m_md5.c b/src/lib/libcrypto/evp/m_md5.c
index daa7aee7b0..b66b25bab8 100644
--- a/src/lib/libcrypto/evp/m_md5.c
+++ b/src/lib/libcrypto/evp/m_md5.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_md5.c,v 1.17 2022/01/14 08:38:06 tb Exp $ */ 1/* $OpenBSD: m_md5.c,v 1.18 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -71,7 +71,7 @@
71#include <openssl/rsa.h> 71#include <openssl/rsa.h>
72#endif 72#endif
73 73
74#include "evp_locl.h" 74#include "evp_local.h"
75 75
76static int 76static int
77init(EVP_MD_CTX *ctx) 77init(EVP_MD_CTX *ctx)
diff --git a/src/lib/libcrypto/evp/m_md5_sha1.c b/src/lib/libcrypto/evp/m_md5_sha1.c
index f8bec10d18..b1944b881e 100644
--- a/src/lib/libcrypto/evp/m_md5_sha1.c
+++ b/src/lib/libcrypto/evp/m_md5_sha1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_md5_sha1.c,v 1.4 2022/01/14 08:38:06 tb Exp $ */ 1/* $OpenBSD: m_md5_sha1.c,v 1.5 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2017 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -24,7 +24,7 @@
24#include <openssl/rsa.h> 24#include <openssl/rsa.h>
25#endif 25#endif
26 26
27#include "evp_locl.h" 27#include "evp_local.h"
28 28
29struct md5_sha1_ctx { 29struct md5_sha1_ctx {
30 MD5_CTX md5; 30 MD5_CTX md5;
diff --git a/src/lib/libcrypto/evp/m_null.c b/src/lib/libcrypto/evp/m_null.c
index 4334decb99..d09c0007f3 100644
--- a/src/lib/libcrypto/evp/m_null.c
+++ b/src/lib/libcrypto/evp/m_null.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_null.c,v 1.11 2022/01/14 08:38:06 tb Exp $ */ 1/* $OpenBSD: m_null.c,v 1.12 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -62,7 +62,7 @@
62#include <openssl/objects.h> 62#include <openssl/objects.h>
63#include <openssl/x509.h> 63#include <openssl/x509.h>
64 64
65#include "evp_locl.h" 65#include "evp_local.h"
66 66
67static int 67static int
68init(EVP_MD_CTX *ctx) 68init(EVP_MD_CTX *ctx)
diff --git a/src/lib/libcrypto/evp/m_ripemd.c b/src/lib/libcrypto/evp/m_ripemd.c
index 47397833de..896de59d1c 100644
--- a/src/lib/libcrypto/evp/m_ripemd.c
+++ b/src/lib/libcrypto/evp/m_ripemd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_ripemd.c,v 1.14 2022/01/14 08:38:06 tb Exp $ */ 1/* $OpenBSD: m_ripemd.c,v 1.15 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -71,7 +71,7 @@
71#include <openssl/rsa.h> 71#include <openssl/rsa.h>
72#endif 72#endif
73 73
74#include "evp_locl.h" 74#include "evp_local.h"
75 75
76static int 76static int
77init(EVP_MD_CTX *ctx) 77init(EVP_MD_CTX *ctx)
diff --git a/src/lib/libcrypto/evp/m_sha1.c b/src/lib/libcrypto/evp/m_sha1.c
index a6fb53641e..5b38666892 100644
--- a/src/lib/libcrypto/evp/m_sha1.c
+++ b/src/lib/libcrypto/evp/m_sha1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_sha1.c,v 1.19 2022/01/14 08:38:06 tb Exp $ */ 1/* $OpenBSD: m_sha1.c,v 1.20 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -70,7 +70,7 @@
70#include <openssl/rsa.h> 70#include <openssl/rsa.h>
71#endif 71#endif
72 72
73#include "evp_locl.h" 73#include "evp_local.h"
74 74
75static int 75static int
76init(EVP_MD_CTX *ctx) 76init(EVP_MD_CTX *ctx)
diff --git a/src/lib/libcrypto/evp/m_sigver.c b/src/lib/libcrypto/evp/m_sigver.c
index 5be924bed5..49b1ce29b7 100644
--- a/src/lib/libcrypto/evp/m_sigver.c
+++ b/src/lib/libcrypto/evp/m_sigver.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_sigver.c,v 1.10 2022/11/10 15:17:30 jsing Exp $ */ 1/* $OpenBSD: m_sigver.c,v 1.11 2022/11/26 16:08:52 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -63,7 +63,7 @@
63#include <openssl/objects.h> 63#include <openssl/objects.h>
64#include <openssl/x509.h> 64#include <openssl/x509.h>
65 65
66#include "evp_locl.h" 66#include "evp_local.h"
67 67
68static int 68static int
69update_oneshot_only(EVP_MD_CTX *ctx, const void *data, size_t datalen) 69update_oneshot_only(EVP_MD_CTX *ctx, const void *data, size_t datalen)
diff --git a/src/lib/libcrypto/evp/m_sm3.c b/src/lib/libcrypto/evp/m_sm3.c
index ae8b342e82..bf0ef527eb 100644
--- a/src/lib/libcrypto/evp/m_sm3.c
+++ b/src/lib/libcrypto/evp/m_sm3.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_sm3.c,v 1.3 2022/01/14 08:38:06 tb Exp $ */ 1/* $OpenBSD: m_sm3.c,v 1.4 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2018, Ribose Inc 3 * Copyright (c) 2018, Ribose Inc
4 * 4 *
@@ -25,7 +25,7 @@
25#include <openssl/rsa.h> 25#include <openssl/rsa.h>
26#endif 26#endif
27 27
28#include "evp_locl.h" 28#include "evp_local.h"
29 29
30static int 30static int
31sm3_init(EVP_MD_CTX *ctx) 31sm3_init(EVP_MD_CTX *ctx)
diff --git a/src/lib/libcrypto/evp/m_streebog.c b/src/lib/libcrypto/evp/m_streebog.c
index 3f825e3a0e..5a0dece599 100644
--- a/src/lib/libcrypto/evp/m_streebog.c
+++ b/src/lib/libcrypto/evp/m_streebog.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_streebog.c,v 1.4 2022/01/14 08:38:06 tb Exp $ */ 1/* $OpenBSD: m_streebog.c,v 1.5 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> 3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
4 * Copyright (c) 2005-2006 Cryptocom LTD 4 * Copyright (c) 2005-2006 Cryptocom LTD
@@ -57,7 +57,7 @@
57#include <openssl/gost.h> 57#include <openssl/gost.h>
58#include <openssl/objects.h> 58#include <openssl/objects.h>
59 59
60#include "evp_locl.h" 60#include "evp_local.h"
61 61
62static int 62static int
63streebog_init256(EVP_MD_CTX *ctx) 63streebog_init256(EVP_MD_CTX *ctx)
diff --git a/src/lib/libcrypto/evp/m_wp.c b/src/lib/libcrypto/evp/m_wp.c
index 07ae7ca551..2e0b46d5d3 100644
--- a/src/lib/libcrypto/evp/m_wp.c
+++ b/src/lib/libcrypto/evp/m_wp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_wp.c,v 1.10 2022/01/14 08:38:06 tb Exp $ */ 1/* $OpenBSD: m_wp.c,v 1.11 2022/11/26 16:08:52 tb Exp $ */
2 2
3#include <stdio.h> 3#include <stdio.h>
4 4
@@ -11,7 +11,7 @@
11#include <openssl/x509.h> 11#include <openssl/x509.h>
12#include <openssl/whrlpool.h> 12#include <openssl/whrlpool.h>
13 13
14#include "evp_locl.h" 14#include "evp_local.h"
15 15
16static int 16static int
17init(EVP_MD_CTX *ctx) 17init(EVP_MD_CTX *ctx)
diff --git a/src/lib/libcrypto/evp/names.c b/src/lib/libcrypto/evp/names.c
index 02529eef6c..a27a187542 100644
--- a/src/lib/libcrypto/evp/names.c
+++ b/src/lib/libcrypto/evp/names.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: names.c,v 1.15 2021/12/12 21:30:13 tb Exp $ */ 1/* $OpenBSD: names.c,v 1.16 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -62,7 +62,7 @@
62#include <openssl/objects.h> 62#include <openssl/objects.h>
63#include <openssl/x509.h> 63#include <openssl/x509.h>
64 64
65#include "evp_locl.h" 65#include "evp_local.h"
66 66
67int 67int
68EVP_add_cipher(const EVP_CIPHER *c) 68EVP_add_cipher(const EVP_CIPHER *c)
diff --git a/src/lib/libcrypto/evp/p5_crpt.c b/src/lib/libcrypto/evp/p5_crpt.c
index b9482e0864..e85a60f50e 100644
--- a/src/lib/libcrypto/evp/p5_crpt.c
+++ b/src/lib/libcrypto/evp/p5_crpt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p5_crpt.c,v 1.20 2021/12/12 21:30:13 tb Exp $ */ 1/* $OpenBSD: p5_crpt.c,v 1.21 2022/11/26 16:08:52 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -64,7 +64,7 @@
64#include <openssl/evp.h> 64#include <openssl/evp.h>
65#include <openssl/x509.h> 65#include <openssl/x509.h>
66 66
67#include "evp_locl.h" 67#include "evp_local.h"
68 68
69/* Doesn't do anything now: Builtin PBE algorithms in static table. 69/* Doesn't do anything now: Builtin PBE algorithms in static table.
70 */ 70 */
diff --git a/src/lib/libcrypto/evp/p5_crpt2.c b/src/lib/libcrypto/evp/p5_crpt2.c
index f3585ff34b..6c0cf529a4 100644
--- a/src/lib/libcrypto/evp/p5_crpt2.c
+++ b/src/lib/libcrypto/evp/p5_crpt2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p5_crpt2.c,v 1.24 2021/12/12 21:27:37 tb Exp $ */ 1/* $OpenBSD: p5_crpt2.c,v 1.25 2022/11/26 16:08:52 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -69,7 +69,7 @@
69#include <openssl/hmac.h> 69#include <openssl/hmac.h>
70#include <openssl/x509.h> 70#include <openssl/x509.h>
71 71
72#include "evp_locl.h" 72#include "evp_local.h"
73#include "hmac_local.h" 73#include "hmac_local.h"
74 74
75/* This is an implementation of PKCS#5 v2.0 password based encryption key 75/* This is an implementation of PKCS#5 v2.0 password based encryption key
diff --git a/src/lib/libcrypto/evp/p_dec.c b/src/lib/libcrypto/evp/p_dec.c
index c19cc651b3..33dd301911 100644
--- a/src/lib/libcrypto/evp/p_dec.c
+++ b/src/lib/libcrypto/evp/p_dec.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p_dec.c,v 1.12 2021/12/12 21:30:13 tb Exp $ */ 1/* $OpenBSD: p_dec.c,v 1.13 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -69,7 +69,7 @@
69#include <openssl/rsa.h> 69#include <openssl/rsa.h>
70#endif 70#endif
71 71
72#include "evp_locl.h" 72#include "evp_local.h"
73 73
74int 74int
75EVP_PKEY_decrypt_old(unsigned char *key, const unsigned char *ek, int ekl, 75EVP_PKEY_decrypt_old(unsigned char *key, const unsigned char *ek, int ekl,
diff --git a/src/lib/libcrypto/evp/p_enc.c b/src/lib/libcrypto/evp/p_enc.c
index 5553429c50..4685f55cad 100644
--- a/src/lib/libcrypto/evp/p_enc.c
+++ b/src/lib/libcrypto/evp/p_enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p_enc.c,v 1.12 2021/12/12 21:30:13 tb Exp $ */ 1/* $OpenBSD: p_enc.c,v 1.13 2022/11/26 16:08:53 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -69,7 +69,7 @@
69#include <openssl/rsa.h> 69#include <openssl/rsa.h>
70#endif 70#endif
71 71
72#include "evp_locl.h" 72#include "evp_local.h"
73 73
74int 74int
75EVP_PKEY_encrypt_old(unsigned char *ek, const unsigned char *key, int key_len, 75EVP_PKEY_encrypt_old(unsigned char *ek, const unsigned char *key, int key_len,
diff --git a/src/lib/libcrypto/evp/p_lib.c b/src/lib/libcrypto/evp/p_lib.c
index ec3949b4c1..e1760122c6 100644
--- a/src/lib/libcrypto/evp/p_lib.c
+++ b/src/lib/libcrypto/evp/p_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p_lib.c,v 1.31 2022/11/18 14:45:10 tb Exp $ */ 1/* $OpenBSD: p_lib.c,v 1.32 2022/11/26 16:08:53 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -81,8 +81,8 @@
81#include <openssl/engine.h> 81#include <openssl/engine.h>
82#endif 82#endif
83 83
84#include "asn1_locl.h" 84#include "asn1_local.h"
85#include "evp_locl.h" 85#include "evp_local.h"
86 86
87static void EVP_PKEY_free_it(EVP_PKEY *x); 87static void EVP_PKEY_free_it(EVP_PKEY *x);
88 88
diff --git a/src/lib/libcrypto/evp/p_open.c b/src/lib/libcrypto/evp/p_open.c
index e4c59e68db..bce900b9ab 100644
--- a/src/lib/libcrypto/evp/p_open.c
+++ b/src/lib/libcrypto/evp/p_open.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p_open.c,v 1.20 2021/12/12 21:30:13 tb Exp $ */ 1/* $OpenBSD: p_open.c,v 1.21 2022/11/26 16:08:53 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -69,7 +69,7 @@
69#include <openssl/rsa.h> 69#include <openssl/rsa.h>
70#include <openssl/x509.h> 70#include <openssl/x509.h>
71 71
72#include "evp_locl.h" 72#include "evp_local.h"
73 73
74int 74int
75EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, 75EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
diff --git a/src/lib/libcrypto/evp/p_sign.c b/src/lib/libcrypto/evp/p_sign.c
index 1e33cfbe7f..1f78d1efef 100644
--- a/src/lib/libcrypto/evp/p_sign.c
+++ b/src/lib/libcrypto/evp/p_sign.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p_sign.c,v 1.16 2022/01/14 08:38:06 tb Exp $ */ 1/* $OpenBSD: p_sign.c,v 1.17 2022/11/26 16:08:53 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -63,7 +63,7 @@
63#include <openssl/objects.h> 63#include <openssl/objects.h>
64#include <openssl/x509.h> 64#include <openssl/x509.h>
65 65
66#include "evp_locl.h" 66#include "evp_local.h"
67 67
68int 68int
69EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen, 69EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
diff --git a/src/lib/libcrypto/evp/p_verify.c b/src/lib/libcrypto/evp/p_verify.c
index d51d1b4a0a..545715325d 100644
--- a/src/lib/libcrypto/evp/p_verify.c
+++ b/src/lib/libcrypto/evp/p_verify.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p_verify.c,v 1.15 2022/01/14 08:38:06 tb Exp $ */ 1/* $OpenBSD: p_verify.c,v 1.16 2022/11/26 16:08:53 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -63,7 +63,7 @@
63#include <openssl/objects.h> 63#include <openssl/objects.h>
64#include <openssl/x509.h> 64#include <openssl/x509.h>
65 65
66#include "evp_locl.h" 66#include "evp_local.h"
67 67
68int 68int
69EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf, 69EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
diff --git a/src/lib/libcrypto/evp/pmeth_fn.c b/src/lib/libcrypto/evp/pmeth_fn.c
index c9117eedd4..cab1dfab6f 100644
--- a/src/lib/libcrypto/evp/pmeth_fn.c
+++ b/src/lib/libcrypto/evp/pmeth_fn.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pmeth_fn.c,v 1.6 2017/01/29 17:49:23 beck Exp $ */ 1/* $OpenBSD: pmeth_fn.c,v 1.7 2022/11/26 16:08:53 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -63,7 +63,7 @@
63#include <openssl/evp.h> 63#include <openssl/evp.h>
64#include <openssl/objects.h> 64#include <openssl/objects.h>
65 65
66#include "evp_locl.h" 66#include "evp_local.h"
67 67
68#define M_check_autoarg(ctx, arg, arglen, err) \ 68#define M_check_autoarg(ctx, arg, arglen, err) \
69 if (ctx->pmeth->flags & EVP_PKEY_FLAG_AUTOARGLEN) \ 69 if (ctx->pmeth->flags & EVP_PKEY_FLAG_AUTOARGLEN) \
diff --git a/src/lib/libcrypto/evp/pmeth_gn.c b/src/lib/libcrypto/evp/pmeth_gn.c
index 7d921d23b4..d31bb7c0b4 100644
--- a/src/lib/libcrypto/evp/pmeth_gn.c
+++ b/src/lib/libcrypto/evp/pmeth_gn.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pmeth_gn.c,v 1.10 2022/01/10 12:10:26 tb Exp $ */ 1/* $OpenBSD: pmeth_gn.c,v 1.11 2022/11/26 16:08:53 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -64,9 +64,9 @@
64#include <openssl/evp.h> 64#include <openssl/evp.h>
65#include <openssl/objects.h> 65#include <openssl/objects.h>
66 66
67#include "asn1_locl.h" 67#include "asn1_local.h"
68#include "bn_lcl.h" 68#include "bn_local.h"
69#include "evp_locl.h" 69#include "evp_local.h"
70 70
71int 71int
72EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx) 72EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx)
diff --git a/src/lib/libcrypto/evp/pmeth_lib.c b/src/lib/libcrypto/evp/pmeth_lib.c
index 19610dfbad..e4abdc4aec 100644
--- a/src/lib/libcrypto/evp/pmeth_lib.c
+++ b/src/lib/libcrypto/evp/pmeth_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pmeth_lib.c,v 1.25 2022/11/10 16:37:52 jsing Exp $ */ 1/* $OpenBSD: pmeth_lib.c,v 1.26 2022/11/26 16:08:53 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -72,8 +72,8 @@
72#include <openssl/engine.h> 72#include <openssl/engine.h>
73#endif 73#endif
74 74
75#include "asn1_locl.h" 75#include "asn1_local.h"
76#include "evp_locl.h" 76#include "evp_local.h"
77 77
78DECLARE_STACK_OF(EVP_PKEY_METHOD) 78DECLARE_STACK_OF(EVP_PKEY_METHOD)
79STACK_OF(EVP_PKEY_METHOD) *pkey_app_methods = NULL; 79STACK_OF(EVP_PKEY_METHOD) *pkey_app_methods = NULL;