From e48ae391e770d61c0cb2a3daf0d90eb506ec4f6b Mon Sep 17 00:00:00 2001 From: jsing Date: Sat, 8 Jul 2023 06:50:38 +0000 Subject: [PATCH] Hit md5 with the style(9) stick. --- lib/libcrypto/md5/md5.h | 27 ++-- lib/libcrypto/md5/md5_dgst.c | 234 ++++++++++++++++++++--------------- lib/libcrypto/md5/md5_one.c | 32 ++--- 3 files changed, 163 insertions(+), 130 deletions(-) diff --git a/lib/libcrypto/md5/md5.h b/lib/libcrypto/md5/md5.h index e2c511c7c51..d248c93a858 100644 --- a/lib/libcrypto/md5/md5.h +++ b/lib/libcrypto/md5/md5.h @@ -1,25 +1,25 @@ -/* $OpenBSD: md5.h,v 1.20 2014/10/20 13:06:54 bcook Exp $ */ +/* $OpenBSD: md5.h,v 1.21 2023/07/08 06:50:38 jsing 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: @@ -34,10 +34,10 @@ * 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 + * 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 @@ -49,7 +49,7 @@ * 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 @@ -86,20 +86,19 @@ extern "C" { #define MD5_LBLOCK (MD5_CBLOCK/4) #define MD5_DIGEST_LENGTH 16 -typedef struct MD5state_st - { - MD5_LONG A,B,C,D; - MD5_LONG Nl,Nh; +typedef struct MD5state_st { + MD5_LONG A, B,C, D; + MD5_LONG Nl, Nh; MD5_LONG data[MD5_LBLOCK]; unsigned int num; - } MD5_CTX; +} MD5_CTX; int MD5_Init(MD5_CTX *c); int MD5_Update(MD5_CTX *c, const void *data, size_t len) - __attribute__ ((__bounded__(__buffer__,2,3))); + __attribute__ ((__bounded__(__buffer__, 2, 3))); int MD5_Final(unsigned char *md, MD5_CTX *c); unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md) - __attribute__ ((__bounded__(__buffer__,1,2))); + __attribute__ ((__bounded__(__buffer__, 1, 2))); void MD5_Transform(MD5_CTX *c, const unsigned char *b); #ifdef __cplusplus } diff --git a/lib/libcrypto/md5/md5_dgst.c b/lib/libcrypto/md5/md5_dgst.c index 5c08493d53f..19a2b01e174 100644 --- a/lib/libcrypto/md5/md5_dgst.c +++ b/lib/libcrypto/md5/md5_dgst.c @@ -1,25 +1,25 @@ -/* $OpenBSD: md5_dgst.c,v 1.16 2023/07/08 06:41:45 jsing Exp $ */ +/* $OpenBSD: md5_dgst.c,v 1.17 2023/07/08 06:50:38 jsing 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: @@ -34,10 +34,10 @@ * 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 + * 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 @@ -49,7 +49,7 @@ * 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 @@ -78,7 +78,7 @@ __BEGIN_HIDDEN_DECLS -void md5_block_data_order (MD5_CTX *c, const void *p,size_t num); +void md5_block_data_order (MD5_CTX *c, const void *p, size_t num); __END_HIDDEN_DECLS @@ -143,115 +143,147 @@ __END_HIDDEN_DECLS #define INIT_DATA_C (unsigned long)0x98badcfeL #define INIT_DATA_D (unsigned long)0x10325476L -int MD5_Init(MD5_CTX *c) - { - memset (c,0,sizeof(*c)); - c->A=INIT_DATA_A; - c->B=INIT_DATA_B; - c->C=INIT_DATA_C; - c->D=INIT_DATA_D; +int +MD5_Init(MD5_CTX *c) +{ + memset (c, 0, sizeof(*c)); + c->A = INIT_DATA_A; + c->B = INIT_DATA_B; + c->C = INIT_DATA_C; + c->D = INIT_DATA_D; return 1; - } +} #ifndef md5_block_data_order #ifdef X #undef X #endif -void md5_block_data_order (MD5_CTX *c, const void *data_, size_t num) - { - const unsigned char *data=data_; - unsigned MD32_REG_T A,B,C,D,l; +void +md5_block_data_order(MD5_CTX *c, const void *data_, size_t num) +{ + const unsigned char *data = data_; + unsigned MD32_REG_T A, B,C, D, l; #ifndef MD32_XARRAY /* See comment in crypto/sha/sha_locl.h for details. */ unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7, - XX8, XX9,XX10,XX11,XX12,XX13,XX14,XX15; + XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15; # define X(i) XX##i #else MD5_LONG XX[MD5_LBLOCK]; # define X(i) XX[i] #endif - A=c->A; - B=c->B; - C=c->C; - D=c->D; + A = c->A; + B = c->B; + C = c->C; + D = c->D; - for (;num--;) - { - HOST_c2l(data,l); X( 0)=l; HOST_c2l(data,l); X( 1)=l; - /* Round 0 */ - R0(A,B,C,D,X( 0), 7,0xd76aa478L); HOST_c2l(data,l); X( 2)=l; - R0(D,A,B,C,X( 1),12,0xe8c7b756L); HOST_c2l(data,l); X( 3)=l; - R0(C,D,A,B,X( 2),17,0x242070dbL); HOST_c2l(data,l); X( 4)=l; - R0(B,C,D,A,X( 3),22,0xc1bdceeeL); HOST_c2l(data,l); X( 5)=l; - R0(A,B,C,D,X( 4), 7,0xf57c0fafL); HOST_c2l(data,l); X( 6)=l; - R0(D,A,B,C,X( 5),12,0x4787c62aL); HOST_c2l(data,l); X( 7)=l; - R0(C,D,A,B,X( 6),17,0xa8304613L); HOST_c2l(data,l); X( 8)=l; - R0(B,C,D,A,X( 7),22,0xfd469501L); HOST_c2l(data,l); X( 9)=l; - R0(A,B,C,D,X( 8), 7,0x698098d8L); HOST_c2l(data,l); X(10)=l; - R0(D,A,B,C,X( 9),12,0x8b44f7afL); HOST_c2l(data,l); X(11)=l; - R0(C,D,A,B,X(10),17,0xffff5bb1L); HOST_c2l(data,l); X(12)=l; - R0(B,C,D,A,X(11),22,0x895cd7beL); HOST_c2l(data,l); X(13)=l; - R0(A,B,C,D,X(12), 7,0x6b901122L); HOST_c2l(data,l); X(14)=l; - R0(D,A,B,C,X(13),12,0xfd987193L); HOST_c2l(data,l); X(15)=l; - R0(C,D,A,B,X(14),17,0xa679438eL); - R0(B,C,D,A,X(15),22,0x49b40821L); - /* Round 1 */ - R1(A,B,C,D,X( 1), 5,0xf61e2562L); - R1(D,A,B,C,X( 6), 9,0xc040b340L); - R1(C,D,A,B,X(11),14,0x265e5a51L); - R1(B,C,D,A,X( 0),20,0xe9b6c7aaL); - R1(A,B,C,D,X( 5), 5,0xd62f105dL); - R1(D,A,B,C,X(10), 9,0x02441453L); - R1(C,D,A,B,X(15),14,0xd8a1e681L); - R1(B,C,D,A,X( 4),20,0xe7d3fbc8L); - R1(A,B,C,D,X( 9), 5,0x21e1cde6L); - R1(D,A,B,C,X(14), 9,0xc33707d6L); - R1(C,D,A,B,X( 3),14,0xf4d50d87L); - R1(B,C,D,A,X( 8),20,0x455a14edL); - R1(A,B,C,D,X(13), 5,0xa9e3e905L); - R1(D,A,B,C,X( 2), 9,0xfcefa3f8L); - R1(C,D,A,B,X( 7),14,0x676f02d9L); - R1(B,C,D,A,X(12),20,0x8d2a4c8aL); - /* Round 2 */ - R2(A,B,C,D,X( 5), 4,0xfffa3942L); - R2(D,A,B,C,X( 8),11,0x8771f681L); - R2(C,D,A,B,X(11),16,0x6d9d6122L); - R2(B,C,D,A,X(14),23,0xfde5380cL); - R2(A,B,C,D,X( 1), 4,0xa4beea44L); - R2(D,A,B,C,X( 4),11,0x4bdecfa9L); - R2(C,D,A,B,X( 7),16,0xf6bb4b60L); - R2(B,C,D,A,X(10),23,0xbebfbc70L); - R2(A,B,C,D,X(13), 4,0x289b7ec6L); - R2(D,A,B,C,X( 0),11,0xeaa127faL); - R2(C,D,A,B,X( 3),16,0xd4ef3085L); - R2(B,C,D,A,X( 6),23,0x04881d05L); - R2(A,B,C,D,X( 9), 4,0xd9d4d039L); - R2(D,A,B,C,X(12),11,0xe6db99e5L); - R2(C,D,A,B,X(15),16,0x1fa27cf8L); - R2(B,C,D,A,X( 2),23,0xc4ac5665L); - /* Round 3 */ - R3(A,B,C,D,X( 0), 6,0xf4292244L); - R3(D,A,B,C,X( 7),10,0x432aff97L); - R3(C,D,A,B,X(14),15,0xab9423a7L); - R3(B,C,D,A,X( 5),21,0xfc93a039L); - R3(A,B,C,D,X(12), 6,0x655b59c3L); - R3(D,A,B,C,X( 3),10,0x8f0ccc92L); - R3(C,D,A,B,X(10),15,0xffeff47dL); - R3(B,C,D,A,X( 1),21,0x85845dd1L); - R3(A,B,C,D,X( 8), 6,0x6fa87e4fL); - R3(D,A,B,C,X(15),10,0xfe2ce6e0L); - R3(C,D,A,B,X( 6),15,0xa3014314L); - R3(B,C,D,A,X(13),21,0x4e0811a1L); - R3(A,B,C,D,X( 4), 6,0xf7537e82L); - R3(D,A,B,C,X(11),10,0xbd3af235L); - R3(C,D,A,B,X( 2),15,0x2ad7d2bbL); - R3(B,C,D,A,X( 9),21,0xeb86d391L); + for (; num--; ) { + HOST_c2l(data, l); + X( 0) = l; + HOST_c2l(data, l); + X( 1) = l; + /* Round 0 */ + R0(A, B,C, D,X( 0), 7, 0xd76aa478L); + HOST_c2l(data, l); + X( 2) = l; + R0(D, A,B, C,X( 1), 12, 0xe8c7b756L); + HOST_c2l(data, l); + X( 3) = l; + R0(C, D,A, B,X( 2), 17, 0x242070dbL); + HOST_c2l(data, l); + X( 4) = l; + R0(B, C,D, A,X( 3), 22, 0xc1bdceeeL); + HOST_c2l(data, l); + X( 5) = l; + R0(A, B,C, D,X( 4), 7, 0xf57c0fafL); + HOST_c2l(data, l); + X( 6) = l; + R0(D, A,B, C,X( 5), 12, 0x4787c62aL); + HOST_c2l(data, l); + X( 7) = l; + R0(C, D,A, B,X( 6), 17, 0xa8304613L); + HOST_c2l(data, l); + X( 8) = l; + R0(B, C,D, A,X( 7), 22, 0xfd469501L); + HOST_c2l(data, l); + X( 9) = l; + R0(A, B,C, D,X( 8), 7, 0x698098d8L); + HOST_c2l(data, l); + X(10) = l; + R0(D, A,B, C,X( 9), 12, 0x8b44f7afL); + HOST_c2l(data, l); + X(11) = l; + R0(C, D,A, B,X(10), 17, 0xffff5bb1L); + HOST_c2l(data, l); + X(12) = l; + R0(B, C,D, A,X(11), 22, 0x895cd7beL); + HOST_c2l(data, l); + X(13) = l; + R0(A, B,C, D,X(12), 7, 0x6b901122L); + HOST_c2l(data, l); + X(14) = l; + R0(D, A,B, C,X(13), 12, 0xfd987193L); + HOST_c2l(data, l); + X(15) = l; + R0(C, D,A, B,X(14), 17, 0xa679438eL); + R0(B, C,D, A,X(15), 22, 0x49b40821L); + /* Round 1 */ + R1(A, B,C, D,X( 1), 5, 0xf61e2562L); + R1(D, A,B, C,X( 6), 9, 0xc040b340L); + R1(C, D,A, B,X(11), 14, 0x265e5a51L); + R1(B, C,D, A,X( 0), 20, 0xe9b6c7aaL); + R1(A, B,C, D,X( 5), 5, 0xd62f105dL); + R1(D, A,B, C,X(10), 9, 0x02441453L); + R1(C, D,A, B,X(15), 14, 0xd8a1e681L); + R1(B, C,D, A,X( 4), 20, 0xe7d3fbc8L); + R1(A, B,C, D,X( 9), 5, 0x21e1cde6L); + R1(D, A,B, C,X(14), 9, 0xc33707d6L); + R1(C, D,A, B,X( 3), 14, 0xf4d50d87L); + R1(B, C,D, A,X( 8), 20, 0x455a14edL); + R1(A, B,C, D,X(13), 5, 0xa9e3e905L); + R1(D, A,B, C,X( 2), 9, 0xfcefa3f8L); + R1(C, D,A, B,X( 7), 14, 0x676f02d9L); + R1(B, C,D, A,X(12), 20, 0x8d2a4c8aL); + /* Round 2 */ + R2(A, B,C, D,X( 5), 4, 0xfffa3942L); + R2(D, A,B, C,X( 8), 11, 0x8771f681L); + R2(C, D,A, B,X(11), 16, 0x6d9d6122L); + R2(B, C,D, A,X(14), 23, 0xfde5380cL); + R2(A, B,C, D,X( 1), 4, 0xa4beea44L); + R2(D, A,B, C,X( 4), 11, 0x4bdecfa9L); + R2(C, D,A, B,X( 7), 16, 0xf6bb4b60L); + R2(B, C,D, A,X(10), 23, 0xbebfbc70L); + R2(A, B,C, D,X(13), 4, 0x289b7ec6L); + R2(D, A,B, C,X( 0), 11, 0xeaa127faL); + R2(C, D,A, B,X( 3), 16, 0xd4ef3085L); + R2(B, C,D, A,X( 6), 23, 0x04881d05L); + R2(A, B,C, D,X( 9), 4, 0xd9d4d039L); + R2(D, A,B, C,X(12), 11, 0xe6db99e5L); + R2(C, D,A, B,X(15), 16, 0x1fa27cf8L); + R2(B, C,D, A,X( 2), 23, 0xc4ac5665L); + /* Round 3 */ + R3(A, B,C, D,X( 0), 6, 0xf4292244L); + R3(D, A,B, C,X( 7), 10, 0x432aff97L); + R3(C, D,A, B,X(14), 15, 0xab9423a7L); + R3(B, C,D, A,X( 5), 21, 0xfc93a039L); + R3(A, B,C, D,X(12), 6, 0x655b59c3L); + R3(D, A,B, C,X( 3), 10, 0x8f0ccc92L); + R3(C, D,A, B,X(10), 15, 0xffeff47dL); + R3(B, C,D, A,X( 1), 21, 0x85845dd1L); + R3(A, B,C, D,X( 8), 6, 0x6fa87e4fL); + R3(D, A,B, C,X(15), 10, 0xfe2ce6e0L); + R3(C, D,A, B,X( 6), 15, 0xa3014314L); + R3(B, C,D, A,X(13), 21, 0x4e0811a1L); + R3(A, B,C, D,X( 4), 6, 0xf7537e82L); + R3(D, A,B, C,X(11), 10, 0xbd3af235L); + R3(C, D,A, B,X( 2), 15, 0x2ad7d2bbL); + R3(B, C,D, A,X( 9), 21, 0xeb86d391L); - A = c->A += A; - B = c->B += B; - C = c->C += C; - D = c->D += D; - } + A = c->A += A; + B = c->B += B; + C = c->C += C; + D = c->D += D; } +} #endif diff --git a/lib/libcrypto/md5/md5_one.c b/lib/libcrypto/md5/md5_one.c index 3fb05de30c3..6e894de7fe0 100644 --- a/lib/libcrypto/md5/md5_one.c +++ b/lib/libcrypto/md5/md5_one.c @@ -1,25 +1,25 @@ -/* $OpenBSD: md5_one.c,v 1.10 2015/09/10 15:56:25 jsing Exp $ */ +/* $OpenBSD: md5_one.c,v 1.11 2023/07/08 06:50:38 jsing 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: @@ -34,10 +34,10 @@ * 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 + * 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 @@ -49,7 +49,7 @@ * 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 @@ -61,17 +61,19 @@ #include #include -unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md) - { +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 (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); - } + MD5_Update(&c, d, n); + MD5_Final(md, &c); + explicit_bzero(&c, sizeof(c)); + return (md); +} -- 2.20.1