summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_ciph.c
diff options
context:
space:
mode:
authorjsing <>2014-07-08 21:50:40 +0000
committerjsing <>2014-07-08 21:50:40 +0000
commitaada90c5a31d6f9946d326fe0849c4b0b8563b69 (patch)
tree7d46297663c0f9be9c0aa717dac104a531cbf6ec /src/lib/libssl/ssl_ciph.c
parentfd03fdc872e2b02959e82767f19c00043e3812c2 (diff)
downloadopenbsd-aada90c5a31d6f9946d326fe0849c4b0b8563b69.tar.gz
openbsd-aada90c5a31d6f9946d326fe0849c4b0b8563b69.tar.bz2
openbsd-aada90c5a31d6f9946d326fe0849c4b0b8563b69.zip
Remove SSL_FIPS.
ok deraadt@ miod@
Diffstat (limited to 'src/lib/libssl/ssl_ciph.c')
-rw-r--r--src/lib/libssl/ssl_ciph.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index b8a6eaf514..31964ebe14 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_ciph.c,v 1.55 2014/06/18 04:48:37 miod Exp $ */ 1/* $OpenBSD: ssl_ciph.c,v 1.56 2014/07/08 21:50:40 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -557,13 +557,6 @@ static const SSL_CIPHER cipher_aliases[] = {
557 .name = SSL_TXT_HIGH, 557 .name = SSL_TXT_HIGH,
558 .algo_strength = SSL_HIGH, 558 .algo_strength = SSL_HIGH,
559 }, 559 },
560
561 /* FIPS 140-2 approved ciphersuite */
562 {
563 .name = SSL_TXT_FIPS,
564 .algorithm_enc = ~SSL_eNULL,
565 .algo_strength = SSL_FIPS,
566 },
567}; 560};
568 561
569/* Search for public key algorithm with given name and 562/* Search for public key algorithm with given name and