import openssl-0.9.7-beta1

1 files changed, 1027 insertions, 457 deletions

diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index f562ec6b14..df307a80c5 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,6 @@
-/* ssl/ssl_lib.c */
+/*! \file ssl/ssl_lib.c
+ *  \brief Version independent SSL functions.
+ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -55,52 +57,126 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
+/* ====================================================================
+ * Copyright (c) 1998-2001 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
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT 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.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
 
+
+#ifdef REF_CHECK
+#  include <assert.h>
+#endif
 #include <stdio.h>
-#include "objects.h"
-#include "lhash.h"
+#include <openssl/objects.h>
+#include <openssl/lhash.h>
+#include <openssl/x509v3.h>
 #include "ssl_locl.h"
+#include "kssl_lcl.h"
 
-char *SSL_version_str="SSLeay 0.9.0b 29-Jun-1998";
-
-static STACK *ssl_meth=NULL;
-static STACK *ssl_ctx_meth=NULL;
-static int ssl_meth_num=0;
-static int ssl_ctx_meth_num=0;
+const char *SSL_version_str=OPENSSL_VERSION_TEXT;
 
-SSL3_ENC_METHOD ssl3_undef_enc_method={
-        ssl_undefined_function,
-        ssl_undefined_function,
-        ssl_undefined_function,
-        ssl_undefined_function,
-        ssl_undefined_function,
+OPENSSL_GLOBAL SSL3_ENC_METHOD ssl3_undef_enc_method={
+        /* evil casts, but these functions are only called if there's a library bug */
+        (int (*)(SSL *,int))ssl_undefined_function,
+        (int (*)(SSL *, unsigned char *, int))ssl_undefined_function,
         ssl_undefined_function,
+        (int (*)(SSL *, unsigned char *, unsigned char *, int))ssl_undefined_function,
+        (int (*)(SSL*, int))ssl_undefined_function,
+        (int (*)(SSL *, EVP_MD_CTX *, EVP_MD_CTX *, const char*, int, unsigned char *))ssl_undefined_function
         };
 
-void SSL_clear(s)
-SSL *s;
+int SSL_clear(SSL *s)
         {
-        int state;
 
-        if (s->method == NULL) return;
+        if (s->method == NULL)
+                {
+                SSLerr(SSL_F_SSL_CLEAR,SSL_R_NO_METHOD_SPECIFIED);
+                return(0);
+                }
+
+        if (ssl_clear_bad_session(s))
+                {
+                SSL_SESSION_free(s->session);
+                s->session=NULL;
+                }
 
         s->error=0;
         s->hit=0;
+        s->shutdown=0;
 
+#if 0 /* Disabled since version 1.10 of this file (early return not
+       * needed because SSL_clear is not called when doing renegotiation) */
         /* This is set if we are doing dynamic renegotiation so keep
          * the old cipher.  It is sort of a SSL_clear_lite :-) */
-        if (s->new_session) return;
+        if (s->new_session) return(1);
+#else
+        if (s->new_session)
+                {
+                SSLerr(SSL_F_SSL_CLEAR,ERR_R_INTERNAL_ERROR);
+                return 0;
+                }
+#endif
 
-        state=s->state; /* Keep to check if we throw away the session-id */
         s->type=0;
 
+        s->state=SSL_ST_BEFORE|((s->server)?SSL_ST_ACCEPT:SSL_ST_CONNECT);
+
         s->version=s->method->version;
+        s->client_version=s->version;
         s->rwstate=SSL_NOTHING;
-        s->state=SSL_ST_BEFORE;
         s->rstate=SSL_ST_READ_HEADER;
-        s->read_ahead=s->ctx->default_read_ahead;
-
-/*      s->shutdown=(SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN); */
+#if 0
+        s->read_ahead=s->ctx->read_ahead;
+#endif
 
         if (s->init_buf != NULL)
                 {
@@ -110,30 +186,34 @@ SSL *s;
 
         ssl_clear_cipher_ctx(s);
 
-        if (ssl_clear_bad_session(s))
-                {
-                SSL_SESSION_free(s->session);
-                s->session=NULL;
-                }
-
-        s->shutdown=(SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
         s->first_packet=0;
 
-        s->method->ssl_clear(s);
+#if 1
+        /* Check to see if we were changed into a different method, if
+         * so, revert back if we are not doing session-id reuse. */
+        if (!s->in_handshake && (s->session == NULL) && (s->method != s->ctx->method))
+                {
+                s->method->ssl_free(s);
+                s->method=s->ctx->method;
+                if (!s->method->ssl_new(s))
+                        return(0);
+                }
+        else
+#endif
+                s->method->ssl_clear(s);
+        return(1);
         }
 
-/* Used to change an SSL_CTXs default SSL method type */
-int SSL_CTX_set_ssl_version(ctx,meth)
-SSL_CTX *ctx;
-SSL_METHOD *meth;
+/** Used to change an SSL_CTXs default SSL method type */
+int SSL_CTX_set_ssl_version(SSL_CTX *ctx,SSL_METHOD *meth)
         {
-        STACK *sk;
+        STACK_OF(SSL_CIPHER) *sk;
 
         ctx->method=meth;
 
         sk=ssl_create_cipher_list(ctx->method,&(ctx->cipher_list),
                 &(ctx->cipher_list_by_id),SSL_DEFAULT_CIPHER_LIST);
-        if ((sk == NULL) || (sk_num(sk) <= 0))
+        if ((sk == NULL) || (sk_SSL_CIPHER_num(sk) <= 0))
                 {
                 SSLerr(SSL_F_SSL_CTX_SET_SSL_VERSION,SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS);
                 return(0);
@@ -141,8 +221,7 @@ SSL_METHOD *meth;
         return(1);
         }
 
-SSL *SSL_new(ctx)
-SSL_CTX *ctx;
+SSL *SSL_new(SSL_CTX *ctx)
         {
         SSL *s;
 
@@ -157,20 +236,50 @@ SSL_CTX *ctx;
                 return(NULL);
                 }
 
-        s=(SSL *)Malloc(sizeof(SSL));
+        s=(SSL *)OPENSSL_malloc(sizeof(SSL));
         if (s == NULL) goto err;
         memset(s,0,sizeof(SSL));
 
-        if (ctx->default_cert != NULL)
-                {
-                CRYPTO_add(&ctx->default_cert->references,1,
-                        CRYPTO_LOCK_SSL_CERT);
-                s->cert=ctx->default_cert;
+#ifndef OPENSSL_NO_KRB5
+        s->kssl_ctx = kssl_ctx_new();
+#endif  /* OPENSSL_NO_KRB5 */
+
+        s->options=ctx->options;
+        s->mode=ctx->mode;
+        s->max_cert_list=ctx->max_cert_list;
+
+        if (ctx->cert != NULL)
+                {
+                /* Earlier library versions used to copy the pointer to
+                 * the CERT, not its contents; only when setting new
+                 * parameters for the per-SSL copy, ssl_cert_new would be
+                 * called (and the direct reference to the per-SSL_CTX
+                 * settings would be lost, but those still were indirectly
+                 * accessed for various purposes, and for that reason they
+                 * used to be known as s->ctx->default_cert).
+                 * Now we don't look at the SSL_CTX's CERT after having
+                 * duplicated it once. */
+
+                s->cert = ssl_cert_dup(ctx->cert);
+                if (s->cert == NULL)
+                        goto err;
                 }
         else
-                s->cert=NULL;
-        s->verify_mode=ctx->default_verify_mode;
+                s->cert=NULL; /* Cannot really happen (see SSL_CTX_new) */
+
+        s->read_ahead=ctx->read_ahead;
+        s->msg_callback=ctx->msg_callback;
+        s->msg_callback_arg=ctx->msg_callback_arg;
+        s->verify_mode=ctx->verify_mode;
+        s->verify_depth=ctx->verify_depth;
+        s->sid_ctx_length=ctx->sid_ctx_length;
+        memcpy(&s->sid_ctx,&ctx->sid_ctx,sizeof(s->sid_ctx));
         s->verify_callback=ctx->default_verify_callback;
+        s->generate_session_id=ctx->generate_session_id;
+        s->purpose = ctx->purpose;
+        s->trust = ctx->trust;
+        s->quiet_shutdown=ctx->quiet_shutdown;
+
         CRYPTO_add(&ctx->references,1,CRYPTO_LOCK_SSL_CTX);
         s->ctx=ctx;
 
@@ -179,30 +288,130 @@ SSL_CTX *ctx;
         s->method=ctx->method;
 
         if (!s->method->ssl_new(s))
-                {
-                SSL_CTX_free(ctx);
-                Free(s);
                 goto err;
-                }
 
-        s->quiet_shutdown=ctx->quiet_shutdown;
         s->references=1;
-        s->options=ctx->options;
+        s->server=(ctx->method->ssl_accept == ssl_undefined_function)?0:1;
+
         SSL_clear(s);
 
-        CRYPTO_new_ex_data(ssl_meth,(char *)s,&s->ex_data);
+        CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL, s, &s->ex_data);
 
         return(s);
 err:
+        if (s != NULL)
+                {
+                if (s->cert != NULL)
+                        ssl_cert_free(s->cert);
+                if (s->ctx != NULL)
+                        SSL_CTX_free(s->ctx); /* decrement reference count */
+                OPENSSL_free(s);
+                }
         SSLerr(SSL_F_SSL_NEW,ERR_R_MALLOC_FAILURE);
         return(NULL);
         }
 
-void SSL_free(s)
-SSL *s;
+int SSL_CTX_set_session_id_context(SSL_CTX *ctx,const unsigned char *sid_ctx,
+                                   unsigned int sid_ctx_len)
+    {
+    if(sid_ctx_len > SSL_MAX_SID_CTX_LENGTH)
+        {
+        SSLerr(SSL_F_SSL_CTX_SET_SESSION_ID_CONTEXT,SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG);
+        return 0;
+        }
+    ctx->sid_ctx_length=sid_ctx_len;
+    memcpy(ctx->sid_ctx,sid_ctx,sid_ctx_len);
+
+    return 1;
+    }
+
+int SSL_set_session_id_context(SSL *ssl,const unsigned char *sid_ctx,
+                               unsigned int sid_ctx_len)
+    {
+    if(sid_ctx_len > SSL_MAX_SID_CTX_LENGTH)
+        {
+        SSLerr(SSL_F_SSL_SET_SESSION_ID_CONTEXT,SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG);
+        return 0;
+        }
+    ssl->sid_ctx_length=sid_ctx_len;
+    memcpy(ssl->sid_ctx,sid_ctx,sid_ctx_len);
+
+    return 1;
+    }
+
+int SSL_CTX_set_generate_session_id(SSL_CTX *ctx, GEN_SESSION_CB cb)
+        {
+        CRYPTO_w_lock(CRYPTO_LOCK_SSL_CTX);
+        ctx->generate_session_id = cb;
+        CRYPTO_w_unlock(CRYPTO_LOCK_SSL_CTX);
+        return 1;
+        }
+
+int SSL_set_generate_session_id(SSL *ssl, GEN_SESSION_CB cb)
+        {
+        CRYPTO_w_lock(CRYPTO_LOCK_SSL);
+        ssl->generate_session_id = cb;
+        CRYPTO_w_unlock(CRYPTO_LOCK_SSL);
+        return 1;
+        }
+
+int SSL_has_matching_session_id(const SSL *ssl, const unsigned char *id,
+                                unsigned int id_len)
+        {
+        /* A quick examination of SSL_SESSION_hash and SSL_SESSION_cmp shows how
+         * we can "construct" a session to give us the desired check - ie. to
+         * find if there's a session in the hash table that would conflict with
+         * any new session built out of this id/id_len and the ssl_version in
+         * use by this SSL. */
+        SSL_SESSION r, *p;
+        r.ssl_version = ssl->version;
+        r.session_id_length = id_len;
+        memcpy(r.session_id, id, id_len);
+        /* NB: SSLv2 always uses a fixed 16-byte session ID, so even if a
+         * callback is calling us to check the uniqueness of a shorter ID, it
+         * must be compared as a padded-out ID because that is what it will be
+         * converted to when the callback has finished choosing it. */
+        if((r.ssl_version == SSL2_VERSION) &&
+                        (id_len < SSL2_SSL_SESSION_ID_LENGTH))
+                {
+                memset(r.session_id + id_len, 0,
+                        SSL2_SSL_SESSION_ID_LENGTH - id_len);
+                r.session_id_length = SSL2_SSL_SESSION_ID_LENGTH;
+                }
+
+        CRYPTO_r_lock(CRYPTO_LOCK_SSL_CTX);
+        p = (SSL_SESSION *)lh_retrieve(ssl->ctx->sessions, &r);
+        CRYPTO_r_unlock(CRYPTO_LOCK_SSL_CTX);
+        return (p != NULL);
+        }
+
+int SSL_CTX_set_purpose(SSL_CTX *s, int purpose)
+        {
+        return X509_PURPOSE_set(&s->purpose, purpose);
+        }
+
+int SSL_set_purpose(SSL *s, int purpose)
+        {
+        return X509_PURPOSE_set(&s->purpose, purpose);
+        }
+
+int SSL_CTX_set_trust(SSL_CTX *s, int trust)
+        {
+        return X509_TRUST_set(&s->trust, trust);
+        }
+
+int SSL_set_trust(SSL *s, int trust)
+        {
+        return X509_TRUST_set(&s->trust, trust);
+        }
+
+void SSL_free(SSL *s)
         {
         int i;
 
+        if(s == NULL)
+            return;
+
         i=CRYPTO_add(&s->references,-1,CRYPTO_LOCK_SSL);
 #ifdef REF_PRINT
         REF_PRINT("SSL",s);
@@ -216,7 +425,7 @@ SSL *s;
                 }
 #endif
 
-        CRYPTO_free_ex_data(ssl_meth,(char *)s,&s->ex_data);
+        CRYPTO_free_ex_data(CRYPTO_EX_INDEX_SSL, s, &s->ex_data);
 
         if (s->bbio != NULL)
                 {
@@ -236,8 +445,8 @@ SSL *s;
         if (s->init_buf != NULL) BUF_MEM_free(s->init_buf);
 
         /* add extra stuff */
-        if (s->cipher_list != NULL) sk_free(s->cipher_list);
-        if (s->cipher_list_by_id != NULL) sk_free(s->cipher_list_by_id);
+        if (s->cipher_list != NULL) sk_SSL_CIPHER_free(s->cipher_list);
+        if (s->cipher_list_by_id != NULL) sk_SSL_CIPHER_free(s->cipher_list_by_id);
 
         /* Make the next call work :-) */
         if (s->session != NULL)
@@ -254,17 +463,14 @@ SSL *s;
         if (s->ctx) SSL_CTX_free(s->ctx);
 
         if (s->client_CA != NULL)
-                sk_pop_free(s->client_CA,X509_NAME_free);
+                sk_X509_NAME_pop_free(s->client_CA,X509_NAME_free);
 
         if (s->method != NULL) s->method->ssl_free(s);
 
-        Free((char *)s);
+        OPENSSL_free(s);
         }
 
-void SSL_set_bio(s, rbio,wbio)
-SSL *s;
-BIO *rbio;
-BIO *wbio;
+void SSL_set_bio(SSL *s,BIO *rbio,BIO *wbio)
         {
         /* If the output buffering BIO is still in place, remove it
          */
@@ -284,16 +490,18 @@ BIO *wbio;
         s->wbio=wbio;
         }
 
-BIO *SSL_get_rbio(s)
-SSL *s;
+BIO *SSL_get_rbio(SSL *s)
         { return(s->rbio); }
 
-BIO *SSL_get_wbio(s)
-SSL *s;
+BIO *SSL_get_wbio(SSL *s)
         { return(s->wbio); }
 
-int SSL_get_fd(s)
-SSL *s;
+int SSL_get_fd(SSL *s)
+        {
+        return(SSL_get_rfd(s));
+        }
+
+int SSL_get_rfd(SSL *s)
         {
         int ret= -1;
         BIO *b,*r;
@@ -305,10 +513,20 @@ SSL *s;
         return(ret);
         }
 
-#ifndef NO_SOCK
-int SSL_set_fd(s, fd)
-SSL *s;
-int fd;
+int SSL_get_wfd(SSL *s)
+        {
+        int ret= -1;
+        BIO *b,*r;
+
+        b=SSL_get_wbio(s);
+        r=BIO_find_type(b,BIO_TYPE_DESCRIPTOR);
+        if (r != NULL)
+                BIO_get_fd(r,&ret);
+        return(ret);
+        }
+
+#ifndef OPENSSL_NO_SOCK
+int SSL_set_fd(SSL *s,int fd)
         {
         int ret=0;
         BIO *bio=NULL;
@@ -327,9 +545,7 @@ err:
         return(ret);
         }
 
-int SSL_set_wfd(s, fd)
-SSL *s;
-int fd;
+int SSL_set_wfd(SSL *s,int fd)
         {
         int ret=0;
         BIO *bio=NULL;
@@ -351,9 +567,7 @@ err:
         return(ret);
         }
 
-int SSL_set_rfd(s, fd)
-SSL *s;
-int fd;
+int SSL_set_rfd(SSL *s,int fd)
         {
         int ret=0;
         BIO *bio=NULL;
@@ -379,61 +593,104 @@ err:
         }
 #endif
 
-int SSL_get_verify_mode(s)
-SSL *s;
+
+/* return length of latest Finished message we sent, copy to 'buf' */
+size_t SSL_get_finished(SSL *s, void *buf, size_t count)
+        {
+        size_t ret = 0;
+        
+        if (s->s3 != NULL)
+                {
+                ret = s->s3->tmp.finish_md_len;
+                if (count > ret)
+                        count = ret;
+                memcpy(buf, s->s3->tmp.finish_md, count);
+                }
+        return ret;
+        }
+
+/* return length of latest Finished message we expected, copy to 'buf' */
+size_t SSL_get_peer_finished(SSL *s, void *buf, size_t count)
+        {
+        size_t ret = 0;
+        
+        if (s->s3 != NULL)
+                {
+                ret = s->s3->tmp.peer_finish_md_len;
+                if (count > ret)
+                        count = ret;
+                memcpy(buf, s->s3->tmp.peer_finish_md, count);
+                }
+        return ret;
+        }
+
+
+int SSL_get_verify_mode(SSL *s)
         {
         return(s->verify_mode);
         }
 
-int (*SSL_get_verify_callback(s))()
-SSL *s;
+int SSL_get_verify_depth(SSL *s)
+        {
+        return(s->verify_depth);
+        }
+
+int (*SSL_get_verify_callback(SSL *s))(int,X509_STORE_CTX *)
         {
         return(s->verify_callback);
         }
 
-int SSL_CTX_get_verify_mode(ctx)
-SSL_CTX *ctx;
+int SSL_CTX_get_verify_mode(SSL_CTX *ctx)
         {
-        return(ctx->default_verify_mode);
+        return(ctx->verify_mode);
         }
 
-int (*SSL_CTX_get_verify_callback(ctx))()
-SSL_CTX *ctx;
+int SSL_CTX_get_verify_depth(SSL_CTX *ctx)
+        {
+        return(ctx->verify_depth);
+        }
+
+int (*SSL_CTX_get_verify_callback(SSL_CTX *ctx))(int,X509_STORE_CTX *)
         {
         return(ctx->default_verify_callback);
         }
 
-void SSL_set_verify(s, mode, callback)
-SSL *s;
-int mode;
-int (*callback)();
+void SSL_set_verify(SSL *s,int mode,
+                    int (*callback)(int ok,X509_STORE_CTX *ctx))
         {
         s->verify_mode=mode;
         if (callback != NULL)
                 s->verify_callback=callback;
         }
 
-void SSL_set_read_ahead(s, yes)
-SSL *s;
-int yes;
+void SSL_set_verify_depth(SSL *s,int depth)
+        {
+        s->verify_depth=depth;
+        }
+
+void SSL_set_read_ahead(SSL *s,int yes)
         {
         s->read_ahead=yes;
         }
 
-int SSL_get_read_ahead(s)
-SSL *s;
+int SSL_get_read_ahead(SSL *s)
         {
         return(s->read_ahead);
         }
 
-int SSL_pending(s)
-SSL *s;
+int SSL_pending(SSL *s)
         {
+        /* SSL_pending cannot work properly if read-ahead is enabled
+         * (SSL_[CTX_]ctrl(..., SSL_CTRL_SET_READ_AHEAD, 1, NULL)),
+         * and it is impossible to fix since SSL_pending cannot report
+         * errors that may be observed while scanning the new data.
+         * (Note that SSL_pending() is often used as a boolean value,
+         * so we'd better not return -1.)
+         */
         return(s->method->ssl_pending(s));
         }
 
-X509 *SSL_get_peer_certificate(s)
-SSL *s;
+X509 *SSL_get_peer_certificate(SSL *s)
         {
         X509 *r;
         
@@ -449,23 +706,24 @@ SSL *s;
         return(r);
         }
 
-STACK *SSL_get_peer_cert_chain(s)
-SSL *s;
+STACK_OF(X509) *SSL_get_peer_cert_chain(SSL *s)
         {
-        STACK *r;
+        STACK_OF(X509) *r;
         
-        if ((s == NULL) || (s->session == NULL) || (s->session->cert == NULL))
+        if ((s == NULL) || (s->session == NULL) || (s->session->sess_cert == NULL))
                 r=NULL;
         else
-                r=s->session->cert->cert_chain;
+                r=s->session->sess_cert->cert_chain;
 
+        /* If we are a client, cert_chain includes the peer's own
+         * certificate; if we are a server, it does not. */
+        
         return(r);
         }
 
 /* Now in theory, since the calling process own 't' it should be safe to
  * modify.  We need to be able to read f without being hassled */
-void SSL_copy_session_id(t,f)
-SSL *t,*f;
+void SSL_copy_session_id(SSL *t,SSL *f)
         {
         CERT *tmp;
 
@@ -490,30 +748,29 @@ SSL *t,*f;
         else
                 t->cert=NULL;
         if (tmp != NULL) ssl_cert_free(tmp);
+        SSL_set_session_id_context(t,f->sid_ctx,f->sid_ctx_length);
         }
 
 /* Fix this so it checks all the valid key/cert options */
-int SSL_CTX_check_private_key(ctx)
-SSL_CTX *ctx;
+int SSL_CTX_check_private_key(SSL_CTX *ctx)
         {
         if (    (ctx == NULL) ||
-                (ctx->default_cert == NULL) ||
-                (ctx->default_cert->key->x509 == NULL))
+                (ctx->cert == NULL) ||
+                (ctx->cert->key->x509 == NULL))
                 {
                 SSLerr(SSL_F_SSL_CTX_CHECK_PRIVATE_KEY,SSL_R_NO_CERTIFICATE_ASSIGNED);
                 return(0);
                 }
-        if      (ctx->default_cert->key->privatekey == NULL)
+        if      (ctx->cert->key->privatekey == NULL)
                 {
                 SSLerr(SSL_F_SSL_CTX_CHECK_PRIVATE_KEY,SSL_R_NO_PRIVATE_KEY_ASSIGNED);
                 return(0);
                 }
-        return(X509_check_private_key(ctx->default_cert->key->x509, ctx->default_cert->key->privatekey));
+        return(X509_check_private_key(ctx->cert->key->x509, ctx->cert->key->privatekey));
         }
 
 /* Fix this function so that it takes an optional type parameter */
-int SSL_check_private_key(ssl)
-SSL *ssl;
+int SSL_check_private_key(SSL *ssl)
         {
         if (ssl == NULL)
                 {
@@ -521,7 +778,10 @@ SSL *ssl;
                 return(0);
                 }
         if (ssl->cert == NULL)
-                return(SSL_CTX_check_private_key(ssl->ctx));
+                {
+                SSLerr(SSL_F_SSL_CHECK_PRIVATE_KEY,SSL_R_NO_CERTIFICATE_ASSIGNED);
+                return 0;
+                }
         if (ssl->cert->key->x509 == NULL)
                 {
                 SSLerr(SSL_F_SSL_CHECK_PRIVATE_KEY,SSL_R_NO_CERTIFICATE_ASSIGNED);
@@ -536,29 +796,37 @@ SSL *ssl;
                 ssl->cert->key->privatekey));
         }
 
-int SSL_accept(s)
-SSL *s;
+int SSL_accept(SSL *s)
         {
+        if (s->handshake_func == 0)
+                /* Not properly initialized yet */
+                SSL_set_accept_state(s);
+
         return(s->method->ssl_accept(s));
         }
 
-int SSL_connect(s)
-SSL *s;
+int SSL_connect(SSL *s)
         {
+        if (s->handshake_func == 0)
+                /* Not properly initialized yet */
+                SSL_set_connect_state(s);
+
         return(s->method->ssl_connect(s));
         }
 
-long SSL_get_default_timeout(s)
-SSL *s;
+long SSL_get_default_timeout(SSL *s)
         {
         return(s->method->get_timeout());
         }
 
-int SSL_read(s,buf,num)
-SSL *s;
-char *buf;
-int num;
+int SSL_read(SSL *s,void *buf,int num)
         {
+        if (s->handshake_func == 0)
+                {
+                SSLerr(SSL_F_SSL_READ, SSL_R_UNINITIALIZED);
+                return -1;
+                }
+
         if (s->shutdown & SSL_RECEIVED_SHUTDOWN)
                 {
                 s->rwstate=SSL_NOTHING;
@@ -567,11 +835,14 @@ int num;
         return(s->method->ssl_read(s,buf,num));
         }
 
-int SSL_peek(s,buf,num)
-SSL *s;
-char *buf;
-int num;
+int SSL_peek(SSL *s,void *buf,int num)
         {
+        if (s->handshake_func == 0)
+                {
+                SSLerr(SSL_F_SSL_READ, SSL_R_UNINITIALIZED);
+                return -1;
+                }
+
         if (s->shutdown & SSL_RECEIVED_SHUTDOWN)
                 {
                 return(0);
@@ -579,11 +850,14 @@ int num;
         return(s->method->ssl_peek(s,buf,num));
         }
 
-int SSL_write(s,buf,num)
-SSL *s;
-char *buf;
-int num;
+int SSL_write(SSL *s,const void *buf,int num)
         {
+        if (s->handshake_func == 0)
+                {
+                SSLerr(SSL_F_SSL_WRITE, SSL_R_UNINITIALIZED);
+                return -1;
+                }
+
         if (s->shutdown & SSL_SENT_SHUTDOWN)
                 {
                 s->rwstate=SSL_NOTHING;
@@ -593,42 +867,176 @@ int num;
         return(s->method->ssl_write(s,buf,num));
         }
 
-int SSL_shutdown(s)
-SSL *s;
+int SSL_shutdown(SSL *s)
         {
+        /* Note that this function behaves differently from what one might
+         * expect.  Return values are 0 for no success (yet),
+         * 1 for success; but calling it once is usually not enough,
+         * even if blocking I/O is used (see ssl3_shutdown).
+         */
+
+        if (s->handshake_func == 0)
+                {
+                SSLerr(SSL_F_SSL_SHUTDOWN, SSL_R_UNINITIALIZED);
+                return -1;
+                }
+
         if ((s != NULL) && !SSL_in_init(s))
                 return(s->method->ssl_shutdown(s));
         else
                 return(1);
         }
 
-int SSL_renegotiate(s)
-SSL *s;
+int SSL_renegotiate(SSL *s)
         {
-        s->new_session=1;
+        if (s->new_session == 0)
+                {
+                s->new_session=1;
+                }
         return(s->method->ssl_renegotiate(s));
         }
 
-long SSL_ctrl(s,cmd,larg,parg)
-SSL *s;
-int cmd;
-long larg;
-char *parg;
+int SSL_renegotiate_pending(SSL *s)
+        {
+        /* becomes true when negotiation is requested;
+         * false again once a handshake has finished */
+        return (s->new_session != 0);
+        }
+
+long SSL_ctrl(SSL *s,int cmd,long larg,void *parg)
         {
-        return(s->method->ssl_ctrl(s,cmd,larg,parg));
+        long l;
+
+        switch (cmd)
+                {
+        case SSL_CTRL_GET_READ_AHEAD:
+                return(s->read_ahead);
+        case SSL_CTRL_SET_READ_AHEAD:
+                l=s->read_ahead;
+                s->read_ahead=larg;
+                return(l);
+
+        case SSL_CTRL_SET_MSG_CALLBACK_ARG:
+                s->msg_callback_arg = parg;
+                return 1;
+
+        case SSL_CTRL_OPTIONS:
+                return(s->options|=larg);
+        case SSL_CTRL_MODE:
+                return(s->mode|=larg);
+        case SSL_CTRL_GET_MAX_CERT_LIST:
+                return(s->max_cert_list);
+        case SSL_CTRL_SET_MAX_CERT_LIST:
+                l=s->max_cert_list;
+                s->max_cert_list=larg;
+                return(l);
+        default:
+                return(s->method->ssl_ctrl(s,cmd,larg,parg));
+                }
+        }
+
+long SSL_callback_ctrl(SSL *s, int cmd, void (*fp)())
+        {
+        switch(cmd)
+                {
+        case SSL_CTRL_SET_MSG_CALLBACK:
+                s->msg_callback = (void (*)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg))(fp);
+                return 1;
+                
+        default:
+                return(s->method->ssl_callback_ctrl(s,cmd,fp));
+                }
         }
 
-long SSL_CTX_ctrl(ctx,cmd,larg,parg)
-SSL_CTX *ctx;
-int cmd;
-long larg;
-char *parg;
+struct lhash_st *SSL_CTX_sessions(SSL_CTX *ctx)
         {
-        return(ctx->method->ssl_ctx_ctrl(ctx,cmd,larg,parg));
+        return ctx->sessions;
         }
 
-int ssl_cipher_id_cmp(a,b)
-SSL_CIPHER *a,*b;
+long SSL_CTX_ctrl(SSL_CTX *ctx,int cmd,long larg,void *parg)
+        {
+        long l;
+
+        switch (cmd)
+                {
+        case SSL_CTRL_GET_READ_AHEAD:
+                return(ctx->read_ahead);
+        case SSL_CTRL_SET_READ_AHEAD:
+                l=ctx->read_ahead;
+                ctx->read_ahead=larg;
+                return(l);
+                
+        case SSL_CTRL_SET_MSG_CALLBACK_ARG:
+                ctx->msg_callback_arg = parg;
+                return 1;
+
+        case SSL_CTRL_GET_MAX_CERT_LIST:
+                return(ctx->max_cert_list);
+        case SSL_CTRL_SET_MAX_CERT_LIST:
+                l=ctx->max_cert_list;
+                ctx->max_cert_list=larg;
+                return(l);
+
+        case SSL_CTRL_SET_SESS_CACHE_SIZE:
+                l=ctx->session_cache_size;
+                ctx->session_cache_size=larg;
+                return(l);
+        case SSL_CTRL_GET_SESS_CACHE_SIZE:
+                return(ctx->session_cache_size);
+        case SSL_CTRL_SET_SESS_CACHE_MODE:
+                l=ctx->session_cache_mode;
+                ctx->session_cache_mode=larg;
+                return(l);
+        case SSL_CTRL_GET_SESS_CACHE_MODE:
+                return(ctx->session_cache_mode);
+
+        case SSL_CTRL_SESS_NUMBER:
+                return(ctx->sessions->num_items);
+        case SSL_CTRL_SESS_CONNECT:
+                return(ctx->stats.sess_connect);
+        case SSL_CTRL_SESS_CONNECT_GOOD:
+                return(ctx->stats.sess_connect_good);
+        case SSL_CTRL_SESS_CONNECT_RENEGOTIATE:
+                return(ctx->stats.sess_connect_renegotiate);
+        case SSL_CTRL_SESS_ACCEPT:
+                return(ctx->stats.sess_accept);
+        case SSL_CTRL_SESS_ACCEPT_GOOD:
+                return(ctx->stats.sess_accept_good);
+        case SSL_CTRL_SESS_ACCEPT_RENEGOTIATE:
+                return(ctx->stats.sess_accept_renegotiate);
+        case SSL_CTRL_SESS_HIT:
+                return(ctx->stats.sess_hit);
+        case SSL_CTRL_SESS_CB_HIT:
+                return(ctx->stats.sess_cb_hit);
+        case SSL_CTRL_SESS_MISSES:
+                return(ctx->stats.sess_miss);
+        case SSL_CTRL_SESS_TIMEOUTS:
+                return(ctx->stats.sess_timeout);
+        case SSL_CTRL_SESS_CACHE_FULL:
+                return(ctx->stats.sess_cache_full);
+        case SSL_CTRL_OPTIONS:
+                return(ctx->options|=larg);
+        case SSL_CTRL_MODE:
+                return(ctx->mode|=larg);
+        default:
+                return(ctx->method->ssl_ctx_ctrl(ctx,cmd,larg,parg));
+                }
+        }
+
+long SSL_CTX_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)())
+        {
+        switch(cmd)
+                {
+        case SSL_CTRL_SET_MSG_CALLBACK:
+                ctx->msg_callback = (void (*)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg))(fp);
+                return 1;
+
+        default:
+                return(ctx->method->ssl_ctx_callback_ctrl(ctx,cmd,fp));
+                }
+        }
+
+int ssl_cipher_id_cmp(const SSL_CIPHER *a, const SSL_CIPHER *b)
         {
         long l;
 
@@ -639,8 +1047,8 @@ SSL_CIPHER *a,*b;
                 return((l > 0)?1:-1);
         }
 
-int ssl_cipher_ptr_id_cmp(ap,bp)
-SSL_CIPHER **ap,**bp;
+int ssl_cipher_ptr_id_cmp(const SSL_CIPHER * const *ap,
+                        const SSL_CIPHER * const *bp)
         {
         long l;
 
@@ -651,10 +1059,9 @@ SSL_CIPHER **ap,**bp;
                 return((l > 0)?1:-1);
         }
 
-/* return a STACK of the ciphers available for the SSL and in order of
+/** return a STACK of the ciphers available for the SSL and in order of
  * preference */
-STACK *SSL_get_ciphers(s)
-SSL *s;
+STACK_OF(SSL_CIPHER) *SSL_get_ciphers(SSL *s)
         {
         if ((s != NULL) && (s->cipher_list != NULL))
                 {
@@ -668,10 +1075,9 @@ SSL *s;
         return(NULL);
         }
 
-/* return a STACK of the ciphers available for the SSL and in order of
+/** return a STACK of the ciphers available for the SSL and in order of
  * algorithm id */
-STACK *ssl_get_ciphers_by_id(s)
-SSL *s;
+STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s)
         {
         if ((s != NULL) && (s->cipher_list_by_id != NULL))
                 {
@@ -685,29 +1091,25 @@ SSL *s;
         return(NULL);
         }
 
-/* The old interface to get the same thing as SSL_get_ciphers() */
-char *SSL_get_cipher_list(s,n)
-SSL *s;
-int n;
+/** The old interface to get the same thing as SSL_get_ciphers() */
+const char *SSL_get_cipher_list(SSL *s,int n)
         {
         SSL_CIPHER *c;
-        STACK *sk;
+        STACK_OF(SSL_CIPHER) *sk;
 
         if (s == NULL) return(NULL);
         sk=SSL_get_ciphers(s);
-        if ((sk == NULL) || (sk_num(sk) <= n))
+        if ((sk == NULL) || (sk_SSL_CIPHER_num(sk) <= n))
                 return(NULL);
-        c=(SSL_CIPHER *)sk_value(sk,n);
+        c=sk_SSL_CIPHER_value(sk,n);
         if (c == NULL) return(NULL);
         return(c->name);
         }
 
-/* specify the ciphers to be used by defaut by the SSL_CTX */
-int SSL_CTX_set_cipher_list(ctx,str)
-SSL_CTX *ctx;
-char *str;
+/** specify the ciphers to be used by default by the SSL_CTX */
+int SSL_CTX_set_cipher_list(SSL_CTX *ctx, const char *str)
         {
-        STACK *sk;
+        STACK_OF(SSL_CIPHER) *sk;
         
         sk=ssl_create_cipher_list(ctx->method,&ctx->cipher_list,
                 &ctx->cipher_list_by_id,str);
@@ -715,12 +1117,10 @@ char *str;
         return((sk == NULL)?0:1);
         }
 
-/* specify the ciphers to be used by the SSL */
-int SSL_set_cipher_list(s, str)
-SSL *s;
-char *str;
+/** specify the ciphers to be used by the SSL */
+int SSL_set_cipher_list(SSL *s,const char *str)
         {
-        STACK *sk;
+        STACK_OF(SSL_CIPHER) *sk;
         
         sk=ssl_create_cipher_list(s->ctx->method,&s->cipher_list,
                 &s->cipher_list_by_id,str);
@@ -729,13 +1129,11 @@ char *str;
         }
 
 /* works well for SSLv2, not so good for SSLv3 */
-char *SSL_get_shared_ciphers(s,buf,len)
-SSL *s;
-char *buf;
-int len;
+char *SSL_get_shared_ciphers(SSL *s,char *buf,int len)
         {
-        char *p,*cp;
-        STACK *sk;
+        char *p;
+        const char *cp;
+        STACK_OF(SSL_CIPHER) *sk;
         SSL_CIPHER *c;
         int i;
 
@@ -745,11 +1143,11 @@ int len;
 
         p=buf;
         sk=s->session->ciphers;
-        for (i=0; i<sk_num(sk); i++)
+        for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
                 {
                 /* Decrement for either the ':' or a '\0' */
                 len--;
-                c=(SSL_CIPHER *)sk_value(sk,i);
+                c=sk_SSL_CIPHER_value(sk,i);
                 for (cp=c->name; *cp; )
                         {
                         if (len-- == 0)
@@ -766,35 +1164,36 @@ int len;
         return(buf);
         }
 
-int ssl_cipher_list_to_bytes(s,sk,p)
-SSL *s;
-STACK *sk;
-unsigned char *p;
+int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p)
         {
         int i,j=0;
         SSL_CIPHER *c;
         unsigned char *q;
+#ifndef OPENSSL_NO_KRB5
+        int nokrb5 = !kssl_tgt_is_available(s->kssl_ctx);
+#endif /* OPENSSL_NO_KRB5 */
 
         if (sk == NULL) return(0);
         q=p;
 
-        for (i=0; i<sk_num(sk); i++)
+        for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
                 {
-                c=(SSL_CIPHER *)sk_value(sk,i);
+                c=sk_SSL_CIPHER_value(sk,i);
+#ifndef OPENSSL_NO_KRB5
+                if ((c->algorithms & SSL_KRB5) && nokrb5)
+                    continue;
+#endif /* OPENSSL_NO_KRB5 */                    
                 j=ssl_put_cipher_by_char(s,c,p);
                 p+=j;
                 }
         return(p-q);
         }
 
-STACK *ssl_bytes_to_cipher_list(s,p,num,skp)
-SSL *s;
-unsigned char *p;
-int num;
-STACK **skp;
+STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s,unsigned char *p,int num,
+                                               STACK_OF(SSL_CIPHER) **skp)
         {
         SSL_CIPHER *c;
-        STACK *sk;
+        STACK_OF(SSL_CIPHER) *sk;
         int i,n;
 
         n=ssl_put_cipher_by_char(s,NULL,NULL);
@@ -804,11 +1203,11 @@ STACK **skp;
                 return(NULL);
                 }
         if ((skp == NULL) || (*skp == NULL))
-                sk=sk_new(NULL); /* change perhaps later */
+                sk=sk_SSL_CIPHER_new_null(); /* change perhaps later */
         else
                 {
                 sk= *skp;
-                sk_zero(sk);
+                sk_SSL_CIPHER_zero(sk);
                 }
 
         for (i=0; i<num; i+=n)
@@ -817,7 +1216,7 @@ STACK **skp;
                 p+=n;
                 if (c != NULL)
                         {
-                        if (!sk_push(sk,(char *)c))
+                        if (!sk_SSL_CIPHER_push(sk,c))
                                 {
                                 SSLerr(SSL_F_SSL_BYTES_TO_CIPHER_LIST,ERR_R_MALLOC_FAILURE);
                                 goto err;
@@ -830,23 +1229,28 @@ STACK **skp;
         return(sk);
 err:
         if ((skp == NULL) || (*skp == NULL))
-                sk_free(sk);
+                sk_SSL_CIPHER_free(sk);
         return(NULL);
         }
 
-unsigned long SSL_SESSION_hash(a)
-SSL_SESSION *a;
+unsigned long SSL_SESSION_hash(SSL_SESSION *a)
         {
         unsigned long l;
 
-        l=      (a->session_id[0]     )|(a->session_id[1]<< 8L)|
-                (a->session_id[2]<<16L)|(a->session_id[3]<<24L);
+        l=(unsigned long)
+                ((unsigned int) a->session_id[0]     )|
+                ((unsigned int) a->session_id[1]<< 8L)|
+                ((unsigned long)a->session_id[2]<<16L)|
+                ((unsigned long)a->session_id[3]<<24L);
         return(l);
         }
 
-int SSL_SESSION_cmp(a, b)
-SSL_SESSION *a;
-SSL_SESSION *b;
+/* NB: If this function (or indeed the hash function which uses a sort of
+ * coarser function than this one) is changed, ensure
+ * SSL_CTX_has_matching_session_id() is checked accordingly. It relies on being
+ * able to construct an SSL_SESSION that will collide with any existing session
+ * with a matching session ID. */
+int SSL_SESSION_cmp(SSL_SESSION *a,SSL_SESSION *b)
         {
         if (a->ssl_version != b->ssl_version)
                 return(1);
@@ -855,17 +1259,29 @@ SSL_SESSION *b;
         return(memcmp(a->session_id,b->session_id,a->session_id_length));
         }
 
-SSL_CTX *SSL_CTX_new(meth)
-SSL_METHOD *meth;
+/* These wrapper functions should remain rather than redeclaring
+ * SSL_SESSION_hash and SSL_SESSION_cmp for void* types and casting each
+ * variable. The reason is that the functions aren't static, they're exposed via
+ * ssl.h. */
+static IMPLEMENT_LHASH_HASH_FN(SSL_SESSION_hash, SSL_SESSION *)
+static IMPLEMENT_LHASH_COMP_FN(SSL_SESSION_cmp, SSL_SESSION *)
+
+SSL_CTX *SSL_CTX_new(SSL_METHOD *meth)
         {
-        SSL_CTX *ret;
+        SSL_CTX *ret=NULL;
         
         if (meth == NULL)
                 {
                 SSLerr(SSL_F_SSL_CTX_NEW,SSL_R_NULL_SSL_METHOD_PASSED);
                 return(NULL);
                 }
-        ret=(SSL_CTX *)Malloc(sizeof(SSL_CTX));
+
+        if (SSL_get_ex_data_X509_STORE_CTX_idx() < 0)
+                {
+                SSLerr(SSL_F_SSL_CTX_NEW,SSL_R_X509_VERIFICATION_SETUP_PROBLEMS);
+                goto err;
+                }
+        ret=(SSL_CTX *)OPENSSL_malloc(sizeof(SSL_CTX));
         if (ret == NULL)
                 goto err;
 
@@ -882,21 +1298,12 @@ SSL_METHOD *meth;
         /* We take the system default */
         ret->session_timeout=meth->get_timeout();
 
-        ret->new_session_cb=NULL;
-        ret->remove_session_cb=NULL;
-        ret->get_session_cb=NULL;
-
-        ret->sess_connect=0;
-        ret->sess_connect_good=0;
-        ret->sess_accept=0;
-        ret->sess_accept_renegotiate=0;
-        ret->sess_connect_renegotiate=0;
-        ret->sess_accept_good=0;
-        ret->sess_miss=0;
-        ret->sess_timeout=0;
-        ret->sess_cache_full=0;
-        ret->sess_hit=0;
-        ret->sess_cb_hit=0;
+        ret->new_session_cb=0;
+        ret->remove_session_cb=0;
+        ret->get_session_cb=0;
+        ret->generate_session_id=0;
+
+        memset((char *)&ret->stats,0,sizeof(ret->stats));
 
         ret->references=1;
         ret->quiet_shutdown=0;
@@ -909,19 +1316,26 @@ SSL_METHOD *meth;
 
         ret->info_callback=NULL;
 
-        ret->app_verify_callback=NULL;
+        ret->app_verify_callback=0;
         ret->app_verify_arg=NULL;
 
-        ret->default_read_ahead=0;
-        ret->default_verify_mode=SSL_VERIFY_NONE;
+        ret->max_cert_list=SSL_MAX_CERT_LIST_DEFAULT;
+        ret->read_ahead=0;
+        ret->msg_callback=0;
+        ret->msg_callback_arg=NULL;
+        ret->verify_mode=SSL_VERIFY_NONE;
+        ret->verify_depth=-1; /* Don't impose a limit (but x509_lu.c does) */
+        ret->sid_ctx_length=0;
         ret->default_verify_callback=NULL;
-        if ((ret->default_cert=ssl_cert_new()) == NULL)
+        if ((ret->cert=ssl_cert_new()) == NULL)
                 goto err;
 
-        ret->default_passwd_callback=NULL;
-        ret->client_cert_cb=NULL;
+        ret->default_passwd_callback=0;
+        ret->default_passwd_callback_userdata=NULL;
+        ret->client_cert_cb=0;
 
-        ret->sessions=lh_new(SSL_SESSION_hash,SSL_SESSION_cmp);
+        ret->sessions=lh_new(LHASH_HASH_FN(SSL_SESSION_hash),
+                        LHASH_COMP_FN(SSL_SESSION_cmp));
         if (ret->sessions == NULL) goto err;
         ret->cert_store=X509_STORE_new();
         if (ret->cert_store == NULL) goto err;
@@ -929,7 +1343,8 @@ SSL_METHOD *meth;
         ssl_create_cipher_list(ret->method,
                 &ret->cipher_list,&ret->cipher_list_by_id,
                 SSL_DEFAULT_CIPHER_LIST);
-        if ((ret->cipher_list == NULL) || (sk_num(ret->cipher_list) <= 0))
+        if (ret->cipher_list == NULL
+            || sk_SSL_CIPHER_num(ret->cipher_list) <= 0)
                 {
                 SSLerr(SSL_F_SSL_CTX_NEW,SSL_R_LIBRARY_HAS_NO_CIPHERS);
                 goto err2;
@@ -951,10 +1366,13 @@ SSL_METHOD *meth;
                 goto err2;
                 }
 
-        if ((ret->client_CA=sk_new_null()) == NULL)
+        if ((ret->client_CA=sk_X509_NAME_new_null()) == NULL)
                 goto err;
 
-        CRYPTO_new_ex_data(ssl_ctx_meth,(char *)ret,&ret->ex_data);
+        CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_CTX, ret, &ret->ex_data);
+
+        ret->extra_certs=NULL;
+        ret->comp_methods=SSL_COMP_get_compression_methods();
 
         return(ret);
 err:
@@ -964,8 +1382,12 @@ err2:
         return(NULL);
         }
 
-void SSL_CTX_free(a)
-SSL_CTX *a;
+#if 0
+static void SSL_COMP_free(SSL_COMP *comp)
+    { OPENSSL_free(comp); }
+#endif
+
+void SSL_CTX_free(SSL_CTX *a)
         {
         int i;
 
@@ -983,7 +1405,7 @@ SSL_CTX *a;
                 abort(); /* ok */
                 }
 #endif
-        CRYPTO_free_ex_data(ssl_ctx_meth,(char *)a,&a->ex_data);
+        CRYPTO_free_ex_data(CRYPTO_EX_INDEX_SSL_CTX, a, &a->ex_data);
 
         if (a->sessions != NULL)
                 {
@@ -993,96 +1415,105 @@ SSL_CTX *a;
         if (a->cert_store != NULL)
                 X509_STORE_free(a->cert_store);
         if (a->cipher_list != NULL)
-                sk_free(a->cipher_list);
+                sk_SSL_CIPHER_free(a->cipher_list);
         if (a->cipher_list_by_id != NULL)
-                sk_free(a->cipher_list_by_id);
-        if (a->default_cert != NULL)
-                ssl_cert_free(a->default_cert);
+                sk_SSL_CIPHER_free(a->cipher_list_by_id);
+        if (a->cert != NULL)
+                ssl_cert_free(a->cert);
         if (a->client_CA != NULL)
-                sk_pop_free(a->client_CA,X509_NAME_free);
-        Free((char *)a);
+                sk_X509_NAME_pop_free(a->client_CA,X509_NAME_free);
+        if (a->extra_certs != NULL)
+                sk_X509_pop_free(a->extra_certs,X509_free);
+#if 0 /* This should never be done, since it removes a global database */
+        if (a->comp_methods != NULL)
+                sk_SSL_COMP_pop_free(a->comp_methods,SSL_COMP_free);
+#else
+        a->comp_methods = NULL;
+#endif
+        OPENSSL_free(a);
         }
 
-void SSL_CTX_set_default_passwd_cb(ctx,cb)
-SSL_CTX *ctx;
-int (*cb)();
+void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb)
         {
         ctx->default_passwd_callback=cb;
         }
 
-void SSL_CTX_set_cert_verify_cb(ctx,cb,arg)
-SSL_CTX *ctx;
-int (*cb)();
-char *arg;
+void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx,void *u)
+        {
+        ctx->default_passwd_callback_userdata=u;
+        }
+
+void SSL_CTX_set_cert_verify_callback(SSL_CTX *ctx, int (*cb)(X509_STORE_CTX *,void *), void *arg)
         {
         ctx->app_verify_callback=cb;
         ctx->app_verify_arg=arg;
         }
 
-void SSL_CTX_set_verify(ctx,mode,cb)
-SSL_CTX *ctx;
-int mode;
-int (*cb)();
+void SSL_CTX_set_verify(SSL_CTX *ctx,int mode,int (*cb)(int, X509_STORE_CTX *))
         {
-        ctx->default_verify_mode=mode;
+        ctx->verify_mode=mode;
         ctx->default_verify_callback=cb;
-        /* This needs cleaning up EAY EAY EAY */
-        X509_STORE_set_verify_cb_func(ctx->cert_store,cb);
         }
 
-void ssl_set_cert_masks(c)
-CERT *c;
+void SSL_CTX_set_verify_depth(SSL_CTX *ctx,int depth)
+        {
+        ctx->verify_depth=depth;
+        }
+
+void ssl_set_cert_masks(CERT *c, SSL_CIPHER *cipher)
         {
         CERT_PKEY *cpk;
         int rsa_enc,rsa_tmp,rsa_sign,dh_tmp,dh_rsa,dh_dsa,dsa_sign;
         int rsa_enc_export,dh_rsa_export,dh_dsa_export;
-        int rsa_tmp_export,dh_tmp_export;
+        int rsa_tmp_export,dh_tmp_export,kl;
         unsigned long mask,emask;
 
-        if ((c == NULL) || (c->valid)) return;
+        if (c == NULL) return;
 
-#ifndef NO_RSA
-        rsa_tmp=((c->rsa_tmp != NULL) || (c->rsa_tmp_cb != NULL))?1:0;
-        rsa_tmp_export=((c->rsa_tmp_cb != NULL) ||
-                (rsa_tmp && (RSA_size(c->rsa_tmp)*8 <= 512)))?1:0;
+        kl=SSL_C_EXPORT_PKEYLENGTH(cipher);
+
+#ifndef OPENSSL_NO_RSA
+        rsa_tmp=(c->rsa_tmp != NULL || c->rsa_tmp_cb != NULL);
+        rsa_tmp_export=(c->rsa_tmp_cb != NULL ||
+                (rsa_tmp && RSA_size(c->rsa_tmp)*8 <= kl));
 #else
         rsa_tmp=rsa_tmp_export=0;
 #endif
-#ifndef NO_DH
-        dh_tmp=((c->dh_tmp != NULL) || (c->dh_tmp_cb != NULL))?1:0;
-        dh_tmp_export=((c->dh_tmp_cb != NULL) ||
-                (dh_tmp && (DH_size(c->dh_tmp)*8 <= 512)))?1:0;
+#ifndef OPENSSL_NO_DH
+        dh_tmp=(c->dh_tmp != NULL || c->dh_tmp_cb != NULL);
+        dh_tmp_export=(c->dh_tmp_cb != NULL ||
+                (dh_tmp && DH_size(c->dh_tmp)*8 <= kl));
 #else
         dh_tmp=dh_tmp_export=0;
 #endif
 
         cpk= &(c->pkeys[SSL_PKEY_RSA_ENC]);
-        rsa_enc= ((cpk->x509 != NULL) && (cpk->privatekey != NULL))?1:0;
-        rsa_enc_export=(rsa_enc && (EVP_PKEY_size(cpk->privatekey)*8 <= 512))?1:0;
+        rsa_enc= (cpk->x509 != NULL && cpk->privatekey != NULL);
+        rsa_enc_export=(rsa_enc && EVP_PKEY_size(cpk->privatekey)*8 <= kl);
         cpk= &(c->pkeys[SSL_PKEY_RSA_SIGN]);
-        rsa_sign=((cpk->x509 != NULL) && (cpk->privatekey != NULL))?1:0;
+        rsa_sign=(cpk->x509 != NULL && cpk->privatekey != NULL);
         cpk= &(c->pkeys[SSL_PKEY_DSA_SIGN]);
-        dsa_sign=((cpk->x509 != NULL) && (cpk->privatekey != NULL))?1:0;
+        dsa_sign=(cpk->x509 != NULL && cpk->privatekey != NULL);
         cpk= &(c->pkeys[SSL_PKEY_DH_RSA]);
-        dh_rsa=  ((cpk->x509 != NULL) && (cpk->privatekey != NULL))?1:0;
-        dh_rsa_export=(dh_rsa && (EVP_PKEY_size(cpk->privatekey)*8 <= 512))?1:0;
+        dh_rsa=  (cpk->x509 != NULL && cpk->privatekey != NULL);
+        dh_rsa_export=(dh_rsa && EVP_PKEY_size(cpk->privatekey)*8 <= kl);
         cpk= &(c->pkeys[SSL_PKEY_DH_DSA]);
 /* FIX THIS EAY EAY EAY */
-        dh_dsa=  ((cpk->x509 != NULL) && (cpk->privatekey != NULL))?1:0;
-        dh_dsa_export=(dh_dsa && (EVP_PKEY_size(cpk->privatekey)*8 <= 512))?1:0;
+        dh_dsa=  (cpk->x509 != NULL && cpk->privatekey != NULL);
+        dh_dsa_export=(dh_dsa && EVP_PKEY_size(cpk->privatekey)*8 <= kl);
 
         mask=0;
         emask=0;
 
 #ifdef CIPHER_DEBUG
-        printf("rt=%d dht=%d re=%d rs=%d ds=%d dhr=%d dhd=%d\n",
-                rsa_tmp,dh_tmp,
-                rsa_enc,rsa_sign,dsa_sign,dh_rsa,dh_dsa);
+        printf("rt=%d rte=%d dht=%d re=%d ree=%d rs=%d ds=%d dhr=%d dhd=%d\n",
+                rsa_tmp,rsa_tmp_export,dh_tmp,
+                rsa_enc,rsa_enc_export,rsa_sign,dsa_sign,dh_rsa,dh_dsa);
 #endif
 
         if (rsa_enc || (rsa_tmp && rsa_sign))
                 mask|=SSL_kRSA;
-        if (rsa_enc_export || (rsa_tmp_export && rsa_sign))
+        if (rsa_enc_export || (rsa_tmp_export && (rsa_sign || rsa_enc)))
                 emask|=SSL_kRSA;
 
 #if 0
@@ -1119,9 +1550,12 @@ CERT *c;
                 emask|=SSL_aDSS;
                 }
 
-#ifdef SSL_ALLOW_ADH
         mask|=SSL_aNULL;
         emask|=SSL_aNULL;
+
+#ifndef OPENSSL_NO_KRB5
+        mask|=SSL_kKRB5|SSL_aKRB5;
+        emask|=SSL_kKRB5|SSL_aKRB5;
 #endif
 
         c->mask=mask;
@@ -1130,18 +1564,17 @@ CERT *c;
         }
 
 /* THIS NEEDS CLEANING UP */
-X509 *ssl_get_server_send_cert(s)
-SSL *s;
+X509 *ssl_get_server_send_cert(SSL *s)
         {
         unsigned long alg,mask,kalg;
         CERT *c;
-        int i,export;
+        int i,is_export;
 
         c=s->cert;
-        ssl_set_cert_masks(c);
+        ssl_set_cert_masks(c, s->s3->tmp.new_cipher);
         alg=s->s3->tmp.new_cipher->algorithms;
-        export=(alg & SSL_EXPORT)?1:0;
-        mask=(export)?c->export_mask:c->mask;
+        is_export=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher);
+        mask=is_export?c->export_mask:c->mask;
         kalg=alg&(SSL_MKEY_MASK|SSL_AUTH_MASK);
 
         if      (kalg & SSL_kDHr)
@@ -1157,18 +1590,21 @@ SSL *s;
                 else
                         i=SSL_PKEY_RSA_ENC;
                 }
+        else if (kalg & SSL_aKRB5)
+                {
+                /* VRS something else here? */
+                return(NULL);
+                }
         else /* if (kalg & SSL_aNULL) */
                 {
-                SSLerr(SSL_F_SSL_GET_SERVER_SEND_CERT,SSL_R_INTERNAL_ERROR);
+                SSLerr(SSL_F_SSL_GET_SERVER_SEND_CERT,ERR_R_INTERNAL_ERROR);
                 return(NULL);
                 }
         if (c->pkeys[i].x509 == NULL) return(NULL);
         return(c->pkeys[i].x509);
         }
 
-EVP_PKEY *ssl_get_sign_pkey(s,cipher)
-SSL *s;
-SSL_CIPHER *cipher;
+EVP_PKEY *ssl_get_sign_pkey(SSL *s,SSL_CIPHER *cipher)
         {
         unsigned long alg;
         CERT *c;
@@ -1190,14 +1626,12 @@ SSL_CIPHER *cipher;
                 }
         else /* if (alg & SSL_aNULL) */
                 {
-                SSLerr(SSL_F_SSL_GET_SIGN_PKEY,SSL_R_INTERNAL_ERROR);
+                SSLerr(SSL_F_SSL_GET_SIGN_PKEY,ERR_R_INTERNAL_ERROR);
                 return(NULL);
                 }
         }
 
-void ssl_update_cache(s,mode)
-SSL *s;
-int mode;
+void ssl_update_cache(SSL *s,int mode)
         {
         int i;
 
@@ -1205,9 +1639,10 @@ int mode;
          * and it would be rather hard to do anyway :-) */
         if (s->session->session_id_length == 0) return;
 
-        if ((s->ctx->session_cache_mode & mode)
-                && (!s->hit)
-                && SSL_CTX_add_session(s->ctx,s->session)
+        i=s->ctx->session_cache_mode;
+        if ((i & mode) && (!s->hit)
+                && ((i & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP)
+                    || SSL_CTX_add_session(s->ctx,s->session))
                 && (s->ctx->new_session_cb != NULL))
                 {
                 CRYPTO_add(&s->session->references,1,CRYPTO_LOCK_SSL_SESSION);
@@ -1216,28 +1651,24 @@ int mode;
                 }
 
         /* auto flush every 255 connections */
-        i=s->ctx->session_cache_mode;
         if ((!(i & SSL_SESS_CACHE_NO_AUTO_CLEAR)) &&
                 ((i & mode) == mode))
                 {
                 if (  (((mode & SSL_SESS_CACHE_CLIENT)
-                        ?s->ctx->sess_connect_good
-                        :s->ctx->sess_accept_good) & 0xff) == 0xff)
+                        ?s->ctx->stats.sess_connect_good
+                        :s->ctx->stats.sess_accept_good) & 0xff) == 0xff)
                         {
                         SSL_CTX_flush_sessions(s->ctx,time(NULL));
                         }
                 }
         }
 
-SSL_METHOD *SSL_get_ssl_method(s)
-SSL *s;
+SSL_METHOD *SSL_get_ssl_method(SSL *s)
         {
         return(s->method);
         }
 
-int SSL_set_ssl_method(s,meth)
-SSL *s;
-SSL_METHOD *meth;
+int SSL_set_ssl_method(SSL *s,SSL_METHOD *meth)
         {
         int conn= -1;
         int ret=1;
@@ -1264,17 +1695,23 @@ SSL_METHOD *meth;
         return(ret);
         }
 
-int SSL_get_error(s,i)
-SSL *s;
-int i;
+int SSL_get_error(SSL *s,int i)
         {
         int reason;
+        unsigned long l;
         BIO *bio;
 
         if (i > 0) return(SSL_ERROR_NONE);
 
-        if (ERR_peek_error() != 0)
-                return(SSL_ERROR_SSL);
+        /* Make things return SSL_ERROR_SYSCALL when doing SSL_do_handshake
+         * etc, where we do encode the error */
+        if ((l=ERR_peek_error()) != 0)
+                {
+                if (ERR_GET_LIB(l) == ERR_LIB_SYS)
+                        return(SSL_ERROR_SYSCALL);
+                else
+                        return(SSL_ERROR_SSL);
+                }
 
         if ((i < 0) && SSL_want_read(s))
                 {
@@ -1282,12 +1719,23 @@ int i;
                 if (BIO_should_read(bio))
                         return(SSL_ERROR_WANT_READ);
                 else if (BIO_should_write(bio))
+                        /* This one doesn't make too much sense ... We never try
+                         * to write to the rbio, and an application program where
+                         * rbio and wbio are separate couldn't even know what it
+                         * should wait for.
+                         * However if we ever set s->rwstate incorrectly
+                         * (so that we have SSL_want_read(s) instead of
+                         * SSL_want_write(s)) and rbio and wbio *are* the same,
+                         * this test works around that bug; so it might be safer
+                         * to keep it. */
                         return(SSL_ERROR_WANT_WRITE);
                 else if (BIO_should_io_special(bio))
                         {
                         reason=BIO_get_retry_reason(bio);
                         if (reason == BIO_RR_CONNECT)
                                 return(SSL_ERROR_WANT_CONNECT);
+                        else if (reason == BIO_RR_ACCEPT)
+                                return(SSL_ERROR_WANT_ACCEPT);
                         else
                                 return(SSL_ERROR_SYSCALL); /* unknown */
                         }
@@ -1299,12 +1747,15 @@ int i;
                 if (BIO_should_write(bio))
                         return(SSL_ERROR_WANT_WRITE);
                 else if (BIO_should_read(bio))
+                        /* See above (SSL_want_read(s) with BIO_should_write(bio)) */
                         return(SSL_ERROR_WANT_READ);
                 else if (BIO_should_io_special(bio))
                         {
                         reason=BIO_get_retry_reason(bio);
                         if (reason == BIO_RR_CONNECT)
                                 return(SSL_ERROR_WANT_CONNECT);
+                        else if (reason == BIO_RR_ACCEPT)
+                                return(SSL_ERROR_WANT_ACCEPT);
                         else
                                 return(SSL_ERROR_SYSCALL);
                         }
@@ -1331,8 +1782,7 @@ int i;
         return(SSL_ERROR_SYSCALL);
         }
 
-int SSL_do_handshake(s)
-SSL *s;
+int SSL_do_handshake(SSL *s)
         {
         int ret=1;
 
@@ -1341,7 +1791,9 @@ SSL *s;
                 SSLerr(SSL_F_SSL_DO_HANDSHAKE,SSL_R_CONNECTION_TYPE_NOT_SET);
                 return(-1);
                 }
-        if (s->s3->renegotiate) ssl3_renegotiate_check(s);
+
+        s->method->ssl_renegotiate_check(s);
+
         if (SSL_in_init(s) || SSL_in_before(s))
                 {
                 ret=s->handshake_func(s);
@@ -1351,9 +1803,9 @@ SSL *s;
 
 /* For the next 2 functions, SSL_clear() sets shutdown and so
  * one of these calls will reset it */
-void SSL_set_accept_state(s)
-SSL *s;
+void SSL_set_accept_state(SSL *s)
         {
+        s->server=1;
         s->shutdown=0;
         s->state=SSL_ST_ACCEPT|SSL_ST_BEFORE;
         s->handshake_func=s->method->ssl_accept;
@@ -1361,9 +1813,9 @@ SSL *s;
         ssl_clear_cipher_ctx(s);
         }
 
-void SSL_set_connect_state(s)
-SSL *s;
+void SSL_set_connect_state(SSL *s)
         {
+        s->server=0;
         s->shutdown=0;
         s->state=SSL_ST_CONNECT|SSL_ST_BEFORE;
         s->handshake_func=s->method->ssl_connect;
@@ -1371,22 +1823,19 @@ SSL *s;
         ssl_clear_cipher_ctx(s);
         }
 
-int ssl_undefined_function(s)
-SSL *s;
+int ssl_undefined_function(SSL *s)
         {
         SSLerr(SSL_F_SSL_UNDEFINED_FUNCTION,ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
         return(0);
         }
 
-SSL_METHOD *ssl_bad_method(ver)
-int ver;
+SSL_METHOD *ssl_bad_method(int ver)
         {
         SSLerr(SSL_F_SSL_BAD_METHOD,ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
         return(NULL);
         }
 
-char *SSL_get_version(s)
-SSL *s;
+const char *SSL_get_version(SSL *s)
         {
         if (s->version == TLS1_VERSION)
                 return("TLSv1");
@@ -1398,30 +1847,67 @@ SSL *s;
                 return("unknown");
         }
 
-SSL *SSL_dup(s)
-SSL *s;
-        {
-        STACK *sk;
+SSL *SSL_dup(SSL *s)
+        {
+        STACK_OF(X509_NAME) *sk;
         X509_NAME *xn;
-        SSL *ret;
+        SSL *ret;
         int i;
                  
-        if ((ret=SSL_new(SSL_get_SSL_CTX(s))) == NULL) return(NULL);
-                          
-        /* This copies version, session-id, SSL_METHOD and 'cert' */
-        SSL_copy_session_id(ret,s);
+        if ((ret=SSL_new(SSL_get_SSL_CTX(s))) == NULL)
+            return(NULL);
+
+        ret->version = s->version;
+        ret->type = s->type;
+        ret->method = s->method;
+
+        if (s->session != NULL)
+                {
+                /* This copies session-id, SSL_METHOD, sid_ctx, and 'cert' */
+                SSL_copy_session_id(ret,s);
+                }
+        else
+                {
+                /* No session has been established yet, so we have to expect
+                 * that s->cert or ret->cert will be changed later --
+                 * they should not both point to the same object,
+                 * and thus we can't use SSL_copy_session_id. */
 
+                ret->method = s->method;
+                ret->method->ssl_new(ret);
+
+                if (s->cert != NULL)
+                        {
+                        if (ret->cert != NULL)
+                                {
+                                ssl_cert_free(ret->cert);
+                                }
+                        ret->cert = ssl_cert_dup(s->cert);
+                        if (ret->cert == NULL)
+                                goto err;
+                        }
+                                
+                SSL_set_session_id_context(ret,
+                        s->sid_ctx, s->sid_ctx_length);
+                }
+
+        ret->options=s->options;
+        ret->mode=s->mode;
+        SSL_set_max_cert_list(ret,SSL_get_max_cert_list(s));
         SSL_set_read_ahead(ret,SSL_get_read_ahead(s));
+        ret->msg_callback = s->msg_callback;
+        ret->msg_callback_arg = s->msg_callback_arg;
         SSL_set_verify(ret,SSL_get_verify_mode(s),
                 SSL_get_verify_callback(s));
+        SSL_set_verify_depth(ret,SSL_get_verify_depth(s));
+        ret->generate_session_id = s->generate_session_id;
 
         SSL_set_info_callback(ret,SSL_get_info_callback(s));
         
         ret->debug=s->debug;
-        ret->options=s->options;
 
         /* copy app data, a little dangerous perhaps */
-        if (!CRYPTO_dup_ex_data(ssl_meth,&ret->ex_data,&s->ex_data))
+        if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_SSL, &ret->ex_data, &s->ex_data))
                 goto err;
 
         /* setup rbio, and wbio */
@@ -1440,27 +1926,40 @@ SSL *s;
                 else
                         ret->wbio=ret->rbio;
                 }
+        ret->rwstate = s->rwstate;
+        ret->in_handshake = s->in_handshake;
+        ret->handshake_func = s->handshake_func;
+        ret->server = s->server;
+        ret->new_session = s->new_session;
+        ret->quiet_shutdown = s->quiet_shutdown;
+        ret->shutdown=s->shutdown;
+        ret->state=s->state; /* SSL_dup does not really work at any state, though */
+        ret->rstate=s->rstate;
+        ret->init_num = 0; /* would have to copy ret->init_buf, ret->init_msg, ret->init_num, ret->init_off */
+        ret->hit=s->hit;
+        ret->purpose=s->purpose;
+        ret->trust=s->trust;
 
         /* dup the cipher_list and cipher_list_by_id stacks */
         if (s->cipher_list != NULL)
                 {
-                if ((ret->cipher_list=sk_dup(s->cipher_list)) == NULL)
+                if ((ret->cipher_list=sk_SSL_CIPHER_dup(s->cipher_list)) == NULL)
                         goto err;
                 }
         if (s->cipher_list_by_id != NULL)
-                if ((ret->cipher_list_by_id=sk_dup(s->cipher_list_by_id))
+                if ((ret->cipher_list_by_id=sk_SSL_CIPHER_dup(s->cipher_list_by_id))
                         == NULL)
                         goto err;
 
         /* Dup the client_CA list */
         if (s->client_CA != NULL)
                 {
-                if ((sk=sk_dup(s->client_CA)) == NULL) goto err;
+                if ((sk=sk_X509_NAME_dup(s->client_CA)) == NULL) goto err;
                 ret->client_CA=sk;
-                for (i=0; i<sk_num(sk); i++)
+                for (i=0; i<sk_X509_NAME_num(sk); i++)
                         {
-                        xn=(X509_NAME *)sk_value(sk,i);
-                        if ((sk_value(sk,i)=(char *)X509_NAME_dup(xn)) == NULL)
+                        xn=sk_X509_NAME_value(sk,i);
+                        if (sk_X509_NAME_set(sk,i,X509_NAME_dup(xn)) == NULL)
                                 {
                                 X509_NAME_free(xn);
                                 goto err;
@@ -1468,10 +1967,6 @@ SSL *s;
                         }
                 }
 
-        ret->shutdown=s->shutdown;
-        ret->state=s->state;
-        ret->handshake_func=s->handshake_func;
-
         if (0)
                 {
 err:
@@ -1481,26 +1976,34 @@ err:
         return(ret);
         }
 
-void ssl_clear_cipher_ctx(s)
-SSL *s;
+void ssl_clear_cipher_ctx(SSL *s)
         {
-        if (s->enc_read_ctx != NULL)
-                {
-                EVP_CIPHER_CTX_cleanup(s->enc_read_ctx);
-                Free(s->enc_read_ctx);
-                s->enc_read_ctx=NULL;
-                }
-        if (s->enc_write_ctx != NULL)
-                {
-                EVP_CIPHER_CTX_cleanup(s->enc_write_ctx);
-                Free(s->enc_write_ctx);
-                s->enc_write_ctx=NULL;
-                }
+        if (s->enc_read_ctx != NULL)
+                {
+                EVP_CIPHER_CTX_cleanup(s->enc_read_ctx);
+                OPENSSL_free(s->enc_read_ctx);
+                s->enc_read_ctx=NULL;
+                }
+        if (s->enc_write_ctx != NULL)
+                {
+                EVP_CIPHER_CTX_cleanup(s->enc_write_ctx);
+                OPENSSL_free(s->enc_write_ctx);
+                s->enc_write_ctx=NULL;
+                }
+        if (s->expand != NULL)
+                {
+                COMP_CTX_free(s->expand);
+                s->expand=NULL;
+                }
+        if (s->compress != NULL)
+                {
+                COMP_CTX_free(s->compress);
+                s->compress=NULL;
+                }
         }
 
 /* Fix this function so that it takes an optional type parameter */
-X509 *SSL_get_certificate(s)
-SSL *s;
+X509 *SSL_get_certificate(SSL *s)
         {
         if (s->cert != NULL)
                 return(s->cert->key->x509);
@@ -1509,8 +2012,7 @@ SSL *s;
         }
 
 /* Fix this function so that it takes an optional type parameter */
-EVP_PKEY *SSL_get_privatekey(s)
-SSL *s;
+EVP_PKEY *SSL_get_privatekey(SSL *s)
         {
         if (s->cert != NULL)
                 return(s->cert->key->privatekey);
@@ -1518,17 +2020,14 @@ SSL *s;
                 return(NULL);
         }
 
-SSL_CIPHER *SSL_get_current_cipher(s)
-SSL *s;
+SSL_CIPHER *SSL_get_current_cipher(SSL *s)
         {
-        if ((s->session != NULL) && (s->session->cipher != NULL))
-                return(s->session->cipher);
-        return(NULL);
+        if ((s->session != NULL) && (s->session->cipher != NULL))
+                return(s->session->cipher);
+        return(NULL);
         }
 
-int ssl_init_wbio_buffer(s,push)
-SSL *s;
-int push;
+int ssl_init_wbio_buffer(SSL *s,int push)
         {
         BIO *bbio;
 
@@ -1544,7 +2043,7 @@ int push;
                 if (s->bbio == s->wbio)
                         s->wbio=BIO_pop(s->wbio);
                 }
-        BIO_reset(bbio);
+        (void)BIO_reset(bbio);
 /*      if (!BIO_set_write_buffer_size(bbio,16*1024)) */
         if (!BIO_set_read_buffer_size(bbio,1))
                 {
@@ -1563,159 +2062,230 @@ int push;
                 }
         return(1);
         }
+
+void ssl_free_wbio_buffer(SSL *s)
+        {
+        if (s->bbio == NULL) return;
+
+        if (s->bbio == s->wbio)
+                {
+                /* remove buffering */
+                s->wbio=BIO_pop(s->wbio);
+#ifdef REF_CHECK /* not the usual REF_CHECK, but this avoids adding one more preprocessor symbol */
+                assert(s->wbio != NULL);
+#endif  
+        }
+        BIO_free(s->bbio);
+        s->bbio=NULL;
+        }
         
-void SSL_CTX_set_quiet_shutdown(ctx,mode)
-SSL_CTX *ctx;
-int mode;
+void SSL_CTX_set_quiet_shutdown(SSL_CTX *ctx,int mode)
         {
         ctx->quiet_shutdown=mode;
         }
 
-int SSL_CTX_get_quiet_shutdown(ctx)
-SSL_CTX *ctx;
+int SSL_CTX_get_quiet_shutdown(SSL_CTX *ctx)
         {
         return(ctx->quiet_shutdown);
         }
 
-void SSL_set_quiet_shutdown(s,mode)
-SSL *s;
-int mode;
+void SSL_set_quiet_shutdown(SSL *s,int mode)
         {
         s->quiet_shutdown=mode;
         }
 
-int SSL_get_quiet_shutdown(s)
-SSL *s;
+int SSL_get_quiet_shutdown(SSL *s)
         {
         return(s->quiet_shutdown);
         }
 
-void SSL_set_shutdown(s,mode)
-SSL *s;
-int mode;
+void SSL_set_shutdown(SSL *s,int mode)
         {
         s->shutdown=mode;
         }
 
-int SSL_get_shutdown(s)
-SSL *s;
+int SSL_get_shutdown(SSL *s)
         {
         return(s->shutdown);
         }
 
-int SSL_version(s)
-SSL *s;
+int SSL_version(SSL *s)
         {
         return(s->version);
         }
 
-SSL_CTX *SSL_get_SSL_CTX(ssl)
-SSL *ssl;
+SSL_CTX *SSL_get_SSL_CTX(SSL *ssl)
         {
         return(ssl->ctx);
         }
 
-int SSL_CTX_set_default_verify_paths(ctx)
-SSL_CTX *ctx;
+#ifndef OPENSSL_NO_STDIO
+int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx)
         {
         return(X509_STORE_set_default_paths(ctx->cert_store));
         }
 
-int SSL_CTX_load_verify_locations(ctx,CAfile,CApath)
-SSL_CTX *ctx;
-char *CAfile;
-char *CApath;
+int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
+                const char *CApath)
         {
         return(X509_STORE_load_locations(ctx->cert_store,CAfile,CApath));
         }
+#endif
 
-void SSL_set_info_callback(ssl,cb)
-SSL *ssl;
-void (*cb)();
+void SSL_set_info_callback(SSL *ssl,
+                           void (*cb)(const SSL *ssl,int type,int val))
         {
         ssl->info_callback=cb;
         }
 
-void (*SSL_get_info_callback(ssl))()
-SSL *ssl;
+void (*SSL_get_info_callback(SSL *ssl))(const SSL *ssl,int type,int val)
         {
-        return(ssl->info_callback);
+        return ssl->info_callback;
         }
 
-int SSL_state(ssl)
-SSL *ssl;
+int SSL_state(SSL *ssl)
         {
         return(ssl->state);
         }
 
-void SSL_set_verify_result(ssl,arg)
-SSL *ssl;
-long arg;
+void SSL_set_verify_result(SSL *ssl,long arg)
         {
         ssl->verify_result=arg;
         }
 
-long SSL_get_verify_result(ssl)
-SSL *ssl;
+long SSL_get_verify_result(SSL *ssl)
         {
         return(ssl->verify_result);
         }
 
-int SSL_get_ex_new_index(argl,argp,new_func,dup_func,free_func)
-long argl;
-char *argp;
-int (*new_func)();
-int (*dup_func)();
-void (*free_func)();
-        {
-        ssl_meth_num++;
-        return(CRYPTO_get_ex_new_index(ssl_meth_num-1,
-                &ssl_meth,argl,argp,new_func,dup_func,free_func));
-        }
+int SSL_get_ex_new_index(long argl,void *argp,CRYPTO_EX_new *new_func,
+                         CRYPTO_EX_dup *dup_func,CRYPTO_EX_free *free_func)
+        {
+        return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL, argl, argp,
+                                new_func, dup_func, free_func);
+        }
 
-int SSL_set_ex_data(s,idx,arg)
-SSL *s;
-int idx;
-char *arg;
+int SSL_set_ex_data(SSL *s,int idx,void *arg)
         {
         return(CRYPTO_set_ex_data(&s->ex_data,idx,arg));
         }
 
-char *SSL_get_ex_data(s,idx)
-SSL *s;
-int idx;
+void *SSL_get_ex_data(SSL *s,int idx)
         {
         return(CRYPTO_get_ex_data(&s->ex_data,idx));
         }
 
-int SSL_CTX_get_ex_new_index(argl,argp,new_func,dup_func,free_func)
-long argl;
-char *argp;
-int (*new_func)();
-int (*dup_func)();
-void (*free_func)();
-        {
-        ssl_ctx_meth_num++;
-        return(CRYPTO_get_ex_new_index(ssl_ctx_meth_num-1,
-                &ssl_ctx_meth,argl,argp,new_func,dup_func,free_func));
-        }
+int SSL_CTX_get_ex_new_index(long argl,void *argp,CRYPTO_EX_new *new_func,
+                             CRYPTO_EX_dup *dup_func,CRYPTO_EX_free *free_func)
+        {
+        return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL_CTX, argl, argp,
+                                new_func, dup_func, free_func);
+        }
 
-int SSL_CTX_set_ex_data(s,idx,arg)
-SSL_CTX *s;
-int idx;
-char *arg;
+int SSL_CTX_set_ex_data(SSL_CTX *s,int idx,void *arg)
         {
         return(CRYPTO_set_ex_data(&s->ex_data,idx,arg));
         }
 
-char *SSL_CTX_get_ex_data(s,idx)
-SSL_CTX *s;
-int idx;
+void *SSL_CTX_get_ex_data(SSL_CTX *s,int idx)
         {
         return(CRYPTO_get_ex_data(&s->ex_data,idx));
         }
 
-#if defined(_WINDLL) && defined(WIN16)
+int ssl_ok(SSL *s)
+        {
+        return(1);
+        }
+
+X509_STORE *SSL_CTX_get_cert_store(SSL_CTX *ctx)
+        {
+        return(ctx->cert_store);
+        }
+
+void SSL_CTX_set_cert_store(SSL_CTX *ctx,X509_STORE *store)
+        {
+        if (ctx->cert_store != NULL)
+                X509_STORE_free(ctx->cert_store);
+        ctx->cert_store=store;
+        }
+
+int SSL_want(SSL *s)
+        {
+        return(s->rwstate);
+        }
+
+/*!
+ * \brief Set the callback for generating temporary RSA keys.
+ * \param ctx the SSL context.
+ * \param cb the callback
+ */
+
+#ifndef OPENSSL_NO_RSA
+void SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx,RSA *(*cb)(SSL *ssl,
+                                                          int is_export,
+                                                          int keylength))
+    {
+    SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TMP_RSA_CB,(void (*)())cb);
+    }
+
+void SSL_set_tmp_rsa_callback(SSL *ssl,RSA *(*cb)(SSL *ssl,
+                                                  int is_export,
+                                                  int keylength))
+    {
+    SSL_callback_ctrl(ssl,SSL_CTRL_SET_TMP_RSA_CB,(void (*)())cb);
+    }
+#endif
+
+#ifdef DOXYGEN
+/*!
+ * \brief The RSA temporary key callback function.
+ * \param ssl the SSL session.
+ * \param is_export \c TRUE if the temp RSA key is for an export ciphersuite.
+ * \param keylength if \c is_export is \c TRUE, then \c keylength is the size
+ * of the required key in bits.
+ * \return the temporary RSA key.
+ * \sa SSL_CTX_set_tmp_rsa_callback, SSL_set_tmp_rsa_callback
+ */
+
+RSA *cb(SSL *ssl,int is_export,int keylength)
+    {}
+#endif
+
+/*!
+ * \brief Set the callback for generating temporary DH keys.
+ * \param ctx the SSL context.
+ * \param dh the callback
+ */
+
+#ifndef OPENSSL_NO_DH
+void SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx,DH *(*dh)(SSL *ssl,int is_export,
+                                                        int keylength))
+        {
+        SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TMP_DH_CB,(void (*)())dh);
+        }
+
+void SSL_set_tmp_dh_callback(SSL *ssl,DH *(*dh)(SSL *ssl,int is_export,
+                                                int keylength))
+        {
+        SSL_callback_ctrl(ssl,SSL_CTRL_SET_TMP_DH_CB,(void (*)())dh);
+        }
+#endif
+
+
+void SSL_CTX_set_msg_callback(SSL_CTX *ctx, void (*cb)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg))
+        {
+        SSL_CTX_callback_ctrl(ctx, SSL_CTRL_SET_MSG_CALLBACK, (void (*)())cb);
+        }
+void SSL_set_msg_callback(SSL *ssl, void (*cb)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg))
+        {
+        SSL_callback_ctrl(ssl, SSL_CTRL_SET_MSG_CALLBACK, (void (*)())cb);
+        }
+
+
+
+#if defined(_WINDLL) && defined(OPENSSL_SYS_WIN16)
 #include "../crypto/bio/bss_file.c"
 #endif
 
+IMPLEMENT_STACK_OF(SSL_CIPHER)
+IMPLEMENT_STACK_OF(SSL_COMP)