summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/md5
diff options
context:
space:
mode:
authorbcook <>2014-10-20 13:06:54 +0000
committerbcook <>2014-10-20 13:06:54 +0000
commitdd4273fba31ef60efe2d1cd25f9ae3f3aa30d3ed (patch)
tree9f1b71bdf20f33992bbc4fa9ce82f07ec687ade8 /src/lib/libcrypto/md5
parent514ab254d4a55f1937d1cb4e94c49f7819060f3e (diff)
downloadopenbsd-dd4273fba31ef60efe2d1cd25f9ae3f3aa30d3ed.tar.gz
openbsd-dd4273fba31ef60efe2d1cd25f9ae3f3aa30d3ed.tar.bz2
openbsd-dd4273fba31ef60efe2d1cd25f9ae3f3aa30d3ed.zip
digests: *_LONG_LOG2 is not used, stop talking about it.
Modified patch from Dmitry Eremin-Solenikov leave the sole public define in ripemd.h ok deraadt@ miod@
Diffstat (limited to 'src/lib/libcrypto/md5')
-rw-r--r--src/lib/libcrypto/md5/md5.h5
-rw-r--r--src/lib/libcrypto/md5/md5_locl.h6
2 files changed, 3 insertions, 8 deletions
diff --git a/src/lib/libcrypto/md5/md5.h b/src/lib/libcrypto/md5/md5.h
index 89e4b7f5ee..e2c511c7c5 100644
--- a/src/lib/libcrypto/md5/md5.h
+++ b/src/lib/libcrypto/md5/md5.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: md5.h,v 1.19 2014/07/13 14:13:27 beck Exp $ */ 1/* $OpenBSD: md5.h,v 1.20 2014/10/20 13:06:54 bcook 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 *
@@ -76,8 +76,7 @@ extern "C" {
76 76
77/* 77/*
78 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 78 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
79 * ! MD5_LONG has to be at least 32 bits wide. If it's wider, then ! 79 * ! MD5_LONG has to be at least 32 bits wide. !
80 * ! MD5_LONG_LOG2 has to be defined along. !
81 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 80 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
82 */ 81 */
83 82
diff --git a/src/lib/libcrypto/md5/md5_locl.h b/src/lib/libcrypto/md5/md5_locl.h
index 9aaed18d7f..00c5a67e31 100644
--- a/src/lib/libcrypto/md5/md5_locl.h
+++ b/src/lib/libcrypto/md5/md5_locl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: md5_locl.h,v 1.12 2014/08/18 19:11:48 bcook Exp $ */ 1/* $OpenBSD: md5_locl.h,v 1.13 2014/10/20 13:06:54 bcook 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 *
@@ -63,10 +63,6 @@
63 63
64#include <openssl/md5.h> 64#include <openssl/md5.h>
65 65
66#ifndef MD5_LONG_LOG2
67#define MD5_LONG_LOG2 2 /* default to 32 bits */
68#endif
69
70#ifdef MD5_ASM 66#ifdef MD5_ASM
71# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) || \ 67# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) || \
72 defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) 68 defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)