This change was a quick experiment that I'd wanted to try that works quite
[openssl.git] / demos / tunala / tunala.c
index bb90338..dbf155c 100644 (file)
@@ -68,7 +68,10 @@ typedef struct _tunala_world_t {
 
 static SSL_CTX *initialise_ssl_ctx(int server_mode, const char *engine_id,
                const char *CAfile, const char *cert, const char *key,
-               const char *cipher_list, int out_state);
+               const char *dcert, const char *dkey, const char *cipher_list,
+               const char *dh_file, const char *dh_special, int ctx_options,
+               int out_state, int out_verify, int verify_mode,
+               unsigned int verify_depth);
 static void selector_init(tunala_selector_t *selector);
 static void selector_add_listener(tunala_selector_t *selector, int fd);
 static void selector_add_tunala(tunala_selector_t *selector, tunala_item_t *t);
@@ -77,7 +80,7 @@ static int selector_select(tunala_selector_t *selector);
  * which case *newfd is populated. */
 static int selector_get_listener(tunala_selector_t *selector, int fd, int *newfd);
 static int tunala_world_new_item(tunala_world_t *world, int fd,
-               const unsigned char *ip, unsigned short port);
+               const unsigned char *ip, unsigned short port, int flipped);
 static void tunala_world_del_item(tunala_world_t *world, unsigned int idx);
 static int tunala_item_io(tunala_selector_t *selector, tunala_item_t *item);
 
@@ -91,29 +94,105 @@ static int def_max_tunnels = 50;
 static const char *def_cacert = NULL;
 static const char *def_cert = NULL;
 static const char *def_key = NULL;
+static const char *def_dcert = NULL;
+static const char *def_dkey = NULL;
 static const char *def_engine_id = NULL;
 static int def_server_mode = 0;
+static int def_flipped = 0;
 static const char *def_cipher_list = NULL;
+static const char *def_dh_file = NULL;
+static const char *def_dh_special = NULL;
+static int def_ctx_options = 0;
+static int def_verify_mode = 0;
+static unsigned int def_verify_depth = 10;
 static int def_out_state = 0;
+static unsigned int def_out_verify = 0;
+static int def_out_totals = 0;
 
 static const char *helpstring =
-       "\n'Tunala' (A tunneler with a New Zealand accent)\n"
-       "Usage: tunala [options], where options are from;\n"
-       "    -listen [host:]<port>  (default = 127.0.0.1:8080)\n"
-       "    -proxy <host>:<port>   (default = 127.0.0.1:443)\n"
-       "    -maxtunnels <num>      (default = 50)\n"
-       "    -cacert <path|NULL>    (default = NULL)\n"
-       "    -cert <path|NULL>      (default = NULL)\n"
-       "    -key <path|NULL>       (default = whatever '-cert' is)\n"
-       "    -engine <id|NULL>      (default = NULL)\n"
-       "    -server <0|1>          (default = 0, ie. an SSL client)\n"
-       "    -cipher <list>         (specifies cipher list to use)\n"
-       "    -out_state             (prints SSL handshake states)\n"
-       "    -<h|help|?>            (displays this help screen)\n"
-       "NB: It is recommended to specify a cert+key when operating as an\n"
-       "SSL server. If you only specify '-cert', the same file must\n"
-       "contain a matching private key.\n";
+"\n'Tunala' (A tunneler with a New Zealand accent)\n"
+"Usage: tunala [options], where options are from;\n"
+" -listen [host:]<port>  (default = 127.0.0.1:8080)\n"
+" -proxy <host>:<port>   (default = 127.0.0.1:443)\n"
+" -maxtunnels <num>      (default = 50)\n"
+" -cacert <path|NULL>    (default = NULL)\n"
+" -cert <path|NULL>      (default = NULL)\n"
+" -key <path|NULL>       (default = whatever '-cert' is)\n"
+" -dcert <path|NULL>     (usually for DSA, default = NULL)\n"
+" -dkey <path|NULL>      (usually for DSA, default = whatever '-dcert' is)\n"
+" -engine <id|NULL>      (default = NULL)\n"
+" -server <0|1>          (default = 0, ie. an SSL client)\n"
+" -flipped <0|1>         (makes SSL servers be network clients, and vice versa)\n"
+" -cipher <list>         (specifies cipher list to use)\n"
+" -dh_file <path>        (a PEM file containing DH parameters to use)\n"
+" -dh_special <NULL|generate|standard> (see below: def=NULL)\n"
+" -no_ssl2               (disable SSLv2)\n"
+" -no_ssl3               (disable SSLv3)\n"
+" -no_tls1               (disable TLSv1)\n"
+" -v_peer                (verify the peer certificate)\n"
+" -v_strict              (do not continue if peer doesn't authenticate)\n"
+" -v_once                (no verification in renegotiates)\n"
+" -v_depth <num>         (limit certificate chain depth, default = 10)\n"
+" -out_state             (prints SSL handshake states)\n"
+" -out_verify <0|1|2|3>  (prints certificate verification states: def=1)\n"
+" -out_totals            (prints out byte-totals when a tunnel closes)\n"
+" -<h|help|?>            (displays this help screen)\n"
+"Notes:\n"
+"(1) It is recommended to specify a cert+key when operating as an SSL server.\n"
+"    If you only specify '-cert', the same file must contain a matching\n"
+"    private key.\n"
+"(2) Either dh_file or dh_special can be used to specify where DH parameters\n"
+"    will be obtained from (or '-dh_special NULL' for the default choice) but\n"
+"    you cannot specify both. For dh_special, 'generate' will create new DH\n"
+"    parameters on startup, and 'standard' will use embedded parameters\n"
+"    instead.\n"
+"(3) Normally an ssl client connects to an ssl server - so that an 'ssl client\n"
+"    tunala' listens for 'clean' client connections and proxies ssl, and an\n"
+"    'ssl server tunala' listens for ssl connections and proxies 'clean'. With\n"
+"    '-flipped 1', this behaviour is reversed so that an 'ssl server tunala'\n"
+"    listens for clean client connections and proxies ssl (but participating\n"
+"    as an ssl *server* in the SSL/TLS protocol), and an 'ssl client tunala'\n"
+"    listens for ssl connections (participating as an ssl *client* in the\n"
+"    SSL/TLS protocol) and proxies 'clean' to the end destination. This can\n"
+"    be useful for allowing network access to 'servers' where only the server\n"
+"    needs to authenticate the client (ie. the other way is not required).\n"
+"    Even with client and server authentication, this 'technique' mitigates\n"
+"    some DoS (denial-of-service) potential as it will be the network client\n"
+"    having to perform the first private key operation rather than the other\n"
+"    way round.\n"
+"(4) The 'technique' used by setting '-flipped 1' is probably compatible with\n"
+"    absolutely nothing except another complimentary instance of 'tunala'\n"
+"    running with '-flipped 1'. :-)\n";
 
+/* Default DH parameters for use with "-dh_special standard" ... stolen striaght
+ * from s_server. */
+static unsigned char dh512_p[]={
+       0xDA,0x58,0x3C,0x16,0xD9,0x85,0x22,0x89,0xD0,0xE4,0xAF,0x75,
+       0x6F,0x4C,0xCA,0x92,0xDD,0x4B,0xE5,0x33,0xB8,0x04,0xFB,0x0F,
+       0xED,0x94,0xEF,0x9C,0x8A,0x44,0x03,0xED,0x57,0x46,0x50,0xD3,
+       0x69,0x99,0xDB,0x29,0xD7,0x76,0x27,0x6B,0xA2,0xD3,0xD4,0x12,
+       0xE2,0x18,0xF4,0xDD,0x1E,0x08,0x4C,0xF6,0xD8,0x00,0x3E,0x7C,
+       0x47,0x74,0xE8,0x33,
+       };
+static unsigned char dh512_g[]={
+       0x02,
+       };
+
+/* And the function that parses the above "standard" parameters, again, straight
+ * out of s_server. */
+static DH *get_dh512(void)
+       {
+       DH *dh=NULL;
+
+       if ((dh=DH_new()) == NULL) return(NULL);
+       dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL);
+       dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL);
+       if ((dh->p == NULL) || (dh->g == NULL))
+               return(NULL);
+       return(dh);
+       }
+
+/* Various help/error messages used by main() */
 static int usage(const char *errstr, int isunknownarg)
 {
        if(isunknownarg)
@@ -126,14 +205,13 @@ static int usage(const char *errstr, int isunknownarg)
 
 static int err_str0(const char *str0)
 {
-       fprintf(stderr, str0);
-       fprintf(stderr, "\n");
+       fprintf(stderr, "%s\n", str0);
        return 1;
 }
 
-static int err_str1(const char *str0, const char *str1)
+static int err_str1(const char *fmt, const char *str1)
 {
-       fprintf(stderr, str0, str1);
+       fprintf(stderr, fmt, str1);
        fprintf(stderr, "\n");
        return 1;
 }
@@ -166,6 +244,55 @@ static int parse_server_mode(const char *s, int *servermode)
        return 1;
 }
 
+static int parse_dh_special(const char *s, const char **dh_special)
+{
+       if((strcmp(s, "NULL") == 0) || (strcmp(s, "generate") == 0) ||
+                       (strcmp(s, "standard") == 0)) {
+               *dh_special = s;
+               return 1;
+       }
+       fprintf(stderr, "Error, '%s' is an invalid value for 'dh_special'\n", s);
+       return 0;
+}
+
+static int parse_verify_level(const char *s, unsigned int *verify_level)
+{
+       unsigned long l;
+       char *temp;
+       l = strtoul(s, &temp, 10);
+       if((temp == s) || (*temp != '\0') || (l > 3)) {
+               fprintf(stderr, "Error, '%s' is an invalid value for "
+                               "out_verify\n", s);
+               return 0;
+       }
+       *verify_level = (unsigned int)l;
+       return 1;
+}
+
+static int parse_verify_depth(const char *s, unsigned int *verify_depth)
+{
+       unsigned long l;
+       char *temp;
+       l = strtoul(s, &temp, 10);
+       if((temp == s) || (*temp != '\0') || (l < 1) || (l > 50)) {
+               fprintf(stderr, "Error, '%s' is an invalid value for "
+                               "verify_depth\n", s);
+               return 0;
+       }
+       *verify_depth = (unsigned int)l;
+       return 1;
+}
+
+/* Some fprintf format strings used when tunnels close */
+static const char *io_stats_client_dirty =
+"    SSL (network) traffic to/from server; %8lu bytes in, %8lu bytes out\n";
+static const char *io_stats_client_clean =
+"    tunnelled data to/from server;        %8lu bytes in, %8lu bytes out\n";
+static const char *io_stats_server_dirty =
+"    SSL (network) traffic to/from client; %8lu bytes in, %8lu bytes out\n";
+static const char *io_stats_server_clean =
+"    tunnelled data to/from client;        %8lu bytes in, %8lu bytes out\n";
+
 int main(int argc, char *argv[])
 {
        unsigned int loop;
@@ -181,10 +308,20 @@ int main(int argc, char *argv[])
        const char *cacert = def_cacert;
        const char *cert = def_cert;
        const char *key = def_key;
+       const char *dcert = def_dcert;
+       const char *dkey = def_dkey;
        const char *engine_id = def_engine_id;
        int server_mode = def_server_mode;
+       int flipped = def_flipped;
        const char *cipher_list = def_cipher_list;
+       const char *dh_file = def_dh_file;
+       const char *dh_special = def_dh_special;
+       int ctx_options = def_ctx_options;
+       int verify_mode = def_verify_mode;
+       unsigned int verify_depth = def_verify_depth;
        int out_state = def_out_state;
+       unsigned int out_verify = def_out_verify;
+       int out_totals = def_out_totals;
 
 /* Parse command-line arguments */
 next_arg:
@@ -236,6 +373,24 @@ next_arg:
                        else
                                key = *argv;
                        goto next_arg;
+               } else if(strcmp(*argv, "-dcert") == 0) {
+                       if(argc < 2)
+                               return usage("-dcert requires an argument", 0);
+                       argc--; argv++;
+                       if(strcmp(*argv, "NULL") == 0)
+                               dcert = NULL;
+                       else
+                               dcert = *argv;
+                       goto next_arg;
+               } else if(strcmp(*argv, "-dkey") == 0) {
+                       if(argc < 2)
+                               return usage("-dkey requires an argument", 0);
+                       argc--; argv++;
+                       if(strcmp(*argv, "NULL") == 0)
+                               dkey = NULL;
+                       else
+                               dkey = *argv;
+                       goto next_arg;
                } else if(strcmp(*argv, "-engine") == 0) {
                        if(argc < 2)
                                return usage("-engine requires an argument", 0);
@@ -249,15 +404,76 @@ next_arg:
                        if(!parse_server_mode(*argv, &server_mode))
                                return 1;
                        goto next_arg;
+               } else if(strcmp(*argv, "-flipped") == 0) {
+                       if(argc < 2)
+                               return usage("-flipped requires an argument", 0);
+                       argc--; argv++;
+                       if(!parse_server_mode(*argv, &flipped))
+                               return 1;
+                       goto next_arg;
                } else if(strcmp(*argv, "-cipher") == 0) {
                        if(argc < 2)
                                return usage("-cipher requires an argument", 0);
                        argc--; argv++;
                        cipher_list = *argv;
                        goto next_arg;
+               } else if(strcmp(*argv, "-dh_file") == 0) {
+                       if(argc < 2)
+                               return usage("-dh_file requires an argument", 0);
+                       if(dh_special)
+                               return usage("cannot mix -dh_file with "
+                                               "-dh_special", 0);
+                       argc--; argv++;
+                       dh_file = *argv;
+                       goto next_arg;
+               } else if(strcmp(*argv, "-dh_special") == 0) {
+                       if(argc < 2)
+                               return usage("-dh_special requires an argument", 0);
+                       if(dh_file)
+                               return usage("cannot mix -dh_file with "
+                                               "-dh_special", 0);
+                       argc--; argv++;
+                       if(!parse_dh_special(*argv, &dh_special))
+                               return 1;
+                       goto next_arg;
+               } else if(strcmp(*argv, "-no_ssl2") == 0) {
+                       ctx_options |= SSL_OP_NO_SSLv2;
+                       goto next_arg;
+               } else if(strcmp(*argv, "-no_ssl3") == 0) {
+                       ctx_options |= SSL_OP_NO_SSLv3;
+                       goto next_arg;
+               } else if(strcmp(*argv, "-no_tls1") == 0) {
+                       ctx_options |= SSL_OP_NO_TLSv1;
+                       goto next_arg;
+               } else if(strcmp(*argv, "-v_peer") == 0) {
+                       verify_mode |= SSL_VERIFY_PEER;
+                       goto next_arg;
+               } else if(strcmp(*argv, "-v_strict") == 0) {
+                       verify_mode |= SSL_VERIFY_FAIL_IF_NO_PEER_CERT;
+                       goto next_arg;
+               } else if(strcmp(*argv, "-v_once") == 0) {
+                       verify_mode |= SSL_VERIFY_CLIENT_ONCE;
+                       goto next_arg;
+               } else if(strcmp(*argv, "-v_depth") == 0) {
+                       if(argc < 2)
+                               return usage("-v_depth requires an argument", 0);
+                       argc--; argv++;
+                       if(!parse_verify_depth(*argv, &verify_depth))
+                               return 1;
+                       goto next_arg;
                } else if(strcmp(*argv, "-out_state") == 0) {
                        out_state = 1;
                        goto next_arg;
+               } else if(strcmp(*argv, "-out_verify") == 0) {
+                       if(argc < 2)
+                               return usage("-out_verify requires an argument", 0);
+                       argc--; argv++;
+                       if(!parse_verify_level(*argv, &out_verify))
+                               return 1;
+                       goto next_arg;
+               } else if(strcmp(*argv, "-out_totals") == 0) {
+                       out_totals = 1;
+                       goto next_arg;
                } else if((strcmp(*argv, "-h") == 0) ||
                                (strcmp(*argv, "-help") == 0) ||
                                (strcmp(*argv, "-?") == 0)) {
@@ -273,7 +489,9 @@ next_arg:
        err_str0("ip_initialise succeeded");
        /* Create the SSL_CTX */
        if((world.ssl_ctx = initialise_ssl_ctx(server_mode, engine_id,
-                       cacert, cert, key, cipher_list, out_state)) == NULL)
+                       cacert, cert, key, dcert, dkey, cipher_list, dh_file,
+                       dh_special, ctx_options, out_state, out_verify,
+                       verify_mode, verify_depth)) == NULL)
                return err_str1("initialise_ssl_ctx(engine_id=%s) failed",
                        (engine_id == NULL) ? "NULL" : engine_id);
        err_str1("initialise_ssl_ctx(engine_id=%s) succeeded",
@@ -321,8 +539,8 @@ main_loop:
                                        &world.selector, world.listen_fd,
                                        &newfd) == 1)) {
                /* We have a new connection */
-               if(!tunala_world_new_item(&world, newfd,
-                                       proxy_ip, proxy_port))
+               if(!tunala_world_new_item(&world, newfd, proxy_ip,
+                                               proxy_port, flipped))
                        fprintf(stderr, "tunala_world_new_item failed\n");
                else
                        fprintf(stderr, "Info, new tunnel opened, now up to "
@@ -338,6 +556,27 @@ main_loop:
                        /* We're closing whether for reasons of an error or a
                         * natural close. Don't increment loop or t_item because
                         * the next item is moving to us! */
+                       if(!out_totals)
+                               goto skip_totals;
+                       fprintf(stderr, "Tunnel closing, traffic stats follow\n");
+                       /* Display the encrypted (over the network) stats */
+                       fprintf(stderr, (server_mode ? io_stats_server_dirty :
+                                               io_stats_client_dirty),
+                               buffer_total_in(state_machine_get_buffer(
+                                               &t_item->sm,SM_DIRTY_IN)),
+                               buffer_total_out(state_machine_get_buffer(
+                                               &t_item->sm,SM_DIRTY_OUT)));
+                       /* Display the local (tunnelled) stats. NB: Data we
+                        * *receive* is data sent *out* of the state_machine on
+                        * its 'clean' side. Hence the apparent back-to-front
+                        * OUT/IN mixup here :-) */
+                       fprintf(stderr, (server_mode ? io_stats_server_clean :
+                                               io_stats_client_clean),
+                               buffer_total_out(state_machine_get_buffer(
+                                               &t_item->sm,SM_CLEAN_OUT)),
+                               buffer_total_in(state_machine_get_buffer(
+                                               &t_item->sm,SM_CLEAN_IN)));
+skip_totals:
                        tunala_world_del_item(&world, loop);
                        fprintf(stderr, "Info, tunnel closed, down to %d\n",
                                        world.tunnels_used);
@@ -358,54 +597,13 @@ main_loop:
 /* OpenSSL bits */
 /****************/
 
-static SSL_CTX *initialise_ssl_ctx(int server_mode, const char *engine_id,
-               const char *CAfile, const char *cert, const char *key,
-               const char *cipher_list, int out_state)
+static int ctx_set_cert(SSL_CTX *ctx, const char *cert, const char *key)
 {
-       SSL_CTX *ctx, *ret = NULL;
-       SSL_METHOD *meth;
-       ENGINE *e = NULL;
        FILE *fp = NULL;
        X509 *x509 = NULL;
        EVP_PKEY *pkey = NULL;
+       int toret = 0; /* Assume an error */
 
-        OpenSSL_add_ssl_algorithms();
-        SSL_load_error_strings();
-
-       meth = (server_mode ? SSLv23_server_method() : SSLv23_client_method());
-       if(meth == NULL)
-               goto err;
-       if(engine_id) {
-               if((e = ENGINE_by_id(engine_id)) == NULL) {
-                       fprintf(stderr, "Error obtaining '%s' engine, openssl "
-                                       "errors follow\n", engine_id);
-                       goto err;
-               }
-               if(!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
-                       fprintf(stderr, "Error assigning '%s' engine, openssl "
-                                       "errors follow\n", engine_id);
-                       goto err;
-               }
-               ENGINE_free(e);
-       }
-       if((ctx = SSL_CTX_new(meth)) == NULL)
-               goto err;
-       /* cacert */
-       if(CAfile) {
-               if(!X509_STORE_load_locations(SSL_CTX_get_cert_store(ctx),
-                                       CAfile, NULL)) {
-                       fprintf(stderr, "Error loading CA cert(s) in '%s'\n",
-                                       CAfile);
-                       goto err;
-               }
-               fprintf(stderr, "Info, operating with CA cert(s) in '%s'\n",
-                               CAfile);
-       } else
-               fprintf(stderr, "Info, operating without a CA cert(-list)\n");
-       if(!SSL_CTX_set_default_verify_paths(ctx)) {
-               fprintf(stderr, "Error setting default verify paths\n");
-               goto err;
-       }
        /* cert */
        if(cert) {
                if((fp = fopen(cert, "r")) == NULL) {
@@ -422,19 +620,23 @@ static SSL_CTX *initialise_ssl_ctx(int server_mode, const char *engine_id,
                                        cert);
                        goto err;
                }
-               fprintf(stderr, "Info, operating with cert in '%s'\n", cert);
+               /* Clear the FILE* for reuse in the "key" code */
                fclose(fp);
                fp = NULL;
+               fprintf(stderr, "Info, operating with cert in '%s'\n", cert);
                /* If a cert was given without matching key, we assume the same
                 * file contains the required key. */
                if(!key)
                        key = cert;
-       } else
-               if(key) {
+       } else {
+               if(key)
                        fprintf(stderr, "Error, can't specify a key without a "
                                        "corresponding certificate\n");
-                       goto err;
-               }
+               else
+                       fprintf(stderr, "Error, ctx_set_cert called with "
+                                       "NULLs!\n");
+               goto err;
+       }
        /* key */
        if(key) {
                if((fp = fopen(key, "r")) == NULL) {
@@ -454,6 +656,123 @@ static SSL_CTX *initialise_ssl_ctx(int server_mode, const char *engine_id,
                fprintf(stderr, "Info, operating with key in '%s'\n", key);
        } else
                fprintf(stderr, "Info, operating without a cert or key\n");
+       /* Success */
+       toret = 1; err:
+       if(x509)
+               X509_free(x509);
+       if(pkey)
+               EVP_PKEY_free(pkey);
+       if(fp)
+               fclose(fp);
+       return toret;
+}
+
+static int ctx_set_dh(SSL_CTX *ctx, const char *dh_file, const char *dh_special)
+{
+       DH *dh = NULL;
+       FILE *fp = NULL;
+
+       if(dh_special) {
+               if(strcmp(dh_special, "NULL") == 0)
+                       return 1;
+               if(strcmp(dh_special, "standard") == 0) {
+                       if((dh = get_dh512()) == NULL) {
+                               fprintf(stderr, "Error, can't parse 'standard'"
+                                               " DH parameters\n");
+                               return 0;
+                       }
+                       fprintf(stderr, "Info, using 'standard' DH parameters\n");
+                       goto do_it;
+               }
+               if(strcmp(dh_special, "generate") != 0)
+                       /* This shouldn't happen - screening values is handled
+                        * in main(). */
+                       abort();
+               fprintf(stderr, "Info, generating DH parameters ... ");
+               fflush(stderr);
+               if((dh = DH_generate_parameters(512, DH_GENERATOR_5,
+                                       NULL, NULL)) == NULL) {
+                       fprintf(stderr, "error!\n");
+                       return 0;
+               }
+               fprintf(stderr, "complete\n");
+               goto do_it;
+       }
+       /* So, we're loading dh_file */
+       if((fp = fopen(dh_file, "r")) == NULL) {
+               fprintf(stderr, "Error, couldn't open '%s' for DH parameters\n",
+                               dh_file);
+               return 0;
+       }
+       dh = PEM_read_DHparams(fp, NULL, NULL, NULL);
+       fclose(fp);
+       if(dh == NULL) {
+               fprintf(stderr, "Error, could not parse DH parameters from '%s'\n",
+                               dh_file);
+               return 0;
+       }
+       fprintf(stderr, "Info, using DH parameters from file '%s'\n", dh_file);
+do_it:
+       SSL_CTX_set_tmp_dh(ctx, dh);
+       DH_free(dh);
+       return 1;
+}
+
+static SSL_CTX *initialise_ssl_ctx(int server_mode, const char *engine_id,
+               const char *CAfile, const char *cert, const char *key,
+               const char *dcert, const char *dkey, const char *cipher_list,
+               const char *dh_file, const char *dh_special, int ctx_options,
+               int out_state, int out_verify, int verify_mode,
+               unsigned int verify_depth)
+{
+       SSL_CTX *ctx, *ret = NULL;
+       SSL_METHOD *meth;
+       ENGINE *e = NULL;
+
+        OpenSSL_add_ssl_algorithms();
+        SSL_load_error_strings();
+
+       meth = (server_mode ? SSLv23_server_method() : SSLv23_client_method());
+       if(meth == NULL)
+               goto err;
+       if(engine_id) {
+               if((e = ENGINE_by_id(engine_id)) == NULL) {
+                       fprintf(stderr, "Error obtaining '%s' engine, openssl "
+                                       "errors follow\n", engine_id);
+                       goto err;
+               }
+               if(!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
+                       fprintf(stderr, "Error assigning '%s' engine, openssl "
+                                       "errors follow\n", engine_id);
+                       goto err;
+               }
+               ENGINE_free(e);
+       }
+       if((ctx = SSL_CTX_new(meth)) == NULL)
+               goto err;
+       /* cacert */
+       if(CAfile) {
+               if(!X509_STORE_load_locations(SSL_CTX_get_cert_store(ctx),
+                                       CAfile, NULL)) {
+                       fprintf(stderr, "Error loading CA cert(s) in '%s'\n",
+                                       CAfile);
+                       goto err;
+               }
+               fprintf(stderr, "Info, operating with CA cert(s) in '%s'\n",
+                               CAfile);
+       } else
+               fprintf(stderr, "Info, operating without a CA cert(-list)\n");
+       if(!SSL_CTX_set_default_verify_paths(ctx)) {
+               fprintf(stderr, "Error setting default verify paths\n");
+               goto err;
+       }
+
+       /* cert and key */
+       if((cert || key) && !ctx_set_cert(ctx, cert, key))
+               goto err;
+       /* dcert and dkey */
+       if((dcert || dkey) && !ctx_set_cert(ctx, dcert, dkey))
+               goto err;
 
        /* cipher_list */
        if(cipher_list) {
@@ -466,13 +785,29 @@ static SSL_CTX *initialise_ssl_ctx(int server_mode, const char *engine_id,
        } else
                fprintf(stderr, "Info, operating with default cipher list\n");
 
+       /* dh_file & dh_special */
+       if((dh_file || dh_special) && !ctx_set_dh(ctx, dh_file, dh_special))
+               goto err;
+
+       /* ctx_options */
+       SSL_CTX_set_options(ctx, ctx_options);
+
        /* out_state (output of SSL handshake states to screen). */
-       if(out_state) {
-               SSL_CTX_set_info_callback(ctx, cb_ssl_info);
+       if(out_state)
                cb_ssl_info_set_output(stderr);
+
+       /* out_verify */
+       if(out_verify > 0) {
+               cb_ssl_verify_set_output(stderr);
+               cb_ssl_verify_set_level(out_verify);
        }
 
-       /* Success! */
+       /* verify_depth */
+       cb_ssl_verify_set_depth(verify_depth);
+
+       /* Success! (includes setting verify_mode) */
+       SSL_CTX_set_info_callback(ctx, cb_ssl_info);
+       SSL_CTX_set_verify(ctx, verify_mode, cb_ssl_verify);
        ret = ctx;
 err:
        if(!ret) {
@@ -480,12 +815,6 @@ err:
                if(ctx)
                        SSL_CTX_free(ctx);
        }
-       if(fp)
-               fclose(fp);
-       if(x509)
-               X509_free(x509);
-       if(pkey)
-               EVP_PKEY_free(pkey);
        return ret;
 }
 
@@ -606,7 +935,7 @@ static int tunala_world_make_room(tunala_world_t *world)
 }
 
 static int tunala_world_new_item(tunala_world_t *world, int fd,
-               const unsigned char *ip, unsigned short port)
+               const unsigned char *ip, unsigned short port, int flipped)
 {
        tunala_item_t *item;
        int newfd;
@@ -627,8 +956,10 @@ static int tunala_world_new_item(tunala_world_t *world, int fd,
                goto err;
        /* Which way round? If we're a server, "fd" is the dirty side and the
         * connection we open is the clean one. For a client, it's the other way
-        * around. */
-       if(world->server_mode) {
+        * around. Unless, of course, we're "flipped" in which case everything
+        * gets reversed. :-) */
+       if((world->server_mode && !flipped) ||
+                       (!world->server_mode && flipped)) {
                item->dirty_read = item->dirty_send = fd;
                item->clean_read = item->clean_send = newfd;
        } else {
@@ -757,7 +1088,7 @@ static int tunala_item_io(tunala_selector_t *selector, tunala_item_t *item)
                        return 0;
        }
        if((item->dirty_read == -1) || (item->dirty_send == -1)) {
-               if(state_machine_close_dirty(&item->sm))
+               if(!state_machine_close_dirty(&item->sm))
                        return 0;
        }
        return 1;