diff options
| author | Michael Brown <mcb30@etherboot.org> | 2009-02-18 22:27:34 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@etherboot.org> | 2009-02-19 00:06:41 +0000 |
| commit | b4d3d686cc67c2503976ec4c854efc3a20519203 (patch) | |
| tree | c194d6d6a4b6fb93fae56bc6ac9a81607048861d /src/net/tls.c | |
| parent | a3219b24a8ea4699e7b04cf1f1131aade9fcd855 (diff) | |
| download | ipxe-b4d3d686cc67c2503976ec4c854efc3a20519203.tar.gz | |
[crypto] Change cipher_{en,de}crypt() to void functions
It is a programming error, not a runtime error, if we attempt to use
block ciphers with an incorrect blocksize, so use an assert() rather
than an error status return.
Diffstat (limited to 'src/net/tls.c')
| -rw-r--r-- | src/net/tls.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/net/tls.c b/src/net/tls.c index 024b45db..73f9ad06 100644 --- a/src/net/tls.c +++ b/src/net/tls.c @@ -1223,15 +1223,9 @@ static int tls_send_plaintext ( struct tls_session *tls, unsigned int type, tlshdr->length = htons ( plaintext_len ); memcpy ( cipherspec->cipher_next_ctx, cipherspec->cipher_ctx, cipherspec->cipher->ctxsize ); - if ( ( rc = cipher_encrypt ( cipherspec->cipher, - cipherspec->cipher_next_ctx, plaintext, - iob_put ( ciphertext, plaintext_len ), - plaintext_len ) ) != 0 ) { - DBGC ( tls, "TLS %p could not encrypt: %s\n", - tls, strerror ( rc ) ); - DBGC_HD ( tls, plaintext, plaintext_len ); - goto done; - } + cipher_encrypt ( cipherspec->cipher, cipherspec->cipher_next_ctx, + plaintext, iob_put ( ciphertext, plaintext_len ), + plaintext_len ); /* Free plaintext as soon as possible to conserve memory */ free ( plaintext ); @@ -1393,14 +1387,8 @@ static int tls_new_ciphertext ( struct tls_session *tls, } /* Decrypt the record */ - if ( ( rc = cipher_decrypt ( cipherspec->cipher, - cipherspec->cipher_ctx, ciphertext, - plaintext, record_len ) ) != 0 ) { - DBGC ( tls, "TLS %p could not decrypt: %s\n", - tls, strerror ( rc ) ); - DBGC_HD ( tls, ciphertext, record_len ); - goto done; - } + cipher_decrypt ( cipherspec->cipher, cipherspec->cipher_ctx, + ciphertext, plaintext, record_len ); /* Split record into content and MAC */ if ( is_stream_cipher ( cipherspec->cipher ) ) { |