make no-dsa work again

diff --git a/apps/speed.c b/apps/speed.c
index 0cb7f24cc427948c8d4e0008aa73b960a039d7df..65f85fecf7f3d231688e9433df83d848f36a9852 100644 (file)
--- 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 41f0f775978d1932c559ac1f8218deeed1005ec1..beb5a6c8d82b700a7da9e26ae2810836c6428165 100644 (file)
--- 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)