X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=ssl%2Fssl_task.c;h=ab37cc6bef742064aea99f615678b45668b29291;hb=1d4d68570b8d3f214da0df57c5a629ced9668161;hp=b971a270d42941f2c636282fc74292793c7fdb8d;hpb=17e3dd1c62e9aadcd908c55e650f70379d2d19e2;p=openssl.git diff --git a/ssl/ssl_task.c b/ssl/ssl_task.c index b971a270d4..ab37cc6bef 100644 --- a/ssl/ssl_task.c +++ b/ssl/ssl_task.c @@ -5,21 +5,21 @@ * This package is an SSL implementation written * by Eric Young (eay@cryptsoft.com). * The implementation was written so as to conform with Netscapes SSL. - * + * * This library is free for commercial and non-commercial use as long as * the following conditions are aheared to. The following conditions * apply to all code found in this distribution, be it the RC4, RSA, * lhash, DES, etc., code; not just the SSL code. The SSL documentation * included with this distribution is covered by the same copyright terms * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * + * * Copyright remains Eric Young's, and as such any Copyright notices in * the code are not to be removed. * If this package is used in a product, Eric Young should be given attribution * as the author of the parts of the library used. * This can be in the form of a textual message at program startup or * in documentation (online or textual) provided with the package. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -34,10 +34,10 @@ * Eric Young (eay@cryptsoft.com)" * The word 'cryptographic' can be left out if the rouines from the library * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from + * 4. If you include any Windows specific code (or a derivative thereof) from * the apps directory (application code) you must include an acknowledgement: * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * + * * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -49,7 +49,7 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * + * * The licence and distribution terms for any publically available version or * derivative of this code cannot be changed. i.e. this code cannot simply be * copied and put under another distribution licence @@ -57,22 +57,22 @@ */ /* VMS */ -/* +/*- * DECnet object for servicing SSL. We accept the inbound and speak a * simple protocol for multiplexing the 2 data streams (application and * ssl data) over this logical link. * * Logical names: - * SSL_CIPHER Defines a list of cipher specifications the server - * will support in order of preference. + * SSL_CIPHER Defines a list of cipher specifications the server + * will support in order of preference. * SSL_SERVER_CERTIFICATE - * Points to PEM (privacy enhanced mail) file that - * contains the server certificate and private password. - * SYS$NET Logical created by netserver.exe as hook for completing - * DECnet logical link. + * Points to PEM (privacy enhanced mail) file that + * contains the server certificate and private password. + * SYS$NET Logical created by netserver.exe as hook for completing + * DECnet logical link. * * Each NSP message sent over the DECnet link has the following structure: - * struct rpc_msg { + * struct rpc_msg { * char channel; * char function; * short length; @@ -103,7 +103,7 @@ * R, Confirm, {hello} ----> * <---- R, put, {srv hello} * R, Confirm, 0 ----> - * . (SSL handshake completed) + * . (SSL handshake completed) * . (read first app data). * <---- A, confirm, {http data} * A, Put, {http data} ----> @@ -116,36 +116,44 @@ */ #include #include -#include /* VMS IO$_ definitions */ -#include /* VMS string descriptors */ +#include /* VMS IO$_ definitions */ +#include /* VMS string descriptors */ extern int SYS$QIOW(), SYS$ASSIGN(); int LIB$INIT_TIMER(), LIB$SHOW_TIMER(); -#include /* from ssltest.c */ +#include /* from ssltest.c */ #include + +#include "e_os.h" + #include #include -#include #include +#include "ssl_locl.h" -int MS_CALLBACK verify_callback(int ok, X509 *xs, X509 *xi, int depth, - int error); -BIO *bio_err=NULL; -BIO *bio_stdout=NULL; +int verify_callback(int ok, X509 *xs, X509 *xi, int depth, + int error); +BIO *bio_err = NULL; +BIO *bio_stdout = NULL; BIO_METHOD *BIO_s_rtcp(); -static char *cipher=NULL; -int verbose=1; +static char *cipher = NULL; +int verbose = 1; #ifdef FIONBIO -static int s_nbio=0; +static int s_nbio = 0; #endif #define TEST_SERVER_CERT "SSL_SERVER_CERTIFICATE" /*************************************************************************/ -struct rpc_msg { /* Should have member alignment inhibited */ - char channel; /* 'A'-app data. 'R'-remote client 'G'-global */ - char function; /* 'G'-get, 'P'-put, 'C'-confirm, 'X'-close */ - unsigned short int length; /* Amount of data returned or max to return */ - char data[4092]; /* variable data */ +/* Should have member alignment inhibited */ +struct rpc_msg { + /* 'A'-app data. 'R'-remote client 'G'-global */ + char channel; + /* 'G'-get, 'P'-put, 'C'-confirm, 'X'-close */ + char function; + /* Amount of data returned or max to return */ + unsigned short int length; + /* variable data */ + char data[4092]; }; #define RPC_HDR_SIZE (sizeof(struct rpc_msg) - 4092) @@ -157,210 +165,229 @@ struct io_status { unsigned short count; unsigned long stsval; }; -int doit(io_channel chan, SSL_CTX *s_ctx ); +int doit(io_channel chan, SSL_CTX *s_ctx); /*****************************************************************************/ -/* Decnet I/O routines. +/* + * Decnet I/O routines. */ -static int get ( io_channel chan, char *buffer, int maxlen, int *length ) +static int get(io_channel chan, char *buffer, int maxlen, int *length) { int status; struct io_status iosb; - status = SYS$QIOW ( 0, chan, IO$_READVBLK, &iosb, 0, 0, - buffer, maxlen, 0, 0, 0, 0 ); - if ( (status&1) == 1 ) status = iosb.status; - if ( (status&1) == 1 ) *length = iosb.count; + status = SYS$QIOW(0, chan, IO$_READVBLK, &iosb, 0, 0, + buffer, maxlen, 0, 0, 0, 0); + if ((status & 1) == 1) + status = iosb.status; + if ((status & 1) == 1) + *length = iosb.count; return status; } -static int put ( io_channel chan, char *buffer, int length ) +static int put(io_channel chan, char *buffer, int length) { int status; struct io_status iosb; - status = SYS$QIOW ( 0, chan, IO$_WRITEVBLK, &iosb, 0, 0, - buffer, length, 0, 0, 0, 0 ); - if ( (status&1) == 1 ) status = iosb.status; + status = SYS$QIOW(0, chan, IO$_WRITEVBLK, &iosb, 0, 0, + buffer, length, 0, 0, 0, 0); + if ((status & 1) == 1) + status = iosb.status; return status; } + /***************************************************************************/ -/* Handle operations on the 'G' channel. +/* + * Handle operations on the 'G' channel. */ -static int general_request ( io_channel chan, struct rpc_msg *msg, int length ) +static int general_request(io_channel chan, struct rpc_msg *msg, int length) { return 48; } + /***************************************************************************/ -int main ( int argc, char **argv ) +int main(int argc, char **argv) { int status, length; io_channel chan; struct rpc_msg msg; - char *CApath=NULL,*CAfile=NULL; - int badop=0; - int ret=1; - int client_auth=0; - int server_auth=0; - SSL_CTX *s_ctx=NULL; + char *CApath = NULL, *CAfile = NULL; + int badop = 0; + int ret = 1; + int client_auth = 0; + int server_auth = 0; + SSL_CTX *s_ctx = NULL; /* * Confirm logical link with initiating client. */ LIB$INIT_TIMER(); - status = SYS$ASSIGN ( &sysnet, &chan, 0, 0, 0 ); - printf("status of assign to SYS$NET: %d\n", status ); + status = SYS$ASSIGN(&sysnet, &chan, 0, 0, 0); + printf("status of assign to SYS$NET: %d\n", status); /* * Initialize standard out and error files. */ - if (bio_err == NULL) - if ((bio_err=BIO_new(BIO_s_file())) != NULL) - BIO_set_fp(bio_err,stderr,BIO_NOCLOSE); - if (bio_stdout == NULL) - if ((bio_stdout=BIO_new(BIO_s_file())) != NULL) - BIO_set_fp(bio_stdout,stdout,BIO_NOCLOSE); + if (bio_err == NULL) + if ((bio_err = BIO_new(BIO_s_file())) != NULL) + BIO_set_fp(bio_err, stderr, BIO_NOCLOSE); + if (bio_stdout == NULL) + if ((bio_stdout = BIO_new(BIO_s_file())) != NULL) + BIO_set_fp(bio_stdout, stdout, BIO_NOCLOSE); /* * get the preferred cipher list and other initialization */ - if (cipher == NULL) cipher=getenv("SSL_CIPHER"); - printf("cipher list: %s\n", cipher ? cipher : "{undefined}" ); + if (cipher == NULL) + cipher = getenv("SSL_CIPHER"); + printf("cipher list: %s\n", cipher ? cipher : "{undefined}"); - SSL_load_error_strings(); - SSLeay_add_all_algorithms(); + SSL_load_error_strings(); + OpenSSL_add_all_algorithms(); -/* DRM, this was the original, but there is no such thing as SSLv2() - s_ctx=SSL_CTX_new(SSLv2()); -*/ - s_ctx=SSL_CTX_new(SSLv2_server_method()); + s_ctx = SSL_CTX_new(SSLv23_server_method()); - if (s_ctx == NULL) goto end; + if (s_ctx == NULL) + goto end; - SSL_CTX_use_certificate_file(s_ctx,TEST_SERVER_CERT,SSL_FILETYPE_PEM); - SSL_CTX_use_RSAPrivateKey_file(s_ctx,TEST_SERVER_CERT,SSL_FILETYPE_PEM); - printf("Loaded server certificate: '%s'\n", TEST_SERVER_CERT ); + SSL_CTX_use_certificate_file(s_ctx, TEST_SERVER_CERT, SSL_FILETYPE_PEM); + SSL_CTX_use_RSAPrivateKey_file(s_ctx, TEST_SERVER_CERT, SSL_FILETYPE_PEM); + printf("Loaded server certificate: '%s'\n", TEST_SERVER_CERT); /* * Take commands from client until bad status. */ LIB$SHOW_TIMER(); - status = doit ( chan, s_ctx ); + status = doit(chan, s_ctx); LIB$SHOW_TIMER(); /* * do final cleanup and exit. */ -end: - if (s_ctx != NULL) SSL_CTX_free(s_ctx); + end: + if (s_ctx != NULL) + SSL_CTX_free(s_ctx); LIB$SHOW_TIMER(); return 1; } -int doit(io_channel chan, SSL_CTX *s_ctx ) +int doit(io_channel chan, SSL_CTX *s_ctx) { int status, length, link_state; - struct rpc_msg msg; - static char cbuf[200],sbuf[200]; - SSL *s_ssl=NULL; - BIO *c_to_s=NULL; - BIO *s_to_c=NULL; - BIO *c_bio=NULL; - BIO *s_bio=NULL; - int i; - int done=0; + struct rpc_msg msg; + + SSL *s_ssl = NULL; + BIO *c_to_s = NULL; + BIO *s_to_c = NULL; + BIO *c_bio = NULL; + BIO *s_bio = NULL; + int i; + int done = 0; - s_ssl=SSL_new(s_ctx); - if (s_ssl == NULL) goto err; + s_ssl = SSL_new(s_ctx); + if (s_ssl == NULL) + goto err; - c_to_s=BIO_new(BIO_s_rtcp()); - s_to_c=BIO_new(BIO_s_rtcp()); - if ((s_to_c == NULL) || (c_to_s == NULL)) goto err; -/* original, DRM 24-SEP-1997 - BIO_set_fd ( c_to_s, "", chan ); - BIO_set_fd ( s_to_c, "", chan ); + c_to_s = BIO_new(BIO_s_rtcp()); + s_to_c = BIO_new(BIO_s_rtcp()); + if ((s_to_c == NULL) || (c_to_s == NULL)) + goto err; +/*- original, DRM 24-SEP-1997 + BIO_set_fd ( c_to_s, "", chan ); + BIO_set_fd ( s_to_c, "", chan ); */ - BIO_set_fd ( c_to_s, 0, chan ); - BIO_set_fd ( s_to_c, 0, chan ); + BIO_set_fd(c_to_s, 0, chan); + BIO_set_fd(s_to_c, 0, chan); - c_bio=BIO_new(BIO_f_ssl()); - s_bio=BIO_new(BIO_f_ssl()); - if ((c_bio == NULL) || (s_bio == NULL)) goto err; + c_bio = BIO_new(BIO_f_ssl()); + s_bio = BIO_new(BIO_f_ssl()); + if ((c_bio == NULL) || (s_bio == NULL)) + goto err; - SSL_set_accept_state(s_ssl); - SSL_set_bio(s_ssl,c_to_s,s_to_c); - BIO_set_ssl(s_bio,s_ssl,BIO_CLOSE); + SSL_set_accept_state(s_ssl); + SSL_set_bio(s_ssl, c_to_s, s_to_c); + BIO_set_ssl(s_bio, s_ssl, BIO_CLOSE); - /* We can always do writes */ - printf("Begin doit main loop\n"); - /* - * Link states: 0-idle, 1-read pending, 2-write pending, 3-closed. - */ - for (link_state = 0; link_state < 3; ) { - /* - * Wait for remote end to request data action on A channel. - */ - while ( link_state == 0 ) { - status = get ( chan, (char *) &msg, sizeof(msg), &length ); - if ( (status&1) == 0 ) { - printf("Error in main loop get: %d\n", status ); - link_state = 3; - break; - } - if ( length < RPC_HDR_SIZE ) { - printf("Error in main loop get size: %d\n", length ); - break; - link_state = 3; - } - if ( msg.channel != 'A' ) { - printf("Error in main loop, unexpected channel: %c\n", - msg.channel ); - break; - link_state = 3; - } - if ( msg.function == 'G' ) { - link_state = 1; - } else if ( msg.function == 'P' ) { - link_state = 2; /* write pending */ - } else if ( msg.function == 'X' ) { - link_state = 3; - } else { - link_state = 3; - } - } - if ( link_state == 1 ) { - i = BIO_read ( s_bio, msg.data, msg.length ); - if ( i < 0 ) link_state = 3; - else { - msg.channel = 'A'; - msg.function = 'C'; /* confirm */ - msg.length = i; - status = put ( chan, (char *) &msg, i+RPC_HDR_SIZE ); - if ( (status&1) == 0 ) break; - link_state = 0; - } - } else if ( link_state == 2 ) { - i = BIO_write ( s_bio, msg.data, msg.length ); - if ( i < 0 ) link_state = 3; - else { - msg.channel = 'A'; - msg.function = 'C'; /* confirm */ - msg.length = 0; - status = put ( chan, (char *) &msg, RPC_HDR_SIZE ); - if ( (status&1) == 0 ) break; - link_state = 0; - } - } - } - fprintf(stdout,"DONE\n"); -err: - /* We have to set the BIO's to NULL otherwise they will be - * free()ed twice. Once when th s_ssl is SSL_free()ed and - * again when c_ssl is SSL_free()ed. - * This is a hack required because s_ssl and c_ssl are sharing the same - * BIO structure and SSL_set_bio() and SSL_free() automatically - * BIO_free non NULL entries. - * You should not normally do this or be required to do this */ - s_ssl->rbio=NULL; - s_ssl->wbio=NULL; + /* We can always do writes */ + printf("Begin doit main loop\n"); + /* + * Link states: 0-idle, 1-read pending, 2-write pending, 3-closed. + */ + for (link_state = 0; link_state < 3;) { + /* + * Wait for remote end to request data action on A channel. + */ + while (link_state == 0) { + status = get(chan, (char *)&msg, sizeof(msg), &length); + if ((status & 1) == 0) { + printf("Error in main loop get: %d\n", status); + link_state = 3; + break; + } + if (length < RPC_HDR_SIZE) { + printf("Error in main loop get size: %d\n", length); + break; + link_state = 3; + } + if (msg.channel != 'A') { + printf("Error in main loop, unexpected channel: %c\n", + msg.channel); + break; + link_state = 3; + } + if (msg.function == 'G') { + link_state = 1; + } else if (msg.function == 'P') { + link_state = 2; /* write pending */ + } else if (msg.function == 'X') { + link_state = 3; + } else { + link_state = 3; + } + } + if (link_state == 1) { + i = BIO_read(s_bio, msg.data, msg.length); + if (i < 0) + link_state = 3; + else { + msg.channel = 'A'; + msg.function = 'C'; /* confirm */ + msg.length = i; + status = put(chan, (char *)&msg, i + RPC_HDR_SIZE); + if ((status & 1) == 0) + break; + link_state = 0; + } + } else if (link_state == 2) { + i = BIO_write(s_bio, msg.data, msg.length); + if (i < 0) + link_state = 3; + else { + msg.channel = 'A'; + msg.function = 'C'; /* confirm */ + msg.length = 0; + status = put(chan, (char *)&msg, RPC_HDR_SIZE); + if ((status & 1) == 0) + break; + link_state = 0; + } + } + } + fprintf(stdout, "DONE\n"); + err: + /* + * We have to set the BIO's to NULL otherwise they will be free()ed + * twice. Once when th s_ssl is SSL_free()ed and again when c_ssl is + * SSL_free()ed. This is a hack required because s_ssl and c_ssl are + * sharing the same BIO structure and SSL_set_bio() and SSL_free() + * automatically BIO_free non NULL entries. You should not normally do + * this or be required to do this + */ + s_ssl->rbio = NULL; + s_ssl->wbio = NULL; - if (c_to_s != NULL) BIO_free(c_to_s); - if (s_to_c != NULL) BIO_free(s_to_c); - if (c_bio != NULL) BIO_free(c_bio); - if (s_bio != NULL) BIO_free(s_bio); - return(0); + if (c_to_s != NULL) + BIO_free(c_to_s); + if (s_to_c != NULL) + BIO_free(s_to_c); + if (c_bio != NULL) + BIO_free(c_bio); + if (s_bio != NULL) + BIO_free(s_bio); + return (0); }