Lines 1-49
Link Here
|
1 |
--- plugins/qca-ossl/ossl110-compat.h.orig 2019-04-24 12:58:14 UTC |
|
|
2 |
+++ plugins/qca-ossl/ossl110-compat.h |
3 |
@@ -205,22 +205,6 @@ static int RSA_meth_set_priv_dec(RSA_METHOD *rsa, int |
4 |
return 1; |
5 |
} |
6 |
|
7 |
-static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const unsigned char *m, |
8 |
- unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const RSA *rsa)) |
9 |
-{ |
10 |
- if (!meth) return 0; |
11 |
- meth->rsa_sign = sign; |
12 |
- return 1; |
13 |
-} |
14 |
- |
15 |
-static int RSA_meth_set_verify(RSA_METHOD *meth, int (*verify) (int dtype, const unsigned char *m, |
16 |
- unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa)) |
17 |
-{ |
18 |
- if (!meth) return 0; |
19 |
- meth->rsa_verify = verify; |
20 |
- return 1; |
21 |
-} |
22 |
- |
23 |
static int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa)) |
24 |
{ |
25 |
if (!meth) return 0; |
26 |
@@ -271,5 +255,23 @@ static void HMAC_CTX_free(HMAC_CTX *ctx) |
27 |
#define X509_REVOKED_get0_revocationDate(rev) (rev)->revocationDate |
28 |
|
29 |
#endif // OPENSSL_VERSION_NUMBER < 0x10100000L |
30 |
+ |
31 |
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) |
32 |
+static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const unsigned char *m, |
33 |
+ unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const RSA *rsa)) |
34 |
+{ |
35 |
+ if (!meth) return 0; |
36 |
+ meth->rsa_sign = sign; |
37 |
+ return 1; |
38 |
+} |
39 |
+ |
40 |
+static int RSA_meth_set_verify(RSA_METHOD *meth, int (*verify) (int dtype, const unsigned char *m, |
41 |
+ unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa)) |
42 |
+{ |
43 |
+ if (!meth) return 0; |
44 |
+ meth->rsa_verify = verify; |
45 |
+ return 1; |
46 |
+} |
47 |
+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) |
48 |
|
49 |
#endif // OSSL110COMPAT_H |