Mercurial > hg > orthanc
annotate Resources/Patches/libp11-0.4.0.patch @ 3975:ef907d3b38d5
extended news
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 25 May 2020 07:47:21 +0200 |
parents | b100555c4d6a |
children |
rev | line source |
---|---|
2026 | 1 diff -urEb libp11-0.4.0.orig/src/atfork.c libp11-0.4.0/src/atfork.c |
3806 | 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 | |
2026 | 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 | |
3806 | 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 | |
2026 | 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 | |
3806 | 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 | |
2026 | 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" | |
3723
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
37 diff -urEb libp11-0.4.0.orig/src/p11_key.c libp11-0.4.0/src/p11_key.c |
3806 | 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 @@ | |
3723
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
41 #include <string.h> |
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
42 #include <openssl/bn.h> |
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
43 |
3806 | 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 | |
3723
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
47 +# include <crypto/rsa/rsa_locl.h> |
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
48 +#endif |
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
49 + |
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
50 #ifdef _WIN32 |
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
51 #define strncasecmp strnicmp |
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
52 #endif |
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
53 diff -urEb libp11-0.4.0.orig/src/p11_rsa.c libp11-0.4.0/src/p11_rsa.c |
3806 | 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 @@ | |
3723
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
57 #include <openssl/evp.h> |
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
58 #include <openssl/rsa.h> |
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
59 |
3806 | 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 | |
3723
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
63 +# include <crypto/rsa/rsa_locl.h> |
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
64 +#endif |
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
65 + |
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
66 static int rsa_ex_index = 0; |
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
67 |
cc6d4edfe8fe
fix pkcs11 compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2026
diff
changeset
|
68 #if OPENSSL_VERSION_NUMBER < 0x10100003L |