OpenSSL 0.9.7 stable 2002 05 08 merge

1 files changed, 302 insertions, 87 deletions

diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index eec45cfa48..e5853ede95 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -55,15 +55,68 @@
  * 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 <openssl/buffer.h>
 #include <openssl/rand.h>
 #include <openssl/objects.h>
-#include <openssl/md5.h>
-#include <openssl/sha.h>
 #include <openssl/evp.h>
 #include "ssl_locl.h"
+#include "kssl_lcl.h"
+#include <openssl/md5.h>
 
 static SSL_METHOD *ssl3_get_client_method(int ver);
 static int ssl3_client_hello(SSL *s);
@@ -106,7 +159,7 @@ int ssl3_connect(SSL *s)
         BUF_MEM *buf;
         unsigned long Time=time(NULL),l;
         long num1;
-        void (*cb)()=NULL;
+        void (*cb)(const SSL *ssl,int type,int val)=NULL;
         int ret= -1;
         int new_state,state,skip=0;;
 
@@ -119,8 +172,8 @@ int ssl3_connect(SSL *s)
         else if (s->ctx->info_callback != NULL)
                 cb=s->ctx->info_callback;
         
-        if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); 
         s->in_handshake++;
+        if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); 
 
         for (;;)
                 {
@@ -143,7 +196,7 @@ int ssl3_connect(SSL *s)
 
                         if ((s->version & 0xff00 ) != 0x0300)
                                 {
-                                SSLerr(SSL_F_SSL3_CONNECT, SSL_R_INTERNAL_ERROR);
+                                SSLerr(SSL_F_SSL3_CONNECT, ERR_R_INTERNAL_ERROR);
                                 ret = -1;
                                 goto end;
                                 }
@@ -441,9 +494,9 @@ int ssl3_connect(SSL *s)
                 skip=0;
                 }
 end:
+        s->in_handshake--;
         if (cb != NULL)
                 cb(s,SSL_CB_CONNECT_EXIT,ret);
-        s->in_handshake--;
         return(ret);
         }
 
@@ -554,7 +607,7 @@ static int ssl3_get_server_hello(SSL *s)
                 &ok);
 
         if (!ok) return((int)n);
-        d=p=(unsigned char *)s->init_buf->data;
+        d=p=(unsigned char *)s->init_msg;
 
         if ((p[0] != (s->version>>8)) || (p[1] != (s->version&0xff)))
                 {
@@ -687,16 +740,13 @@ static int ssl3_get_server_certificate(SSL *s)
         STACK_OF(X509) *sk=NULL;
         SESS_CERT *sc;
         EVP_PKEY *pkey=NULL;
+        int need_cert = 1; /* VRS: 0=> will allow null cert if auth == KRB5 */
 
         n=ssl3_get_message(s,
                 SSL3_ST_CR_CERT_A,
                 SSL3_ST_CR_CERT_B,
                 -1,
-#if defined(MSDOS) && !defined(WIN32)
-                1024*30, /* 30k max cert list :-) */
-#else
-                1024*100, /* 100k max cert list :-) */
-#endif
+                s->max_cert_list,
                 &ok);
 
         if (!ok) return((int)n);
@@ -713,7 +763,7 @@ static int ssl3_get_server_certificate(SSL *s)
                 SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_BAD_MESSAGE_TYPE);
                 goto f_err;
                 }
-        d=p=(unsigned char *)s->init_buf->data;
+        d=p=(unsigned char *)s->init_msg;
 
         if ((sk=sk_X509_new_null()) == NULL)
                 {
@@ -763,7 +813,12 @@ static int ssl3_get_server_certificate(SSL *s)
                 }
 
         i=ssl_verify_cert_chain(s,sk);
-        if ((s->verify_mode != SSL_VERIFY_NONE) && (!i))
+        if ((s->verify_mode != SSL_VERIFY_NONE) && (!i)
+#ifndef OPENSSL_NO_KRB5
+                && (s->s3->tmp.new_cipher->algorithms & (SSL_MKEY_MASK|SSL_AUTH_MASK))
+                != (SSL_aKRB5|SSL_kKRB5)
+#endif /* OPENSSL_NO_KRB5 */
+                )
                 {
                 al=ssl_verify_alarm_type(s->verify_result);
                 SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED);
@@ -782,39 +837,66 @@ static int ssl3_get_server_certificate(SSL *s)
          * certificate, which we don't include in s3_srvr.c */
         x=sk_X509_value(sk,0);
         sk=NULL;
+        /* VRS 19990621: possible memory leak; sk=null ==> !sk_pop_free() @end*/
 
         pkey=X509_get_pubkey(x);
 
-        if ((pkey == NULL) || EVP_PKEY_missing_parameters(pkey))
+        /* VRS: allow null cert if auth == KRB5 */
+        need_cert =     ((s->s3->tmp.new_cipher->algorithms
+                        & (SSL_MKEY_MASK|SSL_AUTH_MASK))
+                        == (SSL_aKRB5|SSL_kKRB5))? 0: 1;
+
+#ifdef KSSL_DEBUG
+        printf("pkey,x = %p, %p\n", pkey,x);
+        printf("ssl_cert_type(x,pkey) = %d\n", ssl_cert_type(x,pkey));
+        printf("cipher, alg, nc = %s, %lx, %d\n", s->s3->tmp.new_cipher->name,
+                s->s3->tmp.new_cipher->algorithms, need_cert);
+#endif    /* KSSL_DEBUG */
+
+        if (need_cert && ((pkey == NULL) || EVP_PKEY_missing_parameters(pkey)))
                 {
                 x=NULL;
                 al=SSL3_AL_FATAL;
-                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS);
+                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,
+                        SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS);
                 goto f_err;
                 }
 
         i=ssl_cert_type(x,pkey);
-        if (i < 0)
+        if (need_cert && i < 0)
                 {
                 x=NULL;
                 al=SSL3_AL_FATAL;
-                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_UNKNOWN_CERTIFICATE_TYPE);
+                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,
+                        SSL_R_UNKNOWN_CERTIFICATE_TYPE);
                 goto f_err;
                 }
 
-        sc->peer_cert_type=i;
-        CRYPTO_add(&x->references,1,CRYPTO_LOCK_X509);
-        if (sc->peer_pkeys[i].x509 != NULL) /* Why would this ever happen?
-                                                                                 * We just created sc a couple of
-                                                                                 * lines ago. */
-                X509_free(sc->peer_pkeys[i].x509);
-        sc->peer_pkeys[i].x509=x;
-        sc->peer_key= &(sc->peer_pkeys[i]);
-
-        if (s->session->peer != NULL)
-                X509_free(s->session->peer);
-        CRYPTO_add(&x->references,1,CRYPTO_LOCK_X509);
-        s->session->peer=x;
+        if (need_cert)
+                {
+                sc->peer_cert_type=i;
+                CRYPTO_add(&x->references,1,CRYPTO_LOCK_X509);
+                /* Why would the following ever happen?
+                 * We just created sc a couple of lines ago. */
+                if (sc->peer_pkeys[i].x509 != NULL)
+                        X509_free(sc->peer_pkeys[i].x509);
+                sc->peer_pkeys[i].x509=x;
+                sc->peer_key= &(sc->peer_pkeys[i]);
+
+                if (s->session->peer != NULL)
+                        X509_free(s->session->peer);
+                CRYPTO_add(&x->references,1,CRYPTO_LOCK_X509);
+                s->session->peer=x;
+                }
+        else
+                {
+                sc->peer_cert_type=i;
+                sc->peer_key= NULL;
+
+                if (s->session->peer != NULL)
+                        X509_free(s->session->peer);
+                s->session->peer=NULL;
+                }
         s->session->verify_result = s->verify_result;
 
         x=NULL;
@@ -834,7 +916,7 @@ err:
 
 static int ssl3_get_key_exchange(SSL *s)
         {
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
         unsigned char *q,md_buf[EVP_MAX_MD_SIZE*2];
 #endif
         EVP_MD_CTX md_ctx;
@@ -842,18 +924,20 @@ static int ssl3_get_key_exchange(SSL *s)
         int al,i,j,param_len,ok;
         long n,alg;
         EVP_PKEY *pkey=NULL;
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
         RSA *rsa=NULL;
 #endif
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
         DH *dh=NULL;
 #endif
 
+        /* use same message size as in ssl3_get_certificate_request()
+         * as ServerKeyExchange message may be skipped */
         n=ssl3_get_message(s,
                 SSL3_ST_CR_KEY_EXCH_A,
                 SSL3_ST_CR_KEY_EXCH_B,
                 -1,
-                1024*8, /* ?? */
+                s->max_cert_list,
                 &ok);
 
         if (!ok) return((int)n);
@@ -864,18 +948,18 @@ static int ssl3_get_key_exchange(SSL *s)
                 return(1);
                 }
 
-        param=p=(unsigned char *)s->init_buf->data;
+        param=p=(unsigned char *)s->init_msg;
 
         if (s->session->sess_cert != NULL)
                 {
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
                 if (s->session->sess_cert->peer_rsa_tmp != NULL)
                         {
                         RSA_free(s->session->sess_cert->peer_rsa_tmp);
                         s->session->sess_cert->peer_rsa_tmp=NULL;
                         }
 #endif
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
                 if (s->session->sess_cert->peer_dh_tmp)
                         {
                         DH_free(s->session->sess_cert->peer_dh_tmp);
@@ -890,8 +974,9 @@ static int ssl3_get_key_exchange(SSL *s)
 
         param_len=0;
         alg=s->s3->tmp.new_cipher->algorithms;
+        EVP_MD_CTX_init(&md_ctx);
 
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
         if (alg & SSL_kRSA)
                 {
                 if ((rsa=RSA_new()) == NULL)
@@ -935,17 +1020,17 @@ static int ssl3_get_key_exchange(SSL *s)
                         pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
                 else
                         {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_INTERNAL_ERROR);
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
                         goto err;
                         }
                 s->session->sess_cert->peer_rsa_tmp=rsa;
                 rsa=NULL;
                 }
-#else /* NO_RSA */
+#else /* OPENSSL_NO_RSA */
         if (0)
                 ;
 #endif
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
         else if (alg & SSL_kEDH)
                 {
                 if ((dh=DH_new()) == NULL)
@@ -999,14 +1084,14 @@ static int ssl3_get_key_exchange(SSL *s)
                 p+=i;
                 n-=param_len;
 
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
                 if (alg & SSL_aRSA)
                         pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
 #else
                 if (0)
                         ;
 #endif
-#ifndef NO_DSA
+#ifndef OPENSSL_NO_DSA
                 else if (alg & SSL_aDSS)
                         pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_DSA_SIGN].x509);
 #endif
@@ -1021,7 +1106,7 @@ static int ssl3_get_key_exchange(SSL *s)
                 SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER);
                 goto f_err;
                 }
-#endif /* !NO_DH */
+#endif /* !OPENSSL_NO_DH */
         if (alg & SSL_aFZA)
                 {
                 al=SSL_AD_HANDSHAKE_FAILURE;
@@ -1048,7 +1133,7 @@ static int ssl3_get_key_exchange(SSL *s)
                         goto f_err;
                         }
 
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
                 if (pkey->type == EVP_PKEY_RSA)
                         {
                         int num;
@@ -1057,12 +1142,12 @@ static int ssl3_get_key_exchange(SSL *s)
                         q=md_buf;
                         for (num=2; num > 0; num--)
                                 {
-                                EVP_DigestInit(&md_ctx,(num == 2)
-                                        ?s->ctx->md5:s->ctx->sha1);
+                                EVP_DigestInit_ex(&md_ctx,(num == 2)
+                                        ?s->ctx->md5:s->ctx->sha1, NULL);
                                 EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
                                 EVP_DigestUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
                                 EVP_DigestUpdate(&md_ctx,param,param_len);
-                                EVP_DigestFinal(&md_ctx,q,(unsigned int *)&i);
+                                EVP_DigestFinal_ex(&md_ctx,q,(unsigned int *)&i);
                                 q+=i;
                                 j+=i;
                                 }
@@ -1084,11 +1169,11 @@ static int ssl3_get_key_exchange(SSL *s)
                         }
                 else
 #endif
-#ifndef NO_DSA
+#ifndef OPENSSL_NO_DSA
                         if (pkey->type == EVP_PKEY_DSA)
                         {
                         /* lets do DSS */
-                        EVP_VerifyInit(&md_ctx,EVP_dss1());
+                        EVP_VerifyInit_ex(&md_ctx,EVP_dss1(), NULL);
                         EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
                         EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
                         EVP_VerifyUpdate(&md_ctx,param,param_len);
@@ -1103,7 +1188,7 @@ static int ssl3_get_key_exchange(SSL *s)
                 else
 #endif
                         {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_INTERNAL_ERROR);
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
                         goto err;
                         }
                 }
@@ -1112,7 +1197,7 @@ static int ssl3_get_key_exchange(SSL *s)
                 /* still data left over */
                 if (!(alg & SSL_aNULL))
                         {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_INTERNAL_ERROR);
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
                         goto err;
                         }
                 if (n != 0)
@@ -1123,19 +1208,21 @@ static int ssl3_get_key_exchange(SSL *s)
                         }
                 }
         EVP_PKEY_free(pkey);
+        EVP_MD_CTX_cleanup(&md_ctx);
         return(1);
 f_err:
         ssl3_send_alert(s,SSL3_AL_FATAL,al);
 err:
         EVP_PKEY_free(pkey);
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
         if (rsa != NULL)
                 RSA_free(rsa);
 #endif
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
         if (dh != NULL)
                 DH_free(dh);
 #endif
+        EVP_MD_CTX_cleanup(&md_ctx);
         return(-1);
         }
 
@@ -1152,11 +1239,7 @@ static int ssl3_get_certificate_request(SSL *s)
                 SSL3_ST_CR_CERT_REQ_A,
                 SSL3_ST_CR_CERT_REQ_B,
                 -1,
-#if defined(MSDOS) && !defined(WIN32)
-                1024*30,  /* 30k max cert list :-) */
-#else
-                1024*100, /* 100k max cert list :-) */
-#endif
+                s->max_cert_list,
                 &ok);
 
         if (!ok) return((int)n);
@@ -1188,7 +1271,7 @@ static int ssl3_get_certificate_request(SSL *s)
                         }
                 }
 
-        d=p=(unsigned char *)s->init_buf->data;
+        d=p=(unsigned char *)s->init_msg;
 
         if ((ca_sk=sk_X509_NAME_new(ca_dn_cmp)) == NULL)
                 {
@@ -1308,6 +1391,7 @@ static int ssl3_get_server_done(SSL *s)
                 /* should contain no data */
                 ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
                 SSLerr(SSL_F_SSL3_GET_SERVER_DONE,SSL_R_LENGTH_MISMATCH);
+                return -1;
                 }
         ret=1;
         return(ret);
@@ -1318,10 +1402,13 @@ static int ssl3_send_client_key_exchange(SSL *s)
         unsigned char *p,*d;
         int n;
         unsigned long l;
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
         unsigned char *q;
         EVP_PKEY *pkey=NULL;
 #endif
+#ifndef OPENSSL_NO_KRB5
+        KSSL_ERR kssl_err;
+#endif /* OPENSSL_NO_KRB5 */
 
         if (s->state == SSL3_ST_CW_KEY_EXCH_A)
                 {
@@ -1330,8 +1417,10 @@ static int ssl3_send_client_key_exchange(SSL *s)
 
                 l=s->s3->tmp.new_cipher->algorithms;
 
-#ifndef NO_RSA
-                if (l & SSL_kRSA)
+                /* Fool emacs indentation */
+                if (0) {}
+#ifndef OPENSSL_NO_RSA
+                else if (l & SSL_kRSA)
                         {
                         RSA *rsa;
                         unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
@@ -1345,7 +1434,7 @@ static int ssl3_send_client_key_exchange(SSL *s)
                                         (pkey->type != EVP_PKEY_RSA) ||
                                         (pkey->pkey.rsa == NULL))
                                         {
-                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_INTERNAL_ERROR);
+                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
                                         goto err;
                                         }
                                 rsa=pkey->pkey.rsa;
@@ -1388,10 +1477,136 @@ static int ssl3_send_client_key_exchange(SSL *s)
                                         tmp_buf,SSL_MAX_MASTER_KEY_LENGTH);
                         memset(tmp_buf,0,SSL_MAX_MASTER_KEY_LENGTH);
                         }
-                else
 #endif
-#ifndef NO_DH
-                if (l & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
+#ifndef OPENSSL_NO_KRB5
+                else if (l & SSL_kKRB5)
+                        {
+                        krb5_error_code krb5rc;
+                        KSSL_CTX        *kssl_ctx = s->kssl_ctx;
+                        /*  krb5_data   krb5_ap_req;  */
+                        krb5_data       *enc_ticket;
+                        krb5_data       authenticator, *authp = NULL;
+                        EVP_CIPHER_CTX  ciph_ctx;
+                        EVP_CIPHER      *enc = NULL;
+                        unsigned char   iv[EVP_MAX_IV_LENGTH];
+                        unsigned char   tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
+                        unsigned char   epms[SSL_MAX_MASTER_KEY_LENGTH 
+                                                + EVP_MAX_IV_LENGTH];
+                        int             padl, outl = sizeof(epms);
+
+                        EVP_CIPHER_CTX_init(&ciph_ctx);
+
+#ifdef KSSL_DEBUG
+                        printf("ssl3_send_client_key_exchange(%lx & %lx)\n",
+                                l, SSL_kKRB5);
+#endif  /* KSSL_DEBUG */
+
+                        authp = NULL;
+#ifdef KRB5SENDAUTH
+                        if (KRB5SENDAUTH)  authp = &authenticator;
+#endif  /* KRB5SENDAUTH */
+
+                        krb5rc = kssl_cget_tkt(kssl_ctx, &enc_ticket, authp,
+                                &kssl_err);
+                        enc = kssl_map_enc(kssl_ctx->enctype);
+                        if (enc == NULL)
+                            goto err;
+#ifdef KSSL_DEBUG
+                        {
+                        printf("kssl_cget_tkt rtn %d\n", krb5rc);
+                        if (krb5rc && kssl_err.text)
+                          printf("kssl_cget_tkt kssl_err=%s\n", kssl_err.text);
+                        }
+#endif  /* KSSL_DEBUG */
+
+                        if (krb5rc)
+                                {
+                                ssl3_send_alert(s,SSL3_AL_FATAL,
+                                                SSL_AD_HANDSHAKE_FAILURE);
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
+                                                kssl_err.reason);
+                                goto err;
+                                }
+
+                        /*  20010406 VRS - Earlier versions used KRB5 AP_REQ
+                        **  in place of RFC 2712 KerberosWrapper, as in:
+                        **
+                        **  Send ticket (copy to *p, set n = length)
+                        **  n = krb5_ap_req.length;
+                        **  memcpy(p, krb5_ap_req.data, krb5_ap_req.length);
+                        **  if (krb5_ap_req.data)  
+                        **    kssl_krb5_free_data_contents(NULL,&krb5_ap_req);
+                        **
+                        **  Now using real RFC 2712 KerberosWrapper
+                        **  (Thanks to Simon Wilkinson <sxw@sxw.org.uk>)
+                        **  Note: 2712 "opaque" types are here replaced
+                        **  with a 2-byte length followed by the value.
+                        **  Example:
+                        **  KerberosWrapper= xx xx asn1ticket 0 0 xx xx encpms
+                        **  Where "xx xx" = length bytes.  Shown here with
+                        **  optional authenticator omitted.
+                        */
+
+                        /*  KerberosWrapper.Ticket              */
+                        s2n(enc_ticket->length,p);
+                        memcpy(p, enc_ticket->data, enc_ticket->length);
+                        p+= enc_ticket->length;
+                        n = enc_ticket->length + 2;
+
+                        /*  KerberosWrapper.Authenticator       */
+                        if (authp  &&  authp->length)  
+                                {
+                                s2n(authp->length,p);
+                                memcpy(p, authp->data, authp->length);
+                                p+= authp->length;
+                                n+= authp->length + 2;
+                                
+                                free(authp->data);
+                                authp->data = NULL;
+                                authp->length = 0;
+                                }
+                        else
+                                {
+                                s2n(0,p);/*  null authenticator length  */
+                                n+=2;
+                                }
+ 
+                        if (RAND_bytes(tmp_buf,SSL_MAX_MASTER_KEY_LENGTH) <= 0)
+                            goto err;
+
+                        /*  20010420 VRS.  Tried it this way; failed.
+                        **      EVP_EncryptInit_ex(&ciph_ctx,enc, NULL,NULL);
+                        **      EVP_CIPHER_CTX_set_key_length(&ciph_ctx,
+                        **                              kssl_ctx->length);
+                        **      EVP_EncryptInit_ex(&ciph_ctx,NULL, key,iv);
+                        */
+
+                        memset(iv, 0, EVP_MAX_IV_LENGTH);  /* per RFC 1510 */
+                        EVP_EncryptInit_ex(&ciph_ctx,enc, NULL,
+                                kssl_ctx->key,iv);
+                        EVP_EncryptUpdate(&ciph_ctx,epms,&outl,tmp_buf,
+                                SSL_MAX_MASTER_KEY_LENGTH);
+                        EVP_EncryptFinal_ex(&ciph_ctx,&(epms[outl]),&padl);
+                        outl += padl;
+                        EVP_CIPHER_CTX_cleanup(&ciph_ctx);
+
+                        /*  KerberosWrapper.EncryptedPreMasterSecret    */
+                        s2n(outl,p);
+                        memcpy(p, epms, outl);
+                        p+=outl;
+                        n+=outl + 2;
+
+                        s->session->master_key_length=
+                                s->method->ssl3_enc->generate_master_secret(s,
+                                        s->session->master_key,
+                                        tmp_buf, SSL_MAX_MASTER_KEY_LENGTH);
+
+                        memset(tmp_buf, 0, SSL_MAX_MASTER_KEY_LENGTH);
+                        memset(epms, 0, outl);
+                        }
+#endif
+#ifndef OPENSSL_NO_DH
+                else if (l & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
                         {
                         DH *dh_srvr,*dh_clnt;
 
@@ -1445,11 +1660,11 @@ static int ssl3_send_client_key_exchange(SSL *s)
 
                         /* perhaps clean things up a bit EAY EAY EAY EAY*/
                         }
-                else
 #endif
+                else
                         {
                         ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
-                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_INTERNAL_ERROR);
+                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
                         goto err;
                         }
                 
@@ -1473,11 +1688,11 @@ static int ssl3_send_client_verify(SSL *s)
         unsigned char *p,*d;
         unsigned char data[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH];
         EVP_PKEY *pkey;
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
         unsigned u=0;
 #endif
         unsigned long n;
-#ifndef NO_DSA
+#ifndef OPENSSL_NO_DSA
         int j;
 #endif
 
@@ -1490,7 +1705,7 @@ static int ssl3_send_client_verify(SSL *s)
                 s->method->ssl3_enc->cert_verify_mac(s,&(s->s3->finish_dgst2),
                         &(data[MD5_DIGEST_LENGTH]));
 
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
                 if (pkey->type == EVP_PKEY_RSA)
                         {
                         s->method->ssl3_enc->cert_verify_mac(s,
@@ -1507,7 +1722,7 @@ static int ssl3_send_client_verify(SSL *s)
                         }
                 else
 #endif
-#ifndef NO_DSA
+#ifndef OPENSSL_NO_DSA
                         if (pkey->type == EVP_PKEY_DSA)
                         {
                         if (!DSA_sign(pkey->save_type,
@@ -1524,7 +1739,7 @@ static int ssl3_send_client_verify(SSL *s)
                 else
 #endif
                         {
-                        SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,SSL_R_INTERNAL_ERROR);
+                        SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,ERR_R_INTERNAL_ERROR);
                         goto err;
                         }
                 *(d++)=SSL3_MT_CERTIFICATE_VERIFY;
@@ -1623,10 +1838,10 @@ static int ssl3_check_cert_and_algorithm(SSL *s)
         long algs;
         EVP_PKEY *pkey=NULL;
         SESS_CERT *sc;
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
         RSA *rsa;
 #endif
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
         DH *dh;
 #endif
 
@@ -1634,20 +1849,20 @@ static int ssl3_check_cert_and_algorithm(SSL *s)
 
         if (sc == NULL)
                 {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_INTERNAL_ERROR);
+                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,ERR_R_INTERNAL_ERROR);
                 goto err;
                 }
 
         algs=s->s3->tmp.new_cipher->algorithms;
 
         /* we don't have a certificate */
-        if (algs & (SSL_aDH|SSL_aNULL))
+        if (algs & (SSL_aDH|SSL_aNULL|SSL_aKRB5))
                 return(1);
 
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
         rsa=s->session->sess_cert->peer_rsa_tmp;
 #endif
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
         dh=s->session->sess_cert->peer_dh_tmp;
 #endif
 
@@ -1665,14 +1880,14 @@ static int ssl3_check_cert_and_algorithm(SSL *s)
                 SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_RSA_SIGNING_CERT);
                 goto f_err;
                 }
-#ifndef NO_DSA
+#ifndef OPENSSL_NO_DSA
         else if ((algs & SSL_aDSS) && !has_bits(i,EVP_PK_DSA|EVP_PKT_SIGN))
                 {
                 SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DSA_SIGNING_CERT);
                 goto f_err;
                 }
 #endif
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
         if ((algs & SSL_kRSA) &&
                 !(has_bits(i,EVP_PK_RSA|EVP_PKT_ENC) || (rsa != NULL)))
                 {
@@ -1680,7 +1895,7 @@ static int ssl3_check_cert_and_algorithm(SSL *s)
                 goto f_err;
                 }
 #endif
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
         if ((algs & SSL_kEDH) &&
                 !(has_bits(i,EVP_PK_DH|EVP_PKT_EXCH) || (dh != NULL)))
                 {
@@ -1692,7 +1907,7 @@ static int ssl3_check_cert_and_algorithm(SSL *s)
                 SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DH_RSA_CERT);
                 goto f_err;
                 }
-#ifndef NO_DSA
+#ifndef OPENSSL_NO_DSA
         else if ((algs & SSL_kDHd) && !has_bits(i,EVP_PK_DH|EVP_PKS_DSA))
                 {
                 SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DH_DSA_CERT);
@@ -1703,7 +1918,7 @@ static int ssl3_check_cert_and_algorithm(SSL *s)
 
         if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) && !has_bits(i,EVP_PKT_EXP))
                 {
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
                 if (algs & SSL_kRSA)
                         {
                         if (rsa == NULL
@@ -1715,7 +1930,7 @@ static int ssl3_check_cert_and_algorithm(SSL *s)
                         }
                 else
 #endif
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
                         if (algs & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
                             {
                             if (dh == NULL