diff options
author | tb <> | 2023-12-29 05:57:24 +0000 |
---|---|---|
committer | tb <> | 2023-12-29 05:57:24 +0000 |
commit | 55b5efee44a1a983840a2ae8e17bca6699ea0eb5 (patch) | |
tree | d23e528b84492fee1ea739b20a4f899b8b8d1b7f | |
parent | cc4c5fb8cba6334c1540d03d7c8906fb65d970ed (diff) | |
download | openbsd-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/Makefile | 8 | ||||
-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 | ||
3 | LIB= crypto | 3 | LIB= crypto |
4 | LIBREBUILD=y | 4 | LIBREBUILD=y |
@@ -350,7 +350,6 @@ SRCS+= bio_enc.c | |||
350 | SRCS+= bio_md.c | 350 | SRCS+= bio_md.c |
351 | SRCS+= c_all.c | 351 | SRCS+= c_all.c |
352 | SRCS+= cipher_method_lib.c | 352 | SRCS+= cipher_method_lib.c |
353 | SRCS+= digest.c | ||
354 | SRCS+= e_aes.c | 353 | SRCS+= e_aes.c |
355 | SRCS+= e_aes_cbc_hmac_sha1.c | 354 | SRCS+= e_aes_cbc_hmac_sha1.c |
356 | SRCS+= e_bf.c | 355 | SRCS+= e_bf.c |
@@ -368,9 +367,10 @@ SRCS+= e_rc4.c | |||
368 | SRCS+= e_rc4_hmac_md5.c | 367 | SRCS+= e_rc4_hmac_md5.c |
369 | SRCS+= e_sm4.c | 368 | SRCS+= e_sm4.c |
370 | SRCS+= e_xcbc_d.c | 369 | SRCS+= e_xcbc_d.c |
371 | SRCS+= encode.c | ||
372 | SRCS+= evp_aead.c | 370 | SRCS+= evp_aead.c |
373 | SRCS+= evp_enc.c | 371 | SRCS+= evp_cipher.c |
372 | SRCS+= evp_digest.c | ||
373 | SRCS+= evp_encode.c | ||
374 | SRCS+= evp_err.c | 374 | SRCS+= evp_err.c |
375 | SRCS+= evp_key.c | 375 | SRCS+= evp_key.c |
376 | SRCS+= evp_lib.c | 376 | SRCS+= 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 | * |