summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiod <>2014-07-10 09:01:04 +0000
committermiod <>2014-07-10 09:01:04 +0000
commit23766ed83538ea4d81ccbd3d526fe4d73691a9e6 (patch)
tree57c0a92fa6c453387695fb76f1c1f006643ffda0
parent4d1eee46aec689b068fa01bc913884bbcafcdb84 (diff)
downloadopenbsd-23766ed83538ea4d81ccbd3d526fe4d73691a9e6.tar.gz
openbsd-23766ed83538ea4d81ccbd3d526fe4d73691a9e6.tar.bz2
openbsd-23766ed83538ea4d81ccbd3d526fe4d73691a9e6.zip
Remove bogus preprocessor statements trying to pick the largest integer
type for BF_LONG, MD[45]_LONG and SHA_LONG. First, the preprocessor symbols they check for a 64-bit system is __ILP64__ which no sane system provides; second, on the platforms which have assembler code to speed things up, the assembler code assumes a 32-bit type will be used.
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/bf/blowfish.h9
-rw-r--r--src/lib/libcrypto/md4/md4.h9
-rw-r--r--src/lib/libcrypto/md5/md5.h9
-rw-r--r--src/lib/libcrypto/sha/sha.h9
-rw-r--r--src/lib/libssl/src/crypto/bf/blowfish.h9
-rw-r--r--src/lib/libssl/src/crypto/md4/md4.h9
-rw-r--r--src/lib/libssl/src/crypto/md5/md5.h9
-rw-r--r--src/lib/libssl/src/crypto/sha/sha.h9
8 files changed, 8 insertions, 64 deletions
diff --git a/src/lib/libcrypto/bf/blowfish.h b/src/lib/libcrypto/bf/blowfish.h
index 9dbf3c6dc7..4d2db80552 100644
--- a/src/lib/libcrypto/bf/blowfish.h
+++ b/src/lib/libcrypto/bf/blowfish.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: blowfish.h,v 1.13 2014/06/12 15:49:28 deraadt Exp $ */ 1/* $OpenBSD: blowfish.h,v 1.14 2014/07/10 09:01:04 miod 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 *
@@ -79,14 +79,7 @@ extern "C" {
79 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 79 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
80 */ 80 */
81 81
82#if defined(__LP32__)
83#define BF_LONG unsigned long
84#elif defined(__ILP64__)
85#define BF_LONG unsigned long
86#define BF_LONG_LOG2 3
87#else
88#define BF_LONG unsigned int 82#define BF_LONG unsigned int
89#endif
90 83
91#define BF_ROUNDS 16 84#define BF_ROUNDS 16
92#define BF_BLOCK 8 85#define BF_BLOCK 8
diff --git a/src/lib/libcrypto/md4/md4.h b/src/lib/libcrypto/md4/md4.h
index f8ee0c1fea..bbdac701f6 100644
--- a/src/lib/libcrypto/md4/md4.h
+++ b/src/lib/libcrypto/md4/md4.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: md4.h,v 1.11 2014/06/12 15:49:29 deraadt Exp $ */ 1/* $OpenBSD: md4.h,v 1.12 2014/07/10 09:01:04 miod 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 *
@@ -78,14 +78,7 @@ extern "C" {
78 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 78 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
79 */ 79 */
80 80
81#if defined(__LP32__)
82#define MD4_LONG unsigned long
83#elif defined(__ILP64__)
84#define MD4_LONG unsigned long
85#define MD4_LONG_LOG2 3
86#else
87#define MD4_LONG unsigned int 81#define MD4_LONG unsigned int
88#endif
89 82
90#define MD4_CBLOCK 64 83#define MD4_CBLOCK 64
91#define MD4_LBLOCK (MD4_CBLOCK/4) 84#define MD4_LBLOCK (MD4_CBLOCK/4)
diff --git a/src/lib/libcrypto/md5/md5.h b/src/lib/libcrypto/md5/md5.h
index 66e52ce227..3f27da8d69 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.15 2014/06/14 10:28:31 avsm Exp $ */ 1/* $OpenBSD: md5.h,v 1.16 2014/07/10 09:01:04 miod 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 *
@@ -78,14 +78,7 @@ extern "C" {
78 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 78 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
79 */ 79 */
80 80
81#if defined(__LP32__)
82#define MD5_LONG unsigned long
83#elif defined(__ILP64__)
84#define MD5_LONG unsigned long
85#define MD5_LONG_LOG2 3
86#else
87#define MD5_LONG unsigned int 81#define MD5_LONG unsigned int
88#endif
89 82
90#define MD5_CBLOCK 64 83#define MD5_CBLOCK 64
91#define MD5_LBLOCK (MD5_CBLOCK/4) 84#define MD5_LBLOCK (MD5_CBLOCK/4)
diff --git a/src/lib/libcrypto/sha/sha.h b/src/lib/libcrypto/sha/sha.h
index a03694cd28..5baa80e62f 100644
--- a/src/lib/libcrypto/sha/sha.h
+++ b/src/lib/libcrypto/sha/sha.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sha.h,v 1.15 2014/06/14 10:28:31 avsm Exp $ */ 1/* $OpenBSD: sha.h,v 1.16 2014/07/10 09:01:04 miod 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 *
@@ -78,14 +78,7 @@ extern "C" {
78 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 78 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
79 */ 79 */
80 80
81#if defined(__LP32__)
82#define SHA_LONG unsigned long
83#elif defined(__ILP64__)
84#define SHA_LONG unsigned long
85#define SHA_LONG_LOG2 3
86#else
87#define SHA_LONG unsigned int 81#define SHA_LONG unsigned int
88#endif
89 82
90#define SHA_LBLOCK 16 83#define SHA_LBLOCK 16
91#define SHA_CBLOCK (SHA_LBLOCK*4) /* SHA treats input data as a 84#define SHA_CBLOCK (SHA_LBLOCK*4) /* SHA treats input data as a
diff --git a/src/lib/libssl/src/crypto/bf/blowfish.h b/src/lib/libssl/src/crypto/bf/blowfish.h
index 9dbf3c6dc7..4d2db80552 100644
--- a/src/lib/libssl/src/crypto/bf/blowfish.h
+++ b/src/lib/libssl/src/crypto/bf/blowfish.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: blowfish.h,v 1.13 2014/06/12 15:49:28 deraadt Exp $ */ 1/* $OpenBSD: blowfish.h,v 1.14 2014/07/10 09:01:04 miod 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 *
@@ -79,14 +79,7 @@ extern "C" {
79 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 79 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
80 */ 80 */
81 81
82#if defined(__LP32__)
83#define BF_LONG unsigned long
84#elif defined(__ILP64__)
85#define BF_LONG unsigned long
86#define BF_LONG_LOG2 3
87#else
88#define BF_LONG unsigned int 82#define BF_LONG unsigned int
89#endif
90 83
91#define BF_ROUNDS 16 84#define BF_ROUNDS 16
92#define BF_BLOCK 8 85#define BF_BLOCK 8
diff --git a/src/lib/libssl/src/crypto/md4/md4.h b/src/lib/libssl/src/crypto/md4/md4.h
index f8ee0c1fea..bbdac701f6 100644
--- a/src/lib/libssl/src/crypto/md4/md4.h
+++ b/src/lib/libssl/src/crypto/md4/md4.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: md4.h,v 1.11 2014/06/12 15:49:29 deraadt Exp $ */ 1/* $OpenBSD: md4.h,v 1.12 2014/07/10 09:01:04 miod 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 *
@@ -78,14 +78,7 @@ extern "C" {
78 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 78 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
79 */ 79 */
80 80
81#if defined(__LP32__)
82#define MD4_LONG unsigned long
83#elif defined(__ILP64__)
84#define MD4_LONG unsigned long
85#define MD4_LONG_LOG2 3
86#else
87#define MD4_LONG unsigned int 81#define MD4_LONG unsigned int
88#endif
89 82
90#define MD4_CBLOCK 64 83#define MD4_CBLOCK 64
91#define MD4_LBLOCK (MD4_CBLOCK/4) 84#define MD4_LBLOCK (MD4_CBLOCK/4)
diff --git a/src/lib/libssl/src/crypto/md5/md5.h b/src/lib/libssl/src/crypto/md5/md5.h
index 66e52ce227..3f27da8d69 100644
--- a/src/lib/libssl/src/crypto/md5/md5.h
+++ b/src/lib/libssl/src/crypto/md5/md5.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: md5.h,v 1.15 2014/06/14 10:28:31 avsm Exp $ */ 1/* $OpenBSD: md5.h,v 1.16 2014/07/10 09:01:04 miod 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 *
@@ -78,14 +78,7 @@ extern "C" {
78 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 78 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
79 */ 79 */
80 80
81#if defined(__LP32__)
82#define MD5_LONG unsigned long
83#elif defined(__ILP64__)
84#define MD5_LONG unsigned long
85#define MD5_LONG_LOG2 3
86#else
87#define MD5_LONG unsigned int 81#define MD5_LONG unsigned int
88#endif
89 82
90#define MD5_CBLOCK 64 83#define MD5_CBLOCK 64
91#define MD5_LBLOCK (MD5_CBLOCK/4) 84#define MD5_LBLOCK (MD5_CBLOCK/4)
diff --git a/src/lib/libssl/src/crypto/sha/sha.h b/src/lib/libssl/src/crypto/sha/sha.h
index a03694cd28..5baa80e62f 100644
--- a/src/lib/libssl/src/crypto/sha/sha.h
+++ b/src/lib/libssl/src/crypto/sha/sha.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sha.h,v 1.15 2014/06/14 10:28:31 avsm Exp $ */ 1/* $OpenBSD: sha.h,v 1.16 2014/07/10 09:01:04 miod 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 *
@@ -78,14 +78,7 @@ extern "C" {
78 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 78 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
79 */ 79 */
80 80
81#if defined(__LP32__)
82#define SHA_LONG unsigned long
83#elif defined(__ILP64__)
84#define SHA_LONG unsigned long
85#define SHA_LONG_LOG2 3
86#else
87#define SHA_LONG unsigned int 81#define SHA_LONG unsigned int
88#endif
89 82
90#define SHA_LBLOCK 16 83#define SHA_LBLOCK 16
91#define SHA_CBLOCK (SHA_LBLOCK*4) /* SHA treats input data as a 84#define SHA_CBLOCK (SHA_LBLOCK*4) /* SHA treats input data as a
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-10-29 13:55:26 +0000