diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-10-06 11:22:28 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-11-15 10:45:21 +0100 |
| commit | 6c62f9e1639a7d1a879f363a99882920104dfedb (patch) | |
| tree | c3696f02ee053fc5bf9e2250b811973d5aaedd51 /apps/openssl.c | |
| parent | Simplify PKCS#12 PBE algorithm. (diff) | |
| download | openssl-6c62f9e1639a7d1a879f363a99882920104dfedb.tar.xz openssl-6c62f9e1639a7d1a879f363a99882920104dfedb.zip | |
Remove heartbeats completely
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1669)
Diffstat (limited to 'apps/openssl.c')
| -rw-r--r-- | apps/openssl.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/apps/openssl.c b/apps/openssl.c index f6a8f9df55..a4159138e5 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -628,9 +628,6 @@ static void list_disabled(void) #ifdef OPENSSL_NO_GOST BIO_puts(bio_out, "GOST\n"); #endif -#ifdef OPENSSL_NO_HEARTBEATS - BIO_puts(bio_out, "HEARTBEATS\n"); -#endif #ifdef OPENSSL_NO_IDEA BIO_puts(bio_out, "IDEA\n"); #endif |