Commit 2eab92f8 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

make no-dsa work again

parent 2bbd82cf

apps/speed.c

+2 −0
Changes for apps/speed.c: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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))

				{

ssl/ssl_locl.h

+3 −0
Changes for ssl/ssl_locl.h: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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)