summaryrefslogtreecommitdiffstats
path: root/apps/s_cb.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2013-08-17 17:40:08 +0100
committerDr. Stephen Henson <steve@openssl.org>2013-08-19 14:13:38 +0100
commit5b430cfc441e7e442199ccfaefb99af2b13dc44e (patch)
treea27bef52db1875d47e744584951883be5a16c9e8 /apps/s_cb.c
parent171c4da568bc8606e107cfaa3c994e3b961bec30 (diff)
Make no-ec compilation work.
(cherry picked from commit 14536c8c9c0abb894afcadb9a58b4b29fc8f7a4d)
Diffstat (limited to 'apps/s_cb.c')
-rw-r--r--apps/s_cb.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/s_cb.c b/apps/s_cb.c
index 380fc329b0..411a4f671a 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -423,7 +423,7 @@ int ssl_print_sigalgs(BIO *out, SSL *s)
BIO_printf(out, "Peer signing digest: %s\n", OBJ_nid2sn(mdnid));
return 1;
}
-
+#ifndef OPENSSL_NO_EC
int ssl_print_point_formats(BIO *out, SSL *s)
{
int i, nformats;
@@ -515,7 +515,7 @@ int ssl_print_curves(BIO *out, SSL *s, int noshared)
BIO_puts(out, "\n");
return 1;
}
-
+#endif
int ssl_print_tmp_key(BIO *out, SSL *s)
{
EVP_PKEY *key;
@@ -531,7 +531,7 @@ int ssl_print_tmp_key(BIO *out, SSL *s)
case EVP_PKEY_DH:
BIO_printf(out, "DH, %d bits\n", EVP_PKEY_bits(key));
break;
-
+#ifndef OPENSSL_NO_ECDH
case EVP_PKEY_EC:
{
EC_KEY *ec = EVP_PKEY_get1_EC_KEY(key);
@@ -545,6 +545,7 @@ int ssl_print_tmp_key(BIO *out, SSL *s)
BIO_printf(out, "ECDH, %s, %d bits\n",
cname, EVP_PKEY_bits(key));
}
+#endif
}
EVP_PKEY_free(key);
return 1;