Upgrade chrome's OpenSSL to same version Android ships with.

openssl/apps/s_server.c

 /* apps/s_server.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * 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
@@ skipping 38 matching lines @@
  * 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
  * [including the GNU Public Licence.]
  */
 /* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer. 
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ skipping 36 matching lines @@
  * This product includes cryptographic software written by Eric Young
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com).
  *
  */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  * ECC cipher suite support in OpenSSL originally developed by 
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
+/* ====================================================================
+ * Copyright 2005 Nokia. All rights reserved.
+ *
+ * The portions of the attached software ("Contribution") is developed by
+ * Nokia Corporation and is licensed pursuant to the OpenSSL open source
+ * license.
+ *
+ * The Contribution, originally written by Mika Kousa and Pasi Eronen of
+ * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
+ * support (see RFC 4279) to OpenSSL.
+ *
+ * No patent licenses or other rights except those expressly stated in
+ * the OpenSSL open source license shall be deemed granted or received
+ * expressly, by implication, estoppel, or otherwise.
+ *
+ * No assurances are provided by Nokia that the Contribution does not
+ * infringe the patent or other intellectual property rights of any third
+ * party or that the license provides you with all the necessary rights
+ * to make use of the Contribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
+ * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
+ * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
+ * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
+ * OTHERWISE.
+ */
 
 /* Until the key-gen callbacks are modified to use newer prototypes, we allow
  * deprecated functions for openssl-internal code */
 #ifdef OPENSSL_NO_DEPRECATED
 #undef OPENSSL_NO_DEPRECATED
 #endif
 
 #include <assert.h>
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/stat.h>
 #include <openssl/e_os2.h>
 #ifdef OPENSSL_NO_STDIO
 #define APPS_WIN16
 #endif
 
 #if !defined(OPENSSL_SYS_NETWARE)  /* conflicts with winsock2 stuff on netware */
 #include <sys/types.h>
 #endif
 
 /* With IPv6, it looks like Digital has mixed up the proper order of
@@ skipping 17 matching lines @@
 #include <openssl/ocsp.h>
 #ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>
 #endif
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif
 #include "s_apps.h"
 #include "timeouts.h"
 
-#ifdef OPENSSL_SYS_WINCE
-/* Windows CE incorrectly defines fileno as returning void*, so to avoid problems below... */
-#ifdef fileno
-#undef fileno
-#endif
-#define fileno(a) (int)_fileno(a)
-#endif
-
 #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
 
+#if defined(OPENSSL_SYS_BEOS_R5)
+#include <fcntl.h>
+#endif
+
 #ifndef OPENSSL_NO_RSA
 static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength);
 #endif
 static int sv_body(char *hostname, int s, unsigned char *context);
 static int www_body(char *hostname, int s, unsigned char *context);
 static void close_accept_socket(void );
 static void sv_usage(void);
 static int init_ssl_connection(SSL *s);
 static void print_stats(BIO *bp,SSL_CTX *ctx);
 static int generate_session_id(const SSL *ssl, unsigned char *id,
                                 unsigned int *id_len);
 #ifndef OPENSSL_NO_DH
 static DH *load_dh_param(const char *dhfile);
 static DH *get_dh512(void);
 #endif
 
 #ifdef MONOLITH
 static void s_server_init(void);
 #endif
 
-#ifndef S_ISDIR
-# if defined(_S_IFMT) && defined(_S_IFDIR)
-#  define S_ISDIR(a)    (((a) & _S_IFMT) == _S_IFDIR)
-# else
-#  define S_ISDIR(a)    (((a) & S_IFMT) == S_IFDIR)
-# endif
-#endif
-
 #ifndef OPENSSL_NO_DH
 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[]={
@@ skipping 21 matching lines @@
 static int bufsize=BUFSIZZ;
 static int accept_socket= -1;
 
 #define TEST_CERT       "server.pem"
 #ifndef OPENSSL_NO_TLSEXT
 #define TEST_CERT2      "server2.pem"
 #endif
 #undef PROG
 #define PROG            s_server_main
 
-extern int verify_depth;
+extern int verify_depth, verify_return_error;
 
 static char *cipher=NULL;
 static int s_server_verify=SSL_VERIFY_NONE;
 static int s_server_session_id_context = 1; /* anything will do */
 static const char *s_cert_file=TEST_CERT,*s_key_file=NULL;
 #ifndef OPENSSL_NO_TLSEXT
 static const char *s_cert_file2=TEST_CERT2,*s_key_file2=NULL;
 #endif
 static char *s_dcert_file=NULL,*s_dkey_file=NULL;
 #ifdef FIONBIO
@@ skipping 22 matching lines @@
 static char *engine_id=NULL;
 #endif
 static const char *session_id_prefix=NULL;
 
 static int enable_timeouts = 0;
 static long socket_mtu;
 #ifndef OPENSSL_NO_DTLS1
 static int cert_chain = 0;
 #endif
 
+#ifndef OPENSSL_NO_PSK
+static char *psk_identity="Client_identity";
+char *psk_key=NULL; /* by default PSK is not used */
+
+static unsigned int psk_server_cb(SSL *ssl, const char *identity,
+        unsigned char *psk, unsigned int max_psk_len)
+        {
+        unsigned int psk_len = 0;
+        int ret;
+        BIGNUM *bn = NULL;
+
+        if (s_debug)
+                BIO_printf(bio_s_out,"psk_server_cb\n");
+        if (!identity)
+                {
+                BIO_printf(bio_err,"Error: client did not send PSK identity\n");
+                goto out_err;
+                }
+        if (s_debug)
+                BIO_printf(bio_s_out,"identity_len=%d identity=%s\n",
+                        identity ? (int)strlen(identity) : 0, identity);
+
+        /* here we could lookup the given identity e.g. from a database */
+        if (strcmp(identity, psk_identity) != 0)
+                {
+                BIO_printf(bio_s_out, "PSK error: client identity not found"
+                           " (got '%s' expected '%s')\n", identity,
+                           psk_identity);
+                goto out_err;
+                }
+        if (s_debug)
+                BIO_printf(bio_s_out, "PSK client identity found\n");
+
+        /* convert the PSK key to binary */
+        ret = BN_hex2bn(&bn, psk_key);
+        if (!ret)
+                {
+                BIO_printf(bio_err,"Could not convert PSK key '%s' to BIGNUM\n", psk_key);
+                if (bn)
+                        BN_free(bn);
+                return 0;
+                }
+        if (BN_num_bytes(bn) > (int)max_psk_len)
+                {
+                BIO_printf(bio_err,"psk buffer of callback is too small (%d) for key (%d)\n",
+                        max_psk_len, BN_num_bytes(bn));
+                BN_free(bn);
+                return 0;
+                }
+
+        ret = BN_bn2bin(bn, psk);
+        BN_free(bn);
+
+        if (ret < 0)
+                goto out_err;
+        psk_len = (unsigned int)ret;
+
+        if (s_debug)
+                BIO_printf(bio_s_out, "fetched PSK len=%d\n", psk_len);
+        return psk_len;
+ out_err:
+        if (s_debug)
+                BIO_printf(bio_err, "Error in PSK server callback\n");
+        return 0;
+        }
+#endif
 
 #ifdef MONOLITH
 static void s_server_init(void)
         {
         accept_socket=-1;
         cipher=NULL;
         s_server_verify=SSL_VERIFY_NONE;
         s_dcert_file=NULL;
         s_dkey_file=NULL;
         s_cert_file=TEST_CERT;
@@ skipping 44 matching lines @@
         BIO_printf(bio_err," -dcert arg    - second certificate file to use (usually for DSA)\n");
         BIO_printf(bio_err," -dcertform x  - second certificate format (PEM or DER) PEM default\n");
         BIO_printf(bio_err," -dkey arg     - second private key file to use (usually for DSA)\n");
         BIO_printf(bio_err," -dkeyform arg - second key format (PEM, DER or ENGINE) PEM default\n");
         BIO_printf(bio_err," -dpass arg    - second private key file pass phrase source\n");
         BIO_printf(bio_err," -dhparam arg  - DH parameter file to use, in cert file if not specified\n");
         BIO_printf(bio_err,"                 or a default set of parameters is used\n");
 #ifndef OPENSSL_NO_ECDH
         BIO_printf(bio_err," -named_curve arg  - Elliptic curve name to use for ephemeral ECDH keys.\n" \
                            "                 Use \"openssl ecparam -list_curves\" for all names\n" \
-                           "                 (default is sect163r2).\n");
+                           "                 (default is nistp256).\n");
 #endif
 #ifdef FIONBIO
         BIO_printf(bio_err," -nbio         - Run with non-blocking IO\n");
 #endif
         BIO_printf(bio_err," -nbio_test    - test with the non-blocking test bio\n");
         BIO_printf(bio_err," -crlf         - convert LF from terminal into CRLF\n");
         BIO_printf(bio_err," -debug        - Print more output\n");
         BIO_printf(bio_err," -msg          - Show protocol messages\n");
         BIO_printf(bio_err," -state        - Print the SSL states\n");
         BIO_printf(bio_err," -CApath arg   - PEM format directory of CA's\n");
         BIO_printf(bio_err," -CAfile arg   - PEM format file of CA's\n");
         BIO_printf(bio_err," -nocert       - Don't use any certificates (Anon-DH)\n");
         BIO_printf(bio_err," -cipher arg   - play with 'openssl ciphers' to see what goes here\n");
         BIO_printf(bio_err," -serverpref   - Use server's cipher preferences\n");
         BIO_printf(bio_err," -quiet        - No server output\n");
         BIO_printf(bio_err," -no_tmp_rsa   - Do not generate a tmp RSA key\n");
+#ifndef OPENSSL_NO_PSK
+        BIO_printf(bio_err," -psk_hint arg - PSK identity hint to use\n");
+        BIO_printf(bio_err," -psk arg      - PSK in hex (without 0x)\n");
+# ifndef OPENSSL_NO_JPAKE
+        BIO_printf(bio_err," -jpake arg    - JPAKE secret to use\n");
+# endif
+#endif
         BIO_printf(bio_err," -ssl2         - Just talk SSLv2\n");
         BIO_printf(bio_err," -ssl3         - Just talk SSLv3\n");
         BIO_printf(bio_err," -tls1         - Just talk TLSv1\n");
         BIO_printf(bio_err," -dtls1        - Just talk DTLSv1\n");
         BIO_printf(bio_err," -timeout      - Enable timeouts\n");
         BIO_printf(bio_err," -mtu          - Set link layer MTU\n");
         BIO_printf(bio_err," -chain        - Read a certificate chain\n");
         BIO_printf(bio_err," -no_ssl2      - Just disable SSLv2\n");
         BIO_printf(bio_err," -no_ssl3      - Just disable SSLv3\n");
         BIO_printf(bio_err," -no_tls1      - Just disable TLSv1\n");
@@ skipping 16 matching lines @@
 #ifndef OPENSSL_NO_TLSEXT
         BIO_printf(bio_err," -servername host - servername for HostName TLS extension\n");
         BIO_printf(bio_err," -servername_fatal - on mismatch send fatal alert (default warning alert)\n");
         BIO_printf(bio_err," -cert2 arg    - certificate file to use for servername\n");
         BIO_printf(bio_err,"                 (default is %s)\n",TEST_CERT2);
         BIO_printf(bio_err," -key2 arg     - Private Key file to use for servername, in cert file if\n");
         BIO_printf(bio_err,"                 not specified (default is %s)\n",TEST_CERT2);
         BIO_printf(bio_err," -tlsextdebug  - hex dump of all TLS extensions received\n");
         BIO_printf(bio_err," -no_ticket    - disable use of RFC4507bis session tickets\n");
         BIO_printf(bio_err," -legacy_renegotiation - enable use of legacy renegotiation (dangerous)\n");
+# ifndef OPENSSL_NO_NEXTPROTONEG
         BIO_printf(bio_err," -nextprotoneg arg - set the advertised protocols for the NPN extension (comma-separated list)\n");
+# endif
 #endif
         }
 
 static int local_argc=0;
 static char **local_argv;
 
 #ifdef CHARSET_EBCDIC
 static int ebcdic_new(BIO *bi);
 static int ebcdic_free(BIO *a);
 static int ebcdic_read(BIO *b, char *out, int outl);
@@ skipping 162 matching lines @@
         
         if (!p->servername)
                 return SSL_TLSEXT_ERR_NOACK;
         
         if (servername)
                 {
                 if (strcmp(servername,p->servername)) 
                         return p->extension_error;
                 if (ctx2)
                         {
-                        BIO_printf(p->biodebug,"Swiching server context.\n");
+                        BIO_printf(p->biodebug,"Switching server context.\n");
                         SSL_set_SSL_CTX(s,ctx2);
                         }     
                 }
         return SSL_TLSEXT_ERR_OK;
 }
 
 /* Structure passed to cert status callback */
 
 typedef struct tlsextstatusctx_st {
    /* Default responder to use */
@@ skipping 18 matching lines @@
  */
 
 static int cert_status_cb(SSL *s, void *arg)
         {
         tlsextstatusctx *srctx = arg;
         BIO *err = srctx->err;
         char *host, *port, *path;
         int use_ssl;
         unsigned char *rspder = NULL;
         int rspderlen;
-        STACK *aia = NULL;
+        STACK_OF(OPENSSL_STRING) *aia = NULL;
         X509 *x = NULL;
         X509_STORE_CTX inctx;
         X509_OBJECT obj;
         OCSP_REQUEST *req = NULL;
         OCSP_RESPONSE *resp = NULL;
         OCSP_CERTID *id = NULL;
         STACK_OF(X509_EXTENSION) *exts;
         int ret = SSL_TLSEXT_ERR_NOACK;
         int i;
 #if 0
 STACK_OF(OCSP_RESPID) *ids;
 SSL_get_tlsext_status_ids(s, &ids);
 BIO_printf(err, "cert_status: received %d ids\n", sk_OCSP_RESPID_num(ids));
 #endif
         if (srctx->verbose)
                 BIO_puts(err, "cert_status: callback called\n");
         /* Build up OCSP query from server certificate */
         x = SSL_get_certificate(s);
         aia = X509_get1_ocsp(x);
         if (aia)
                 {
-                if (!OCSP_parse_url(sk_value(aia, 0),
+                if (!OCSP_parse_url(sk_OPENSSL_STRING_value(aia, 0),
                         &host, &port, &path, &use_ssl))
                         {
                         BIO_puts(err, "cert_status: can't parse AIA URL\n");
                         goto err;
                         }
                 if (srctx->verbose)
                         BIO_printf(err, "cert_status: AIA URL: %s\n",
-                                        sk_value(aia, 0));
+                                        sk_OPENSSL_STRING_value(aia, 0));
                 }
         else
                 {
                 if (!srctx->host)
                         {
                         BIO_puts(srctx->err, "cert_status: no AIA and no default responder URL\n");
                         goto done;
                         }
                 host = srctx->host;
                 path = srctx->path;
@@ skipping 24 matching lines @@
                 goto err;
         id = NULL;
         /* Add any extensions to the request */
         SSL_get_tlsext_status_exts(s, &exts);
         for (i = 0; i < sk_X509_EXTENSION_num(exts); i++)
                 {
                 X509_EXTENSION *ext = sk_X509_EXTENSION_value(exts, i);
                 if (!OCSP_REQUEST_add_ext(req, ext, -1))
                         goto err;
                 }
-        resp = process_responder(err, req, host, path, port, use_ssl,
+        resp = process_responder(err, req, host, path, port, use_ssl, NULL,
                                         srctx->timeout);
         if (!resp)
                 {
                 BIO_puts(err, "cert_status: error querying responder\n");
                 goto done;
                 }
         rspderlen = i2d_OCSP_RESPONSE(resp, &rspder);
         if (rspderlen <= 0)
                 goto err;
         SSL_set_tlsext_status_ocsp_resp(s, rspder, rspderlen);
@@ skipping 17 matching lines @@
                 OCSP_CERTID_free(id);
         if (req)
                 OCSP_REQUEST_free(req);
         if (resp)
                 OCSP_RESPONSE_free(resp);
         return ret;
         err:
         ret = SSL_TLSEXT_ERR_ALERT_FATAL;
         goto done;
         }
-#endif
 
-
-/* This the context that we pass to next_proto_cb */
+# ifndef OPENSSL_NO_NEXTPROTONEG
+/* This is the context that we pass to next_proto_cb */
 typedef struct tlsextnextprotoctx_st {
         unsigned char *data;
         unsigned int len;
 } tlsextnextprotoctx;
 
-
 static int next_proto_cb(SSL *s, const unsigned char **data, unsigned int *len, void *arg)
         {
         tlsextnextprotoctx *next_proto = arg;
 
         *data = next_proto->data;
         *len = next_proto->len;
 
         return SSL_TLSEXT_ERR_OK;
         }
-
+# endif  /* ndef OPENSSL_NO_NPN */
+#endif
 
 int MAIN(int, char **);
 
 #ifndef OPENSSL_NO_JPAKE
 static char *jpake_secret = NULL;
 #endif
 
 int MAIN(int argc, char *argv[])
         {
-        X509_STORE *store = NULL;
-        int vflags = 0;
+        X509_VERIFY_PARAM *vpm = NULL;
+        int badarg = 0;
         short port=PORT;
         char *CApath=NULL,*CAfile=NULL;
         unsigned char *context = NULL;
         char *dhfile = NULL;
 #ifndef OPENSSL_NO_ECDH
         char *named_curve = NULL;
 #endif
         int badop=0,bugs=0;
         int ret=1;
         int off=0;
         int no_tmp_rsa=0,no_dhe=0,no_ecdhe=0,nocert=0;
         int state=0;
-        SSL_METHOD *meth=NULL;
-        int socket_type=SOCK_STREAM;
+        const SSL_METHOD *meth=NULL;
+        int socket_type=SOCK_STREAM;
         ENGINE *e=NULL;
         char *inrand=NULL;
         int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM;
         char *passarg = NULL, *pass = NULL;
         char *dpassarg = NULL, *dpass = NULL;
         int s_dcert_format = FORMAT_PEM, s_dkey_format = FORMAT_PEM;
         X509 *s_cert = NULL, *s_dcert = NULL;
         EVP_PKEY *s_key = NULL, *s_dkey = NULL;
         int no_cache = 0;
 #ifndef OPENSSL_NO_TLSEXT
         EVP_PKEY *s_key2 = NULL;
         X509 *s_cert2 = NULL;
 #endif
 #ifndef OPENSSL_NO_TLSEXT
         tlsextctx tlsextcbp = {NULL, NULL, SSL_TLSEXT_ERR_ALERT_WARNING};
+# ifndef OPENSSL_NO_NEXTPROTONEG
         const char *next_proto_neg_in = NULL;
         tlsextnextprotoctx next_proto;
-        char snapstart = 0;
+# endif
 #endif
-
+#ifndef OPENSSL_NO_PSK
+        /* by default do not send a PSK identity hint */
+        static char *psk_identity_hint=NULL;
+#endif
 #if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
         meth=SSLv23_server_method();
 #elif !defined(OPENSSL_NO_SSL3)
         meth=SSLv3_server_method();
 #elif !defined(OPENSSL_NO_SSL2)
         meth=SSLv2_server_method();
 #endif
 
         local_argc=argc;
         local_argv=argv;
@@ skipping 113 matching lines @@
                         {
                         nocert=1;
                         }
                 else if (strcmp(*argv,"-CApath") == 0)
                         {
                         if (--argc < 1) goto bad;
                         CApath= *(++argv);
                         }
                 else if (strcmp(*argv,"-no_cache") == 0)
                         no_cache = 1;
-                else if (strcmp(*argv,"-crl_check") == 0)
+                else if (args_verify(&argv, &argc, &badarg, bio_err, &vpm))
                         {
-                        vflags |= X509_V_FLAG_CRL_CHECK;
+                        if (badarg)
+                                goto bad;
+                        continue;
                         }
-                else if (strcmp(*argv,"-crl_check_all") == 0)
-                        {
-                        vflags |= X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL;
-                        }
+                else if (strcmp(*argv,"-verify_return_error") == 0)
+                        verify_return_error = 1;
                 else if (strcmp(*argv,"-serverpref") == 0)
                         { off|=SSL_OP_CIPHER_SERVER_PREFERENCE; }
                 else if (strcmp(*argv,"-legacy_renegotiation") == 0)
                         off|=SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION;
                 else if (strcmp(*argv,"-cipher") == 0)
                         {
                         if (--argc < 1) goto bad;
                         cipher= *(++argv);
                         }
                 else if (strcmp(*argv,"-CAfile") == 0)
@@ skipping 56 matching lines @@
                 else if (strcmp(*argv,"-quiet") == 0)
                         { s_quiet=1; }
                 else if (strcmp(*argv,"-bugs") == 0)
                         { bugs=1; }
                 else if (strcmp(*argv,"-no_tmp_rsa") == 0)
                         { no_tmp_rsa=1; }
                 else if (strcmp(*argv,"-no_dhe") == 0)
                         { no_dhe=1; }
                 else if (strcmp(*argv,"-no_ecdhe") == 0)
                         { no_ecdhe=1; }
+#ifndef OPENSSL_NO_PSK
+                else if (strcmp(*argv,"-psk_hint") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        psk_identity_hint= *(++argv);
+                        }
+                else if (strcmp(*argv,"-psk") == 0)
+                        {
+                        size_t i;
+
+                        if (--argc < 1) goto bad;
+                        psk_key=*(++argv);
+                        for (i=0; i<strlen(psk_key); i++)
+                                {
+                                if (isxdigit((int)psk_key[i]))
+                                        continue;
+                                BIO_printf(bio_err,"Not a hex number '%s'\n",*argv);
+                                goto bad;
+                                }
+                        }
+#endif
                 else if (strcmp(*argv,"-www") == 0)
                         { www=1; }
                 else if (strcmp(*argv,"-WWW") == 0)
                         { www=2; }
                 else if (strcmp(*argv,"-HTTP") == 0)
                         { www=3; }
                 else if (strcmp(*argv,"-no_ssl2") == 0)
                         { off|=SSL_OP_NO_SSLv2; }
                 else if (strcmp(*argv,"-no_ssl3") == 0)
                         { off|=SSL_OP_NO_SSLv3; }
                 else if (strcmp(*argv,"-no_tls1") == 0)
                         { off|=SSL_OP_NO_TLSv1; }
+                else if (strcmp(*argv,"-no_comp") == 0)
+                        { off|=SSL_OP_NO_COMPRESSION; }
 #ifndef OPENSSL_NO_TLSEXT
                 else if (strcmp(*argv,"-no_ticket") == 0)
                         { off|=SSL_OP_NO_TICKET; }
 #endif
 #ifndef OPENSSL_NO_SSL2
                 else if (strcmp(*argv,"-ssl2") == 0)
                         { meth=SSLv2_server_method(); }
 #endif
 #ifndef OPENSSL_NO_SSL3
                 else if (strcmp(*argv,"-ssl3") == 0)
@@ skipping 47 matching lines @@
                 else if (strcmp(*argv,"-cert2") == 0)
                         {
                         if (--argc < 1) goto bad;
                         s_cert_file2= *(++argv);
                         }
                 else if (strcmp(*argv,"-key2") == 0)
                         {
                         if (--argc < 1) goto bad;
                         s_key_file2= *(++argv);
                         }
+# ifndef OPENSSL_NO_NEXTPROTONEG
                 else if (strcmp(*argv,"-nextprotoneg") == 0)
                         {
                         if (--argc < 1) goto bad;
                         next_proto_neg_in = *(++argv);
                         }
-                else if (strcmp(*argv,"-snapstart") == 0)
-                        {
-                        snapstart = 1;
-                        }
+# endif
 #endif
-#ifndef OPENSSL_NO_JPAKE
+#if !defined(OPENSSL_NO_JPAKE) && !defined(OPENSSL_NO_PSK)
                 else if (strcmp(*argv,"-jpake") == 0)
                         {
                         if (--argc < 1) goto bad;
                         jpake_secret = *(++argv);
                         }
 #endif
                 else
                         {
                         BIO_printf(bio_err,"unknown option %s\n",*argv);
                         badop=1;
                         break;
                         }
                 argc--;
                 argv++;
                 }
         if (badop)
                 {
 bad:
                 sv_usage();
                 goto end;
                 }
 
+#if !defined(OPENSSL_NO_JPAKE) && !defined(OPENSSL_NO_PSK)
+        if (jpake_secret)
+                {
+                if (psk_key)
+                        {
+                        BIO_printf(bio_err,
+                                   "Can't use JPAKE and PSK together\n");
+                        goto end;
+                        }
+                psk_identity = "JPAKE";
+                if (cipher)
+                        {
+                        BIO_printf(bio_err, "JPAKE sets cipher to PSK\n");
+                        goto end;
+                        }
+                cipher = "PSK";
+                }
+
+#endif
+
         SSL_load_error_strings();
         OpenSSL_add_ssl_algorithms();
 
 #ifndef OPENSSL_NO_ENGINE
         e = setup_engine(bio_err, engine_id, 1);
 #endif
 
         if (!app_passwd(bio_err, passarg, dpassarg, &pass, &dpass))
                 {
                 BIO_printf(bio_err, "Error getting password\n");
@@ skipping 40 matching lines @@
                         
                         s_cert2 = load_cert(bio_err,s_cert_file2,s_cert_format,
                                 NULL, e, "second server certificate file");
                         
                         if (!s_cert2)
                                 {
                                 ERR_print_errors(bio_err);
                                 goto end;
                                 }
                         }
-
-                if (next_proto_neg_in)
-                        {
-                        unsigned short len;
-                        next_proto.data = next_protos_parse(&len,
-                                next_proto_neg_in);
-                        if (next_proto.data == NULL)
-                                goto end;
-                        next_proto.len = len;
-                        }
-                else
-                        {
-                        next_proto.data = NULL;
-                        }
 #endif
                 }
+
+
         if (s_dcert_file)
                 {
 
                 if (s_dkey_file == NULL)
                         s_dkey_file = s_dcert_file;
 
                 s_dkey = load_key(bio_err, s_dkey_file, s_dkey_format,
                                 0, dpass, e,
                                "second certificate private key file");
                 if (!s_dkey)
@@ skipping 98 matching lines @@
                 }
 #endif
 
         if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
                 (!SSL_CTX_set_default_verify_paths(ctx)))
                 {
                 /* BIO_printf(bio_err,"X509_load_verify_locations\n"); */
                 ERR_print_errors(bio_err);
                 /* goto end; */
                 }
-        store = SSL_CTX_get_cert_store(ctx);
-        X509_STORE_set_flags(store, vflags);
+        if (vpm)
+                SSL_CTX_set1_param(ctx, vpm);
+
 #ifndef OPENSSL_NO_TLSEXT
         if (s_cert2)
                 {
                 ctx2=SSL_CTX_new(meth);
                 if (ctx2 == NULL)
                         {
                         ERR_print_errors(bio_err);
                         goto end;
                         }
                 }
@@ skipping 15 matching lines @@
                                 BIO_printf(bio_err,"error setting 'id_prefix'\n");
                                 ERR_print_errors(bio_err);
                                 goto end;
                                 }
                         BIO_printf(bio_err,"id_prefix '%s' set.\n", session_id_prefix);
                         }
                 SSL_CTX_set_quiet_shutdown(ctx2,1);
                 if (bugs) SSL_CTX_set_options(ctx2,SSL_OP_ALL);
                 if (hack) SSL_CTX_set_options(ctx2,SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG);
                 SSL_CTX_set_options(ctx2,off);
-
                 /* DTLS: partial reads end up discarding unread UDP bytes :-( 
                  * Setting read ahead solves this problem.
                  */
                 if (socket_type == SOCK_DGRAM) SSL_CTX_set_read_ahead(ctx2, 1);
 
-
                 if (state) SSL_CTX_set_info_callback(ctx2,apps_ssl_info_callback);
 
                 if (no_cache)
                         SSL_CTX_set_session_cache_mode(ctx2,SSL_SESS_CACHE_OFF);
                 else
                         SSL_CTX_sess_set_cache_size(ctx2,128);
 
                 if ((!SSL_CTX_load_verify_locations(ctx2,CAfile,CApath)) ||
                         (!SSL_CTX_set_default_verify_paths(ctx2)))
                         {
                         ERR_print_errors(bio_err);
                         }
-                store = SSL_CTX_get_cert_store(ctx2);
-                X509_STORE_set_flags(store, vflags);
+                if (vpm)
+                        SSL_CTX_set1_param(ctx2, vpm);
                 }
 
+# ifndef OPENSSL_NO_NEXTPROTONEG
         if (next_proto.data)
-                {
                 SSL_CTX_set_next_protos_advertised_cb(ctx, next_proto_cb, &next_proto);
-                }
+# endif
 #endif 
 
-        if (snapstart)
-                {
-                static const unsigned char orbit[8] = {1, 2, 3, 4, 5, 6, 7, 8};
-                SSL_CTX_set_snap_start_orbit(ctx, orbit);
-                }
-
 #ifndef OPENSSL_NO_DH
         if (!no_dhe)
                 {
                 DH *dh=NULL;
 
                 if (dhfile)
                         dh = load_dh_param(dhfile);
                 else if (s_cert_file)
                         dh = load_dh_param(s_cert_file);
 
@@ skipping 55 matching lines @@
                                 }
                         }
 
                 if (ecdh != NULL)
                         {
                         BIO_printf(bio_s_out,"Setting temp ECDH parameters\n");
                         }
                 else
                         {
                         BIO_printf(bio_s_out,"Using default temp ECDH parameters\n");
-                        ecdh = EC_KEY_new_by_curve_name(NID_sect163r2);
+                        ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
                         if (ecdh == NULL) 
                                 {
-                                BIO_printf(bio_err, "unable to create curve (sect163r2)\n");
+                                BIO_printf(bio_err, "unable to create curve (nistp256)\n");
                                 goto end;
                                 }
                         }
                 (void)BIO_flush(bio_s_out);
 
                 SSL_CTX_set_tmp_ecdh(ctx,ecdh);
 #ifndef OPENSSL_NO_TLSEXT
                 if (ctx2) 
                         SSL_CTX_set_tmp_ecdh(ctx2,ecdh);
 #endif
@@ skipping 14 matching lines @@
                 }
 
 #ifndef OPENSSL_NO_RSA
 #if 1
         if (!no_tmp_rsa)
                 {
                 SSL_CTX_set_tmp_rsa_callback(ctx,tmp_rsa_cb);
 #ifndef OPENSSL_NO_TLSEXT
                 if (ctx2) 
                         SSL_CTX_set_tmp_rsa_callback(ctx2,tmp_rsa_cb);
-#endif  
+#endif          
                 }
 #else
         if (!no_tmp_rsa && SSL_CTX_need_tmp_RSA(ctx))
                 {
                 RSA *rsa;
 
                 BIO_printf(bio_s_out,"Generating temp (512 bit) RSA key...");
                 BIO_flush(bio_s_out);
 
                 rsa=RSA_generate_key(512,RSA_F4,NULL);
 
                 if (!SSL_CTX_set_tmp_rsa(ctx,rsa))
                         {
                         ERR_print_errors(bio_err);
                         goto end;
                         }
 #ifndef OPENSSL_NO_TLSEXT
                         if (ctx2)
                                 {
                                 if (!SSL_CTX_set_tmp_rsa(ctx2,rsa))
                                         {
                                         ERR_print_errors(bio_err);
                                         goto end;
                                         }
                                 }
+# ifndef OPENSSL_NO_NEXTPROTONEG
+                if (next_proto_neg_in)
+                        {
+                        unsigned short len;
+                        next_proto.data = next_protos_parse(&len,
+                                next_proto_neg_in);
+                        if (next_proto.data == NULL)
+                                goto end;
+                        next_proto.len = len;
+                        }
+                else
+                        {
+                        next_proto.data = NULL;
+                        }
+# endif
 #endif
                 RSA_free(rsa);
                 BIO_printf(bio_s_out,"\n");
                 }
 #endif
 #endif
 
-        if (cipher != NULL)
-                if(!SSL_CTX_set_cipher_list(ctx,cipher)) {
-                BIO_printf(bio_err,"error setting cipher list\n");
+#ifndef OPENSSL_NO_PSK
+#ifdef OPENSSL_NO_JPAKE
+        if (psk_key != NULL)
+#else
+        if (psk_key != NULL || jpake_secret)
+#endif
+                {
+                if (s_debug)
+                        BIO_printf(bio_s_out, "PSK key given or JPAKE in use, setting server callback\n");
+                SSL_CTX_set_psk_server_callback(ctx, psk_server_cb);
+                }
+
+        if (!SSL_CTX_use_psk_identity_hint(ctx, psk_identity_hint))
+                {
+                BIO_printf(bio_err,"error setting PSK identity hint to context\n");
                 ERR_print_errors(bio_err);
                 goto end;
+                }
+#endif
+
+        if (cipher != NULL)
+                {
+                if(!SSL_CTX_set_cipher_list(ctx,cipher))
+                        {
+                        BIO_printf(bio_err,"error setting cipher list\n");
+                        ERR_print_errors(bio_err);
+                        goto end;
+                        }
 #ifndef OPENSSL_NO_TLSEXT
                 if (ctx2 && !SSL_CTX_set_cipher_list(ctx2,cipher))
                         {
                         BIO_printf(bio_err,"error setting cipher list\n");
                         ERR_print_errors(bio_err);
                         goto end;
                         }
 #endif
-        }
+                }
         SSL_CTX_set_verify(ctx,s_server_verify,verify_callback);
         SSL_CTX_set_session_id_context(ctx,(void*)&s_server_session_id_context,
                 sizeof s_server_session_id_context);
 
         /* Set DTLS cookie generation and verification callbacks */
         SSL_CTX_set_cookie_generate_cb(ctx, generate_cookie_callback);
         SSL_CTX_set_cookie_verify_cb(ctx, verify_cookie_callback);
 
 #ifndef OPENSSL_NO_TLSEXT
         if (ctx2)
                 {
                 SSL_CTX_set_verify(ctx2,s_server_verify,verify_callback);
                 SSL_CTX_set_session_id_context(ctx2,(void*)&s_server_session_id_context,
                         sizeof s_server_session_id_context);
 
                 tlsextcbp.biodebug = bio_s_out;
                 SSL_CTX_set_tlsext_servername_callback(ctx2, ssl_servername_cb);
                 SSL_CTX_set_tlsext_servername_arg(ctx2, &tlsextcbp);
                 SSL_CTX_set_tlsext_servername_callback(ctx, ssl_servername_cb);
                 SSL_CTX_set_tlsext_servername_arg(ctx, &tlsextcbp);
                 }
 #endif
+
         if (CAfile != NULL)
                 {
                 SSL_CTX_set_client_CA_list(ctx,SSL_load_client_CA_file(CAfile));
 #ifndef OPENSSL_NO_TLSEXT
                 if (ctx2) 
                         SSL_CTX_set_client_CA_list(ctx2,SSL_load_client_CA_file(CAfile));
 #endif
                 }
+
         BIO_printf(bio_s_out,"ACCEPT\n");
+        (void)BIO_flush(bio_s_out);
         if (www)
                 do_server(port,socket_type,&accept_socket,www_body, context);
         else
                 do_server(port,socket_type,&accept_socket,sv_body, context);
         print_stats(bio_s_out,ctx);
         ret=0;
 end:
         if (ctx != NULL) SSL_CTX_free(ctx);
         if (s_cert)
                 X509_free(s_cert);
@@ skipping 51 matching lines @@
 static int sv_body(char *hostname, int s, unsigned char *context)
         {
         char *buf=NULL;
         fd_set readfds;
         int ret=1,width;
         int k,i;
         unsigned long l;
         SSL *con=NULL;
         BIO *sbio;
         struct timeval timeout;
-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE)
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_BEOS_R5)
         struct timeval tv;
 #else
         struct timeval *timeoutp;
 #endif
 
         if ((buf=OPENSSL_malloc(bufsize)) == NULL)
                 {
                 BIO_printf(bio_err,"out of memory\n");
                 goto err;
                 }
@@ skipping 31 matching lines @@
                                                                 KRB5SVC);
                         kssl_ctx_setstring(con->kssl_ctx, KSSL_KEYTAB,
                                                                 KRB5KEYTAB);
                         }
 #endif  /* OPENSSL_NO_KRB5 */
                 if(context)
                       SSL_set_session_id_context(con, context,
                                                  strlen((char *)context));
         }
         SSL_clear(con);
+#if 0
+#ifdef TLSEXT_TYPE_opaque_prf_input
+        SSL_set_tlsext_opaque_prf_input(con, "Test server", 11);
+#endif
+#endif
 
         if (SSL_version(con) == DTLS1_VERSION)
                 {
 
                 sbio=BIO_new_dgram(s,BIO_NOCLOSE);
 
-                if ( enable_timeouts)
+                if (enable_timeouts)
                         {
                         timeout.tv_sec = 0;
                         timeout.tv_usec = DGRAM_RCV_TIMEOUT;
                         BIO_ctrl(sbio, BIO_CTRL_DGRAM_SET_RECV_TIMEOUT, 0, &timeout);
                         
                         timeout.tv_sec = 0;
                         timeout.tv_usec = DGRAM_SND_TIMEOUT;
                         BIO_ctrl(sbio, BIO_CTRL_DGRAM_SET_SEND_TIMEOUT, 0, &timeout);
                         }
 
-                
                 if (socket_mtu > 28)
                         {
                         SSL_set_options(con, SSL_OP_NO_QUERY_MTU);
                         SSL_set_mtu(con, socket_mtu - 28);
                         }
                 else
                         /* want to do MTU discovery */
                         BIO_ctrl(sbio, BIO_CTRL_DGRAM_MTU_DISCOVER, 0, NULL);
 
         /* turn on cookie exchange */
@@ skipping 42 matching lines @@
                 {
                 int read_from_terminal;
                 int read_from_sslcon;
 
                 read_from_terminal = 0;
                 read_from_sslcon = SSL_pending(con);
 
                 if (!read_from_sslcon)
                         {
                         FD_ZERO(&readfds);
-#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE)
-                        FD_SET(fileno(stdin),&readfds);
+#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE) && !defined(OPENSSL_SYS_BEOS_R5)
+                        openssl_fdset(fileno(stdin),&readfds);
 #endif
-                        FD_SET(s,&readfds);
+                        openssl_fdset(s,&readfds);
                         /* Note: under VMS with SOCKETSHR the second parameter is
                          * currently of type (int *) whereas under other systems
                          * it is (void *) if you don't have a cast it will choke
                          * the compiler: if you do have a cast then you can either
                          * go for (int *) or (void *).
                          */
 #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE)
                         /* Under DOS (non-djgpp) and Windows we can't select on stdin: only
                          * on sockets. As a workaround we timeout the select every
                          * second and check for any keypress. In a proper Windows
                          * application we wouldn't do this because it is inefficient.
                          */
                         tv.tv_sec = 1;
                         tv.tv_usec = 0;
                         i=select(width,(void *)&readfds,NULL,NULL,&tv);
                         if((i < 0) || (!i && !_kbhit() ) )continue;
                         if(_kbhit())
                                 read_from_terminal = 1;
+#elif defined(OPENSSL_SYS_BEOS_R5)
+                        /* Under BeOS-R5 the situation is similar to DOS */
+                        tv.tv_sec = 1;
+                        tv.tv_usec = 0;
+                        (void)fcntl(fileno(stdin), F_SETFL, O_NONBLOCK);
+                        i=select(width,(void *)&readfds,NULL,NULL,&tv);
+                        if ((i < 0) || (!i && read(fileno(stdin), buf, 0) < 0))
+                                continue;
+                        if (read(fileno(stdin), buf, 0) >= 0)
+                                read_from_terminal = 1;
+                        (void)fcntl(fileno(stdin), F_SETFL, 0);
 #else
                         if ((SSL_version(con) == DTLS1_VERSION) &&
                                 DTLSv1_get_timeout(con, &timeout))
                                 timeoutp = &timeout;
                         else
                                 timeoutp = NULL;
 
                         i=select(width,(void *)&readfds,NULL,NULL,timeoutp);
 
                         if ((SSL_version(con) == DTLS1_VERSION) && DTLSv1_handle_timeout(con) > 0)
                                 {
                                 BIO_printf(bio_err,"TIMEOUT occured\n");
                                 }
 
                         if (i <= 0) continue;
                         if (FD_ISSET(fileno(stdin),&readfds))
                                 read_from_terminal = 1;
 #endif
                         if (FD_ISSET(s,&readfds))
                                 read_from_sslcon = 1;
                         }
                 if (read_from_terminal)
                         {
                         if (s_crlf)
                                 {
                                 int j, lf_num;
 
-                                i=read(fileno(stdin), buf, bufsize/2);
+                                i=raw_read_stdin(buf, bufsize/2);
                                 lf_num = 0;
                                 /* both loops are skipped when i <= 0 */
                                 for (j = 0; j < i; j++)
                                         if (buf[j] == '\n')
                                                 lf_num++;
                                 for (j = i-1; j >= 0; j--)
                                         {
                                         buf[j+lf_num] = buf[j];
                                         if (buf[j] == '\n')
                                                 {
                                                 lf_num--;
                                                 i++;
                                                 buf[j+lf_num] = '\r';
                                                 }
                                         }
                                 assert(lf_num == 0);
                                 }
                         else
-                                i=read(fileno(stdin),buf,bufsize);
+                                i=raw_read_stdin(buf,bufsize);
                         if (!s_quiet)
                                 {
                                 if ((i <= 0) || (buf[0] == 'Q'))
                                         {
                                         BIO_printf(bio_s_out,"DONE\n");
                                         SHUTDOWN(s);
                                         close_accept_socket();
                                         ret= -11;
                                         goto err;
                                         }
                                 if ((i <= 0) || (buf[0] == 'q'))
                                         {
                                         BIO_printf(bio_s_out,"DONE\n");
                                         if (SSL_version(con) != DTLS1_VERSION)
                         SHUTDOWN(s);
         /*                              close_accept_socket();
                                         ret= -11;*/
                                         goto err;
                                         }
+
                                 if ((buf[0] == 'r') && 
                                         ((buf[1] == '\n') || (buf[1] == '\r')))
                                         {
                                         SSL_renegotiate(con);
                                         i=SSL_do_handshake(con);
                                         printf("SSL_do_handshake -> %d\n",i);
                                         i=0; /*13; */
                                         continue;
                                         /* strcpy(buf,"server side RE-NEGOTIATE\n"); */
                                         }
@@ skipping 76 matching lines @@
                         else
                                 {
 again:  
                                 i=SSL_read(con,(char *)buf,bufsize);
                                 switch (SSL_get_error(con,i))
                                         {
                                 case SSL_ERROR_NONE:
 #ifdef CHARSET_EBCDIC
                                         ascii2ebcdic(buf,buf,i);
 #endif
-                                        write(fileno(stdout),buf,
+                                        raw_write_stdout(buf,
                                                 (unsigned int)i);
                                         if (SSL_pending(con)) goto again;
                                         break;
                                 case SSL_ERROR_WANT_WRITE:
                                 case SSL_ERROR_WANT_READ:
                                 case SSL_ERROR_WANT_X509_LOOKUP:
                                         BIO_printf(bio_s_out,"Read BLOCK\n");
                                         break;
                                 case SSL_ERROR_SYSCALL:
                                 case SSL_ERROR_SSL:
                                         BIO_printf(bio_s_out,"ERROR\n");
                                         ERR_print_errors(bio_err);
                                         ret=1;
                                         goto err;
                                 case SSL_ERROR_ZERO_RETURN:
                                         BIO_printf(bio_s_out,"DONE\n");
                                         ret=1;
                                         goto err;
                                         }
                                 }
                         }
                 }
 err:
-        BIO_printf(bio_s_out,"shutting down SSL\n");
+        if (con != NULL)
+                {
+                BIO_printf(bio_s_out,"shutting down SSL\n");
 #if 1
-        SSL_set_shutdown(con,SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
+                SSL_set_shutdown(con,SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
 #else
-        SSL_shutdown(con);
+                SSL_shutdown(con);
 #endif
-        if (con != NULL) SSL_free(con);
+                SSL_free(con);
+                }
         BIO_printf(bio_s_out,"CONNECTION CLOSED\n");
         if (buf != NULL)
                 {
                 OPENSSL_cleanse(buf,bufsize);
                 OPENSSL_free(buf);
                 }
         if (ret >= 0)
                 BIO_printf(bio_s_out,"ACCEPT\n");
         return(ret);
         }
 
 static void close_accept_socket(void)
         {
         BIO_printf(bio_err,"shutdown accept socket\n");
         if (accept_socket >= 0)
                 {
                 SHUTDOWN2(accept_socket);
                 }
         }
 
 static int init_ssl_connection(SSL *con)
         {
         int i;
         const char *str;
         X509 *peer;
         long verify_error;
         MS_STATIC char buf[BUFSIZ];
-#ifndef OPENSSL_NO_TLSEXT
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
         const unsigned char *next_proto_neg;
         unsigned next_proto_neg_len;
 #endif
 
-again:
         if ((i=SSL_accept(con)) <= 0)
                 {
                 if (BIO_sock_should_retry(i))
                         {
                         BIO_printf(bio_s_out,"DELAY\n");
                         return(1);
                         }
 
-                if (SSL_get_error(con, i) == SSL_ERROR_SERVER_RANDOM_VALIDATION_PENDING)
-                        {
-                        SSL_set_suggested_server_random_validity(con, 1);
-                        goto again;
-                        }
-
                 BIO_printf(bio_err,"ERROR\n");
                 verify_error=SSL_get_verify_result(con);
                 if (verify_error != X509_V_OK)
                         {
                         BIO_printf(bio_err,"verify error:%s\n",
                                 X509_verify_cert_error_string(verify_error));
                         }
                 else
                         ERR_print_errors(bio_err);
                 return(0);
@@ skipping 10 matching lines @@
                 BIO_printf(bio_s_out,"subject=%s\n",buf);
                 X509_NAME_oneline(X509_get_issuer_name(peer),buf,sizeof buf);
                 BIO_printf(bio_s_out,"issuer=%s\n",buf);
                 X509_free(peer);
                 }
 
         if (SSL_get_shared_ciphers(con,buf,sizeof buf) != NULL)
                 BIO_printf(bio_s_out,"Shared ciphers:%s\n",buf);
         str=SSL_CIPHER_get_name(SSL_get_current_cipher(con));
         BIO_printf(bio_s_out,"CIPHER is %s\n",(str != NULL)?str:"(NONE)");
-#ifndef OPENSSL_NO_TLSEXT
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
         SSL_get0_next_proto_negotiated(con, &next_proto_neg, &next_proto_neg_len);
-        if (next_proto_neg) {
+        if (next_proto_neg)
+                {
                 BIO_printf(bio_s_out,"NEXTPROTO is ");
                 BIO_write(bio_s_out, next_proto_neg, next_proto_neg_len);
                 BIO_printf(bio_s_out, "\n");
-        }
+                }
 #endif
         if (con->hit) BIO_printf(bio_s_out,"Reused session-id\n");
         if (SSL_ctrl(con,SSL_CTRL_GET_FLAGS,0,NULL) &
                 TLS1_FLAGS_TLS_PADDING_BUG)
                 BIO_printf(bio_s_out,"Peer has incorrect TLSv1 block padding\n");
 #ifndef OPENSSL_NO_KRB5
         if (con->kssl_ctx->client_princ != NULL)
                 {
                 BIO_printf(bio_s_out,"Kerberos peer principal is %s\n",
                         con->kssl_ctx->client_princ);
@@ skipping 37 matching lines @@
         if (x != NULL) X509_free(x);
         fclose(in);
         return(1);
         }
 #endif
 
 static int www_body(char *hostname, int s, unsigned char *context)
         {
         char *buf=NULL;
         int ret=1;
-        int i,j,k,blank,dot;
-        struct stat st_buf;
+        int i,j,k,dot;
         SSL *con;
-        SSL_CIPHER *c;
+        const SSL_CIPHER *c;
         BIO *io,*ssl_bio,*sbio;
-        long total_bytes;
 
         buf=OPENSSL_malloc(bufsize);
         if (buf == NULL) return(0);
         io=BIO_new(BIO_f_buffer());
         ssl_bio=BIO_new(BIO_f_ssl());
         if ((io == NULL) || (ssl_bio == NULL)) goto err;
 
 #ifdef FIONBIO  
         if (s_nbio)
                 {
@@ skipping 50 matching lines @@
                 con->debug=1;
                 BIO_set_callback(SSL_get_rbio(con),bio_dump_callback);
                 BIO_set_callback_arg(SSL_get_rbio(con),(char *)bio_s_out);
                 }
         if (s_msg)
                 {
                 SSL_set_msg_callback(con, msg_cb);
                 SSL_set_msg_callback_arg(con, bio_s_out);
                 }
 
-        blank=0;
         for (;;)
                 {
                 if (hack)
                         {
                         i=SSL_accept(con);
 
                         switch (SSL_get_error(con,i))
                                 {
                         case SSL_ERROR_NONE:
                                 break;
                         case SSL_ERROR_WANT_WRITE:
                         case SSL_ERROR_WANT_READ:
                         case SSL_ERROR_WANT_X509_LOOKUP:
                                 continue;
-                        case SSL_ERROR_SERVER_RANDOM_VALIDATION_PENDING:
-                                SSL_set_suggested_server_random_validity(con, 1);
-                                continue;
                         case SSL_ERROR_SYSCALL:
                         case SSL_ERROR_SSL:
                         case SSL_ERROR_ZERO_RETURN:
                                 ret=1;
                                 goto err;
                                 /* break; */
                                 }
 
                         SSL_renegotiate(con);
                         SSL_write(con,NULL,0);
@@ skipping 162 matching lines @@
                                 break;
                                 }
 
 #if 0
                         /* append if a directory lookup */
                         if (e[-1] == '/')
                                 strcat(p,"index.html");
 #endif
 
                         /* if a directory, do the index thang */
-                        if (stat(p,&st_buf) < 0)
-                                {
-                                BIO_puts(io,text);
-                                BIO_printf(io,"Error accessing '%s'\r\n",p);
-                                ERR_print_errors(io);
-                                break;
-                                }
-                        if (S_ISDIR(st_buf.st_mode))
+                        if (app_isdir(p)>0)
                                 {
 #if 0 /* must check buffer size */
                                 strcat(p,"/index.html");
 #else
                                 BIO_puts(io,text);
                                 BIO_printf(io,"'%s' is a directory\r\n",p);
                                 break;
 #endif
                                 }
 
@@ skipping 12 matching lines @@
                                 {
                                 i=strlen(p);
                                 if (    ((i > 5) && (strcmp(&(p[i-5]),".html") == 0)) ||
                                         ((i > 4) && (strcmp(&(p[i-4]),".php") == 0)) ||
                                         ((i > 4) && (strcmp(&(p[i-4]),".htm") == 0)))
                                         BIO_puts(io,"HTTP/1.0 200 ok\r\nContent-type: text/html\r\n\r\n");
                                 else
                                         BIO_puts(io,"HTTP/1.0 200 ok\r\nContent-type: text/plain\r\n\r\n");
                                 }
                         /* send the file */
-                        total_bytes=0;
                         for (;;)
                                 {
                                 i=BIO_read(file,buf,bufsize);
                                 if (i <= 0) break;
 
 #ifdef RENEG
                                 total_bytes+=i;
                                 fprintf(stderr,"%d\n",i);
                                 if (total_bytes > 3*1024)
                                         {
@@ skipping 109 matching lines @@
                 memcpy(id, session_id_prefix,
                         (strlen(session_id_prefix) < *id_len) ?
                         strlen(session_id_prefix) : *id_len);
                 }
         while(SSL_has_matching_session_id(ssl, id, *id_len) &&
                 (++count < MAX_SESSION_ID_ATTEMPTS));
         if(count >= MAX_SESSION_ID_ATTEMPTS)
                 return 0;
         return 1;
         }