diff options
Diffstat (limited to 'sysutils/bacula/patches/patch-ab')
-rw-r--r-- | sysutils/bacula/patches/patch-ab | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/sysutils/bacula/patches/patch-ab b/sysutils/bacula/patches/patch-ab deleted file mode 100644 index 76bd7c6a278..00000000000 --- a/sysutils/bacula/patches/patch-ab +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2009/08/24 08:23:41 adam Exp $ - ---- src/lib/crypto.c.orig 2008-11-06 20:10:08.000000000 +0100 -+++ src/lib/crypto.c -@@ -309,7 +309,11 @@ typedef struct PEM_CB_Context { - */ - static ASN1_OCTET_STRING *openssl_cert_keyid(X509 *cert) { - X509_EXTENSION *ext; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ const X509V3_EXT_METHOD *method; -+#else - X509V3_EXT_METHOD *method; -+#endif - ASN1_OCTET_STRING *keyid; - int i; - #if (OPENSSL_VERSION_NUMBER >= 0x0090800FL) -@@ -1099,7 +1103,11 @@ CRYPTO_SESSION *crypto_session_new (cryp - /* Encrypt the session key */ - ekey = (unsigned char *)malloc(EVP_PKEY_size(keypair->pubkey)); - -+#if OPENSSL_VERSION_NUMBER >= 0x00909000L -+ if ((ekey_len = EVP_PKEY_encrypt_old(ekey, cs->session_key, cs->session_key_len, keypair->pubkey)) <= 0) { -+#else - if ((ekey_len = EVP_PKEY_encrypt(ekey, cs->session_key, cs->session_key_len, keypair->pubkey)) <= 0) { -+#endif - /* OpenSSL failure */ - RecipientInfo_free(ri); - crypto_session_free(cs); -@@ -1222,8 +1230,13 @@ crypto_error_t crypto_session_decode(con - /* Decrypt the session key */ - /* Allocate sufficient space for the largest possible decrypted data */ - cs->session_key = (unsigned char *)malloc(EVP_PKEY_size(keypair->privkey)); -+#if OPENSSL_VERSION_NUMBER >= 0x00909000L -+ cs->session_key_len = EVP_PKEY_decrypt_old(cs->session_key, M_ASN1_STRING_data(ri->encryptedKey), -+ M_ASN1_STRING_length(ri->encryptedKey), keypair->privkey); -+#else - cs->session_key_len = EVP_PKEY_decrypt(cs->session_key, M_ASN1_STRING_data(ri->encryptedKey), - M_ASN1_STRING_length(ri->encryptedKey), keypair->privkey); -+#endif - - if (cs->session_key_len <= 0) { - openssl_post_errors(M_ERROR, _("Failure decrypting the session key")); |