diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2014-10-07 05:35:11 +0000 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2014-10-07 05:35:11 +0000 |
| commit | 1e963007c0d9466726a8680e52a95955288d8927 (patch) | |
| tree | 9345749af183fe511dfe6a24fb43b44a5feefcd9 /Cryptlib/OpenSSL/crypto/pkcs12/p12_crt.c | |
| parent | e34fca619d8a75f3b67d59d45cdd9db4da2342e6 (diff) | |
| download | efi-boot-shim-1e963007c0d9466726a8680e52a95955288d8927.tar.gz efi-boot-shim-1e963007c0d9466726a8680e52a95955288d8927.zip | |
debian/patches/0001-Update-openssl-to-0.9.8za.patch: cherry-pick
openssl 0.9.8za in via upstream.
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/pkcs12/p12_crt.c')
| -rwxr-xr-x | Cryptlib/OpenSSL/crypto/pkcs12/p12_crt.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Cryptlib/OpenSSL/crypto/pkcs12/p12_crt.c b/Cryptlib/OpenSSL/crypto/pkcs12/p12_crt.c index 9522342f..3ef3be1c 100755 --- a/Cryptlib/OpenSSL/crypto/pkcs12/p12_crt.c +++ b/Cryptlib/OpenSSL/crypto/pkcs12/p12_crt.c @@ -100,7 +100,11 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, nid_cert = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; else #endif +#ifdef OPENSSL_NO_RC2 + nid_cert = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; +#else nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC; +#endif } if (!nid_key) nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; @@ -290,7 +294,11 @@ int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags, free_safes = 0; if (nid_safe == 0) +#ifdef OPENSSL_NO_RC2 + nid_safe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; +#else nid_safe = NID_pbe_WithSHA1And40BitRC2_CBC; +#endif if (nid_safe == -1) p7 = PKCS12_pack_p7data(bags); |