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
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
|
$NetBSD: patch-aa,v 1.3 2007/04/21 15:19:01 obache Exp $
--- src/protocol_auth.c.orig 2006-04-26 13:53:05.000000000 +0000
+++ src/protocol_auth.c
@@ -128,10 +128,10 @@ bool send_metakey(connection_t *c)
/* Allocate buffers for the meta key */
- buffer = alloca(2 * len + 1);
+ buffer = xmalloc_and_zero(2 * len + 1);
if(!c->outkey)
- c->outkey = xmalloc(len);
+ c->outkey = xmalloc_and_zero(len);
if(!c->outctx)
c->outctx = xmalloc_and_zero(sizeof(*c->outctx));
@@ -169,6 +169,7 @@ bool send_metakey(connection_t *c)
if(RSA_public_encrypt(len, (unsigned char *)c->outkey, (unsigned char *)buffer, c->rsa_key, RSA_NO_PADDING) != len) {
logger(LOG_ERR, _("Error during encryption of meta key for %s (%s)"),
c->name, c->hostname);
+ free(buffer);
return false;
}
@@ -193,35 +194,45 @@ bool send_metakey(connection_t *c)
c->outcipher->iv_len)) {
logger(LOG_ERR, _("Error during initialisation of cipher for %s (%s): %s"),
c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
+ free(buffer);
return false;
}
c->status.encryptout = true;
}
+ free(buffer);
return x;
}
bool metakey_h(connection_t *c)
{
- char buffer[MAX_STRING_SIZE];
+ char *buffer, fmt[513];
int cipher, digest, maclength, compression;
int len;
cp();
- if(sscanf(c->buffer, "%*d %d %d %d %d " MAX_STRING, &cipher, &digest, &maclength, &compression, buffer) != 5) {
+ len = RSA_size(myself->connection->rsa_key);
+ buffer = xmalloc(2 * len + 1);
+ memset(buffer, 0, 2 * len + 1);
+
+ memset(fmt, 0, 513);
+ snprintf(fmt, 512, "%%*d %%d %%d %%d %%d %%%ds", 2 * len);
+
+ if(sscanf(c->buffer, fmt, &cipher, &digest, &maclength, &compression, buffer) != 5) {
logger(LOG_ERR, _("Got bad %s from %s (%s)"), "METAKEY", c->name,
c->hostname);
+ free(buffer);
return false;
}
- len = RSA_size(myself->connection->rsa_key);
/* Check if the length of the meta key is all right */
if(strlen(buffer) != len * 2) {
logger(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, "wrong keylength");
+ free(buffer);
return false;
}
@@ -242,6 +253,7 @@ bool metakey_h(connection_t *c)
if(RSA_private_decrypt(len, (unsigned char *)buffer, (unsigned char *)c->inkey, myself->connection->rsa_key, RSA_NO_PADDING) != len) { /* See challenge() */
logger(LOG_ERR, _("Error during encryption of meta key for %s (%s)"),
c->name, c->hostname);
+ free(buffer);
return false;
}
@@ -260,6 +272,7 @@ bool metakey_h(connection_t *c)
if(!c->incipher) {
logger(LOG_ERR, _("%s (%s) uses unknown cipher!"), c->name, c->hostname);
+ free(buffer);
return false;
}
@@ -269,6 +282,7 @@ bool metakey_h(connection_t *c)
c->incipher->iv_len)) {
logger(LOG_ERR, _("Error during initialisation of cipher from %s (%s): %s"),
c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
+ free(buffer);
return false;
}
@@ -284,11 +298,13 @@ bool metakey_h(connection_t *c)
if(!c->indigest) {
logger(LOG_ERR, _("Node %s (%s) uses unknown digest!"), c->name, c->hostname);
+ free(buffer);
return false;
}
if(c->inmaclength > c->indigest->md_size || c->inmaclength < 0) {
logger(LOG_ERR, _("%s (%s) uses bogus MAC length!"), c->name, c->hostname);
+ free(buffer);
return false;
}
} else {
@@ -299,6 +315,7 @@ bool metakey_h(connection_t *c)
c->allow_request = CHALLENGE;
+ free(buffer);
return send_challenge(c);
}
@@ -306,6 +323,7 @@ bool send_challenge(connection_t *c)
{
char *buffer;
int len;
+ bool ret;
cp();
@@ -315,7 +333,7 @@ bool send_challenge(connection_t *c)
/* Allocate buffers for the challenge */
- buffer = alloca(2 * len + 1);
+ buffer = xmalloc_and_zero(2 * len + 1);
if(!c->hischallenge)
c->hischallenge = xmalloc(len);
@@ -331,29 +349,37 @@ bool send_challenge(connection_t *c)
/* Send the challenge */
- return send_request(c, "%d %s", CHALLENGE, buffer);
+ ret = send_request(c, "%d %s", CHALLENGE, buffer);
+
+ free(buffer);
+
+ return ret;
}
bool challenge_h(connection_t *c)
{
- char buffer[MAX_STRING_SIZE];
- int len;
+ char *buffer, fmt[513];
+ int len = RSA_size(myself->connection->rsa_key);
cp();
- if(sscanf(c->buffer, "%*d " MAX_STRING, buffer) != 1) {
+ buffer = xmalloc(2 * len + 1);
+ memset(fmt, 0, 513);
+ snprintf(fmt, 512, "%%*d %%%ds", 2*len);
+
+ if(sscanf(c->buffer, fmt, buffer) != 1) {
logger(LOG_ERR, _("Got bad %s from %s (%s)"), "CHALLENGE", c->name,
c->hostname);
+ free(buffer);
return false;
}
- len = RSA_size(myself->connection->rsa_key);
-
/* Check if the length of the challenge is all right */
if(strlen(buffer) != len * 2) {
logger(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name,
c->hostname, "wrong challenge length");
+ free(buffer);
return false;
}
@@ -370,6 +396,7 @@ bool challenge_h(connection_t *c)
/* Rest is done by send_chal_reply() */
+ free(buffer);
return send_chal_reply(c);
}
|
