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

openssl/ssl/d1_srvr.c

 /* ssl/d1_srvr.c */
 /* 
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
  */
 /* ====================================================================
- * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer. 
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ skipping 96 matching lines @@
  */
 
 #include <stdio.h>
 #include "ssl_locl.h"
 #include <openssl/buffer.h>
 #include <openssl/rand.h>
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/md5.h>
+#include <openssl/bn.h>
 #ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>
 #endif
 
-static SSL_METHOD *dtls1_get_server_method(int ver);
+static const SSL_METHOD *dtls1_get_server_method(int ver);
 static int dtls1_send_hello_verify_request(SSL *s);
 
-static SSL_METHOD *dtls1_get_server_method(int ver)
+static const SSL_METHOD *dtls1_get_server_method(int ver)
         {
         if (ver == DTLS1_VERSION)
                 return(DTLSv1_server_method());
         else
                 return(NULL);
         }
 
 IMPLEMENT_dtls1_meth_func(DTLSv1_server_method,
                         dtls1_accept,
                         ssl_undefined_function,
                         dtls1_get_server_method)
 
 int dtls1_accept(SSL *s)
         {
         BUF_MEM *buf;
-        unsigned long l,Time=(unsigned long)time(NULL);
+        unsigned long Time=(unsigned long)time(NULL);
         void (*cb)(const SSL *ssl,int type,int val)=NULL;
+        unsigned long alg_k;
         int ret= -1;
         int new_state,state,skip=0;
+        int listen;
 
         RAND_add(&Time,sizeof(Time),0);
         ERR_clear_error();
         clear_sys_error();
 
         if (s->info_callback != NULL)
                 cb=s->info_callback;
         else if (s->ctx->info_callback != NULL)
                 cb=s->ctx->info_callback;
+        
+        listen = s->d1->listen;
 
         /* init things to blank */
         s->in_handshake++;
         if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);
 
+        s->d1->listen = listen;
+
         if (s->cert == NULL)
                 {
                 SSLerr(SSL_F_DTLS1_ACCEPT,SSL_R_NO_CERTIFICATE_SET);
                 return(-1);
                 }
 
         for (;;)
                 {
                 state=s->state;
 
@@ skipping 89 matching lines @@
                         if (ret <= 0) goto end;
                         dtls1_stop_timer(s);
 
                         if (ret == 1 && (SSL_get_options(s) & SSL_OP_COOKIE_EXCHANGE))
                                 s->state = DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A;
                         else
                                 s->state = SSL3_ST_SW_SRVR_HELLO_A;
 
                         s->init_num=0;
 
+                        /* Reflect ClientHello sequence to remain stateless while listening */
+                        if (listen)
+                                {
+                                memcpy(s->s3->write_sequence, s->s3->read_sequence, sizeof(s->s3->write_sequence));
+                                }
+
                         /* If we're just listening, stop here */
-                        if (s->d1->listen && s->state == SSL3_ST_SW_SRVR_HELLO_A)
+                        if (listen && s->state == SSL3_ST_SW_SRVR_HELLO_A)
                                 {
                                 ret = 2;
                                 s->d1->listen = 0;
+                                /* Set expected sequence numbers
+                                 * to continue the handshake.
+                                 */
+                                s->d1->handshake_read_seq = 2;
+                                s->d1->handshake_write_seq = 1;
+                                s->d1->next_handshake_write_seq = 1;
                                 goto end;
                                 }
                         
                         break;
                         
                 case DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A:
                 case DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B:
 
-                        dtls1_start_timer(s);
                         ret = dtls1_send_hello_verify_request(s);
                         if ( ret <= 0) goto end;
                         s->state=SSL3_ST_SW_FLUSH;
                         s->s3->tmp.next_state=SSL3_ST_SR_CLNT_HELLO_A;
 
-                        /* HelloVerifyRequests resets Finished MAC */
-                        if (s->client_version != DTLS1_BAD_VER)
+                        /* HelloVerifyRequest resets Finished MAC */
+                        if (s->version != DTLS1_BAD_VER)
                                 ssl3_init_finished_mac(s);
                         break;
                         
                 case SSL3_ST_SW_SRVR_HELLO_A:
                 case SSL3_ST_SW_SRVR_HELLO_B:
                         s->new_session = 2;
                         dtls1_start_timer(s);
                         ret=dtls1_send_server_hello(s);
                         if (ret <= 0) goto end;
 
 #ifndef OPENSSL_NO_TLSEXT
                         if (s->hit)
                                 {
                                 if (s->tlsext_ticket_expected)
                                         s->state=SSL3_ST_SW_SESSION_TICKET_A;
                                 else
                                         s->state=SSL3_ST_SW_CHANGE_A;
                                 }
 #else
                         if (s->hit)
                                         s->state=SSL3_ST_SW_CHANGE_A;
 #endif
                         else
                                 s->state=SSL3_ST_SW_CERT_A;
                         s->init_num=0;
                         break;
 
                 case SSL3_ST_SW_CERT_A:
                 case SSL3_ST_SW_CERT_B:
-                        /* Check if it is anon DH */
-                        if (!(s->s3->tmp.new_cipher->algorithms & SSL_aNULL))
+                        /* Check if it is anon DH or normal PSK */
+                        if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL)
+                                && !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK))
                                 {
                                 dtls1_start_timer(s);
                                 ret=dtls1_send_server_certificate(s);
                                 if (ret <= 0) goto end;
 #ifndef OPENSSL_NO_TLSEXT
                                 if (s->tlsext_status_expected)
                                         s->state=SSL3_ST_SW_CERT_STATUS_A;
                                 else
                                         s->state=SSL3_ST_SW_KEY_EXCH_A;
                                 }
                         else
                                 {
                                 skip = 1;
                                 s->state=SSL3_ST_SW_KEY_EXCH_A;
                                 }
 #else
                                 }
                         else
                                 skip=1;
 
                         s->state=SSL3_ST_SW_KEY_EXCH_A;
 #endif
                         s->init_num=0;
                         break;
 
                 case SSL3_ST_SW_KEY_EXCH_A:
                 case SSL3_ST_SW_KEY_EXCH_B:
-                        l=s->s3->tmp.new_cipher->algorithms;
+                        alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
 
                         /* clear this, it may get reset by
                          * send_server_key_exchange */
                         if ((s->options & SSL_OP_EPHEMERAL_RSA)
 #ifndef OPENSSL_NO_KRB5
-                                && !(l & SSL_KRB5)
+                                && !(alg_k & SSL_kKRB5)
 #endif /* OPENSSL_NO_KRB5 */
                                 )
                                 /* option SSL_OP_EPHEMERAL_RSA sends temporary RSA key
                                  * even when forbidden by protocol specs
                                  * (handshake may fail as clients are not required to
                                  * be able to handle this) */
                                 s->s3->tmp.use_rsa_tmp=1;
                         else
                                 s->s3->tmp.use_rsa_tmp=0;
 
-                        /* only send if a DH key exchange, fortezza or
+                        /* only send if a DH key exchange or
                          * RSA but we have a sign only certificate */
                         if (s->s3->tmp.use_rsa_tmp
-                            || (l & (SSL_DH|SSL_kFZA))
-                            || ((l & SSL_kRSA)
+                        /* PSK: send ServerKeyExchange if PSK identity
+                         * hint if provided */
+#ifndef OPENSSL_NO_PSK
+                            || ((alg_k & SSL_kPSK) && s->ctx->psk_identity_hint)
+#endif
+                            || (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
+                            || (alg_k & SSL_kEECDH)
+                            || ((alg_k & SSL_kRSA)
                                 && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL
                                     || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher)
                                         && EVP_PKEY_size(s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)
                                         )
                                     )
                                 )
                             )
                                 {
                                 dtls1_start_timer(s);
                                 ret=dtls1_send_server_key_exchange(s);
@@ skipping 10 matching lines @@
                 case SSL3_ST_SW_CERT_REQ_B:
                         if (/* don't request cert unless asked for it: */
                                 !(s->verify_mode & SSL_VERIFY_PEER) ||
                                 /* if SSL_VERIFY_CLIENT_ONCE is set,
                                  * don't request cert during re-negotiation: */
                                 ((s->session->peer != NULL) &&
                                  (s->verify_mode & SSL_VERIFY_CLIENT_ONCE)) ||
                                 /* never request cert in anonymous ciphersuites
                                  * (see section "Certificate request" in SSL 3 drafts
                                  * and in RFC 2246): */
-                                ((s->s3->tmp.new_cipher->algorithms & SSL_aNULL) &&
+                                ((s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) &&
                                  /* ... except when the application insists on verification
                                   * (against the specs, but s3_clnt.c accepts this for SSL 3) */
                                  !(s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) ||
-                                 /* never request cert in Kerberos ciphersuites */
-                                (s->s3->tmp.new_cipher->algorithms & SSL_aKRB5))
+                                 /* never request cert in Kerberos ciphersuites */
+                                (s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5)
+                                /* With normal PSK Certificates and
+                                 * Certificate Requests are omitted */
+                                || (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK))
                                 {
                                 /* no cert request */
                                 skip=1;
                                 s->s3->tmp.cert_request=0;
                                 s->state=SSL3_ST_SW_SRVR_DONE_A;
                                 }
                         else
                                 {
                                 s->s3->tmp.cert_request=1;
                                 dtls1_start_timer(s);
@@ skipping 51 matching lines @@
                         break;
 
                 case SSL3_ST_SR_KEY_EXCH_A:
                 case SSL3_ST_SR_KEY_EXCH_B:
                         ret=ssl3_get_client_key_exchange(s);
                         if (ret <= 0) goto end;
                         dtls1_stop_timer(s);
                         s->state=SSL3_ST_SR_CERT_VRFY_A;
                         s->init_num=0;
 
-                        /* We need to get hashes here so if there is
-                         * a client cert, it can be verified */ 
-                        s->method->ssl3_enc->cert_verify_mac(s,
-                                &(s->s3->finish_dgst1),
-                                &(s->s3->tmp.cert_verify_md[0]));
-                        s->method->ssl3_enc->cert_verify_mac(s,
-                                &(s->s3->finish_dgst2),
-                                &(s->s3->tmp.cert_verify_md[MD5_DIGEST_LENGTH]));
+                        if (ret == 2)
+                                {
+                                /* For the ECDH ciphersuites when
+                                 * the client sends its ECDH pub key in
+                                 * a certificate, the CertificateVerify
+                                 * message is not sent.
+                                 */
+                                s->state=SSL3_ST_SR_FINISHED_A;
+                                s->init_num = 0;
+                                }
+                        else
+                                {
+                                s->state=SSL3_ST_SR_CERT_VRFY_A;
+                                s->init_num=0;
 
+                                /* We need to get hashes here so if there is
+                                 * a client cert, it can be verified */ 
+                                s->method->ssl3_enc->cert_verify_mac(s,
+                                        NID_md5,
+                                        &(s->s3->tmp.cert_verify_md[0]));
+                                s->method->ssl3_enc->cert_verify_mac(s,
+                                        NID_sha1,
+                                        &(s->s3->tmp.cert_verify_md[MD5_DIGEST_LENGTH]));
+                                }
                         break;
 
                 case SSL3_ST_SR_CERT_VRFY_A:
                 case SSL3_ST_SR_CERT_VRFY_B:
 
                         s->d1->change_cipher_spec_ok = 1;
                         /* we should decide if we expected this one */
                         ret=ssl3_get_cert_verify(s);
                         if (ret <= 0) goto end;
                         dtls1_stop_timer(s);
@@ skipping 178 matching lines @@
 int dtls1_send_hello_verify_request(SSL *s)
         {
         unsigned int msg_len;
         unsigned char *msg, *buf, *p;
 
         if (s->state == DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A)
                 {
                 buf = (unsigned char *)s->init_buf->data;
 
                 msg = p = &(buf[DTLS1_HM_HEADER_LENGTH]);
-                if (s->client_version == DTLS1_BAD_VER)
-                        *(p++) = DTLS1_BAD_VER>>8,
-                        *(p++) = DTLS1_BAD_VER&0xff;
-                else
-                        *(p++) = s->version >> 8,
-                        *(p++) = s->version & 0xFF;
+                *(p++) = s->version >> 8;
+                *(p++) = s->version & 0xFF;
 
                 if (s->ctx->app_gen_cookie_cb == NULL ||
                      s->ctx->app_gen_cookie_cb(s, s->d1->cookie,
                          &(s->d1->cookie_len)) == 0)
                         {
                         SSLerr(SSL_F_DTLS1_SEND_HELLO_VERIFY_REQUEST,ERR_R_INTERNAL_ERROR);
                         return 0;
                         }
 
                 *(p++) = (unsigned char) s->d1->cookie_len;
                 memcpy(p, s->d1->cookie, s->d1->cookie_len);
                 p += s->d1->cookie_len;
                 msg_len = p - msg;
 
                 dtls1_set_message_header(s, buf,
                         DTLS1_MT_HELLO_VERIFY_REQUEST, msg_len, 0, msg_len);
 
                 s->state=DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B;
                 /* number of bytes to write */
                 s->init_num=p-buf;
                 s->init_off=0;
-
-                /* buffer the message to handle re-xmits */
-                dtls1_buffer_message(s, 0);
                 }
 
         /* s->state = DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B */
         return(dtls1_do_write(s,SSL3_RT_HANDSHAKE));
         }
 
 int dtls1_send_server_hello(SSL *s)
         {
         unsigned char *buf;
         unsigned char *p,*d;
         int i;
         unsigned int sl;
         unsigned long l,Time;
 
         if (s->state == SSL3_ST_SW_SRVR_HELLO_A)
                 {
                 buf=(unsigned char *)s->init_buf->data;
                 p=s->s3->server_random;
                 Time=(unsigned long)time(NULL);                 /* Time */
                 l2n(Time,p);
                 RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-sizeof(Time));
                 /* Do the message type and length last */
                 d=p= &(buf[DTLS1_HM_HEADER_LENGTH]);
 
-                if (s->client_version == DTLS1_BAD_VER)
-                        *(p++)=DTLS1_BAD_VER>>8,
-                        *(p++)=DTLS1_BAD_VER&0xff;
-                else
-                        *(p++)=s->version>>8,
-                        *(p++)=s->version&0xff;
+                *(p++)=s->version>>8;
+                *(p++)=s->version&0xff;
 
                 /* Random stuff */
                 memcpy(p,s->s3->server_random,SSL3_RANDOM_SIZE);
                 p+=SSL3_RANDOM_SIZE;
 
                 /* now in theory we have 3 options to sending back the
                  * session id.  If it is a re-use, we send back the
                  * old session-id, if it is a new session, we send
                  * back the new session-id or we send back a 0 length
                  * session-id if we want it to be single use.
@@ skipping 85 matching lines @@
 #ifndef OPENSSL_NO_RSA
         unsigned char *q;
         int j,num;
         RSA *rsa;
         unsigned char md_buf[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH];
         unsigned int u;
 #endif
 #ifndef OPENSSL_NO_DH
         DH *dh=NULL,*dhp;
 #endif
+#ifndef OPENSSL_NO_ECDH
+        EC_KEY *ecdh=NULL, *ecdhp;
+        unsigned char *encodedPoint = NULL;
+        int encodedlen = 0;
+        int curve_id = 0;
+        BN_CTX *bn_ctx = NULL; 
+#endif
         EVP_PKEY *pkey;
         unsigned char *p,*d;
         int al,i;
         unsigned long type;
         int n;
         CERT *cert;
         BIGNUM *r[4];
         int nr[4],kn;
         BUF_MEM *buf;
         EVP_MD_CTX md_ctx;
 
         EVP_MD_CTX_init(&md_ctx);
         if (s->state == SSL3_ST_SW_KEY_EXCH_A)
                 {
-                type=s->s3->tmp.new_cipher->algorithms & SSL_MKEY_MASK;
+                type=s->s3->tmp.new_cipher->algorithm_mkey;
                 cert=s->cert;
 
                 buf=s->init_buf;
 
                 r[0]=r[1]=r[2]=r[3]=NULL;
                 n=0;
 #ifndef OPENSSL_NO_RSA
                 if (type & SSL_kRSA)
                         {
                         rsa=cert->rsa_tmp;
@@ skipping 73 matching lines @@
                                         SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB);
                                         goto err;
                                         }
                                 }
                         r[0]=dh->p;
                         r[1]=dh->g;
                         r[2]=dh->pub_key;
                         }
                 else 
 #endif
+#ifndef OPENSSL_NO_ECDH
+                        if (type & SSL_kEECDH)
+                        {
+                        const EC_GROUP *group;
+
+                        ecdhp=cert->ecdh_tmp;
+                        if ((ecdhp == NULL) && (s->cert->ecdh_tmp_cb != NULL))
+                                {
+                                ecdhp=s->cert->ecdh_tmp_cb(s,
+                                      SSL_C_IS_EXPORT(s->s3->tmp.new_cipher),
+                                      SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher));
+                                }
+                        if (ecdhp == NULL)
+                                {
+                                al=SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_ECDH_KEY);
+                                goto f_err;
+                                }
+
+                        if (s->s3->tmp.ecdh != NULL)
+                                {
+                                EC_KEY_free(s->s3->tmp.ecdh); 
+                                SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
+                                goto err;
+                                }
+
+                        /* Duplicate the ECDH structure. */
+                        if (ecdhp == NULL)
+                                {
+                                SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
+                                goto err;
+                                }
+                        if ((ecdh = EC_KEY_dup(ecdhp)) == NULL)
+                                {
+                                SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
+                                goto err;
+                                }
+
+                        s->s3->tmp.ecdh=ecdh;
+                        if ((EC_KEY_get0_public_key(ecdh) == NULL) ||
+                            (EC_KEY_get0_private_key(ecdh) == NULL) ||
+                            (s->options & SSL_OP_SINGLE_ECDH_USE))
+                                {
+                                if(!EC_KEY_generate_key(ecdh))
+                                    {
+                                    SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
+                                    goto err;
+                                    }
+                                }
+
+                        if (((group = EC_KEY_get0_group(ecdh)) == NULL) ||
+                            (EC_KEY_get0_public_key(ecdh)  == NULL) ||
+                            (EC_KEY_get0_private_key(ecdh) == NULL))
+                                {
+                                SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
+                                goto err;
+                                }
+
+                        if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) &&
+                            (EC_GROUP_get_degree(group) > 163)) 
+                                {
+                                SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER);
+                                goto err;
+                                }
+
+                        /* XXX: For now, we only support ephemeral ECDH
+                         * keys over named (not generic) curves. For 
+                         * supported named curves, curve_id is non-zero.
+                         */
+                        if ((curve_id = 
+                            tls1_ec_nid2curve_id(EC_GROUP_get_curve_name(group)))
+                            == 0)
+                                {
+                                SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNSUPPORTED_ELLIPTIC_CURVE);
+                                goto err;
+                                }
+
+                        /* Encode the public key.
+                         * First check the size of encoding and
+                         * allocate memory accordingly.
+                         */
+                        encodedlen = EC_POINT_point2oct(group, 
+                            EC_KEY_get0_public_key(ecdh),
+                            POINT_CONVERSION_UNCOMPRESSED, 
+                            NULL, 0, NULL);
+
+                        encodedPoint = (unsigned char *) 
+                            OPENSSL_malloc(encodedlen*sizeof(unsigned char)); 
+                        bn_ctx = BN_CTX_new();
+                        if ((encodedPoint == NULL) || (bn_ctx == NULL))
+                                {
+                                SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
+                                goto err;
+                                }
+
+
+                        encodedlen = EC_POINT_point2oct(group, 
+                            EC_KEY_get0_public_key(ecdh), 
+                            POINT_CONVERSION_UNCOMPRESSED, 
+                            encodedPoint, encodedlen, bn_ctx);
+
+                        if (encodedlen == 0) 
+                                {
+                                SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
+                                goto err;
+                                }
+
+                        BN_CTX_free(bn_ctx);  bn_ctx=NULL;
+
+                        /* XXX: For now, we only support named (not 
+                         * generic) curves in ECDH ephemeral key exchanges.
+                         * In this situation, we need four additional bytes
+                         * to encode the entire ServerECDHParams
+                         * structure. 
+                         */
+                        n = 4 + encodedlen;
+
+                        /* We'll generate the serverKeyExchange message
+                         * explicitly so we can set these to NULLs
+                         */
+                        r[0]=NULL;
+                        r[1]=NULL;
+                        r[2]=NULL;
+                        r[3]=NULL;
+                        }
+                else 
+#endif /* !OPENSSL_NO_ECDH */
+#ifndef OPENSSL_NO_PSK
+                        if (type & SSL_kPSK)
+                                {
+                                /* reserve size for record length and PSK identity hint*/
+                                n+=2+strlen(s->ctx->psk_identity_hint);
+                                }
+                        else
+#endif /* !OPENSSL_NO_PSK */
                         {
                         al=SSL_AD_HANDSHAKE_FAILURE;
                         SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
                         goto f_err;
                         }
                 for (i=0; r[i] != NULL; i++)
                         {
                         nr[i]=BN_num_bytes(r[i]);
                         n+=2+nr[i];
                         }
 
-                if (!(s->s3->tmp.new_cipher->algorithms & SSL_aNULL))
+                if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL)
+                        && !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK))
                         {
                         if ((pkey=ssl_get_sign_pkey(s,s->s3->tmp.new_cipher))
                                 == NULL)
                                 {
                                 al=SSL_AD_DECODE_ERROR;
                                 goto f_err;
                                 }
                         kn=EVP_PKEY_size(pkey);
                         }
                 else
@@ skipping 10 matching lines @@
                 d=(unsigned char *)s->init_buf->data;
                 p= &(d[DTLS1_HM_HEADER_LENGTH]);
 
                 for (i=0; r[i] != NULL; i++)
                         {
                         s2n(nr[i],p);
                         BN_bn2bin(r[i],p);
                         p+=nr[i];
                         }
 
+#ifndef OPENSSL_NO_ECDH
+                if (type & SSL_kEECDH) 
+                        {
+                        /* XXX: For now, we only support named (not generic) curves.
+                         * In this situation, the serverKeyExchange message has:
+                         * [1 byte CurveType], [2 byte CurveName]
+                         * [1 byte length of encoded point], followed by
+                         * the actual encoded point itself
+                         */
+                        *p = NAMED_CURVE_TYPE;
+                        p += 1;
+                        *p = 0;
+                        p += 1;
+                        *p = curve_id;
+                        p += 1;
+                        *p = encodedlen;
+                        p += 1;
+                        memcpy((unsigned char*)p, 
+                            (unsigned char *)encodedPoint, 
+                            encodedlen);
+                        OPENSSL_free(encodedPoint);
+                        p += encodedlen;
+                        }
+#endif
+
+#ifndef OPENSSL_NO_PSK
+                if (type & SSL_kPSK)
+                        {
+                        /* copy PSK identity hint */
+                        s2n(strlen(s->ctx->psk_identity_hint), p); 
+                        strncpy((char *)p, s->ctx->psk_identity_hint, strlen(s->ctx->psk_identity_hint));
+                        p+=strlen(s->ctx->psk_identity_hint);
+                        }
+#endif
+
                 /* not anonymous */
                 if (pkey != NULL)
                         {
                         /* n is the length of the params, they start at
                          * &(d[DTLS1_HM_HEADER_LENGTH]) and p points to the space
                          * at the end. */
 #ifndef OPENSSL_NO_RSA
                         if (pkey->type == EVP_PKEY_RSA)
                                 {
                                 q=md_buf;
@@ skipping 33 matching lines @@
                                         (unsigned int *)&i,pkey))
                                         {
                                         SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_DSA);
                                         goto err;
                                         }
                                 s2n(i,p);
                                 n+=i+2;
                                 }
                         else
 #endif
+#if !defined(OPENSSL_NO_ECDSA)
+                                if (pkey->type == EVP_PKEY_EC)
+                                {
+                                /* let's do ECDSA */
+                                EVP_SignInit_ex(&md_ctx,EVP_ecdsa(), NULL);
+                                EVP_SignUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
+                                EVP_SignUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
+                                EVP_SignUpdate(&md_ctx,&(d[DTLS1_HM_HEADER_LENGTH]),n);
+                                if (!EVP_SignFinal(&md_ctx,&(p[2]),
+                                        (unsigned int *)&i,pkey))
+                                        {
+                                        SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_ECDSA);
+                                        goto err;
+                                        }
+                                s2n(i,p);
+                                n+=i+2;
+                                }
+                        else
+#endif
                                 {
                                 /* Is this error check actually needed? */
                                 al=SSL_AD_HANDSHAKE_FAILURE;
                                 SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_PKEY_TYPE);
                                 goto f_err;
                                 }
                         }
 
                 d = dtls1_set_message_header(s, d,
                         SSL3_MT_SERVER_KEY_EXCHANGE, n, 0, n);
 
                 /* we should now have things packed up, so lets send
                  * it off */
                 s->init_num=n+DTLS1_HM_HEADER_LENGTH;
                 s->init_off=0;
 
                 /* buffer the message to handle re-xmits */
                 dtls1_buffer_message(s, 0);
                 }
 
         s->state = SSL3_ST_SW_KEY_EXCH_B;
         EVP_MD_CTX_cleanup(&md_ctx);
         return(dtls1_do_write(s,SSL3_RT_HANDSHAKE));
 f_err:
         ssl3_send_alert(s,SSL3_AL_FATAL,al);
 err:
+#ifndef OPENSSL_NO_ECDH
+        if (encodedPoint != NULL) OPENSSL_free(encodedPoint);
+        BN_CTX_free(bn_ctx);
+#endif
         EVP_MD_CTX_cleanup(&md_ctx);
         return(-1);
         }
 
 int dtls1_send_certificate_request(SSL *s)
         {
         unsigned char *p,*d;
         int i,j,nl,off,n;
         STACK_OF(X509_NAME) *sk=NULL;
         X509_NAME *name;
@@ skipping 93 matching lines @@
         }
 
 int dtls1_send_server_certificate(SSL *s)
         {
         unsigned long l;
         X509 *x;
 
         if (s->state == SSL3_ST_SW_CERT_A)
                 {
                 x=ssl_get_server_send_cert(s);
-                if (x == NULL &&
-                        /* VRS: allow null cert if auth == KRB5 */
-                        (s->s3->tmp.new_cipher->algorithms
-                                & (SSL_MKEY_MASK|SSL_AUTH_MASK))
-                        != (SSL_aKRB5|SSL_kKRB5))
+                if (x == NULL)
                         {
-                        SSLerr(SSL_F_DTLS1_SEND_SERVER_CERTIFICATE,ERR_R_INTERNAL_ERROR);
-                        return(0);
+                        /* VRS: allow null cert if auth == KRB5 */
+                        if ((s->s3->tmp.new_cipher->algorithm_mkey != SSL_kKRB5) ||
+                            (s->s3->tmp.new_cipher->algorithm_auth != SSL_aKRB5))
+                                {
+                                SSLerr(SSL_F_DTLS1_SEND_SERVER_CERTIFICATE,ERR_R_INTERNAL_ERROR);
+                                return(0);
+                                }
                         }
 
                 l=dtls1_output_cert_chain(s,x);
                 s->state=SSL3_ST_SW_CERT_B;
                 s->init_num=(int)l;
                 s->init_off=0;
 
                 /* buffer the message to handle re-xmits */
                 dtls1_buffer_message(s, 0);
                 }
@@ skipping 106 matching lines @@
                         SSL3_MT_NEWSESSION_TICKET, msg_len, 0, msg_len);
 
                 /* buffer the message to handle re-xmits */
                 dtls1_buffer_message(s, 0);
                 }
 
         /* SSL3_ST_SW_SESSION_TICKET_B */
         return(dtls1_do_write(s,SSL3_RT_HANDSHAKE));
         }
 #endif