summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2023-12-29 05:57:24 +0000
committertb <>2023-12-29 05:57:24 +0000
commit55b5efee44a1a983840a2ae8e17bca6699ea0eb5 (patch)
treed23e528b84492fee1ea739b20a4f899b8b8d1b7f
parentcc4c5fb8cba6334c1540d03d7c8906fb65d970ed (diff)
downloadopenbsd-55b5efee44a1a983840a2ae8e17bca6699ea0eb5.tar.gz
openbsd-55b5efee44a1a983840a2ae8e17bca6699ea0eb5.tar.bz2
openbsd-55b5efee44a1a983840a2ae8e17bca6699ea0eb5.zip
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
-rw-r--r--src/lib/libcrypto/Makefile8
-rw-r--r--src/lib/libcrypto/evp/evp_cipher.c (renamed from src/lib/libcrypto/evp/evp_enc.c)2
-rw-r--r--src/lib/libcrypto/evp/evp_digest.c (renamed from src/lib/libcrypto/evp/digest.c)2
-rw-r--r--src/lib/libcrypto/evp/evp_encode.c (renamed from src/lib/libcrypto/evp/encode.c)2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index 6329d309e7..d9b3e180f0 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.159 2023/12/20 13:52:17 tb Exp $ 1# $OpenBSD: Makefile,v 1.160 2023/12/29 05:57:24 tb Exp $
2 2
3LIB= crypto 3LIB= crypto
4LIBREBUILD=y 4LIBREBUILD=y
@@ -350,7 +350,6 @@ SRCS+= bio_enc.c
350SRCS+= bio_md.c 350SRCS+= bio_md.c
351SRCS+= c_all.c 351SRCS+= c_all.c
352SRCS+= cipher_method_lib.c 352SRCS+= cipher_method_lib.c
353SRCS+= digest.c
354SRCS+= e_aes.c 353SRCS+= e_aes.c
355SRCS+= e_aes_cbc_hmac_sha1.c 354SRCS+= e_aes_cbc_hmac_sha1.c
356SRCS+= e_bf.c 355SRCS+= e_bf.c
@@ -368,9 +367,10 @@ SRCS+= e_rc4.c
368SRCS+= e_rc4_hmac_md5.c 367SRCS+= e_rc4_hmac_md5.c
369SRCS+= e_sm4.c 368SRCS+= e_sm4.c
370SRCS+= e_xcbc_d.c 369SRCS+= e_xcbc_d.c
371SRCS+= encode.c
372SRCS+= evp_aead.c 370SRCS+= evp_aead.c
373SRCS+= evp_enc.c 371SRCS+= evp_cipher.c
372SRCS+= evp_digest.c
373SRCS+= evp_encode.c
374SRCS+= evp_err.c 374SRCS+= evp_err.c
375SRCS+= evp_key.c 375SRCS+= evp_key.c
376SRCS+= evp_lib.c 376SRCS+= evp_lib.c
diff --git a/src/lib/libcrypto/evp/evp_enc.c b/src/lib/libcrypto/evp/evp_cipher.c
index 3eef53c2d6..3b38e18bf3 100644
--- a/src/lib/libcrypto/evp/evp_enc.c
+++ b/src/lib/libcrypto/evp/evp_cipher.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp_enc.c,v 1.81 2023/12/26 09:04:30 tb Exp $ */ 1/* $OpenBSD: evp_cipher.c,v 1.1 2023/12/29 05:57:24 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 *
diff --git a/src/lib/libcrypto/evp/digest.c b/src/lib/libcrypto/evp/evp_digest.c
index 56decc231c..deb282e4ec 100644
--- a/src/lib/libcrypto/evp/digest.c
+++ b/src/lib/libcrypto/evp/evp_digest.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: digest.c,v 1.41 2023/12/24 22:17:05 tb Exp $ */ 1/* $OpenBSD: evp_digest.c,v 1.1 2023/12/29 05:57:24 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 *
diff --git a/src/lib/libcrypto/evp/encode.c b/src/lib/libcrypto/evp/evp_encode.c
index c62a1dea8f..9387328f5e 100644
--- a/src/lib/libcrypto/evp/encode.c
+++ b/src/lib/libcrypto/evp/evp_encode.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: encode.c,v 1.32 2023/07/07 19:37:53 beck Exp $ */ 1/* $OpenBSD: evp_encode.c,v 1.1 2023/12/29 05:57:24 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 *