Tree - rpms/openssl - src.fedoraproject.org

Blob History Raw

		65ebbae	`diff -up openssl-1.0.0c/apps/pkcs12.c.fips-default openssl-1.0.0c/apps/pkcs12.c`
		65ebbae	`--- openssl-1.0.0c/apps/pkcs12.c.fips-default 2009-07-27 23:08:45.000000000 +0200`
		65ebbae	`+++ openssl-1.0.0c/apps/pkcs12.c 2011-02-04 15:25:38.000000000 +0100`
		65ebbae	`@@ -67,6 +67,9 @@`
		65ebbae	`#include <openssl/err.h>`
		65ebbae	`#include <openssl/pem.h>`
		65ebbae	`#include <openssl/pkcs12.h>`
		65ebbae	`+#ifdef OPENSSL_FIPS`
		65ebbae	`+#include <openssl/fips.h>`
		65ebbae	`+#endif`
		65ebbae
		65ebbae	`#define PROG pkcs12_main`
		65ebbae
		65ebbae	`@@ -130,6 +133,11 @@ int MAIN(int argc, char **argv)`
		65ebbae
		65ebbae	`apps_startup();`
		65ebbae
		65ebbae	`+#ifdef OPENSSL_FIPS`
		65ebbae	`+ if (FIPS_mode())`
		65ebbae	`+ cert_pbe = key_pbe; /* cannot use RC2 in the FIPS mode */`
		65ebbae	`+#endif`
		65ebbae	`+`
		65ebbae	`enc = EVP_des_ede3_cbc();`
		65ebbae	`if (bio_err == NULL ) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);`
		65ebbae