projects / packages / bacula.git / blame
| Commit | Line | Data |
|---|---|---|
| a37f7e26 JK |
1 | diff -durN bacula-5.0.1.orig/src/lib/crypto.c bacula-5.0.1/src/lib/crypto.c |
| 2 | --- bacula-5.0.1.orig/src/lib/crypto.c 2010-02-24 16:33:48.000000000 +0100 | |
| 3 | +++ bacula-5.0.1/src/lib/crypto.c 2010-04-21 20:50:32.587691290 +0200 | |
| 4 | @@ -49,6 +47,13 @@ | |
| 5 | #include "jcr.h" | |
| 6 | #include <assert.h> | |
| 7 | ||
| 8 | +/** | |
| 9 | + * For OpenSSL version 1.x, EVP_PKEY_encrypt no longer | |
| 10 | + * exists. It was not an official API. | |
| 11 | + */ | |
| 12 | +#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old | |
| 13 | +#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old | |
| 14 | + | |
| 15 | /* | |
| 16 | * Bacula ASN.1 Syntax | |
| 17 | * | |
| 18 | @@ -309,7 +316,7 @@ | |
| 19 | */ | |
| 20 | static ASN1_OCTET_STRING *openssl_cert_keyid(X509 *cert) { | |
| 21 | X509_EXTENSION *ext; | |
| 22 | - X509V3_EXT_METHOD *method; | |
| 23 | + const X509V3_EXT_METHOD *method; | |
| 24 | ASN1_OCTET_STRING *keyid; | |
| 25 | int i; | |
| 26 | #if (OPENSSL_VERSION_NUMBER >= 0x0090800FL) | |
| 27 | diff -durN bacula-5.0.1.orig/src/lib/tls.c bacula-5.0.1/src/lib/tls.c | |
| 28 | --- bacula-5.0.1.orig/src/lib/tls.c 2010-02-24 16:33:48.000000000 +0100 | |
| 29 | +++ bacula-5.0.1/src/lib/tls.c 2010-04-21 20:50:32.589983312 +0200 | |
| 30 | @@ -315,7 +315,7 @@ | |
| 31 | extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext))); | |
| 32 | ||
| 33 | if (strcmp(extname, "subjectAltName") == 0) { | |
| 34 | - X509V3_EXT_METHOD *method; | |
| 35 | + const X509V3_EXT_METHOD *method; | |
| 36 | STACK_OF(CONF_VALUE) *val; | |
| 37 | CONF_VALUE *nval; | |
| 38 | void *extstr = NULL; |