1 files changed, 929 insertions, 210 deletions

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 0fd945025d..686992406c 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -55,40 +55,99 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
+/* ====================================================================
+ * Copyright (c) 1998-2002 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).
+ *
+ */
 
 #include <stdio.h>
-#include "objects.h"
+#include <openssl/objects.h>
 #include "ssl_locl.h"
+#include "kssl_lcl.h"
+#include <openssl/md5.h>
 
-char *ssl3_version_str="SSLv3 part of SSLeay 0.9.0b 29-Jun-1998";
+const char *ssl3_version_str="SSLv3" OPENSSL_VERSION_PTEXT;
 
 #define SSL3_NUM_CIPHERS        (sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER))
 
-#ifndef NOPROTO
 static long ssl3_default_timeout(void );
-#else
-static long ssl3_default_timeout();
-#endif
 
-SSL_CIPHER ssl3_ciphers[]={
+OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 /* The RSA ciphers */
 /* Cipher 01 */
         {
         1,
         SSL3_TXT_RSA_NULL_MD5,
         SSL3_CK_RSA_NULL_MD5,
-        SSL_kRSA|SSL_aRSA|SSL_eNULL |SSL_MD5|SSL_NOT_EXP|SSL_SSLV3,
+        SSL_kRSA|SSL_aRSA|SSL_eNULL |SSL_MD5|SSL_SSLV3,
+        SSL_NOT_EXP,
+        0,
+        0,
         0,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 02 */
         {
         1,
         SSL3_TXT_RSA_NULL_SHA,
         SSL3_CK_RSA_NULL_SHA,
-        SSL_kRSA|SSL_aRSA|SSL_eNULL |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3,
+        SSL_kRSA|SSL_aRSA|SSL_eNULL |SSL_SHA1|SSL_SSLV3,
+        SSL_NOT_EXP,
+        0,
+        0,
         0,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 
 /* anon DH */
@@ -97,45 +156,65 @@ SSL_CIPHER ssl3_ciphers[]={
         1,
         SSL3_TXT_ADH_RC4_40_MD5,
         SSL3_CK_ADH_RC4_40_MD5,
-        SSL_kEDH |SSL_aNULL|SSL_RC4  |SSL_MD5 |SSL_EXP|SSL_SSLV3,
+        SSL_kEDH |SSL_aNULL|SSL_RC4  |SSL_MD5 |SSL_SSLV3,
+        SSL_EXPORT|SSL_EXP40,
         0,
+        40,
+        128,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 18 */
         {
         1,
         SSL3_TXT_ADH_RC4_128_MD5,
         SSL3_CK_ADH_RC4_128_MD5,
-        SSL_kEDH |SSL_aNULL|SSL_RC4  |SSL_MD5|SSL_NOT_EXP|SSL_SSLV3,
+        SSL_kEDH |SSL_aNULL|SSL_RC4  |SSL_MD5 |SSL_SSLV3,
+        SSL_NOT_EXP|SSL_MEDIUM,
         0,
+        128,
+        128,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 19 */
         {
         1,
         SSL3_TXT_ADH_DES_40_CBC_SHA,
         SSL3_CK_ADH_DES_40_CBC_SHA,
-        SSL_kEDH |SSL_aNULL|SSL_DES|SSL_SHA1|SSL_EXP|SSL_SSLV3,
+        SSL_kEDH |SSL_aNULL|SSL_DES|SSL_SHA1|SSL_SSLV3,
+        SSL_EXPORT|SSL_EXP40,
         0,
+        40,
+        128,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 1A */
         {
         1,
         SSL3_TXT_ADH_DES_64_CBC_SHA,
         SSL3_CK_ADH_DES_64_CBC_SHA,
-        SSL_kEDH |SSL_aNULL|SSL_DES  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3,
+        SSL_kEDH |SSL_aNULL|SSL_DES  |SSL_SHA1|SSL_SSLV3,
+        SSL_NOT_EXP|SSL_LOW,
         0,
+        56,
+        56,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 1B */
         {
         1,
         SSL3_TXT_ADH_DES_192_CBC_SHA,
         SSL3_CK_ADH_DES_192_CBC_SHA,
-        SSL_kEDH |SSL_aNULL|SSL_3DES |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3,
+        SSL_kEDH |SSL_aNULL|SSL_3DES |SSL_SHA1|SSL_SSLV3,
+        SSL_NOT_EXP|SSL_HIGH,
         0,
+        168,
+        168,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 
 /* RSA again */
@@ -144,72 +223,104 @@ SSL_CIPHER ssl3_ciphers[]={
         1,
         SSL3_TXT_RSA_RC4_40_MD5,
         SSL3_CK_RSA_RC4_40_MD5,
-        SSL_kRSA|SSL_aRSA|SSL_RC4  |SSL_MD5 |SSL_EXP|SSL_SSLV3,
+        SSL_kRSA|SSL_aRSA|SSL_RC4  |SSL_MD5 |SSL_SSLV3,
+        SSL_EXPORT|SSL_EXP40,
         0,
+        40,
+        128,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 04 */
         {
         1,
         SSL3_TXT_RSA_RC4_128_MD5,
         SSL3_CK_RSA_RC4_128_MD5,
-        SSL_kRSA|SSL_aRSA|SSL_RC4  |SSL_MD5|SSL_NOT_EXP|SSL_SSLV3|SSL_MEDIUM,
+        SSL_kRSA|SSL_aRSA|SSL_RC4  |SSL_MD5|SSL_SSLV3,
+        SSL_NOT_EXP|SSL_MEDIUM,
         0,
+        128,
+        128,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 05 */
         {
         1,
         SSL3_TXT_RSA_RC4_128_SHA,
         SSL3_CK_RSA_RC4_128_SHA,
-        SSL_kRSA|SSL_aRSA|SSL_RC4  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_MEDIUM,
+        SSL_kRSA|SSL_aRSA|SSL_RC4  |SSL_SHA1|SSL_SSLV3,
+        SSL_NOT_EXP|SSL_MEDIUM,
         0,
+        128,
+        128,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 06 */
         {
         1,
         SSL3_TXT_RSA_RC2_40_MD5,
         SSL3_CK_RSA_RC2_40_MD5,
-        SSL_kRSA|SSL_aRSA|SSL_RC2  |SSL_MD5 |SSL_EXP|SSL_SSLV3,
+        SSL_kRSA|SSL_aRSA|SSL_RC2  |SSL_MD5 |SSL_SSLV3,
+        SSL_EXPORT|SSL_EXP40,
         0,
+        40,
+        128,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 07 */
         {
         1,
         SSL3_TXT_RSA_IDEA_128_SHA,
         SSL3_CK_RSA_IDEA_128_SHA,
-        SSL_kRSA|SSL_aRSA|SSL_IDEA |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_MEDIUM,
+        SSL_kRSA|SSL_aRSA|SSL_IDEA |SSL_SHA1|SSL_SSLV3,
+        SSL_NOT_EXP|SSL_MEDIUM,
         0,
+        128,
+        128,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 08 */
         {
         1,
         SSL3_TXT_RSA_DES_40_CBC_SHA,
         SSL3_CK_RSA_DES_40_CBC_SHA,
-        SSL_kRSA|SSL_aRSA|SSL_DES|SSL_SHA1|SSL_EXP|SSL_SSLV3,
+        SSL_kRSA|SSL_aRSA|SSL_DES|SSL_SHA1|SSL_SSLV3,
+        SSL_EXPORT|SSL_EXP40,
         0,
+        40,
+        56,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 09 */
         {
         1,
         SSL3_TXT_RSA_DES_64_CBC_SHA,
         SSL3_CK_RSA_DES_64_CBC_SHA,
-        SSL_kRSA|SSL_aRSA|SSL_DES  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,
+        SSL_kRSA|SSL_aRSA|SSL_DES  |SSL_SHA1|SSL_SSLV3,
+        SSL_NOT_EXP|SSL_LOW,
         0,
+        56,
+        56,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 0A */
         {
         1,
         SSL3_TXT_RSA_DES_192_CBC3_SHA,
         SSL3_CK_RSA_DES_192_CBC3_SHA,
-        SSL_kRSA|SSL_aRSA|SSL_3DES |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,
+        SSL_kRSA|SSL_aRSA|SSL_3DES |SSL_SHA1|SSL_SSLV3,
+        SSL_NOT_EXP|SSL_HIGH,
         0,
+        168,
+        168,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 
 /*  The DH ciphers */
@@ -218,54 +329,78 @@ SSL_CIPHER ssl3_ciphers[]={
         0,
         SSL3_TXT_DH_DSS_DES_40_CBC_SHA,
         SSL3_CK_DH_DSS_DES_40_CBC_SHA,
-        SSL_kDHd |SSL_aDH|SSL_DES|SSL_SHA1|SSL_EXP|SSL_SSLV3,
+        SSL_kDHd |SSL_aDH|SSL_DES|SSL_SHA1|SSL_SSLV3,
+        SSL_EXPORT|SSL_EXP40,
         0,
+        40,
+        56,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 0C */
         {
         0,
         SSL3_TXT_DH_DSS_DES_64_CBC_SHA,
         SSL3_CK_DH_DSS_DES_64_CBC_SHA,
-        SSL_kDHd |SSL_aDH|SSL_DES  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,
+        SSL_kDHd |SSL_aDH|SSL_DES  |SSL_SHA1|SSL_SSLV3,
+        SSL_NOT_EXP|SSL_LOW,
         0,
+        56,
+        56,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 0D */
         {
         0,
         SSL3_TXT_DH_DSS_DES_192_CBC3_SHA,
         SSL3_CK_DH_DSS_DES_192_CBC3_SHA,
-        SSL_kDHd |SSL_aDH|SSL_3DES |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,
+        SSL_kDHd |SSL_aDH|SSL_3DES |SSL_SHA1|SSL_SSLV3,
+        SSL_NOT_EXP|SSL_HIGH,
         0,
+        168,
+        168,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 0E */
         {
         0,
         SSL3_TXT_DH_RSA_DES_40_CBC_SHA,
         SSL3_CK_DH_RSA_DES_40_CBC_SHA,
-        SSL_kDHr |SSL_aDH|SSL_DES|SSL_SHA1|SSL_EXP|SSL_SSLV3,
+        SSL_kDHr |SSL_aDH|SSL_DES|SSL_SHA1|SSL_SSLV3,
+        SSL_EXPORT|SSL_EXP40,
         0,
+        40,
+        56,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 0F */
         {
         0,
         SSL3_TXT_DH_RSA_DES_64_CBC_SHA,
         SSL3_CK_DH_RSA_DES_64_CBC_SHA,
-        SSL_kDHr |SSL_aDH|SSL_DES  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,
+        SSL_kDHr |SSL_aDH|SSL_DES  |SSL_SHA1|SSL_SSLV3,
+        SSL_NOT_EXP|SSL_LOW,
         0,
+        56,
+        56,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 10 */
         {
         0,
         SSL3_TXT_DH_RSA_DES_192_CBC3_SHA,
         SSL3_CK_DH_RSA_DES_192_CBC3_SHA,
-        SSL_kDHr |SSL_aDH|SSL_3DES |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,
+        SSL_kDHr |SSL_aDH|SSL_3DES |SSL_SHA1|SSL_SSLV3,
+        SSL_NOT_EXP|SSL_HIGH,
         0,
+        168,
+        168,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 
 /* The Ephemeral DH ciphers */
@@ -274,54 +409,78 @@ SSL_CIPHER ssl3_ciphers[]={
         1,
         SSL3_TXT_EDH_DSS_DES_40_CBC_SHA,
         SSL3_CK_EDH_DSS_DES_40_CBC_SHA,
-        SSL_kEDH|SSL_aDSS|SSL_DES|SSL_SHA1|SSL_EXP|SSL_SSLV3,
+        SSL_kEDH|SSL_aDSS|SSL_DES|SSL_SHA1|SSL_SSLV3,
+        SSL_EXPORT|SSL_EXP40,
         0,
+        40,
+        56,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 12 */
         {
         1,
         SSL3_TXT_EDH_DSS_DES_64_CBC_SHA,
         SSL3_CK_EDH_DSS_DES_64_CBC_SHA,
-        SSL_kEDH|SSL_aDSS|SSL_DES  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,
+        SSL_kEDH|SSL_aDSS|SSL_DES  |SSL_SHA1|SSL_SSLV3,
+        SSL_NOT_EXP|SSL_LOW,
         0,
+        56,
+        56,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 13 */
         {
         1,
         SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA,
         SSL3_CK_EDH_DSS_DES_192_CBC3_SHA,
-        SSL_kEDH|SSL_aDSS|SSL_3DES |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,
+        SSL_kEDH|SSL_aDSS|SSL_3DES |SSL_SHA1|SSL_SSLV3,
+        SSL_NOT_EXP|SSL_HIGH,
         0,
+        168,
+        168,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 14 */
         {
         1,
         SSL3_TXT_EDH_RSA_DES_40_CBC_SHA,
         SSL3_CK_EDH_RSA_DES_40_CBC_SHA,
-        SSL_kEDH|SSL_aRSA|SSL_DES|SSL_SHA1|SSL_EXP|SSL_SSLV3,
+        SSL_kEDH|SSL_aRSA|SSL_DES|SSL_SHA1|SSL_SSLV3,
+        SSL_EXPORT|SSL_EXP40,
         0,
+        40,
+        56,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 15 */
         {
         1,
         SSL3_TXT_EDH_RSA_DES_64_CBC_SHA,
         SSL3_CK_EDH_RSA_DES_64_CBC_SHA,
-        SSL_kEDH|SSL_aRSA|SSL_DES  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,
+        SSL_kEDH|SSL_aRSA|SSL_DES  |SSL_SHA1|SSL_SSLV3,
+        SSL_NOT_EXP|SSL_LOW,
         0,
+        56,
+        56,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 /* Cipher 16 */
         {
         1,
         SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA,
         SSL3_CK_EDH_RSA_DES_192_CBC3_SHA,
-        SSL_kEDH|SSL_aRSA|SSL_3DES |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,
+        SSL_kEDH|SSL_aRSA|SSL_3DES |SSL_SHA1|SSL_SSLV3,
+        SSL_NOT_EXP|SSL_HIGH,
         0,
+        168,
+        168,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 
 /* Fortezza */
@@ -330,9 +489,13 @@ SSL_CIPHER ssl3_ciphers[]={
         0,
         SSL3_TXT_FZA_DMS_NULL_SHA,
         SSL3_CK_FZA_DMS_NULL_SHA,
-        SSL_kFZA|SSL_aFZA |SSL_eNULL |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3,
+        SSL_kFZA|SSL_aFZA |SSL_eNULL |SSL_SHA1|SSL_SSLV3,
+        SSL_NOT_EXP,
+        0,
+        0,
         0,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 
 /* Cipher 1D */
@@ -340,9 +503,13 @@ SSL_CIPHER ssl3_ciphers[]={
         0,
         SSL3_TXT_FZA_DMS_FZA_SHA,
         SSL3_CK_FZA_DMS_FZA_SHA,
-        SSL_kFZA|SSL_aFZA |SSL_eFZA |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3,
+        SSL_kFZA|SSL_aFZA |SSL_eFZA |SSL_SHA1|SSL_SSLV3,
+        SSL_NOT_EXP,
+        0,
+        0,
         0,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
 
 /* Cipher 1E */
@@ -350,10 +517,359 @@ SSL_CIPHER ssl3_ciphers[]={
         0,
         SSL3_TXT_FZA_DMS_RC4_SHA,
         SSL3_CK_FZA_DMS_RC4_SHA,
-        SSL_kFZA|SSL_aFZA |SSL_RC4  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3,
+        SSL_kFZA|SSL_aFZA |SSL_RC4  |SSL_SHA1|SSL_SSLV3,
+        SSL_NOT_EXP|SSL_MEDIUM,
+        0,
+        128,
+        128,
+        SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
+        },
+
+#ifndef OPENSSL_NO_KRB5
+/* The Kerberos ciphers
+** 20000107 VRS: And the first shall be last,
+** in hopes of avoiding the lynx ssl renegotiation problem.
+*/
+/* Cipher 21 VRS */
+        {
+        1,
+        SSL3_TXT_KRB5_DES_40_CBC_SHA,
+        SSL3_CK_KRB5_DES_40_CBC_SHA,
+        SSL_kKRB5|SSL_aKRB5|  SSL_DES|SSL_SHA1   |SSL_SSLV3,
+        SSL_EXPORT|SSL_EXP40,
+        0,
+        40,
+        56,
+        SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
+        },
+
+/* Cipher 22 VRS */
+        {
+        1,
+        SSL3_TXT_KRB5_DES_40_CBC_MD5,
+        SSL3_CK_KRB5_DES_40_CBC_MD5,
+        SSL_kKRB5|SSL_aKRB5|  SSL_DES|SSL_MD5    |SSL_SSLV3,
+        SSL_EXPORT|SSL_EXP40,
+        0,
+        40,
+        56,
+        SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
+        },
+
+/* Cipher 23 VRS */
+        {
+        1,
+        SSL3_TXT_KRB5_DES_64_CBC_SHA,
+        SSL3_CK_KRB5_DES_64_CBC_SHA,
+        SSL_kKRB5|SSL_aKRB5|  SSL_DES|SSL_SHA1   |SSL_SSLV3,
+        SSL_NOT_EXP|SSL_LOW,
+        0,
+        56,
+        56,
+        SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
+        },
+
+/* Cipher 24 VRS */
+        {
+        1,
+        SSL3_TXT_KRB5_DES_64_CBC_MD5,
+        SSL3_CK_KRB5_DES_64_CBC_MD5,
+        SSL_kKRB5|SSL_aKRB5|  SSL_DES|SSL_MD5    |SSL_SSLV3,
+        SSL_NOT_EXP|SSL_LOW,
+        0,
+        56,
+        56,
+        SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
+        },
+
+/* Cipher 25 VRS */
+        {
+        1,
+        SSL3_TXT_KRB5_DES_192_CBC3_SHA,
+        SSL3_CK_KRB5_DES_192_CBC3_SHA,
+        SSL_kKRB5|SSL_aKRB5|  SSL_3DES|SSL_SHA1  |SSL_SSLV3,
+        SSL_NOT_EXP|SSL_HIGH,
+        0,
+        112,
+        168,
+        SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
+        },
+
+/* Cipher 26 VRS */
+        {
+        1,
+        SSL3_TXT_KRB5_DES_192_CBC3_MD5,
+        SSL3_CK_KRB5_DES_192_CBC3_MD5,
+        SSL_kKRB5|SSL_aKRB5|  SSL_3DES|SSL_MD5   |SSL_SSLV3,
+        SSL_NOT_EXP|SSL_HIGH,
         0,
+        112,
+        168,
         SSL_ALL_CIPHERS,
+        SSL_ALL_STRENGTHS,
         },
+#endif  /* OPENSSL_NO_KRB5 */
+
+
+#if TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES
+        /* New TLS Export CipherSuites */
+        /* Cipher 60 */
+            {
+            1,
+            TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5,
+            TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5,
+            SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5|SSL_TLSV1,
+            SSL_EXPORT|SSL_EXP56,
+            0,
+            56,
+            128,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS,
+            },
+        /* Cipher 61 */
+            {
+            1,
+            TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5,
+            TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5,
+            SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5|SSL_TLSV1,
+            SSL_EXPORT|SSL_EXP56,
+            0,
+            56,
+            128,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS,
+            },
+        /* Cipher 62 */
+            {
+            1,
+            TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA,
+            TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA,
+            SSL_kRSA|SSL_aRSA|SSL_DES|SSL_SHA|SSL_TLSV1,
+            SSL_EXPORT|SSL_EXP56,
+            0,
+            56,
+            56,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS,
+            },
+        /* Cipher 63 */
+            {
+            1,
+            TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA,
+            TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA,
+            SSL_kEDH|SSL_aDSS|SSL_DES|SSL_SHA|SSL_TLSV1,
+            SSL_EXPORT|SSL_EXP56,
+            0,
+            56,
+            56,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS,
+            },
+        /* Cipher 64 */
+            {
+            1,
+            TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA,
+            TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA,
+            SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_SHA|SSL_TLSV1,
+            SSL_EXPORT|SSL_EXP56,
+            0,
+            56,
+            128,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS,
+            },
+        /* Cipher 65 */
+            {
+            1,
+            TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA,
+            TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA,
+            SSL_kEDH|SSL_aDSS|SSL_RC4|SSL_SHA|SSL_TLSV1,
+            SSL_EXPORT|SSL_EXP56,
+            0,
+            56,
+            128,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS,
+            },
+        /* Cipher 66 */
+            {
+            1,
+            TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA,
+            TLS1_CK_DHE_DSS_WITH_RC4_128_SHA,
+            SSL_kEDH|SSL_aDSS|SSL_RC4|SSL_SHA|SSL_TLSV1,
+            SSL_NOT_EXP|SSL_MEDIUM,
+            0,
+            128,
+            128,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS
+            },
+#endif
+        /* New AES ciphersuites */
+
+        /* Cipher 2F */
+            {
+            1,
+            TLS1_TXT_RSA_WITH_AES_128_SHA,
+            TLS1_CK_RSA_WITH_AES_128_SHA,
+            SSL_kRSA|SSL_aRSA|SSL_AES|SSL_SHA |SSL_TLSV1,
+            SSL_NOT_EXP|SSL_MEDIUM,
+            0,
+            128,
+            128,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS,
+            },
+        /* Cipher 30 */
+            {
+            0,
+            TLS1_TXT_DH_DSS_WITH_AES_128_SHA,
+            TLS1_CK_DH_DSS_WITH_AES_128_SHA,
+            SSL_kDHd|SSL_aDH|SSL_AES|SSL_SHA|SSL_TLSV1,
+            SSL_NOT_EXP|SSL_MEDIUM,
+            0,
+            128,
+            128,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS,
+            },
+        /* Cipher 31 */
+            {
+            0,
+            TLS1_TXT_DH_RSA_WITH_AES_128_SHA,
+            TLS1_CK_DH_RSA_WITH_AES_128_SHA,
+            SSL_kDHr|SSL_aDH|SSL_AES|SSL_SHA|SSL_TLSV1,
+            SSL_NOT_EXP|SSL_MEDIUM,
+            0,
+            128,
+            128,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS,
+            },
+        /* Cipher 32 */
+            {
+            1,
+            TLS1_TXT_DHE_DSS_WITH_AES_128_SHA,
+            TLS1_CK_DHE_DSS_WITH_AES_128_SHA,
+            SSL_kEDH|SSL_aDSS|SSL_AES|SSL_SHA|SSL_TLSV1,
+            SSL_NOT_EXP|SSL_MEDIUM,
+            0,
+            128,
+            128,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS,
+            },
+        /* Cipher 33 */
+            {
+            1,
+            TLS1_TXT_DHE_RSA_WITH_AES_128_SHA,
+            TLS1_CK_DHE_RSA_WITH_AES_128_SHA,
+            SSL_kEDH|SSL_aRSA|SSL_AES|SSL_SHA|SSL_TLSV1,
+            SSL_NOT_EXP|SSL_MEDIUM,
+            0,
+            128,
+            128,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS,
+            },
+        /* Cipher 34 */
+            {
+            1,
+            TLS1_TXT_ADH_WITH_AES_128_SHA,
+            TLS1_CK_ADH_WITH_AES_128_SHA,
+            SSL_kEDH|SSL_aNULL|SSL_AES|SSL_SHA|SSL_TLSV1,
+            SSL_NOT_EXP|SSL_MEDIUM,
+            0,
+            128,
+            128,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS,
+            },
+
+        /* Cipher 35 */
+            {
+            1,
+            TLS1_TXT_RSA_WITH_AES_256_SHA,
+            TLS1_CK_RSA_WITH_AES_256_SHA,
+            SSL_kRSA|SSL_aRSA|SSL_AES|SSL_SHA |SSL_TLSV1,
+            SSL_NOT_EXP|SSL_HIGH,
+            0,
+            256,
+            256,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS,
+            },
+        /* Cipher 36 */
+            {
+            0,
+            TLS1_TXT_DH_DSS_WITH_AES_256_SHA,
+            TLS1_CK_DH_DSS_WITH_AES_256_SHA,
+            SSL_kDHd|SSL_aDH|SSL_AES|SSL_SHA|SSL_TLSV1,
+            SSL_NOT_EXP|SSL_HIGH,
+            0,
+            256,
+            256,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS,
+            },
+        /* Cipher 37 */
+            {
+            0,
+            TLS1_TXT_DH_RSA_WITH_AES_256_SHA,
+            TLS1_CK_DH_RSA_WITH_AES_256_SHA,
+            SSL_kDHr|SSL_aDH|SSL_AES|SSL_SHA|SSL_TLSV1,
+            SSL_NOT_EXP|SSL_HIGH,
+            0,
+            256,
+            256,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS,
+            },
+        /* Cipher 38 */
+            {
+            1,
+            TLS1_TXT_DHE_DSS_WITH_AES_256_SHA,
+            TLS1_CK_DHE_DSS_WITH_AES_256_SHA,
+            SSL_kEDH|SSL_aDSS|SSL_AES|SSL_SHA|SSL_TLSV1,
+            SSL_NOT_EXP|SSL_HIGH,
+            0,
+            256,
+            256,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS,
+            },
+        /* Cipher 39 */
+            {
+            1,
+            TLS1_TXT_DHE_RSA_WITH_AES_256_SHA,
+            TLS1_CK_DHE_RSA_WITH_AES_256_SHA,
+            SSL_kEDH|SSL_aRSA|SSL_AES|SSL_SHA|SSL_TLSV1,
+            SSL_NOT_EXP|SSL_HIGH,
+            0,
+            256,
+            256,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS,
+            },
+        /* Cipher 3A */
+            {
+            1,
+            TLS1_TXT_ADH_WITH_AES_256_SHA,
+            TLS1_CK_ADH_WITH_AES_256_SHA,
+            SSL_kEDH|SSL_aNULL|SSL_AES|SSL_SHA|SSL_TLSV1,
+            SSL_NOT_EXP|SSL_HIGH,
+            0,
+            256,
+            256,
+            SSL_ALL_CIPHERS,
+            SSL_ALL_STRENGTHS,
+            },
 
 /* end of list */
         };
@@ -384,6 +900,7 @@ static SSL_METHOD SSLv3_data= {
         ssl3_write,
         ssl3_shutdown,
         ssl3_renegotiate,
+        ssl3_renegotiate_check,
         ssl3_ctrl,
         ssl3_ctx_ctrl,
         ssl3_get_cipher_by_char,
@@ -394,27 +911,29 @@ static SSL_METHOD SSLv3_data= {
         ssl_bad_method,
         ssl3_default_timeout,
         &SSLv3_enc_data,
+        ssl_undefined_function,
+        ssl3_callback_ctrl,
+        ssl3_ctx_callback_ctrl,
         };
 
-static long ssl3_default_timeout()
+static long ssl3_default_timeout(void)
         {
         /* 2 hours, the 24 hours mentioned in the SSLv3 spec
          * is way too long for http, the cache would over fill */
         return(60*60*2);
         }
 
-SSL_METHOD *sslv3_base_method()
+SSL_METHOD *sslv3_base_method(void)
         {
         return(&SSLv3_data);
         }
 
-int ssl3_num_ciphers()
+int ssl3_num_ciphers(void)
         {
         return(SSL3_NUM_CIPHERS);
         }
 
-SSL_CIPHER *ssl3_get_cipher(u)
-unsigned int u;
+SSL_CIPHER *ssl3_get_cipher(unsigned int u)
         {
         if (u < SSL3_NUM_CIPHERS)
                 return(&(ssl3_ciphers[SSL3_NUM_CIPHERS-1-u]));
@@ -422,29 +941,24 @@ unsigned int u;
                 return(NULL);
         }
 
-/* The problem is that it may not be the correct record type */
-int ssl3_pending(s)
-SSL *s;
+int ssl3_pending(SSL *s)
         {
-        return(s->s3->rrec.length);
+        if (s->rstate == SSL_ST_READ_BODY)
+                return 0;
+        
+        return (s->s3->rrec.type == SSL3_RT_APPLICATION_DATA) ? s->s3->rrec.length : 0;
         }
 
-int ssl3_new(s)
-SSL *s;
+int ssl3_new(SSL *s)
         {
-        SSL3_CTX *s3;
+        SSL3_STATE *s3;
 
-        if ((s3=(SSL3_CTX *)Malloc(sizeof(SSL3_CTX))) == NULL) goto err;
-        memset(s3,0,sizeof(SSL3_CTX));
+        if ((s3=OPENSSL_malloc(sizeof *s3)) == NULL) goto err;
+        memset(s3,0,sizeof *s3);
+        EVP_MD_CTX_init(&s3->finish_dgst1);
+        EVP_MD_CTX_init(&s3->finish_dgst2);
 
         s->s3=s3;
-        /*
-        s->s3->tmp.ca_names=NULL;
-        s->s3->tmp.key_block=NULL;
-        s->s3->tmp.key_block_length=0;
-        s->s3->rbuf.buf=NULL;
-        s->s3->wbuf.buf=NULL;
-        */
 
         s->method->ssl_clear(s);
         return(1);
@@ -452,40 +966,66 @@ err:
         return(0);
         }
 
-void ssl3_free(s)
-SSL *s;
+void ssl3_free(SSL *s)
         {
+        if(s == NULL)
+            return;
+
         ssl3_cleanup_key_block(s);
         if (s->s3->rbuf.buf != NULL)
-                Free(s->s3->rbuf.buf);
+                OPENSSL_free(s->s3->rbuf.buf);
         if (s->s3->wbuf.buf != NULL)
-                Free(s->s3->wbuf.buf);
-#ifndef NO_DH
+                OPENSSL_free(s->s3->wbuf.buf);
+        if (s->s3->rrec.comp != NULL)
+                OPENSSL_free(s->s3->rrec.comp);
+#ifndef OPENSSL_NO_DH
         if (s->s3->tmp.dh != NULL)
                 DH_free(s->s3->tmp.dh);
 #endif
         if (s->s3->tmp.ca_names != NULL)
-                sk_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
-        memset(s->s3,0,sizeof(SSL3_CTX));
-        Free(s->s3);
+                sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
+        EVP_MD_CTX_cleanup(&s->s3->finish_dgst1);
+        EVP_MD_CTX_cleanup(&s->s3->finish_dgst2);
+        memset(s->s3,0,sizeof *s->s3);
+        OPENSSL_free(s->s3);
         s->s3=NULL;
         }
 
-void ssl3_clear(s)
-SSL *s;
+void ssl3_clear(SSL *s)
         {
         unsigned char *rp,*wp;
+        size_t rlen, wlen;
 
         ssl3_cleanup_key_block(s);
         if (s->s3->tmp.ca_names != NULL)
-                sk_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
+                sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
 
-        rp=s->s3->rbuf.buf;
-        wp=s->s3->wbuf.buf;
+        if (s->s3->rrec.comp != NULL)
+                {
+                OPENSSL_free(s->s3->rrec.comp);
+                s->s3->rrec.comp=NULL;
+                }
+#ifndef OPENSSL_NO_DH
+        if (s->s3->tmp.dh != NULL)
+                DH_free(s->s3->tmp.dh);
+#endif
+
+        rp = s->s3->rbuf.buf;
+        wp = s->s3->wbuf.buf;
+        rlen = s->s3->rbuf.len;
+        wlen = s->s3->wbuf.len;
+
+        EVP_MD_CTX_cleanup(&s->s3->finish_dgst1);
+        EVP_MD_CTX_cleanup(&s->s3->finish_dgst2);
+
+        memset(s->s3,0,sizeof *s->s3);
+        s->s3->rbuf.buf = rp;
+        s->s3->wbuf.buf = wp;
+        s->s3->rbuf.len = rlen;
+        s->s3->wbuf.len = wlen;
+
+        ssl_free_wbio_buffer(s);
 
-        memset(s->s3,0,sizeof(SSL3_CTX));
-        if (rp != NULL) s->s3->rbuf.buf=rp;
-        if (wp != NULL) s->s3->wbuf.buf=wp;
         s->packet_length=0;
         s->s3->renegotiate=0;
         s->s3->total_renegotiations=0;
@@ -494,14 +1034,30 @@ SSL *s;
         s->version=SSL3_VERSION;
         }
 
-long ssl3_ctrl(s,cmd,larg,parg)
-SSL *s;
-int cmd;
-long larg;
-char *parg;
+long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
         {
         int ret=0;
 
+#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_RSA)
+        if (
+#ifndef OPENSSL_NO_RSA
+            cmd == SSL_CTRL_SET_TMP_RSA ||
+            cmd == SSL_CTRL_SET_TMP_RSA_CB ||
+#endif
+#ifndef OPENSSL_NO_DSA
+            cmd == SSL_CTRL_SET_TMP_DH ||
+            cmd == SSL_CTRL_SET_TMP_DH_CB ||
+#endif
+                0)
+                {
+                if (!ssl_cert_inst(&s->cert))
+                        {
+                        SSLerr(SSL_F_SSL3_CTRL, ERR_R_MALLOC_FAILURE);
+                        return(0);
+                        }
+                }
+#endif
+
         switch (cmd)
                 {
         case SSL_CTRL_GET_SESSION_REUSED:
@@ -519,25 +1075,137 @@ char *parg;
         case SSL_CTRL_GET_TOTAL_RENEGOTIATIONS:
                 ret=s->s3->total_renegotiations;
                 break;
+        case SSL_CTRL_GET_FLAGS:
+                ret=(int)(s->s3->flags);
+                break;
+#ifndef OPENSSL_NO_RSA
+        case SSL_CTRL_NEED_TMP_RSA:
+                if ((s->cert != NULL) && (s->cert->rsa_tmp == NULL) &&
+                    ((s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL) ||
+                     (EVP_PKEY_size(s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey) > (512/8))))
+                        ret = 1;
+                break;
+        case SSL_CTRL_SET_TMP_RSA:
+                {
+                        RSA *rsa = (RSA *)parg;
+                        if (rsa == NULL)
+                                {
+                                SSLerr(SSL_F_SSL3_CTRL, ERR_R_PASSED_NULL_PARAMETER);
+                                return(ret);
+                                }
+                        if ((rsa = RSAPrivateKey_dup(rsa)) == NULL)
+                                {
+                                SSLerr(SSL_F_SSL3_CTRL, ERR_R_RSA_LIB);
+                                return(ret);
+                                }
+                        if (s->cert->rsa_tmp != NULL)
+                                RSA_free(s->cert->rsa_tmp);
+                        s->cert->rsa_tmp = rsa;
+                        ret = 1;
+                }
+                break;
+        case SSL_CTRL_SET_TMP_RSA_CB:
+                {
+                SSLerr(SSL_F_SSL3_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+                return(ret);
+                }
+                break;
+#endif
+#ifndef OPENSSL_NO_DH
+        case SSL_CTRL_SET_TMP_DH:
+                {
+                        DH *dh = (DH *)parg;
+                        if (dh == NULL)
+                                {
+                                SSLerr(SSL_F_SSL3_CTRL, ERR_R_PASSED_NULL_PARAMETER);
+                                return(ret);
+                                }
+                        if ((dh = DHparams_dup(dh)) == NULL)
+                                {
+                                SSLerr(SSL_F_SSL3_CTRL, ERR_R_DH_LIB);
+                                return(ret);
+                                }
+                        if (!(s->options & SSL_OP_SINGLE_DH_USE))
+                                {
+                                if (!DH_generate_key(dh))
+                                        {
+                                        DH_free(dh);
+                                        SSLerr(SSL_F_SSL3_CTRL, ERR_R_DH_LIB);
+                                        return(ret);
+                                        }
+                                }
+                        if (s->cert->dh_tmp != NULL)
+                                DH_free(s->cert->dh_tmp);
+                        s->cert->dh_tmp = dh;
+                        ret = 1;
+                }
+                break;
+        case SSL_CTRL_SET_TMP_DH_CB:
+                {
+                SSLerr(SSL_F_SSL3_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+                return(ret);
+                }
+                break;
+#endif
         default:
                 break;
                 }
         return(ret);
         }
 
-long ssl3_ctx_ctrl(ctx,cmd,larg,parg)
-SSL_CTX *ctx;
-int cmd;
-long larg;
-char *parg;
+long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp)())
+        {
+        int ret=0;
+
+#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_RSA)
+        if (
+#ifndef OPENSSL_NO_RSA
+            cmd == SSL_CTRL_SET_TMP_RSA_CB ||
+#endif
+#ifndef OPENSSL_NO_DSA
+            cmd == SSL_CTRL_SET_TMP_DH_CB ||
+#endif
+                0)
+                {
+                if (!ssl_cert_inst(&s->cert))
+                        {
+                        SSLerr(SSL_F_SSL3_CALLBACK_CTRL, ERR_R_MALLOC_FAILURE);
+                        return(0);
+                        }
+                }
+#endif
+
+        switch (cmd)
+                {
+#ifndef OPENSSL_NO_RSA
+        case SSL_CTRL_SET_TMP_RSA_CB:
+                {
+                s->cert->rsa_tmp_cb = (RSA *(*)(SSL *, int, int))fp;
+                }
+                break;
+#endif
+#ifndef OPENSSL_NO_DH
+        case SSL_CTRL_SET_TMP_DH_CB:
+                {
+                s->cert->dh_tmp_cb = (DH *(*)(SSL *, int, int))fp;
+                }
+                break;
+#endif
+        default:
+                break;
+                }
+        return(ret);
+        }
+
+long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
         {
         CERT *cert;
 
-        cert=ctx->default_cert;
+        cert=ctx->cert;
 
         switch (cmd)
                 {
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
         case SSL_CTRL_NEED_TMP_RSA:
                 if (    (cert->rsa_tmp == NULL) &&
                         ((cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL) ||
@@ -546,7 +1214,7 @@ char *parg;
                         return(1);
                 else
                         return(0);
-                break;
+                /* break; */
         case SSL_CTRL_SET_TMP_RSA:
                 {
                 RSA *rsa;
@@ -574,35 +1242,83 @@ char *parg;
                         return(1);
                         }
                 }
-                break;
+                /* break; */
         case SSL_CTRL_SET_TMP_RSA_CB:
-                cert->rsa_tmp_cb=(RSA *(*)())parg;
+                {
+                SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+                return(0);
+                }
                 break;
 #endif
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
         case SSL_CTRL_SET_TMP_DH:
                 {
                 DH *new=NULL,*dh;
 
                 dh=(DH *)parg;
-                if (    ((new=DHparams_dup(dh)) == NULL) ||
-                        (!DH_generate_key(new)))
+                if ((new=DHparams_dup(dh)) == NULL)
                         {
                         SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_DH_LIB);
-                        if (new != NULL) DH_free(new);
-                        return(0);
+                        return 0;
                         }
-                else
+                if (!(ctx->options & SSL_OP_SINGLE_DH_USE))
                         {
-                        if (cert->dh_tmp != NULL)
-                                DH_free(cert->dh_tmp);
-                        cert->dh_tmp=new;
-                        return(1);
+                        if (!DH_generate_key(new))
+                                {
+                                SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_DH_LIB);
+                                DH_free(new);
+                                return 0;
+                                }
                         }
+                if (cert->dh_tmp != NULL)
+                        DH_free(cert->dh_tmp);
+                cert->dh_tmp=new;
+                return 1;
+                }
+                /*break; */
+        case SSL_CTRL_SET_TMP_DH_CB:
+                {
+                SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+                return(0);
                 }
                 break;
+#endif
+        /* A Thawte special :-) */
+        case SSL_CTRL_EXTRA_CHAIN_CERT:
+                if (ctx->extra_certs == NULL)
+                        {
+                        if ((ctx->extra_certs=sk_X509_new_null()) == NULL)
+                                return(0);
+                        }
+                sk_X509_push(ctx->extra_certs,(X509 *)parg);
+                break;
+
+        default:
+                return(0);
+                }
+        return(1);
+        }
+
+long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)())
+        {
+        CERT *cert;
+
+        cert=ctx->cert;
+
+        switch (cmd)
+                {
+#ifndef OPENSSL_NO_RSA
+        case SSL_CTRL_SET_TMP_RSA_CB:
+                {
+                cert->rsa_tmp_cb = (RSA *(*)(SSL *, int, int))fp;
+                }
+                break;
+#endif
+#ifndef OPENSSL_NO_DH
         case SSL_CTRL_SET_TMP_DH_CB:
-                cert->dh_tmp_cb=(DH *(*)())parg;
+                {
+                cert->dh_tmp_cb = (DH *(*)(SSL *, int, int))fp;
+                }
                 break;
 #endif
         default:
@@ -613,8 +1329,7 @@ char *parg;
 
 /* This function needs to check if the ciphers required are actually
  * available */
-SSL_CIPHER *ssl3_get_cipher_by_char(p)
-unsigned char *p;
+SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p)
         {
         static int init=1;
         static SSL_CIPHER *sorted[SSL3_NUM_CIPHERS];
@@ -624,7 +1339,7 @@ unsigned char *p;
 
         if (init)
                 {
-                init=0;
+                CRYPTO_w_lock(CRYPTO_LOCK_SSL);
 
                 for (i=0; i<SSL3_NUM_CIPHERS; i++)
                         sorted[i]= &(ssl3_ciphers[i]);
@@ -632,6 +1347,10 @@ unsigned char *p;
                 qsort(  (char *)sorted,
                         SSL3_NUM_CIPHERS,sizeof(SSL_CIPHER *),
                         FP_ICC ssl_cipher_ptr_id_cmp);
+
+                CRYPTO_w_unlock(CRYPTO_LOCK_SSL);
+
+                init=0;
                 }
 
         id=0x03000000L|((unsigned long)p[0]<<8L)|(unsigned long)p[1];
@@ -639,16 +1358,14 @@ unsigned char *p;
         cpp=(SSL_CIPHER **)OBJ_bsearch((char *)&cp,
                 (char *)sorted,
                 SSL3_NUM_CIPHERS,sizeof(SSL_CIPHER *),
-                (int (*)())ssl_cipher_ptr_id_cmp);
+                FP_ICC ssl_cipher_ptr_id_cmp);
         if ((cpp == NULL) || !(*cpp)->valid)
                 return(NULL);
         else
                 return(*cpp);
         }
 
-int ssl3_put_cipher_by_char(c,p)
-SSL_CIPHER *c;
-unsigned char *p;
+int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p)
         {
         long l;
 
@@ -662,114 +1379,141 @@ unsigned char *p;
         return(2);
         }
 
-int ssl3_part_read(s,i)
-SSL *s;
-int i;
-        {
-        s->rwstate=SSL_READING;
-
-        if (i < 0)
-                {
-                return(i);
-                }
-        else
-                {
-                s->init_num+=i;
-                return(0);
-                }
-        }
-
-SSL_CIPHER *ssl3_choose_cipher(s,have,pref)
-SSL *s;
-STACK *have,*pref;
+SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
+             STACK_OF(SSL_CIPHER) *srvr)
         {
         SSL_CIPHER *c,*ret=NULL;
+        STACK_OF(SSL_CIPHER) *prio, *allow;
         int i,j,ok;
         CERT *cert;
         unsigned long alg,mask,emask;
 
-        /* Lets see which ciphers we can supported */
-        if (s->cert != NULL)
-                cert=s->cert;
+        /* Let's see which ciphers we can support */
+        cert=s->cert;
+
+#if 0
+        /* Do not set the compare functions, because this may lead to a
+         * reordering by "id". We want to keep the original ordering.
+         * We may pay a price in performance during sk_SSL_CIPHER_find(),
+         * but would have to pay with the price of sk_SSL_CIPHER_dup().
+         */
+        sk_SSL_CIPHER_set_cmp_func(srvr, ssl_cipher_ptr_id_cmp);
+        sk_SSL_CIPHER_set_cmp_func(clnt, ssl_cipher_ptr_id_cmp);
+#endif
+
+#ifdef CIPHER_DEBUG
+        printf("Server has %d from %p:\n", sk_SSL_CIPHER_num(srvr), srvr);
+        for(i=0 ; i < sk_SSL_CIPHER_num(srvr) ; ++i)
+            {
+            c=sk_SSL_CIPHER_value(srvr,i);
+            printf("%p:%s\n",c,c->name);
+            }
+        printf("Client sent %d from %p:\n", sk_SSL_CIPHER_num(clnt), clnt);
+        for(i=0 ; i < sk_SSL_CIPHER_num(clnt) ; ++i)
+            {
+            c=sk_SSL_CIPHER_value(clnt,i);
+            printf("%p:%s\n",c,c->name);
+            }
+#endif
+
+        if (s->options & SSL_OP_CIPHER_SERVER_PREFERENCE)
+            {
+            prio = srvr;
+            allow = clnt;
+            }
         else
-                cert=s->ctx->default_cert;
+            {
+            prio = clnt;
+            allow = srvr;
+            }
+
+        for (i=0; i<sk_SSL_CIPHER_num(prio); i++)
+                {
+                c=sk_SSL_CIPHER_value(prio,i);
 
-        ssl_set_cert_masks(cert);
-        mask=cert->mask;
-        emask=cert->export_mask;
+                ssl_set_cert_masks(cert,c);
+                mask=cert->mask;
+                emask=cert->export_mask;
                         
-        sk_set_cmp_func(pref,ssl_cipher_ptr_id_cmp);
+#ifdef KSSL_DEBUG
+                printf("ssl3_choose_cipher %d alg= %lx\n", i,c->algorithms);
+#endif    /* KSSL_DEBUG */
 
-        for (i=0; i<sk_num(have); i++)
-                {
-                c=(SSL_CIPHER *)sk_value(have,i);
                 alg=c->algorithms&(SSL_MKEY_MASK|SSL_AUTH_MASK);
-                if (alg & SSL_EXPORT)
+#ifndef OPENSSL_NO_KRB5
+                if (alg & SSL_KRB5) 
+                        {
+                        if ( !kssl_keytab_is_available(s->kssl_ctx) )
+                            continue;
+                        }
+#endif /* OPENSSL_NO_KRB5 */
+                if (SSL_C_IS_EXPORT(c))
                         {
                         ok=((alg & emask) == alg)?1:0;
 #ifdef CIPHER_DEBUG
-                        printf("%d:[%08lX:%08lX]%s\n",ok,alg,mask,c->name);
+                        printf("%d:[%08lX:%08lX]%p:%s (export)\n",ok,alg,emask,
+                               c,c->name);
 #endif
                         }
                 else
                         {
                         ok=((alg & mask) == alg)?1:0;
 #ifdef CIPHER_DEBUG
-                        printf("%d:[%08lX:%08lX]%s\n",ok,alg,mask,c->name);
+                        printf("%d:[%08lX:%08lX]%p:%s\n",ok,alg,mask,c,
+                               c->name);
 #endif
                         }
 
                 if (!ok) continue;
         
-                j=sk_find(pref,(char *)c);
+                j=sk_SSL_CIPHER_find(allow,c);
                 if (j >= 0)
                         {
-                        ret=(SSL_CIPHER *)sk_value(pref,j);
+                        ret=sk_SSL_CIPHER_value(allow,j);
                         break;
                         }
                 }
         return(ret);
         }
 
-int ssl3_get_req_cert_type(s,p)
-SSL *s;
-unsigned char *p;
+int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
         {
         int ret=0;
         unsigned long alg;
 
         alg=s->s3->tmp.new_cipher->algorithms;
 
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
         if (alg & (SSL_kDHr|SSL_kEDH))
                 {
-#ifndef NO_RSA
+#  ifndef OPENSSL_NO_RSA
                 p[ret++]=SSL3_CT_RSA_FIXED_DH;
-#endif
-#ifndef NO_DSA
+#  endif
+#  ifndef OPENSSL_NO_DSA
                 p[ret++]=SSL3_CT_DSS_FIXED_DH;
-#endif
+#  endif
                 }
         if ((s->version == SSL3_VERSION) &&
                 (alg & (SSL_kEDH|SSL_kDHd|SSL_kDHr)))
                 {
-#ifndef NO_RSA
+#  ifndef OPENSSL_NO_RSA
                 p[ret++]=SSL3_CT_RSA_EPHEMERAL_DH;
-#endif
-#ifndef NO_DSA
+#  endif
+#  ifndef OPENSSL_NO_DSA
                 p[ret++]=SSL3_CT_DSS_EPHEMERAL_DH;
-#endif
+#  endif
                 }
-#endif /* !NO_DH */
-#ifndef NO_RSA
+#endif /* !OPENSSL_NO_DH */
+#ifndef OPENSSL_NO_RSA
         p[ret++]=SSL3_CT_RSA_SIGN;
 #endif
+#ifndef OPENSSL_NO_DSA
         p[ret++]=SSL3_CT_DSS_SIGN;
+#endif
         return(ret);
         }
 
-int ssl3_shutdown(s)
-SSL *s;
+int ssl3_shutdown(SSL *s)
         {
 
         /* Don't do anything much if we have not done the handshake or
@@ -799,7 +1543,7 @@ SSL *s;
         else if (!(s->shutdown & SSL_RECEIVED_SHUTDOWN))
                 {
                 /* If we are waiting for a close from our peer, we are closed */
-                ssl3_read_bytes(s,0,NULL,0);
+                ssl3_read_bytes(s,0,NULL,0,0);
                 }
 
         if ((s->shutdown == (SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN)) &&
@@ -809,13 +1553,9 @@ SSL *s;
                 return(0);
         }
 
-int ssl3_write(s,buf,len)
-SSL *s;
-char *buf;
-int len;
+int ssl3_write(SSL *s, const void *buf, int len)
         {
         int ret,n;
-        BIO *under;
 
 #if 0
         if (s->shutdown & SSL_SEND_SHUTDOWN)
@@ -838,7 +1578,7 @@ int len;
                 if (s->s3->delay_buf_pop_ret == 0)
                         {
                         ret=ssl3_write_bytes(s,SSL3_RT_APPLICATION_DATA,
-                                (char *)buf,len);
+                                             buf,len);
                         if (ret <= 0) return(ret);
 
                         s->s3->delay_buf_pop_ret=ret;
@@ -849,43 +1589,40 @@ int len;
                 if (n <= 0) return(n);
                 s->rwstate=SSL_NOTHING;
 
-                /* We have flushed the buffer */
-                under=BIO_pop(s->wbio);
-                s->wbio=under;
-                BIO_free(s->bbio);
-                s->bbio=NULL;
+                /* We have flushed the buffer, so remove it */
+                ssl_free_wbio_buffer(s);
+                s->s3->flags&= ~SSL3_FLAGS_POP_BUFFER;
+
                 ret=s->s3->delay_buf_pop_ret;
                 s->s3->delay_buf_pop_ret=0;
-
-                s->s3->flags&= ~SSL3_FLAGS_POP_BUFFER;
                 }
         else
                 {
                 ret=ssl3_write_bytes(s,SSL3_RT_APPLICATION_DATA,
-                        (char *)buf,len);
+                                     buf,len);
                 if (ret <= 0) return(ret);
                 }
 
         return(ret);
         }
 
-int ssl3_read(s,buf,len)
-SSL *s;
-char *buf;
-int len;
+static int ssl3_read_internal(SSL *s, void *buf, int len, int peek)
         {
         int ret;
         
         clear_sys_error();
         if (s->s3->renegotiate) ssl3_renegotiate_check(s);
         s->s3->in_read_app_data=1;
-        ret=ssl3_read_bytes(s,SSL3_RT_APPLICATION_DATA,buf,len);
-        if ((ret == -1) && (s->s3->in_read_app_data == 0))
+        ret=ssl3_read_bytes(s,SSL3_RT_APPLICATION_DATA,buf,len,peek);
+        if ((ret == -1) && (s->s3->in_read_app_data == 2))
                 {
-                ERR_get_error(); /* clear the error */
-                s->s3->in_read_app_data=0;
+                /* ssl3_read_bytes decided to call s->handshake_func, which
+                 * called ssl3_read_bytes to read handshake data.
+                 * However, ssl3_read_bytes actually found application data
+                 * and thinks that application data makes sense here; so disable
+                 * handshake processing and try to read application data again. */
                 s->in_handshake++;
-                ret=ssl3_read_bytes(s,SSL3_RT_APPLICATION_DATA,buf,len);
+                ret=ssl3_read_bytes(s,SSL3_RT_APPLICATION_DATA,buf,len,peek);
                 s->in_handshake--;
                 }
         else
@@ -894,33 +1631,17 @@ int len;
         return(ret);
         }
 
-int ssl3_peek(s,buf,len)
-SSL *s;
-char *buf;
-int len;
+int ssl3_read(SSL *s, void *buf, int len)
         {
-        SSL3_RECORD *rr;
-        int n;
-
-        rr= &(s->s3->rrec);
-        if ((rr->length == 0) || (rr->type != SSL3_RT_APPLICATION_DATA))
-                {
-                n=ssl3_read(s,buf,1);
-                if (n <= 0) return(n);
-                rr->length++;
-                rr->off--;
-                }
+        return ssl3_read_internal(s, buf, len, 0);
+        }
 
-        if ((unsigned int)len > rr->length)
-                n=rr->length;
-        else
-                n=len;
-        memcpy(buf,&(rr->data[rr->off]),(unsigned int)n);
-        return(n);
+int ssl3_peek(SSL *s, void *buf, int len)
+        {
+        return ssl3_read_internal(s, buf, len, 1);
         }
 
-int ssl3_renegotiate(s)
-SSL *s;
+int ssl3_renegotiate(SSL *s)
         {
         if (s->handshake_func == NULL)
                 return(1);
@@ -932,8 +1653,7 @@ SSL *s;
         return(1);
         }
 
-int ssl3_renegotiate_check(s)
-SSL *s;
+int ssl3_renegotiate_check(SSL *s)
         {
         int ret=0;
 
@@ -945,7 +1665,7 @@ SSL *s;
                         {
 /*
 if we are the server, and we have sent a 'RENEGOTIATE' message, we
-need to go to SSL_ST_ACCEPT.
+need to go to SSL_ST_ACCEPT.
 */
                         /* SSL_ST_ACCEPT */
                         s->state=SSL_ST_RENEGOTIATE;
@@ -958,4 +1678,3 @@ need to go to SSL_ST_ACCEPT.
         return(ret);
         }
 
-