Mercurial > hg > orthanc

annotate Resources/Patches/libp11-0.4.0.patch @ 3856:dd0fcbf6a791

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
back to mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 21 Apr 2020 14:45:30 +0200
parents b100555c4d6a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2026
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 diff -urEb libp11-0.4.0.orig/src/atfork.c libp11-0.4.0/src/atfork.c
3806
b100555c4d6a fix for libp11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3723
diff changeset
2 --- libp11-0.4.0.orig/src/atfork.c 2020-04-02 17:03:55.340634019 +0200
b100555c4d6a fix for libp11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3723
diff changeset
3 +++ libp11-0.4.0/src/atfork.c 2020-04-02 17:04:10.152619121 +0200
2026
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -25,7 +25,7 @@
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 #include <sys/stat.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 #include <sys/types.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 #include <unistd.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 -#include <atfork.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 +#include "atfork.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 #ifdef __sun
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 # pragma fini(lib_deinit)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 diff -urEb libp11-0.4.0.orig/src/engine.h libp11-0.4.0/src/engine.h
3806
b100555c4d6a fix for libp11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3723
diff changeset
14 --- libp11-0.4.0.orig/src/engine.h 2020-04-02 17:03:55.340634019 +0200
b100555c4d6a fix for libp11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3723
diff changeset
15 +++ libp11-0.4.0/src/engine.h 2020-04-02 17:04:10.152619121 +0200
2026
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 @@ -29,7 +29,7 @@
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 #define _ENGINE_PKCS11_H
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 #ifndef _WIN32
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 -#include "config.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 +//#include "config.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 #endif
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 #include "libp11.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 diff -urEb libp11-0.4.0.orig/src/libp11-int.h libp11-0.4.0/src/libp11-int.h
3806
b100555c4d6a fix for libp11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3723
diff changeset
26 --- libp11-0.4.0.orig/src/libp11-int.h 2020-04-02 17:03:55.340634019 +0200
b100555c4d6a fix for libp11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3723
diff changeset
27 +++ libp11-0.4.0/src/libp11-int.h 2020-04-02 17:04:10.152619121 +0200
2026
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 @@ -20,7 +20,7 @@
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 #define _LIBP11_INT_H
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 #ifndef _WIN32
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 -#include "config.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 +//#include "config.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 #endif
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
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
b100555c4d6a fix for libp11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3723
diff changeset
38 --- libp11-0.4.0.orig/src/p11_key.c 2020-04-02 17:03:55.340634019 +0200
b100555c4d6a fix for libp11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3723
diff changeset
39 +++ libp11-0.4.0/src/p11_key.c 2020-04-02 17:05:39.892516032 +0200
b100555c4d6a fix for libp11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3723
diff changeset
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
b100555c4d6a fix for libp11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3723
diff changeset
44 +#if OPENSSL_VERSION_NUMBER >= 0x10100105L // File renamed in OpenSSL 1.1.1e
b100555c4d6a fix for libp11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3723
diff changeset
45 +# include <crypto/rsa/rsa_local.h>
b100555c4d6a fix for libp11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3723
diff changeset
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
b100555c4d6a fix for libp11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3723
diff changeset
54 --- libp11-0.4.0.orig/src/p11_rsa.c 2020-04-02 17:03:55.340634019 +0200
b100555c4d6a fix for libp11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3723
diff changeset
55 +++ libp11-0.4.0/src/p11_rsa.c 2020-04-02 17:05:49.176504198 +0200
b100555c4d6a fix for libp11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3723
diff changeset
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
b100555c4d6a fix for libp11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3723
diff changeset
60 +#if OPENSSL_VERSION_NUMBER >= 0x10100105L // File renamed in OpenSSL 1.1.1e
b100555c4d6a fix for libp11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3723
diff changeset
61 +# include <crypto/rsa/rsa_local.h>
b100555c4d6a fix for libp11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3723
diff changeset
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