summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src/ssl/d1_srvr.c
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2014-04-17 21:37:37 +0000
committertedu <tedu@openbsd.org>2014-04-17 21:37:37 +0000
commitf9cd3d10235bfe2564dce844f01425b5129af89a (patch)
tree59a1f3426b9d422136eaa74ec4dcab48b5cb7bc6 /lib/libssl/src/ssl/d1_srvr.c
parentkill REF_PRINT/REF_CHECK debugging framework noone would use (diff)
downloadwireguard-openbsd-f9cd3d10235bfe2564dce844f01425b5129af89a.tar.xz
wireguard-openbsd-f9cd3d10235bfe2564dce844f01425b5129af89a.zip
always build in RSA and DSA. ok deraadt miod
Diffstat (limited to 'lib/libssl/src/ssl/d1_srvr.c')
-rw-r--r--lib/libssl/src/ssl/d1_srvr.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/libssl/src/ssl/d1_srvr.c b/lib/libssl/src/ssl/d1_srvr.c
index ce7b243c2db..6a10f7a3ddb 100644
--- a/lib/libssl/src/ssl/d1_srvr.c
+++ b/lib/libssl/src/ssl/d1_srvr.c
@@ -1000,13 +1000,11 @@ dtls1_send_server_done(SSL *s)
int
dtls1_send_server_key_exchange(SSL *s)
{
-#ifndef OPENSSL_NO_RSA
unsigned char *q;
int j, num;
RSA *rsa;
unsigned char md_buf[MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH];
unsigned int u;
-#endif
#ifndef OPENSSL_NO_DH
DH *dh = NULL, *dhp;
#endif
@@ -1041,7 +1039,6 @@ dtls1_send_server_key_exchange(SSL *s)
r[0] = r[1] = r[2] = r[3] = NULL;
n = 0;
-#ifndef OPENSSL_NO_RSA
if (type & SSL_kRSA) {
rsa = cert->rsa_tmp;
if ((rsa == NULL) && (s->cert->rsa_tmp_cb != NULL)) {
@@ -1065,7 +1062,6 @@ dtls1_send_server_key_exchange(SSL *s)
r[1] = rsa->e;
s->s3->tmp.use_rsa_tmp = 1;
} else
-#endif
#ifndef OPENSSL_NO_DH
if (type & SSL_kEDH) {
dhp = cert->dh_tmp;
@@ -1310,7 +1306,6 @@ dtls1_send_server_key_exchange(SSL *s)
/* n is the length of the params, they start at
* &(d[DTLS1_HM_HEADER_LENGTH]) and p points to the space
* at the end. */
-#ifndef OPENSSL_NO_RSA
if (pkey->type == EVP_PKEY_RSA) {
q = md_buf;
j = 0;
@@ -1338,8 +1333,6 @@ dtls1_send_server_key_exchange(SSL *s)
s2n(u, p);
n += u + 2;
} else
-#endif
-#if !defined(OPENSSL_NO_DSA)
if (pkey->type == EVP_PKEY_DSA) {
/* lets do DSS */
EVP_SignInit_ex(&md_ctx, EVP_dss1(), NULL);
@@ -1354,7 +1347,6 @@ dtls1_send_server_key_exchange(SSL *s)
s2n(i, p);
n += i + 2;
} else
-#endif
#if !defined(OPENSSL_NO_ECDSA)
if (pkey->type == EVP_PKEY_EC) {
/* let's do ECDSA */