sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-20 20:10:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

[crypto] Change cipher_{en,de}crypt() to void functions

Browse Source 
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.
This commit is contained in:
Michael Brown
2009-02-18 22:27:34 +00:00
parent a3219b24a8
commit b4d3d686cc
3 changed files with 25 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/net/tls.c
View File

@@ -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 ) ) {