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

1 files changed, 6 insertions, 6 deletions

diff --git a/src/lib/libcrypto/bf/bftest.c b/src/lib/libcrypto/bf/bftest.c
index 6ecd2609a9..5695250195 100644
--- a/src/lib/libcrypto/bf/bftest.c
+++ b/src/lib/libcrypto/bf/bftest.c
@@ -76,18 +76,18 @@ int main(int argc, char *argv[])
 #include <openssl/ebcdic.h>
 #endif
 
-char *bf_key[2]={
+static char *bf_key[2]={
         "abcdefghijklmnopqrstuvwxyz",
         "Who is John Galt?"
         };
 
 /* big endian */
-BF_LONG bf_plain[2][2]={
+static BF_LONG bf_plain[2][2]={
         {0x424c4f57L,0x46495348L},
         {0xfedcba98L,0x76543210L}
         };
 
-BF_LONG bf_cipher[2][2]={
+static BF_LONG bf_cipher[2][2]={
         {0x324ed0feL,0xf413a203L},
         {0xcc91732bL,0x8022f684L}
         };
@@ -228,16 +228,16 @@ static unsigned char ofb64_ok[]={
         0x63,0xC2,0xCF,0x80,0xDA};
 
 #define KEY_TEST_NUM    25
-unsigned char key_test[KEY_TEST_NUM]={
+static unsigned char key_test[KEY_TEST_NUM]={
         0xf0,0xe1,0xd2,0xc3,0xb4,0xa5,0x96,0x87,
         0x78,0x69,0x5a,0x4b,0x3c,0x2d,0x1e,0x0f,
         0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,
         0x88};
 
-unsigned char key_data[8]=
+static unsigned char key_data[8]=
         {0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10};
 
-unsigned char key_out[KEY_TEST_NUM][8]={
+static unsigned char key_out[KEY_TEST_NUM][8]={
         {0xF9,0xAD,0x59,0x7C,0x49,0xDB,0x00,0x5E},
         {0xE9,0x1D,0x21,0xC1,0xD9,0x61,0xA6,0xD6},
         {0xE9,0xC2,0xB7,0x0A,0x1B,0xC6,0x5C,0xF3},