Mercurial > hg > orthanc
comparison Resources/Patches/libp11-0.4.0.patch @ 3723:cc6d4edfe8fe
fix pkcs11 compilation
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 05 Mar 2020 21:13:37 +0100 |
parents | d46746607ae0 |
children | b100555c4d6a |
comparison
equal
deleted
inserted
replaced
3722:a49d49d945c9 | 3723:cc6d4edfe8fe |
---|---|
1 diff -urEb libp11-0.4.0.orig/src/atfork.c libp11-0.4.0/src/atfork.c | 1 diff -urEb libp11-0.4.0.orig/src/atfork.c libp11-0.4.0/src/atfork.c |
2 --- libp11-0.4.0.orig/src/atfork.c 2016-06-20 13:38:43.845575107 +0200 | 2 --- libp11-0.4.0.orig/src/atfork.c 2020-03-05 20:48:55.447852662 +0100 |
3 +++ libp11-0.4.0/src/atfork.c 2016-06-20 13:46:52.969575591 +0200 | 3 +++ libp11-0.4.0/src/atfork.c 2020-03-05 20:49:05.983770656 +0100 |
4 @@ -25,7 +25,7 @@ | 4 @@ -25,7 +25,7 @@ |
5 #include <sys/stat.h> | 5 #include <sys/stat.h> |
6 #include <sys/types.h> | 6 #include <sys/types.h> |
7 #include <unistd.h> | 7 #include <unistd.h> |
8 -#include <atfork.h> | 8 -#include <atfork.h> |
9 +#include "atfork.h" | 9 +#include "atfork.h" |
10 | 10 |
11 #ifdef __sun | 11 #ifdef __sun |
12 # pragma fini(lib_deinit) | 12 # pragma fini(lib_deinit) |
13 diff -urEb libp11-0.4.0.orig/src/engine.h libp11-0.4.0/src/engine.h | 13 diff -urEb libp11-0.4.0.orig/src/engine.h libp11-0.4.0/src/engine.h |
14 --- libp11-0.4.0.orig/src/engine.h 2016-06-20 13:38:43.845575107 +0200 | 14 --- libp11-0.4.0.orig/src/engine.h 2020-03-05 20:48:55.447852662 +0100 |
15 +++ libp11-0.4.0/src/engine.h 2016-06-20 13:46:27.421575566 +0200 | 15 +++ libp11-0.4.0/src/engine.h 2020-03-05 20:49:05.983770656 +0100 |
16 @@ -29,7 +29,7 @@ | 16 @@ -29,7 +29,7 @@ |
17 #define _ENGINE_PKCS11_H | 17 #define _ENGINE_PKCS11_H |
18 | 18 |
19 #ifndef _WIN32 | 19 #ifndef _WIN32 |
20 -#include "config.h" | 20 -#include "config.h" |
21 +//#include "config.h" | 21 +//#include "config.h" |
22 #endif | 22 #endif |
23 | 23 |
24 #include "libp11.h" | 24 #include "libp11.h" |
25 diff -urEb libp11-0.4.0.orig/src/libp11-int.h libp11-0.4.0/src/libp11-int.h | 25 diff -urEb libp11-0.4.0.orig/src/libp11-int.h libp11-0.4.0/src/libp11-int.h |
26 --- libp11-0.4.0.orig/src/libp11-int.h 2016-06-20 13:38:43.845575107 +0200 | 26 --- libp11-0.4.0.orig/src/libp11-int.h 2020-03-05 20:48:55.447852662 +0100 |
27 +++ libp11-0.4.0/src/libp11-int.h 2016-06-20 13:46:27.421575566 +0200 | 27 +++ libp11-0.4.0/src/libp11-int.h 2020-03-05 20:49:05.983770656 +0100 |
28 @@ -20,7 +20,7 @@ | 28 @@ -20,7 +20,7 @@ |
29 #define _LIBP11_INT_H | 29 #define _LIBP11_INT_H |
30 | 30 |
31 #ifndef _WIN32 | 31 #ifndef _WIN32 |
32 -#include "config.h" | 32 -#include "config.h" |
33 +//#include "config.h" | 33 +//#include "config.h" |
34 #endif | 34 #endif |
35 | 35 |
36 #include "libp11.h" | 36 #include "libp11.h" |
37 diff -urEb libp11-0.4.0.orig/src/p11_key.c libp11-0.4.0/src/p11_key.c | |
38 --- libp11-0.4.0.orig/src/p11_key.c 2020-03-05 20:48:55.447852662 +0100 | |
39 +++ libp11-0.4.0/src/p11_key.c 2020-03-05 20:49:24.959625180 +0100 | |
40 @@ -21,6 +21,10 @@ | |
41 #include <string.h> | |
42 #include <openssl/bn.h> | |
43 | |
44 +#if OPENSSL_VERSION_NUMBER >= 0x10100000L // OpenSSL 1.0.2 | |
45 +# include <crypto/rsa/rsa_locl.h> | |
46 +#endif | |
47 + | |
48 #ifdef _WIN32 | |
49 #define strncasecmp strnicmp | |
50 #endif | |
51 diff -urEb libp11-0.4.0.orig/src/p11_rsa.c libp11-0.4.0/src/p11_rsa.c | |
52 --- libp11-0.4.0.orig/src/p11_rsa.c 2020-03-05 20:48:55.447852662 +0100 | |
53 +++ libp11-0.4.0/src/p11_rsa.c 2020-03-05 20:49:20.095662204 +0100 | |
54 @@ -27,6 +27,10 @@ | |
55 #include <openssl/evp.h> | |
56 #include <openssl/rsa.h> | |
57 | |
58 +#if OPENSSL_VERSION_NUMBER >= 0x10100000L // OpenSSL 1.0.2 | |
59 +# include <crypto/rsa/rsa_locl.h> | |
60 +#endif | |
61 + | |
62 static int rsa_ex_index = 0; | |
63 | |
64 #if OPENSSL_VERSION_NUMBER < 0x10100003L |