From 1cc76114d489046325db16299f875e8175c74330 Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Fri, 29 Dec 2023 05:57:24 +0000
Subject: [PATCH] Use more consistent naming for some files in evp

EVP_Digest{Init,Update,Final}() move from digest.c to evp_digest.c which
will become the home of all things related to EVP_MD{,_CTX} handling.

EVP_Cipher{Init,Update,Final}() move from evp_enc.c to evp_cipher.c which
will become the home of all things related to EVP_CIPHER{,_CTX} handling.

EVP_Encode{Init,Update,Final}() move from encode.c to evp_encode.c which
already is the home of EVP_ENCODE_CTX_{new,free}().

discussed with jsing
---
 lib/libcrypto/Makefile                        | 8 ++++----
 lib/libcrypto/evp/{evp_enc.c => evp_cipher.c} | 2 +-
 lib/libcrypto/evp/{digest.c => evp_digest.c}  | 2 +-
 lib/libcrypto/evp/{encode.c => evp_encode.c}  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename lib/libcrypto/evp/{evp_enc.c => evp_cipher.c} (99%)
 rename lib/libcrypto/evp/{digest.c => evp_digest.c} (99%)
 rename lib/libcrypto/evp/{encode.c => evp_encode.c} (99%)

diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index 6329d309e78..d9b3e180f09 100644
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.159 2023/12/20 13:52:17 tb Exp $
+# $OpenBSD: Makefile,v 1.160 2023/12/29 05:57:24 tb Exp $
 
 LIB=	crypto
 LIBREBUILD=y
@@ -350,7 +350,6 @@ SRCS+= bio_enc.c
 SRCS+= bio_md.c
 SRCS+= c_all.c
 SRCS+= cipher_method_lib.c
-SRCS+= digest.c
 SRCS+= e_aes.c
 SRCS+= e_aes_cbc_hmac_sha1.c
 SRCS+= e_bf.c
@@ -368,9 +367,10 @@ SRCS+= e_rc4.c
 SRCS+= e_rc4_hmac_md5.c
 SRCS+= e_sm4.c
 SRCS+= e_xcbc_d.c
-SRCS+= encode.c
 SRCS+= evp_aead.c
-SRCS+= evp_enc.c
+SRCS+= evp_cipher.c
+SRCS+= evp_digest.c
+SRCS+= evp_encode.c
 SRCS+= evp_err.c
 SRCS+= evp_key.c
 SRCS+= evp_lib.c
diff --git a/lib/libcrypto/evp/evp_enc.c b/lib/libcrypto/evp/evp_cipher.c
similarity index 99%
rename from lib/libcrypto/evp/evp_enc.c
rename to lib/libcrypto/evp/evp_cipher.c
index 3eef53c2d69..3b38e18bf3c 100644
--- a/lib/libcrypto/evp/evp_enc.c
+++ b/lib/libcrypto/evp/evp_cipher.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_enc.c,v 1.81 2023/12/26 09:04:30 tb Exp $ */
+/* $OpenBSD: evp_cipher.c,v 1.1 2023/12/29 05:57:24 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libcrypto/evp/digest.c b/lib/libcrypto/evp/evp_digest.c
similarity index 99%
rename from lib/libcrypto/evp/digest.c
rename to lib/libcrypto/evp/evp_digest.c
index 56decc231c2..deb282e4ecc 100644
--- a/lib/libcrypto/evp/digest.c
+++ b/lib/libcrypto/evp/evp_digest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: digest.c,v 1.41 2023/12/24 22:17:05 tb Exp $ */
+/* $OpenBSD: evp_digest.c,v 1.1 2023/12/29 05:57:24 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libcrypto/evp/encode.c b/lib/libcrypto/evp/evp_encode.c
similarity index 99%
rename from lib/libcrypto/evp/encode.c
rename to lib/libcrypto/evp/evp_encode.c
index c62a1dea8fc..9387328f5ea 100644
--- a/lib/libcrypto/evp/encode.c
+++ b/lib/libcrypto/evp/evp_encode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: encode.c,v 1.32 2023/07/07 19:37:53 beck Exp $ */
+/* $OpenBSD: evp_encode.c,v 1.1 2023/12/29 05:57:24 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
-- 
2.20.1