diff options
| author |   jsing <jsing@openbsd.org> | 2014-04-18 01:04:53 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-04-18 01:04:53 +0000 |
| commit | f16f749c6b48a2f529f1db4d72944792a51a70d5 (patch) | |
| tree | c963f20ca8fce52590407d51a6a8693aa949ea52 /lib/libssl/src/apps | |
| parent | lob a few more knf grenades in here to soften things up. (diff) | |
| download | wireguard-openbsd-f16f749c6b48a2f529f1db4d72944792a51a70d5.tar.xz wireguard-openbsd-f16f749c6b48a2f529f1db4d72944792a51a70d5.zip | |
Unifdef OPENSSL_FIPS.
ok miod@
Diffstat (limited to 'lib/libssl/src/apps')
| -rw-r--r-- | lib/libssl/src/apps/openssl.c | 3 | ||||
| -rw-r--r-- | lib/libssl/src/apps/pkcs12.c | 5 | ||||
| -rw-r--r-- | lib/libssl/src/apps/speed.c | 17 |
3 files changed, 0 insertions, 25 deletions
diff --git a/lib/libssl/src/apps/openssl.c b/lib/libssl/src/apps/openssl.c index 0221eb00850..8b2f699cba8 100644 --- a/lib/libssl/src/apps/openssl.c +++ b/lib/libssl/src/apps/openssl.c @@ -129,9 +129,6 @@ #include "progs.h" #include "s_apps.h" #include <openssl/err.h> -#ifdef OPENSSL_FIPS -#include <openssl/fips.h> -#endif /* The LHASH callbacks ("hash" & "cmp") have been replaced by functions with the * base prototypes (we cast each variable inside the function to the required diff --git a/lib/libssl/src/apps/pkcs12.c b/lib/libssl/src/apps/pkcs12.c index 465ff2ebf0d..ca6824efcc0 100644 --- a/lib/libssl/src/apps/pkcs12.c +++ b/lib/libssl/src/apps/pkcs12.c @@ -130,11 +130,6 @@ int MAIN(int argc, char **argv) apps_startup(); -#ifdef OPENSSL_FIPS - if (FIPS_mode()) - cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; - else -#endif cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC; enc = EVP_des_ede3_cbc(); diff --git a/lib/libssl/src/apps/speed.c b/lib/libssl/src/apps/speed.c index 473dfce1248..0806327c389 100644 --- a/lib/libssl/src/apps/speed.c +++ b/lib/libssl/src/apps/speed.c @@ -187,23 +187,6 @@ #endif #include <openssl/modes.h> -#ifdef OPENSSL_FIPS -#ifdef OPENSSL_DOING_MAKEDEPEND -#undef AES_set_encrypt_key -#undef AES_set_decrypt_key -#undef DES_set_key_unchecked -#endif -#define BF_set_key private_BF_set_key -#define CAST_set_key private_CAST_set_key -#define idea_set_encrypt_key private_idea_set_encrypt_key -#define SEED_set_key private_SEED_set_key -#define RC2_set_key private_RC2_set_key -#define RC4_set_key private_RC4_set_key -#define DES_set_key_unchecked private_DES_set_key_unchecked -#define AES_set_encrypt_key private_AES_set_encrypt_key -#define AES_set_decrypt_key private_AES_set_decrypt_key -#define Camellia_set_key private_Camellia_set_key -#endif #ifndef HAVE_FORK # define HAVE_FORK 1 |