Mercurial > hg > orthanc

comparison OrthancFramework/Resources/Patches/libp11-0.4.0.patch @ 4044:d25f4c0fa160 framework

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
splitting code into OrthancFramework and OrthancServer
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 10 Jun 2020 20:30:34 +0200
parents Resources/Patches/libp11-0.4.0.patch@b100555c4d6a
children
comparison
equal deleted inserted replaced
4043:6c6239aec462 4044:d25f4c0fa160
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-04-02 17:03:55.340634019 +0200
3 +++ libp11-0.4.0/src/atfork.c 2020-04-02 17:04:10.152619121 +0200
4 @@ -25,7 +25,7 @@
5 #include <sys/stat.h>
6 #include <sys/types.h>
7 #include <unistd.h>
8 -#include <atfork.h>
9 +#include "atfork.h"
10
11 #ifdef __sun
12 # pragma fini(lib_deinit)
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-04-02 17:03:55.340634019 +0200
15 +++ libp11-0.4.0/src/engine.h 2020-04-02 17:04:10.152619121 +0200
16 @@ -29,7 +29,7 @@
17 #define _ENGINE_PKCS11_H
18
19 #ifndef _WIN32
20 -#include "config.h"
21 +//#include "config.h"
22 #endif
23
24 #include "libp11.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-04-02 17:03:55.340634019 +0200
27 +++ libp11-0.4.0/src/libp11-int.h 2020-04-02 17:04:10.152619121 +0200
28 @@ -20,7 +20,7 @@
29 #define _LIBP11_INT_H
30
31 #ifndef _WIN32
32 -#include "config.h"
33 +//#include "config.h"
34 #endif
35
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-04-02 17:03:55.340634019 +0200
39 +++ libp11-0.4.0/src/p11_key.c 2020-04-02 17:05:39.892516032 +0200
40 @@ -21,6 +21,12 @@
41 #include <string.h>
42 #include <openssl/bn.h>
43
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
47 +# include <crypto/rsa/rsa_locl.h>
48 +#endif
49 +
50 #ifdef _WIN32
51 #define strncasecmp strnicmp
52 #endif
53 diff -urEb libp11-0.4.0.orig/src/p11_rsa.c libp11-0.4.0/src/p11_rsa.c
54 --- libp11-0.4.0.orig/src/p11_rsa.c 2020-04-02 17:03:55.340634019 +0200
55 +++ libp11-0.4.0/src/p11_rsa.c 2020-04-02 17:05:49.176504198 +0200
56 @@ -27,6 +27,12 @@
57 #include <openssl/evp.h>
58 #include <openssl/rsa.h>
59
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
63 +# include <crypto/rsa/rsa_locl.h>
64 +#endif
65 +
66 static int rsa_ex_index = 0;
67
68 #if OPENSSL_VERSION_NUMBER < 0x10100003L