X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=ssl%2Fs2_lib.c;h=ff804d8e0d1b0b66b578feead844914f74dc19d4;hp=39ab1b6c753220627d7a6eaafd56bbf29ea804a9;hb=fccbb9b34f13b2d181db9a4714d92bc70c8c7ef0;hpb=d02f751ce1d13183a0c0e5528ec89f76587ed989 diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c index 39ab1b6c75..ff804d8e0d 100644 --- a/ssl/s2_lib.c +++ b/ssl/s2_lib.c @@ -68,7 +68,7 @@ const char *ssl2_version_str="SSLv2" OPENSSL_VERSION_PTEXT; #define SSL2_NUM_CIPHERS (sizeof(ssl2_ciphers)/sizeof(SSL_CIPHER)) -SSL_CIPHER ssl2_ciphers[]={ +OPENSSL_GLOBAL SSL_CIPHER ssl2_ciphers[]={ /* NULL_WITH_MD5 v3 */ #if 0 { @@ -361,6 +361,11 @@ void ssl2_generate_key_material(SSL *s) unsigned char *km; unsigned char c='0'; +#ifdef CHARSET_EBCDIC + c = os_toascii['0']; /* Must be an ASCII '0', not EBCDIC '0', + see SSLv2 docu */ +#endif + km=s->s2->key_material; for (i=0; is2->key_material_length; i+=MD5_DIGEST_LENGTH) {