rsaz-x86_64.pl: add MULX/ADCX/ADOX code path.

[openssl.git] / crypto / bio / bss_conn.c

diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index 22d00b369ecbc2ec0923b0d1212507e950948e6f..c14727855b259b30b1ed679948337ba2f2e95a1f 100644 (file)
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -56,21 +56,21 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef NO_SOCK
-
 #include <stdio.h>
 #include <errno.h>
 #define USE_SOCKETS
 #include "cryptlib.h"
 #include <openssl/bio.h>
 
-#ifdef WIN16
+#ifndef OPENSSL_NO_SOCK
+
+#ifdef OPENSSL_SYS_WIN16
 #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
 #else
 #define SOCKET_PROTOCOL IPPROTO_TCP
 #endif
 
-#if (defined(VMS) && __VMS_VER < 70000000)
+#if (defined(OPENSSL_SYS_VMS) && __VMS_VER < 70000000)
 /* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
 #undef FIONBIO
 #endif
@@ -95,16 +95,16 @@ typedef struct bio_connect_st
        /* called when the connection is initially made
         *  callback(BIO,state,ret);  The callback should return
         * 'ret'.  state is for compatibility with the ssl info_callback */
-       int (*info_callback)();
+       int (*info_callback)(const BIO *bio,int state,int ret);
        } BIO_CONNECT;
 
-static int conn_write(BIO *h,char *buf,int num);
-static int conn_read(BIO *h,char *buf,int size);
-static int conn_puts(BIO *h,char *str);
-static long conn_ctrl(BIO *h,int cmd,long arg1,char *arg2);
+static int conn_write(BIO *h, const char *buf, int num);
+static int conn_read(BIO *h, char *buf, int size);
+static int conn_puts(BIO *h, const char *str);
+static long conn_ctrl(BIO *h, int cmd, long arg1, void *arg2);
 static int conn_new(BIO *h);
 static int conn_free(BIO *data);
-static long conn_callback_ctrl(BIO *h,int cmd,void *(*fp)());
+static long conn_callback_ctrl(BIO *h, int cmd, bio_info_cb *);
 
 static int conn_state(BIO *b, BIO_CONNECT *c);
 static void conn_close_socket(BIO *data);
@@ -130,7 +130,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
        int ret= -1,i;
        unsigned long l;
        char *p,*q;
-       int (*cb)()=NULL;
+       int (*cb)(const BIO *,int,int)=NULL;
 
        if (c->info_callback != NULL)
                cb=c->info_callback;
@@ -165,7 +165,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
                                                        break;
                                                        }
                                        if (c->param_port != NULL)
-                                               Free(c->param_port);
+                                               OPENSSL_free(c->param_port);
                                        c->param_port=BUF_strdup(p);
                                        }
                                }
@@ -188,7 +188,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
                case BIO_CONN_S_GET_PORT:
                        if (c->param_port == NULL)
                                {
-                               abort();
+                               /* abort(); */
                                goto exit_loop;
                                }
                        else if (BIO_get_port(c->param_port,&c->port) <= 0)
@@ -236,7 +236,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
                                }
                        c->state=BIO_CONN_S_CONNECT;
 
-#ifdef SO_KEEPALIVE
+#if defined(SO_KEEPALIVE) && !defined(OPENSSL_SYS_MPE)
                        i=1;
                        i=setsockopt(b->num,SOL_SOCKET,SO_KEEPALIVE,(char *)&i,sizeof(i));
                        if (i < 0)
@@ -299,7 +299,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
                        ret=1;
                        goto exit_loop;
                default:
-                       abort();
+                       /* abort(); */
                        goto exit_loop;
                        }
 
@@ -322,7 +322,7 @@ BIO_CONNECT *BIO_CONNECT_new(void)
        {
        BIO_CONNECT *ret;
 
-       if ((ret=(BIO_CONNECT *)Malloc(sizeof(BIO_CONNECT))) == NULL)
+       if ((ret=(BIO_CONNECT *)OPENSSL_malloc(sizeof(BIO_CONNECT))) == NULL)
                return(NULL);
        ret->state=BIO_CONN_S_BEFORE;
        ret->param_hostname=NULL;
@@ -344,10 +344,10 @@ void BIO_CONNECT_free(BIO_CONNECT *a)
            return;
 
        if (a->param_hostname != NULL)
-               Free(a->param_hostname);
+               OPENSSL_free(a->param_hostname);
        if (a->param_port != NULL)
-               Free(a->param_port);
-       Free(a);
+               OPENSSL_free(a->param_port);
+       OPENSSL_free(a);
        }
 
 BIO_METHOD *BIO_s_connect(void)
@@ -426,7 +426,7 @@ static int conn_read(BIO *b, char *out, int outl)
        return(ret);
        }
 
-static int conn_write(BIO *b, char *in, int inl)
+static int conn_write(BIO *b, const char *in, int inl)
        {
        int ret;
        BIO_CONNECT *data;
@@ -449,7 +449,7 @@ static int conn_write(BIO *b, char *in, int inl)
        return(ret);
        }
 
-static long conn_ctrl(BIO *b, int cmd, long num, char *ptr)
+static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
        {
        BIO *dbio;
        int *ip;
@@ -469,7 +469,7 @@ static long conn_ctrl(BIO *b, int cmd, long num, char *ptr)
                break;
        case BIO_C_DO_STATE_MACHINE:
                /* use this one to start the connection */
-               if (!data->state != BIO_CONN_S_OK)
+               if (data->state != BIO_CONN_S_OK)
                        ret=(long)conn_state(b,data);
                else
                        ret=1;
@@ -507,33 +507,34 @@ static long conn_ctrl(BIO *b, int cmd, long num, char *ptr)
                        if (num == 0)
                                {
                                if (data->param_hostname != NULL)
-                                       Free(data->param_hostname);
+                                       OPENSSL_free(data->param_hostname);
                                data->param_hostname=BUF_strdup(ptr);
                                }
                        else if (num == 1)
                                {
                                if (data->param_port != NULL)
-                                       Free(data->param_port);
+                                       OPENSSL_free(data->param_port);
                                data->param_port=BUF_strdup(ptr);
                                }
                        else if (num == 2)
                                {
                                char buf[16];
+                               unsigned char *p = ptr;
 
-                               sprintf(buf,"%d.%d.%d.%d",
-                                       ptr[0],ptr[1],ptr[2],ptr[3]);
+                               BIO_snprintf(buf,sizeof buf,"%d.%d.%d.%d",
+                                            p[0],p[1],p[2],p[3]);
                                if (data->param_hostname != NULL)
-                                       Free(data->param_hostname);
+                                       OPENSSL_free(data->param_hostname);
                                data->param_hostname=BUF_strdup(buf);
                                memcpy(&(data->ip[0]),ptr,4);
                                }
                        else if (num == 3)
                                {
-                               char buf[16];
+                               char buf[DECIMAL_SIZE(int)+1];
 
-                               sprintf(buf,"%d",*(int *)ptr);
+                               BIO_snprintf(buf,sizeof buf,"%d",*(int *)ptr);
                                if (data->param_port != NULL)
-                                       Free(data->param_port);
+                                       OPENSSL_free(data->param_port);
                                data->param_port=BUF_strdup(buf);
                                data->port= *(int *)ptr;
                                }
@@ -573,7 +574,8 @@ static long conn_ctrl(BIO *b, int cmd, long num, char *ptr)
                if (data->param_hostname)
                        BIO_set_conn_hostname(dbio,data->param_hostname);
                BIO_set_nbio(dbio,data->nbio);
-               (void)BIO_set_info_callback(dbio,(void *(*)())(data->info_callback));
+               /* FIXME: the cast of the function seems unlikely to be a good idea */
+                (void)BIO_set_info_callback(dbio,(bio_info_cb *)data->info_callback);
                }
                break;
        case BIO_CTRL_SET_CALLBACK:
@@ -588,9 +590,9 @@ static long conn_ctrl(BIO *b, int cmd, long num, char *ptr)
                break;
        case BIO_CTRL_GET_CALLBACK:
                {
-               int (**fptr)();
+               int (**fptr)(const BIO *bio,int state,int xret);
 
-               fptr=(int (**)())ptr;
+               fptr=(int (**)(const BIO *bio,int state,int xret))ptr;
                *fptr=data->info_callback;
                }
                break;
@@ -601,7 +603,7 @@ static long conn_ctrl(BIO *b, int cmd, long num, char *ptr)
        return(ret);
        }
 
-static long conn_callback_ctrl(BIO *b, int cmd, void *(*fp)())
+static long conn_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)
        {
        long ret=1;
        BIO_CONNECT *data;
@@ -612,7 +614,7 @@ static long conn_callback_ctrl(BIO *b, int cmd, void *(*fp)())
                {
        case BIO_CTRL_SET_CALLBACK:
                {
-               data->info_callback=(int (*)())fp;
+               data->info_callback=(int (*)(const struct bio_st *, int, int))fp;
                }
                break;
        default:
@@ -622,7 +624,7 @@ static long conn_callback_ctrl(BIO *b, int cmd, void *(*fp)())
        return(ret);
        }
 
-static int conn_puts(BIO *bp, char *str)
+static int conn_puts(BIO *bp, const char *str)
        {
        int n,ret;