summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/lib/libcrypto/bf/blowfish.h9
-rw-r--r--src/lib/libcrypto/des/qud_cksm.c14
-rw-r--r--src/lib/libcrypto/md4/md4.h9
-rw-r--r--src/lib/libcrypto/md5/md5.h9
-rw-r--r--src/lib/libcrypto/ripemd/ripemd.h2
-rw-r--r--src/lib/libcrypto/sha/sha.h2
-rw-r--r--src/lib/libssl/src/crypto/bf/blowfish.h9
-rw-r--r--src/lib/libssl/src/crypto/des/qud_cksm.c14
-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/ripemd/ripemd.h2
-rw-r--r--src/lib/libssl/src/crypto/sha/sha.h2
12 files changed, 10 insertions, 80 deletions
diff --git a/src/lib/libcrypto/bf/blowfish.h b/src/lib/libcrypto/bf/blowfish.h
index 65685f478c..289c55b3af 100644
--- a/src/lib/libcrypto/bf/blowfish.h
+++ b/src/lib/libcrypto/bf/blowfish.h
@@ -81,16 +81,9 @@ extern "C" {
81 81
82#if defined(__LP32__) 82#if defined(__LP32__)
83#define BF_LONG unsigned long 83#define BF_LONG unsigned long
84#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) 84#elif defined(__ILP64__)
85#define BF_LONG unsigned long 85#define BF_LONG unsigned long
86#define BF_LONG_LOG2 3 86#define BF_LONG_LOG2 3
87/*
88 * _CRAY note. I could declare short, but I have no idea what impact
89 * does it have on performance on none-T3E machines. I could declare
90 * int, but at least on C90 sizeof(int) can be chosen at compile time.
91 * So I've chosen long...
92 * <appro@fy.chalmers.se>
93 */
94#else 87#else
95#define BF_LONG unsigned int 88#define BF_LONG unsigned int
96#endif 89#endif
diff --git a/src/lib/libcrypto/des/qud_cksm.c b/src/lib/libcrypto/des/qud_cksm.c
index dac201227e..c1e11e5fe1 100644
--- a/src/lib/libcrypto/des/qud_cksm.c
+++ b/src/lib/libcrypto/des/qud_cksm.c
@@ -80,18 +80,10 @@ DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[],
80 int i; 80 int i;
81 long l; 81 long l;
82 const unsigned char *cp; 82 const unsigned char *cp;
83#ifdef _CRAY
84 struct lp_st { int a:32; int b:32; } *lp;
85#else
86 DES_LONG *lp; 83 DES_LONG *lp;
87#endif
88 84
89 if (out_count < 1) out_count=1; 85 if (out_count < 1) out_count=1;
90#ifdef _CRAY
91 lp = (struct lp_st *) &(output[0])[0];
92#else
93 lp = (DES_LONG *) &(output[0])[0]; 86 lp = (DES_LONG *) &(output[0])[0];
94#endif
95 87
96 z0=Q_B0((*seed)[0])|Q_B1((*seed)[1])|Q_B2((*seed)[2])|Q_B3((*seed)[3]); 88 z0=Q_B0((*seed)[0])|Q_B1((*seed)[1])|Q_B2((*seed)[2])|Q_B3((*seed)[3]);
97 z1=Q_B0((*seed)[4])|Q_B1((*seed)[5])|Q_B2((*seed)[6])|Q_B3((*seed)[7]); 89 z1=Q_B0((*seed)[4])|Q_B1((*seed)[5])|Q_B2((*seed)[6])|Q_B3((*seed)[7]);
@@ -124,14 +116,8 @@ DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[],
124 { 116 {
125 /* The MIT library assumes that the checksum is 117 /* The MIT library assumes that the checksum is
126 * composed of 2*out_count 32 bit ints */ 118 * composed of 2*out_count 32 bit ints */
127#ifdef _CRAY
128 (*lp).a = z0;
129 (*lp).b = z1;
130 lp++;
131#else
132 *lp++ = z0; 119 *lp++ = z0;
133 *lp++ = z1; 120 *lp++ = z1;
134#endif
135 } 121 }
136 } 122 }
137 return(z0); 123 return(z0);
diff --git a/src/lib/libcrypto/md4/md4.h b/src/lib/libcrypto/md4/md4.h
index c3ed9b3f75..b241ea1e9b 100644
--- a/src/lib/libcrypto/md4/md4.h
+++ b/src/lib/libcrypto/md4/md4.h
@@ -79,16 +79,9 @@ extern "C" {
79 79
80#if defined(__LP32__) 80#if defined(__LP32__)
81#define MD4_LONG unsigned long 81#define MD4_LONG unsigned long
82#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) 82#elif defined(__ILP64__)
83#define MD4_LONG unsigned long 83#define MD4_LONG unsigned long
84#define MD4_LONG_LOG2 3 84#define MD4_LONG_LOG2 3
85/*
86 * _CRAY note. I could declare short, but I have no idea what impact
87 * does it have on performance on none-T3E machines. I could declare
88 * int, but at least on C90 sizeof(int) can be chosen at compile time.
89 * So I've chosen long...
90 * <appro@fy.chalmers.se>
91 */
92#else 85#else
93#define MD4_LONG unsigned int 86#define MD4_LONG unsigned int
94#endif 87#endif
diff --git a/src/lib/libcrypto/md5/md5.h b/src/lib/libcrypto/md5/md5.h
index 4cbf84386b..747bd929fd 100644
--- a/src/lib/libcrypto/md5/md5.h
+++ b/src/lib/libcrypto/md5/md5.h
@@ -79,16 +79,9 @@ extern "C" {
79 79
80#if defined(__LP32__) 80#if defined(__LP32__)
81#define MD5_LONG unsigned long 81#define MD5_LONG unsigned long
82#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) 82#elif defined(__ILP64__)
83#define MD5_LONG unsigned long 83#define MD5_LONG unsigned long
84#define MD5_LONG_LOG2 3 84#define MD5_LONG_LOG2 3
85/*
86 * _CRAY note. I could declare short, but I have no idea what impact
87 * does it have on performance on none-T3E machines. I could declare
88 * int, but at least on C90 sizeof(int) can be chosen at compile time.
89 * So I've chosen long...
90 * <appro@fy.chalmers.se>
91 */
92#else 85#else
93#define MD5_LONG unsigned int 86#define MD5_LONG unsigned int
94#endif 87#endif
diff --git a/src/lib/libcrypto/ripemd/ripemd.h b/src/lib/libcrypto/ripemd/ripemd.h
index 5942eb6180..f32cfae311 100644
--- a/src/lib/libcrypto/ripemd/ripemd.h
+++ b/src/lib/libcrypto/ripemd/ripemd.h
@@ -72,7 +72,7 @@ extern "C" {
72 72
73#if defined(__LP32__) 73#if defined(__LP32__)
74#define RIPEMD160_LONG unsigned long 74#define RIPEMD160_LONG unsigned long
75#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) 75#elif defined(__ILP64__)
76#define RIPEMD160_LONG unsigned long 76#define RIPEMD160_LONG unsigned long
77#define RIPEMD160_LONG_LOG2 3 77#define RIPEMD160_LONG_LOG2 3
78#else 78#else
diff --git a/src/lib/libcrypto/sha/sha.h b/src/lib/libcrypto/sha/sha.h
index 7cbca26ff9..435352c208 100644
--- a/src/lib/libcrypto/sha/sha.h
+++ b/src/lib/libcrypto/sha/sha.h
@@ -79,7 +79,7 @@ extern "C" {
79 79
80#if defined(__LP32__) 80#if defined(__LP32__)
81#define SHA_LONG unsigned long 81#define SHA_LONG unsigned long
82#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) 82#elif defined(__ILP64__)
83#define SHA_LONG unsigned long 83#define SHA_LONG unsigned long
84#define SHA_LONG_LOG2 3 84#define SHA_LONG_LOG2 3
85#else 85#else
diff --git a/src/lib/libssl/src/crypto/bf/blowfish.h b/src/lib/libssl/src/crypto/bf/blowfish.h
index 65685f478c..289c55b3af 100644
--- a/src/lib/libssl/src/crypto/bf/blowfish.h
+++ b/src/lib/libssl/src/crypto/bf/blowfish.h
@@ -81,16 +81,9 @@ extern "C" {
81 81
82#if defined(__LP32__) 82#if defined(__LP32__)
83#define BF_LONG unsigned long 83#define BF_LONG unsigned long
84#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) 84#elif defined(__ILP64__)
85#define BF_LONG unsigned long 85#define BF_LONG unsigned long
86#define BF_LONG_LOG2 3 86#define BF_LONG_LOG2 3
87/*
88 * _CRAY note. I could declare short, but I have no idea what impact
89 * does it have on performance on none-T3E machines. I could declare
90 * int, but at least on C90 sizeof(int) can be chosen at compile time.
91 * So I've chosen long...
92 * <appro@fy.chalmers.se>
93 */
94#else 87#else
95#define BF_LONG unsigned int 88#define BF_LONG unsigned int
96#endif 89#endif
diff --git a/src/lib/libssl/src/crypto/des/qud_cksm.c b/src/lib/libssl/src/crypto/des/qud_cksm.c
index dac201227e..c1e11e5fe1 100644
--- a/src/lib/libssl/src/crypto/des/qud_cksm.c
+++ b/src/lib/libssl/src/crypto/des/qud_cksm.c
@@ -80,18 +80,10 @@ DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[],
80 int i; 80 int i;
81 long l; 81 long l;
82 const unsigned char *cp; 82 const unsigned char *cp;
83#ifdef _CRAY
84 struct lp_st { int a:32; int b:32; } *lp;
85#else
86 DES_LONG *lp; 83 DES_LONG *lp;
87#endif
88 84
89 if (out_count < 1) out_count=1; 85 if (out_count < 1) out_count=1;
90#ifdef _CRAY
91 lp = (struct lp_st *) &(output[0])[0];
92#else
93 lp = (DES_LONG *) &(output[0])[0]; 86 lp = (DES_LONG *) &(output[0])[0];
94#endif
95 87
96 z0=Q_B0((*seed)[0])|Q_B1((*seed)[1])|Q_B2((*seed)[2])|Q_B3((*seed)[3]); 88 z0=Q_B0((*seed)[0])|Q_B1((*seed)[1])|Q_B2((*seed)[2])|Q_B3((*seed)[3]);
97 z1=Q_B0((*seed)[4])|Q_B1((*seed)[5])|Q_B2((*seed)[6])|Q_B3((*seed)[7]); 89 z1=Q_B0((*seed)[4])|Q_B1((*seed)[5])|Q_B2((*seed)[6])|Q_B3((*seed)[7]);
@@ -124,14 +116,8 @@ DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[],
124 { 116 {
125 /* The MIT library assumes that the checksum is 117 /* The MIT library assumes that the checksum is
126 * composed of 2*out_count 32 bit ints */ 118 * composed of 2*out_count 32 bit ints */
127#ifdef _CRAY
128 (*lp).a = z0;
129 (*lp).b = z1;
130 lp++;
131#else
132 *lp++ = z0; 119 *lp++ = z0;
133 *lp++ = z1; 120 *lp++ = z1;
134#endif
135 } 121 }
136 } 122 }
137 return(z0); 123 return(z0);
diff --git a/src/lib/libssl/src/crypto/md4/md4.h b/src/lib/libssl/src/crypto/md4/md4.h
index c3ed9b3f75..b241ea1e9b 100644
--- a/src/lib/libssl/src/crypto/md4/md4.h
+++ b/src/lib/libssl/src/crypto/md4/md4.h
@@ -79,16 +79,9 @@ extern "C" {
79 79
80#if defined(__LP32__) 80#if defined(__LP32__)
81#define MD4_LONG unsigned long 81#define MD4_LONG unsigned long
82#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) 82#elif defined(__ILP64__)
83#define MD4_LONG unsigned long 83#define MD4_LONG unsigned long
84#define MD4_LONG_LOG2 3 84#define MD4_LONG_LOG2 3
85/*
86 * _CRAY note. I could declare short, but I have no idea what impact
87 * does it have on performance on none-T3E machines. I could declare
88 * int, but at least on C90 sizeof(int) can be chosen at compile time.
89 * So I've chosen long...
90 * <appro@fy.chalmers.se>
91 */
92#else 85#else
93#define MD4_LONG unsigned int 86#define MD4_LONG unsigned int
94#endif 87#endif
diff --git a/src/lib/libssl/src/crypto/md5/md5.h b/src/lib/libssl/src/crypto/md5/md5.h
index 4cbf84386b..747bd929fd 100644
--- a/src/lib/libssl/src/crypto/md5/md5.h
+++ b/src/lib/libssl/src/crypto/md5/md5.h
@@ -79,16 +79,9 @@ extern "C" {
79 79
80#if defined(__LP32__) 80#if defined(__LP32__)
81#define MD5_LONG unsigned long 81#define MD5_LONG unsigned long
82#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) 82#elif defined(__ILP64__)
83#define MD5_LONG unsigned long 83#define MD5_LONG unsigned long
84#define MD5_LONG_LOG2 3 84#define MD5_LONG_LOG2 3
85/*
86 * _CRAY note. I could declare short, but I have no idea what impact
87 * does it have on performance on none-T3E machines. I could declare
88 * int, but at least on C90 sizeof(int) can be chosen at compile time.
89 * So I've chosen long...
90 * <appro@fy.chalmers.se>
91 */
92#else 85#else
93#define MD5_LONG unsigned int 86#define MD5_LONG unsigned int
94#endif 87#endif
diff --git a/src/lib/libssl/src/crypto/ripemd/ripemd.h b/src/lib/libssl/src/crypto/ripemd/ripemd.h
index 5942eb6180..f32cfae311 100644
--- a/src/lib/libssl/src/crypto/ripemd/ripemd.h
+++ b/src/lib/libssl/src/crypto/ripemd/ripemd.h
@@ -72,7 +72,7 @@ extern "C" {
72 72
73#if defined(__LP32__) 73#if defined(__LP32__)
74#define RIPEMD160_LONG unsigned long 74#define RIPEMD160_LONG unsigned long
75#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) 75#elif defined(__ILP64__)
76#define RIPEMD160_LONG unsigned long 76#define RIPEMD160_LONG unsigned long
77#define RIPEMD160_LONG_LOG2 3 77#define RIPEMD160_LONG_LOG2 3
78#else 78#else
diff --git a/src/lib/libssl/src/crypto/sha/sha.h b/src/lib/libssl/src/crypto/sha/sha.h
index 7cbca26ff9..435352c208 100644
--- a/src/lib/libssl/src/crypto/sha/sha.h
+++ b/src/lib/libssl/src/crypto/sha/sha.h
@@ -79,7 +79,7 @@ extern "C" {
79 79
80#if defined(__LP32__) 80#if defined(__LP32__)
81#define SHA_LONG unsigned long 81#define SHA_LONG unsigned long
82#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) 82#elif defined(__ILP64__)
83#define SHA_LONG unsigned long 83#define SHA_LONG unsigned long
84#define SHA_LONG_LOG2 3 84#define SHA_LONG_LOG2 3
85#else 85#else
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-20 11:20:04 +0000