From aeaa0e53680b41477c9c469ca8d71bcac4253bc2 Mon Sep 17 00:00:00 2001 From: jsing Date: Fri, 28 Jul 2023 11:06:28 +0000 Subject: [PATCH] Combine md5 into a single C file. --- lib/libcrypto/Makefile | 5 +- lib/libcrypto/md5/{md5_dgst.c => md5.c} | 19 +++++- lib/libcrypto/md5/md5_one.c | 79 ------------------------- 3 files changed, 20 insertions(+), 83 deletions(-) rename lib/libcrypto/md5/{md5_dgst.c => md5.c} (96%) delete mode 100644 lib/libcrypto/md5/md5_one.c diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile index d20361578aa..085924519df 100644 --- a/lib/libcrypto/Makefile +++ b/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.150 2023/07/28 11:04:41 jsing Exp $ +# $OpenBSD: Makefile,v 1.151 2023/07/28 11:06:28 jsing Exp $ LIB= crypto LIBREBUILD=y @@ -448,8 +448,7 @@ SRCS+= lhash.c SRCS+= md4.c # md5/ -SRCS+= md5_dgst.c -SRCS+= md5_one.c +SRCS+= md5.c # modes/ SRCS+= cbc128.c diff --git a/lib/libcrypto/md5/md5_dgst.c b/lib/libcrypto/md5/md5.c similarity index 96% rename from lib/libcrypto/md5/md5_dgst.c rename to lib/libcrypto/md5/md5.c index 3cd4b1ba78f..06516781a16 100644 --- a/lib/libcrypto/md5/md5_dgst.c +++ b/lib/libcrypto/md5/md5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: md5_dgst.c,v 1.19 2023/07/15 15:37:05 jsing Exp $ */ +/* $OpenBSD: md5.c,v 1.6 2023/07/28 11:06:28 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -284,3 +284,20 @@ md5_block_data_order(MD5_CTX *c, const void *data_, size_t num) } } #endif + +unsigned char * +MD5(const unsigned char *d, size_t n, unsigned char *md) +{ + MD5_CTX c; + static unsigned char m[MD5_DIGEST_LENGTH]; + + if (md == NULL) + md = m; + if (!MD5_Init(&c)) + return NULL; + MD5_Update(&c, d, n); + MD5_Final(md, &c); + explicit_bzero(&c, sizeof(c)); + return (md); +} +LCRYPTO_ALIAS(MD5); diff --git a/lib/libcrypto/md5/md5_one.c b/lib/libcrypto/md5/md5_one.c deleted file mode 100644 index 3d5fba57235..00000000000 --- a/lib/libcrypto/md5/md5_one.c +++ /dev/null @@ -1,79 +0,0 @@ -/* $OpenBSD: md5_one.c,v 1.12 2023/07/08 10:45:57 beck Exp $ */ -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include -#include -#include -#include - -unsigned char * -MD5(const unsigned char *d, size_t n, unsigned char *md) -{ - MD5_CTX c; - static unsigned char m[MD5_DIGEST_LENGTH]; - - if (md == NULL) - md = m; - if (!MD5_Init(&c)) - return NULL; - MD5_Update(&c, d, n); - MD5_Final(md, &c); - explicit_bzero(&c, sizeof(c)); - return (md); -} -LCRYPTO_ALIAS(MD5); -- 2.20.1