Replace "SSLeay" in API with OpenSSL

[openssl.git] / demos / bio / sconnect.c

diff --git a/demos/bio/sconnect.c b/demos/bio/sconnect.c
index 87b380b258cb8f5b0c3574ec5aa07ac37a3fde0b..865d50395692998918b5353649f7b6714e0c4d40 100644 (file)
--- a/demos/bio/sconnect.c
+++ b/demos/bio/sconnect.c
@@ -1,7 +1,8 @@
 /* NOCW */
 /* demos/bio/sconnect.c */
 
-/* A minimal program to do SSL to a passed host and port.
+/*-
+ * A minimal program to do SSL to a passed host and port.
  * It is actually using non-blocking IO but in a very simple manner
  * sconnect host:port - it does a 'GET / HTTP/1.0'
  *
@@ -15,102 +16,96 @@
 
 extern int errno;
 
-int main(argc,argv)
+int main(argc, argv)
 int argc;
 char *argv[];
-       {
-       char *host;
-       BIO *out;
-       char buf[1024*10],*p;
-       SSL_CTX *ssl_ctx=NULL;
-       SSL *ssl;
-       BIO *ssl_bio;
-       int i,len,off,ret=1;
+{
+    char *host;
+    BIO *out;
+    char buf[1024 * 10], *p;
+    SSL_CTX *ssl_ctx = NULL;
+    SSL *ssl;
+    BIO *ssl_bio;
+    int i, len, off, ret = 1;
 
-       if (argc <= 1)
-               host="localhost:4433";
-       else
-               host=argv[1];
+    if (argc <= 1)
+        host = "localhost:4433";
+    else
+        host = argv[1];
 
-       /* Lets get nice error messages */
-       SSL_load_error_strings();
+#ifdef WATT32
+    dbug_init();
+    sock_init();
+#endif
 
-       /* Setup all the global SSL stuff */
-       OpenSSL_add_ssl_algorithms();
-       ssl_ctx=SSL_CTX_new(SSLv23_client_method());
+    /* Lets get nice error messages */
+    SSL_load_error_strings();
 
-       /* Lets make a SSL structure */
-       ssl=SSL_new(ssl_ctx);
-       SSL_set_connect_state(ssl);
+    /* Setup all the global SSL stuff */
+    OpenSSL_add_ssl_algorithms();
+    ssl_ctx = SSL_CTX_new(TLS_client_method());
 
-       /* Use it inside an SSL BIO */
-       ssl_bio=BIO_new(BIO_f_ssl());
-       BIO_set_ssl(ssl_bio,ssl,BIO_CLOSE);
+    /* Lets make a SSL structure */
+    ssl = SSL_new(ssl_ctx);
+    SSL_set_connect_state(ssl);
 
-       /* Lets use a connect BIO under the SSL BIO */
-       out=BIO_new(BIO_s_connect());
-       BIO_set_conn_hostname(out,host);
-       BIO_set_nbio(out,1);
-       out=BIO_push(ssl_bio,out);
+    /* Use it inside an SSL BIO */
+    ssl_bio = BIO_new(BIO_f_ssl());
+    BIO_set_ssl(ssl_bio, ssl, BIO_CLOSE);
 
-       p="GET / HTTP/1.0\r\n\r\n";
-       len=strlen(p);
+    /* Lets use a connect BIO under the SSL BIO */
+    out = BIO_new(BIO_s_connect());
+    BIO_set_conn_hostname(out, host);
+    BIO_set_nbio(out, 1);
+    out = BIO_push(ssl_bio, out);
 
-       off=0;
-       for (;;)
-               {
-               i=BIO_write(out,&(p[off]),len);
-               if (i <= 0)
-                       {
-                       if (BIO_should_retry(out))
-                               {
-                               fprintf(stderr,"write DELAY\n");
-                               sleep(1);
-                               continue;
-                               }
-                       else
-                               {
-                               goto err;
-                               }
-                       }
-               off+=i;
-               len-=i;
-               if (len <= 0) break;
-               }
+    p = "GET / HTTP/1.0\r\n\r\n";
+    len = strlen(p);
 
-       for (;;)
-               {
-               i=BIO_read(out,buf,sizeof(buf));
-               if (i == 0) break;
-               if (i < 0)
-                       {
-                       if (BIO_should_retry(out))
-                               {
-                               fprintf(stderr,"read DELAY\n");
-                               sleep(1);
-                               continue;
-                               }
-                       goto err;
-                       }
-               fwrite(buf,1,i,stdout);
-               }
+    off = 0;
+    for (;;) {
+        i = BIO_write(out, &(p[off]), len);
+        if (i <= 0) {
+            if (BIO_should_retry(out)) {
+                fprintf(stderr, "write DELAY\n");
+                sleep(1);
+                continue;
+            } else {
+                goto err;
+            }
+        }
+        off += i;
+        len -= i;
+        if (len <= 0)
+            break;
+    }
 
-       ret=1;
+    for (;;) {
+        i = BIO_read(out, buf, sizeof(buf));
+        if (i == 0)
+            break;
+        if (i < 0) {
+            if (BIO_should_retry(out)) {
+                fprintf(stderr, "read DELAY\n");
+                sleep(1);
+                continue;
+            }
+            goto err;
+        }
+        fwrite(buf, 1, i, stdout);
+    }
 
-       if (0)
-               {
-err:
-               if (ERR_peek_error() == 0) /* system call error */
-                       {
-                       fprintf(stderr,"errno=%d ",errno);
-                       perror("error");
-                       }
-               else
-                       ERR_print_errors_fp(stderr);
-               }
-       BIO_free_all(out);
-       if (ssl_ctx != NULL) SSL_CTX_free(ssl_ctx);
-       exit(!ret);
-       return(ret);
-       }
+    ret = 1;
+    goto done;
 
+ err:
+    if (ERR_peek_error() == 0) { /* system call error */
+        fprintf(stderr, "errno=%d ", errno);
+        perror("error");
+    } else
+        ERR_print_errors_fp(stderr);
+ done:
+    BIO_free_all(out);
+    SSL_CTX_free(ssl_ctx);
+    return (ret == 1);
+}