From 2eab92f8e3017a3a34f38d6fb0d76a0466e324f7 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 10 Mar 2011 18:27:13 +0000 Subject: [PATCH] make no-dsa work again --- apps/speed.c | 2 ++ ssl/ssl_locl.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/apps/speed.c b/apps/speed.c index 0cb7f24cc4..65f85fecf7 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -2703,6 +2703,7 @@ static int do_multi(int multi) else rsa_results[k][1]=d; } +#ifndef OPENSSL_NO_DSA else if(!strncmp(buf,"+F3:",4)) { int k; @@ -2724,6 +2725,7 @@ static int do_multi(int multi) else dsa_results[k][1]=d; } +#endif #ifndef OPENSSL_NO_ECDSA else if(!strncmp(buf,"+F4:",4)) { diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 41f0f77597..beb5a6c8d8 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -344,9 +344,12 @@ * make sure to update this constant too */ #define SSL_MAX_DIGEST 4 +#define TLS1_PRF_DGST_MASK (0xff << TLS1_PRF_DGST_SHIFT) + #define TLS1_PRF_DGST_SHIFT 8 #define TLS1_PRF_MD5 (SSL_HANDSHAKE_MAC_MD5 << TLS1_PRF_DGST_SHIFT) #define TLS1_PRF_SHA1 (SSL_HANDSHAKE_MAC_SHA << TLS1_PRF_DGST_SHIFT) +#define TLS1_PRF_SHA256 (SSL_HANDSHAKE_MAC_SHA256 << TLS1_PRF_DGST_SHIFT) #define TLS1_PRF_GOST94 (SSL_HANDSHAKE_MAC_GOST94 << TLS1_PRF_DGST_SHIFT) #define TLS1_PRF (TLS1_PRF_MD5 | TLS1_PRF_SHA1)