OpenSSL 0.9.5 merge

*warning* this bumps shared lib minors for libssl and libcrypto from 2.1 to 2.2
if you are using the ssl26 packages for ssh and other things to work you will
need to get new ones (see ~beck/libsslsnap/<arch>) on cvs or ~beck/src-patent.tar.gz on cvs

6 files changed, 28 insertions, 28 deletions

diff --git a/src/lib/libcrypto/cast/c_ecb.c b/src/lib/libcrypto/cast/c_ecb.c
index 33182f2b71..0b3da9ad87 100644
--- a/src/lib/libcrypto/cast/c_ecb.c
+++ b/src/lib/libcrypto/cast/c_ecb.c
@@ -60,7 +60,7 @@
 #include "cast_lcl.h"
 #include <openssl/opensslv.h>
 
-char *CAST_version="CAST" OPENSSL_VERSION_PTEXT;
+const char *CAST_version="CAST" OPENSSL_VERSION_PTEXT;
 
 void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out,
                       CAST_KEY *ks, int enc)
diff --git a/src/lib/libcrypto/cast/cast_lcl.h b/src/lib/libcrypto/cast/cast_lcl.h
index 83cf382a91..cfe3842e91 100644
--- a/src/lib/libcrypto/cast/cast_lcl.h
+++ b/src/lib/libcrypto/cast/cast_lcl.h
@@ -216,11 +216,11 @@
         }
 #endif
 
-OPENSSL_EXTERN CAST_LONG CAST_S_table0[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table1[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table2[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table3[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table4[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table5[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table6[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table7[256];
+OPENSSL_EXTERN const CAST_LONG CAST_S_table0[256];
+OPENSSL_EXTERN const CAST_LONG CAST_S_table1[256];
+OPENSSL_EXTERN const CAST_LONG CAST_S_table2[256];
+OPENSSL_EXTERN const CAST_LONG CAST_S_table3[256];
+OPENSSL_EXTERN const CAST_LONG CAST_S_table4[256];
+OPENSSL_EXTERN const CAST_LONG CAST_S_table5[256];
+OPENSSL_EXTERN const CAST_LONG CAST_S_table6[256];
+OPENSSL_EXTERN const CAST_LONG CAST_S_table7[256];
diff --git a/src/lib/libcrypto/cast/cast_s.h b/src/lib/libcrypto/cast/cast_s.h
index 9af28972c5..c483fd5e43 100644
--- a/src/lib/libcrypto/cast/cast_s.h
+++ b/src/lib/libcrypto/cast/cast_s.h
@@ -55,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-OPENSSL_GLOBAL CAST_LONG CAST_S_table0[256]={
+OPENSSL_GLOBAL const CAST_LONG CAST_S_table0[256]={
         0x30fb40d4,0x9fa0ff0b,0x6beccd2f,0x3f258c7a,
         0x1e213f2f,0x9c004dd3,0x6003e540,0xcf9fc949,
         0xbfd4af27,0x88bbbdb5,0xe2034090,0x98d09675,
@@ -121,7 +121,7 @@ OPENSSL_GLOBAL CAST_LONG CAST_S_table0[256]={
         0x1a69e783,0x02cc4843,0xa2f7c579,0x429ef47d,
         0x427b169c,0x5ac9f049,0xdd8f0f00,0x5c8165bf,
         };
-OPENSSL_GLOBAL CAST_LONG CAST_S_table1[256]={
+OPENSSL_GLOBAL const CAST_LONG CAST_S_table1[256]={
         0x1f201094,0xef0ba75b,0x69e3cf7e,0x393f4380,
         0xfe61cf7a,0xeec5207a,0x55889c94,0x72fc0651,
         0xada7ef79,0x4e1d7235,0xd55a63ce,0xde0436ba,
@@ -187,7 +187,7 @@ OPENSSL_GLOBAL CAST_LONG CAST_S_table1[256]={
         0x43d79572,0x7e6dd07c,0x06dfdf1e,0x6c6cc4ef,
         0x7160a539,0x73bfbe70,0x83877605,0x4523ecf1,
         };
-OPENSSL_GLOBAL CAST_LONG CAST_S_table2[256]={
+OPENSSL_GLOBAL const CAST_LONG CAST_S_table2[256]={
         0x8defc240,0x25fa5d9f,0xeb903dbf,0xe810c907,
         0x47607fff,0x369fe44b,0x8c1fc644,0xaececa90,
         0xbeb1f9bf,0xeefbcaea,0xe8cf1950,0x51df07ae,
@@ -253,7 +253,7 @@ OPENSSL_GLOBAL CAST_LONG CAST_S_table2[256]={
         0xf7baefd5,0x4142ed9c,0xa4315c11,0x83323ec5,
         0xdfef4636,0xa133c501,0xe9d3531c,0xee353783,
         };
-OPENSSL_GLOBAL CAST_LONG CAST_S_table3[256]={
+OPENSSL_GLOBAL const CAST_LONG CAST_S_table3[256]={
         0x9db30420,0x1fb6e9de,0xa7be7bef,0xd273a298,
         0x4a4f7bdb,0x64ad8c57,0x85510443,0xfa020ed1,
         0x7e287aff,0xe60fb663,0x095f35a1,0x79ebf120,
@@ -319,7 +319,7 @@ OPENSSL_GLOBAL CAST_LONG CAST_S_table3[256]={
         0x7ae5290c,0x3cb9536b,0x851e20fe,0x9833557e,
         0x13ecf0b0,0xd3ffb372,0x3f85c5c1,0x0aef7ed2,
         };
-OPENSSL_GLOBAL CAST_LONG CAST_S_table4[256]={
+OPENSSL_GLOBAL const CAST_LONG CAST_S_table4[256]={
         0x7ec90c04,0x2c6e74b9,0x9b0e66df,0xa6337911,
         0xb86a7fff,0x1dd358f5,0x44dd9d44,0x1731167f,
         0x08fbf1fa,0xe7f511cc,0xd2051b00,0x735aba00,
@@ -385,7 +385,7 @@ OPENSSL_GLOBAL CAST_LONG CAST_S_table4[256]={
         0xe822fe15,0x88570983,0x750e6249,0xda627e55,
         0x5e76ffa8,0xb1534546,0x6d47de08,0xefe9e7d4,
         };
-OPENSSL_GLOBAL CAST_LONG CAST_S_table5[256]={
+OPENSSL_GLOBAL const CAST_LONG CAST_S_table5[256]={
         0xf6fa8f9d,0x2cac6ce1,0x4ca34867,0xe2337f7c,
         0x95db08e7,0x016843b4,0xeced5cbc,0x325553ac,
         0xbf9f0960,0xdfa1e2ed,0x83f0579d,0x63ed86b9,
@@ -451,7 +451,7 @@ OPENSSL_GLOBAL CAST_LONG CAST_S_table5[256]={
         0xa2d762cf,0x49c92f54,0x38b5f331,0x7128a454,
         0x48392905,0xa65b1db8,0x851c97bd,0xd675cf2f,
         };
-OPENSSL_GLOBAL CAST_LONG CAST_S_table6[256]={
+OPENSSL_GLOBAL const CAST_LONG CAST_S_table6[256]={
         0x85e04019,0x332bf567,0x662dbfff,0xcfc65693,
         0x2a8d7f6f,0xab9bc912,0xde6008a1,0x2028da1f,
         0x0227bce7,0x4d642916,0x18fac300,0x50f18b82,
@@ -517,7 +517,7 @@ OPENSSL_GLOBAL CAST_LONG CAST_S_table6[256]={
         0x518f36b2,0x84b1d370,0x0fedce83,0x878ddada,
         0xf2a279c7,0x94e01be8,0x90716f4b,0x954b8aa3,
         };
-OPENSSL_GLOBAL CAST_LONG CAST_S_table7[256]={
+OPENSSL_GLOBAL const CAST_LONG CAST_S_table7[256]={
         0xe216300d,0xbbddfffc,0xa7ebdabd,0x35648095,
         0x7789f8b7,0xe6c1121b,0x0e241600,0x052ce8b5,
         0x11a9cfb0,0xe5952f11,0xece7990a,0x9386d174,
diff --git a/src/lib/libcrypto/cast/cast_spd.c b/src/lib/libcrypto/cast/cast_spd.c
index c0726906c2..0af915cf20 100644
--- a/src/lib/libcrypto/cast/cast_spd.c
+++ b/src/lib/libcrypto/cast/cast_spd.c
@@ -183,7 +183,7 @@ int main(int argc, char **argv)
 #endif
 
 #ifndef TIMES
-        printf("To get the most acurate results, try to run this\n");
+        printf("To get the most accurate results, try to run this\n");
         printf("program when this computer is idle.\n");
 #endif
 
diff --git a/src/lib/libcrypto/cast/castopts.c b/src/lib/libcrypto/cast/castopts.c
index 642e9725af..c783796610 100644
--- a/src/lib/libcrypto/cast/castopts.c
+++ b/src/lib/libcrypto/cast/castopts.c
@@ -252,7 +252,7 @@ int main(int argc, char **argv)
                 }
 
 #ifndef TIMES
-        fprintf(stderr,"To get the most acurate results, try to run this\n");
+        fprintf(stderr,"To get the most accurate results, try to run this\n");
         fprintf(stderr,"program when this computer is idle.\n");
 #endif
 
diff --git a/src/lib/libcrypto/cast/casttest.c b/src/lib/libcrypto/cast/casttest.c
index 3244b119e9..ab2aeac606 100644
--- a/src/lib/libcrypto/cast/casttest.c
+++ b/src/lib/libcrypto/cast/casttest.c
@@ -71,32 +71,32 @@ int main(int argc, char *argv[])
 
 #define FULL_TEST
 
-unsigned char k[16]={
+static unsigned char k[16]={
         0x01,0x23,0x45,0x67,0x12,0x34,0x56,0x78,
         0x23,0x45,0x67,0x89,0x34,0x56,0x78,0x9A
         };
 
-unsigned char in[8]={ 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF};
+static unsigned char in[8]={ 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF};
 
-int k_len[3]={16,10,5};
-unsigned char c[3][8]={
+static int k_len[3]={16,10,5};
+static unsigned char c[3][8]={
         {0x23,0x8B,0x4F,0xE5,0x84,0x7E,0x44,0xB2},
         {0xEB,0x6A,0x71,0x1A,0x2C,0x02,0x27,0x1B},
         {0x7A,0xC8,0x16,0xD1,0x6E,0x9B,0x30,0x2E},
         };
-unsigned char out[80];
+static unsigned char out[80];
 
-unsigned char in_a[16]={
+static unsigned char in_a[16]={
         0x01,0x23,0x45,0x67,0x12,0x34,0x56,0x78,
         0x23,0x45,0x67,0x89,0x34,0x56,0x78,0x9A};
-unsigned char in_b[16]={
+static unsigned char in_b[16]={
         0x01,0x23,0x45,0x67,0x12,0x34,0x56,0x78,
         0x23,0x45,0x67,0x89,0x34,0x56,0x78,0x9A};
 
-unsigned char c_a[16]={
+static unsigned char c_a[16]={
         0xEE,0xA9,0xD0,0xA2,0x49,0xFD,0x3B,0xA6,
         0xB3,0x43,0x6F,0xB8,0x9D,0x6D,0xCA,0x92};
-unsigned char c_b[16]={
+static unsigned char c_b[16]={
         0xB2,0xC9,0x5E,0xB0,0x0C,0x31,0xAD,0x71,
         0x80,0xAC,0x05,0xB8,0xE8,0x3D,0x69,0x6E};