nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

check return value for crypto_pk_asn1_encode here too. thanks veracode.

Browse Source 
svn:r13603
This commit is contained in:
Roger Dingledine 2008-02-19 23:59:16 +00:00
parent 260c37c14c
commit e0beb6cc5e
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/or/rendcommon.c
View File

@ -485,13 +485,18 @@ rend_encode_service_descriptor(rend_service_descriptor_t *desc,
{ {
char *cp; char *cp;
char *end; char *end;
int i; int i, r;
size_t asn1len; size_t asn1len;
size_t buflen = size_t buflen =
PK_BYTES*2*(smartlist_len(desc->intro_nodes)+2);/*Too long, but ok*/ PK_BYTES*2*(smartlist_len(desc->intro_nodes)+2);/*Too long, but ok*/
cp = *str_out = tor_malloc(buflen); cp = *str_out = tor_malloc(buflen);
end = cp + PK_BYTES*2*(smartlist_len(desc->intro_nodes)+1); end = cp + PK_BYTES*2*(smartlist_len(desc->intro_nodes)+1);
asn1len = crypto_pk_asn1_encode(desc->pk, cp+2, end-(cp+2)); r = crypto_pk_asn1_encode(desc->pk, cp+2, end-(cp+2));
if (r < 0) {
tor_free(*str_out);
return -1;
}
asn1len = r;
set_uint16(cp, htons((uint16_t)asn1len)); set_uint16(cp, htons((uint16_t)asn1len));
cp += 2+asn1len; cp += 2+asn1len;
set_uint32(cp, htonl((uint32_t)desc->timestamp)); set_uint32(cp, htonl((uint32_t)desc->timestamp));
@ -509,12 +514,12 @@ rend_encode_service_descriptor(rend_service_descriptor_t *desc,
cp += strlen(ipoint)+1; cp += strlen(ipoint)+1;
} }
note_crypto_pk_op(REND_SERVER); note_crypto_pk_op(REND_SERVER);
i = crypto_pk_private_sign_digest(key, cp, *str_out, cp-*str_out); r = crypto_pk_private_sign_digest(key, cp, *str_out, cp-*str_out);
if (i<0) { if (r<0) {
tor_free(*str_out); tor_free(*str_out);
return -1; return -1;
} }
cp += i; cp += r;
*len_out = (size_t)(cp-*str_out); *len_out = (size_t)(cp-*str_out);
return 0; return 0;
} }