generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make no-dsa work again

Browse Source
This commit is contained in:
Dr. Stephen Henson 2011-03-10 18:27:13 +00:00
parent 2bbd82cf24
commit 2eab92f8e3
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/speed.c
View File

@ -2703,6 +2703,7 @@ static int do_multi(int multi)
else else
rsa_results[k][1]=d; rsa_results[k][1]=d;
} }
#ifndef OPENSSL_NO_DSA
else if(!strncmp(buf,"+F3:",4)) else if(!strncmp(buf,"+F3:",4))
{ {
int k; int k;
@ -2724,6 +2725,7 @@ static int do_multi(int multi)
else else
dsa_results[k][1]=d; dsa_results[k][1]=d;
} }
#endif
#ifndef OPENSSL_NO_ECDSA #ifndef OPENSSL_NO_ECDSA
else if(!strncmp(buf,"+F4:",4)) else if(!strncmp(buf,"+F4:",4))
{ {

3
ssl/ssl_locl.h
View File

@ -344,9 +344,12 @@
* make sure to update this constant too */ * make sure to update this constant too */
#define SSL_MAX_DIGEST 4 #define SSL_MAX_DIGEST 4
#define TLS1_PRF_DGST_MASK (0xff << TLS1_PRF_DGST_SHIFT)
#define TLS1_PRF_DGST_SHIFT 8 #define TLS1_PRF_DGST_SHIFT 8
#define TLS1_PRF_MD5 (SSL_HANDSHAKE_MAC_MD5 << TLS1_PRF_DGST_SHIFT) #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_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_GOST94 (SSL_HANDSHAKE_MAC_GOST94 << TLS1_PRF_DGST_SHIFT)
#define TLS1_PRF (TLS1_PRF_MD5 | TLS1_PRF_SHA1) #define TLS1_PRF (TLS1_PRF_MD5 | TLS1_PRF_SHA1)