diff options
| author | Martin Willi <martin@revosec.ch> | 2012-07-05 18:21:58 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-07-16 14:53:33 +0200 |
| commit | 2e96de60a8e943a9c0d08e14428aa881789dc7c4 (patch) | |
| tree | 00425899227976029e554783ad10b37e2d9ea887 /src/libtls/tls_protection.c | |
| parent | 5fb719e0de156f6940b7475f444b2d36ebbf7c8d (diff) | |
| download | strongswan-2e96de60a8e943a9c0d08e14428aa881789dc7c4.tar.bz2 strongswan-2e96de60a8e943a9c0d08e14428aa881789dc7c4.tar.xz | |
Add a return value to signer_t.get_signature()
Diffstat (limited to 'src/libtls/tls_protection.c')
| -rw-r--r-- | src/libtls/tls_protection.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/libtls/tls_protection.c b/src/libtls/tls_protection.c index c81c0ba84..7120ca83e 100644 --- a/src/libtls/tls_protection.c +++ b/src/libtls/tls_protection.c @@ -93,7 +93,7 @@ struct private_tls_protection_t { /** * Create the header and feed it into a signer for MAC verification */ -static void sigheader(signer_t *signer, u_int32_t seq, u_int8_t type, +static bool sigheader(signer_t *signer, u_int32_t seq, u_int8_t type, u_int16_t version, u_int16_t length) { /* we only support 32 bit sequence numbers, but TLS uses 64 bit */ @@ -110,7 +110,7 @@ static void sigheader(signer_t *signer, u_int32_t seq, u_int8_t type, htoun16(&header.version, version); htoun16(&header.length, length); - signer->get_signature(signer, chunk_from_thing(header), NULL); + return signer->get_signature(signer, chunk_from_thing(header), NULL); } METHOD(tls_protection_t, process, status_t, @@ -180,8 +180,9 @@ METHOD(tls_protection_t, process, status_t, mac = chunk_skip(data, data.len - bs); data.len -= bs; - sigheader(this->signer_in, this->seq_in, type, this->version, data.len); - if (!this->signer_in->verify_signature(this->signer_in, data, mac)) + if (!sigheader(this->signer_in, this->seq_in, type, + this->version, data.len) || + !this->signer_in->verify_signature(this->signer_in, data, mac)) { DBG1(DBG_TLS, "TLS record MAC verification failed"); this->alert->add(this->alert, TLS_FATAL, TLS_BAD_RECORD_MAC); @@ -218,10 +219,10 @@ METHOD(tls_protection_t, build, status_t, { chunk_t mac; - sigheader(this->signer_out, this->seq_out, *type, - this->version, data->len); - if (!this->signer_out->allocate_signature(this->signer_out, - *data, &mac)) + if (!sigheader(this->signer_out, this->seq_out, *type, + this->version, data->len) || + !this->signer_out->allocate_signature(this->signer_out, + *data, &mac)) { return FAILED; } |