[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  3c06513f3833d4692f620e2c03d7a840871c08a7 (commit)
      from  9c422b5b1ebc9871a7306f66648aa16c8769082a (commit)


- Log -----------------------------------------------------------------
commit 3c06513f3833d4692f620e2c03d7a840871c08a7
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sat May 30 19:20:12 2015 +0200

    Allow all curves when the client doesn't send an supported elliptic curves extension
    
    At least in the case of SSLv3 we can't send an extention.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    MR #811

-----------------------------------------------------------------------

Summary of changes:
 ssl/t1_lib.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index a161dcc..0420fe3 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -555,6 +555,20 @@ int tls1_shared_curve(SSL *s, int nmatch)
         (s, !(s->options & SSL_OP_CIPHER_SERVER_PREFERENCE), &pref,
          &num_pref))
         return nmatch == -1 ? 0 : NID_undef;
+
+    /*
+     * If the client didn't send the elliptic_curves extension all of them
+     * are allowed.
+     */
+    if (num_supp == 0 && (s->options & SSL_OP_CIPHER_SERVER_PREFERENCE) != 0) {
+        supp = eccurves_all;
+        num_supp = sizeof(eccurves_all) / 2;
+    } else if (num_pref == 0 &&
+        (s->options & SSL_OP_CIPHER_SERVER_PREFERENCE) == 0) {
+        pref = eccurves_all;
+        num_pref = sizeof(eccurves_all) / 2;
+    }
+
     k = 0;
     for (i = 0; i < num_pref; i++, pref += 2) {
         const unsigned char *tsupp = supp;