Mercurial > hg > orthanc

comparison Resources/Patches/libp11-0.4.0.patch @ 3806:b100555c4d6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix for libp11
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 02 Apr 2020 17:08:43 +0200
parents cc6d4edfe8fe
children
comparison
equal deleted inserted replaced
3805:cdb429340112 3806:b100555c4d6a
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 2020-03-05 20:48:55.447852662 +0100 2 --- libp11-0.4.0.orig/src/atfork.c 2020-04-02 17:03:55.340634019 +0200
3 +++ libp11-0.4.0/src/atfork.c 2020-03-05 20:49:05.983770656 +0100 3 +++ libp11-0.4.0/src/atfork.c 2020-04-02 17:04:10.152619121 +0200
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 2020-03-05 20:48:55.447852662 +0100 14 --- libp11-0.4.0.orig/src/engine.h 2020-04-02 17:03:55.340634019 +0200
15 +++ libp11-0.4.0/src/engine.h 2020-03-05 20:49:05.983770656 +0100 15 +++ libp11-0.4.0/src/engine.h 2020-04-02 17:04:10.152619121 +0200
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 2020-03-05 20:48:55.447852662 +0100 26 --- libp11-0.4.0.orig/src/libp11-int.h 2020-04-02 17:03:55.340634019 +0200
27 +++ libp11-0.4.0/src/libp11-int.h 2020-03-05 20:49:05.983770656 +0100 27 +++ libp11-0.4.0/src/libp11-int.h 2020-04-02 17:04:10.152619121 +0200
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 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 38 --- libp11-0.4.0.orig/src/p11_key.c 2020-04-02 17:03:55.340634019 +0200
39 +++ libp11-0.4.0/src/p11_key.c 2020-03-05 20:49:24.959625180 +0100 39 +++ libp11-0.4.0/src/p11_key.c 2020-04-02 17:05:39.892516032 +0200
40 @@ -21,6 +21,10 @@ 40 @@ -21,6 +21,12 @@
41 #include <string.h> 41 #include <string.h>
42 #include <openssl/bn.h> 42 #include <openssl/bn.h>
43 43
44 +#if OPENSSL_VERSION_NUMBER >= 0x10100000L // OpenSSL 1.0.2 44 +#if OPENSSL_VERSION_NUMBER >= 0x10100105L // File renamed in OpenSSL 1.1.1e
45 +# include <crypto/rsa/rsa_local.h>
46 +#elif OPENSSL_VERSION_NUMBER >= 0x10100000L // OpenSSL 1.0.2
45 +# include <crypto/rsa/rsa_locl.h> 47 +# include <crypto/rsa/rsa_locl.h>
46 +#endif 48 +#endif
47 + 49 +
48 #ifdef _WIN32 50 #ifdef _WIN32
49 #define strncasecmp strnicmp 51 #define strncasecmp strnicmp
50 #endif 52 #endif
51 diff -urEb libp11-0.4.0.orig/src/p11_rsa.c libp11-0.4.0/src/p11_rsa.c 53 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 54 --- libp11-0.4.0.orig/src/p11_rsa.c 2020-04-02 17:03:55.340634019 +0200
53 +++ libp11-0.4.0/src/p11_rsa.c 2020-03-05 20:49:20.095662204 +0100 55 +++ libp11-0.4.0/src/p11_rsa.c 2020-04-02 17:05:49.176504198 +0200
54 @@ -27,6 +27,10 @@ 56 @@ -27,6 +27,12 @@
55 #include <openssl/evp.h> 57 #include <openssl/evp.h>
56 #include <openssl/rsa.h> 58 #include <openssl/rsa.h>
57 59
58 +#if OPENSSL_VERSION_NUMBER >= 0x10100000L // OpenSSL 1.0.2 60 +#if OPENSSL_VERSION_NUMBER >= 0x10100105L // File renamed in OpenSSL 1.1.1e
61 +# include <crypto/rsa/rsa_local.h>
62 +#elif OPENSSL_VERSION_NUMBER >= 0x10100000L // OpenSSL 1.0.2
59 +# include <crypto/rsa/rsa_locl.h> 63 +# include <crypto/rsa/rsa_locl.h>
60 +#endif 64 +#endif
61 + 65 +
62 static int rsa_ex_index = 0; 66 static int rsa_ex_index = 0;
63 67