Add missing #ifndefs that caused missing symbols when building libssl

[openssl.git] / ssl / s2_lib.c

diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c
index 7241ea2cf981a3ec08765aa581ddc60e19665e6f..e727b1440677cfb540c6f3d17dc55b8d5c65ed09 100644 (file)
--- a/ssl/s2_lib.c
+++ b/ssl/s2_lib.c
@@ -56,22 +56,19 @@
  * [including the GNU Public Licence.]
  */
 
-#include <stdio.h>
-#include "rsa.h"
-#include "objects.h"
 #include "ssl_locl.h"
+#ifndef NO_SSL2
+#include <stdio.h>
+#include <openssl/rsa.h>
+#include <openssl/objects.h>
+#include <openssl/md5.h>
 
-#ifndef NOPROTO
 static long ssl2_default_timeout(void );
-#else
-static long ssl2_default_timeout();
-#endif
-
 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
        {
@@ -196,23 +193,22 @@ static SSL_METHOD SSLv2_data= {
        &ssl3_undef_enc_method,
        };
 
-static long ssl2_default_timeout()
+static long ssl2_default_timeout(void)
        {
        return(300);
        }
 
-SSL_METHOD *sslv2_base_method()
+SSL_METHOD *sslv2_base_method(void)
        {
        return(&SSLv2_data);
        }
 
-int ssl2_num_ciphers()
+int ssl2_num_ciphers(void)
        {
        return(SSL2_NUM_CIPHERS);
        }
 
-SSL_CIPHER *ssl2_get_cipher(u)
-unsigned int u;
+SSL_CIPHER *ssl2_get_cipher(unsigned int u)
        {
        if (u < SSL2_NUM_CIPHERS)
                return(&(ssl2_ciphers[SSL2_NUM_CIPHERS-1-u]));
@@ -220,14 +216,12 @@ unsigned int u;
                return(NULL);
        }
 
-int ssl2_pending(s)
-SSL *s;
+int ssl2_pending(SSL *s)
        {
        return(s->s2->ract_data_length);
        }
 
-int ssl2_new(s)
-SSL *s;
+int ssl2_new(SSL *s)
        {
        SSL2_CTX *s2;
 
@@ -252,8 +246,7 @@ err:
        return(0);
        }
 
-void ssl2_free(s)
-SSL *s;
+void ssl2_free(SSL *s)
        {
        SSL2_CTX *s2;
 
@@ -268,8 +261,7 @@ SSL *s;
        s->s2=NULL;
        }
 
-void ssl2_clear(s)
-SSL *s;
+void ssl2_clear(SSL *s)
        {
        SSL2_CTX *s2;
        unsigned char *rbuf,*wbuf;
@@ -289,11 +281,7 @@ SSL *s;
        s->packet_length=0;
        }
 
-long ssl2_ctrl(s,cmd,larg,parg)
-SSL *s;
-int cmd;
-long larg;
-char *parg;
+long ssl2_ctrl(SSL *s, int cmd, long larg, char *parg)
        {
        int ret=0;
 
@@ -308,19 +296,14 @@ char *parg;
        return(ret);
        }
 
-long ssl2_ctx_ctrl(ctx,cmd,larg,parg)
-SSL_CTX *ctx;
-int cmd;
-long larg;
-char *parg;
+long ssl2_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, char *parg)
        {
        return(0);
        }
 
 /* This function needs to check if the ciphers required are actually
  * available */
-SSL_CIPHER *ssl2_get_cipher_by_char(p)
-const unsigned char *p;
+SSL_CIPHER *ssl2_get_cipher_by_char(const unsigned char *p)
        {
        static int init=1;
        static SSL_CIPHER *sorted[SSL2_NUM_CIPHERS];
@@ -330,7 +313,7 @@ const unsigned char *p;
 
        if (init)
                {
-               init=0;
+               CRYPTO_w_lock(CRYPTO_LOCK_SSL);
 
                for (i=0; i<SSL2_NUM_CIPHERS; i++)
                        sorted[i]= &(ssl2_ciphers[i]);
@@ -338,6 +321,9 @@ const unsigned char *p;
                qsort(  (char *)sorted,
                        SSL2_NUM_CIPHERS,sizeof(SSL_CIPHER *),
                        FP_ICC ssl_cipher_ptr_id_cmp);
+
+               CRYPTO_w_unlock(CRYPTO_LOCK_SSL);
+               init=0;
                }
 
        id=0x02000000L|((unsigned long)p[0]<<16L)|
@@ -353,9 +339,7 @@ const unsigned char *p;
                return(*cpp);
        }
 
-int ssl2_put_cipher_by_char(c,p)
-const SSL_CIPHER *c;
-unsigned char *p;
+int ssl2_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p)
        {
        long l;
 
@@ -370,14 +354,18 @@ unsigned char *p;
        return(3);
        }
 
-void ssl2_generate_key_material(s)
-SSL *s;
+void ssl2_generate_key_material(SSL *s)
        {
        unsigned int i;
        MD5_CTX ctx;
        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; i<s->s2->key_material_length; i+=MD5_DIGEST_LENGTH)
                {
@@ -393,9 +381,7 @@ SSL *s;
                }
        }
 
-void ssl2_return_error(s,err)
-SSL *s;
-int err;
+void ssl2_return_error(SSL *s, int err)
        {
        if (!s->error)
                {
@@ -407,10 +393,9 @@ int err;
        }
 
 
-void ssl2_write_error(s)
-SSL *s;
+void ssl2_write_error(SSL *s)
        {
-       char buf[3];
+       unsigned char buf[3];
        int i,error;
 
        buf[0]=SSL2_MT_ERROR;
@@ -431,10 +416,15 @@ SSL *s;
                s->error=0; */
        }
 
-int ssl2_shutdown(s)
-SSL *s;
+int ssl2_shutdown(SSL *s)
        {
        s->shutdown=(SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
        return(1);
        }
+#else /* !NO_SSL2 */
 
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
+#endif