1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
|
--- ECDSA.xs.orig 2015-01-02 01:24:13 UTC
+++ ECDSA.xs
@@ -7,9 +7,34 @@
#include <openssl/ecdsa.h>
#include <openssl/err.h>
+#include <openssl/bn.h>
#include "const-c.inc"
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#include <openssl/ec.h>
+#else
+static void ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr,
+ const BIGNUM **ps) {
+ if (pr != NULL)
+ *pr = sig->r;
+ if (ps != NULL)
+ *ps = sig->s;
+}
+
+static int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
+{
+ if (r == NULL || s == NULL)
+ return 0;
+ BN_clear_free(sig->r);
+ BN_clear_free(sig->s);
+ sig->r = r;
+ sig->s = s;
+ return 1;
+}
+#endif
+
MODULE = Crypt::OpenSSL::ECDSA PACKAGE = Crypt::OpenSSL::ECDSA
PROTOTYPES: ENABLE
@@ -17,7 +42,9 @@ INCLUDE: const-xs.inc
BOOT:
ERR_load_crypto_strings();
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && OPENSSL_VERSION_NUMBER < 0x10100000L
ERR_load_ECDSA_strings();
+#endif
#ECDSA_SIG *
#ECDSA_SIG_new()
@@ -61,10 +88,16 @@ ECDSA_do_verify(const unsigned char *dgst, const ECDSA
OUTPUT:
RETVAL
-# These ECDSA_METHOD functions only became available in 1.0.2
+# These ECDSA_METHOD functions only became available in 1.0.2,
+# but some of them removed again in 1.1.0.
#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+int
+ECDSA_size(const EC_KEY *eckey)
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+
const ECDSA_METHOD *
ECDSA_OpenSSL()
@@ -77,9 +110,6 @@ ECDSA_get_default_method()
int
ECDSA_set_method(EC_KEY *eckey, const ECDSA_METHOD *meth)
-int
-ECDSA_size(const EC_KEY *eckey)
-
ECDSA_METHOD *
ECDSA_METHOD_new(ECDSA_METHOD *ecdsa_method=0)
@@ -95,8 +125,8 @@ ECDSA_METHOD_set_name(ECDSA_METHOD *ecdsa_method, char
void
ERR_load_ECDSA_strings()
-
#endif
+#endif
@@ -135,11 +165,13 @@ SV *
get_r(ecdsa_sig)
ECDSA_SIG *ecdsa_sig
PREINIT:
+ const BIGNUM *r;
unsigned char *to;
STRLEN len;
CODE:
to = malloc(sizeof(char) * 128);
- len = BN_bn2bin(ecdsa_sig->r, to);
+ ECDSA_SIG_get0(ecdsa_sig, &r, NULL);
+ len = BN_bn2bin(r, to);
RETVAL = newSVpvn((const char*)to, len);
free(to);
OUTPUT:
@@ -149,11 +181,13 @@ SV *
get_s(ecdsa_sig)
ECDSA_SIG *ecdsa_sig
PREINIT:
+ const BIGNUM *s;
unsigned char *to;
STRLEN len;
CODE:
to = malloc(sizeof(char) * 128);
- len = BN_bn2bin(ecdsa_sig->s, to);
+ ECDSA_SIG_get0(ecdsa_sig, NULL, &s);
+ len = BN_bn2bin(s, to);
RETVAL = newSVpvn((const char*)to, len);
free(to);
OUTPUT:
@@ -164,26 +198,36 @@ set_r(ecdsa_sig, r_SV)
ECDSA_SIG *ecdsa_sig
SV * r_SV
PREINIT:
- char *s;
+ char *string;
STRLEN len;
+ BIGNUM *r;
+ BIGNUM *s;
CODE:
- s = SvPV(r_SV, len);
- if (ecdsa_sig->r)
- BN_free(ecdsa_sig->r);
- ecdsa_sig->r = BN_bin2bn((const unsigned char *)s, len, NULL);
+ string = SvPV(r_SV, len);
+ r = BN_bin2bn((const unsigned char *)string, len, NULL);
+ ECDSA_SIG_get0(ecdsa_sig, NULL, (const BIGNUM**)&s);
+ s = BN_dup(s);
+ if (NULL == s)
+ croak("Could not duplicate unchanged ECDSA paramater");
+ ECDSA_SIG_set0(ecdsa_sig, r, s);
void
set_s(ecdsa_sig, s_SV)
ECDSA_SIG *ecdsa_sig
SV * s_SV
PREINIT:
- char *s;
+ char *string;
STRLEN len;
+ BIGNUM *r;
+ BIGNUM *s;
CODE:
- s = SvPV(s_SV, len);
- if (ecdsa_sig->s)
- BN_free(ecdsa_sig->s);
- ecdsa_sig->s = BN_bin2bn((const unsigned char *)s, len, NULL);
+ string = SvPV(s_SV, len);
+ s = BN_bin2bn((const unsigned char *)string, len, NULL);
+ ECDSA_SIG_get0(ecdsa_sig, (const BIGNUM**)&r, NULL);
+ r = BN_dup(r);
+ if (NULL == r)
+ croak("Could not duplicate unchanged ECDSA paramater");
+ ECDSA_SIG_set0(ecdsa_sig, r, s);
|
