Blame bacula-3.0.2-openssl.patch
|
Tomáš Mráz |
43cef8 |
diff -up bacula-3.0.2/bacula-3.0.2/src/lib/crypto.c.openssl bacula-3.0.2/bacula-3.0.2/src/lib/crypto.c
|
|
Tomáš Mráz |
43cef8 |
--- bacula-3.0.2/bacula-3.0.2/src/lib/crypto.c.openssl 2008-11-06 20:10:08.000000000 +0100
|
|
Tomáš Mráz |
43cef8 |
+++ bacula-3.0.2/bacula-3.0.2/src/lib/crypto.c 2009-08-22 12:48:20.000000000 +0200
|
|
Tomáš Mráz |
43cef8 |
@@ -309,7 +309,11 @@ typedef struct PEM_CB_Context {
|
|
Tomáš Mráz |
43cef8 |
*/
|
|
Tomáš Mráz |
43cef8 |
static ASN1_OCTET_STRING *openssl_cert_keyid(X509 *cert) {
|
|
Tomáš Mráz |
43cef8 |
X509_EXTENSION *ext;
|
|
Tomáš Mráz |
43cef8 |
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
|
|
Tomáš Mráz |
43cef8 |
X509V3_EXT_METHOD *method;
|
|
Tomáš Mráz |
43cef8 |
+#else
|
|
Tomáš Mráz |
43cef8 |
+ const X509V3_EXT_METHOD *method;
|
|
Tomáš Mráz |
43cef8 |
+#endif
|
|
Tomáš Mráz |
43cef8 |
ASN1_OCTET_STRING *keyid;
|
|
Tomáš Mráz |
43cef8 |
int i;
|
|
Tomáš Mráz |
43cef8 |
#if (OPENSSL_VERSION_NUMBER >= 0x0090800FL)
|
|
Tomáš Mráz |
43cef8 |
@@ -973,6 +977,10 @@ void crypto_sign_free(SIGNATURE *sig)
|
|
Tomáš Mráz |
43cef8 |
free (sig);
|
|
Tomáš Mráz |
43cef8 |
}
|
|
Tomáš Mráz |
43cef8 |
|
|
Tomáš Mráz |
43cef8 |
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
|
Tomáš Mráz |
43cef8 |
+#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
|
|
Tomáš Mráz |
43cef8 |
+#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
|
|
Tomáš Mráz |
43cef8 |
+#endif
|
|
Tomáš Mráz |
43cef8 |
/*
|
|
Tomáš Mráz |
43cef8 |
* Create a new encryption session.
|
|
Tomáš Mráz |
43cef8 |
* Returns: A pointer to a CRYPTO_SESSION object on success.
|