diff options
| author | Michael Brown | 2009-02-19 02:48:52 +0100 |
|---|---|---|
| committer | Michael Brown | 2009-02-19 02:53:25 +0100 |
| commit | 9937bf13c961bb452e3e41a8fb28694af2b73c46 (patch) | |
| tree | a1a168d7dd04f749a35b28e5a2851c82d12c1d47 /src/crypto/cbc.c | |
| parent | [crypto] Add our own general-purpose cipher-block chaining routines (diff) | |
| download | ipxe-9937bf13c961bb452e3e41a8fb28694af2b73c46.tar.gz ipxe-9937bf13c961bb452e3e41a8fb28694af2b73c46.tar.xz ipxe-9937bf13c961bb452e3e41a8fb28694af2b73c46.zip | |
[crypto] Allow creation of arbitrary CBC cipher algorithms using CBC_CIPHER()
Given any block cipher, a corresponding CBC mode of behaviour for the
cipher can be created using the CBC_CIPHER() macro.
Diffstat (limited to 'src/crypto/cbc.c')
| -rw-r--r-- | src/crypto/cbc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/crypto/cbc.c b/src/crypto/cbc.c index a25d826e8..c7116ea95 100644 --- a/src/crypto/cbc.c +++ b/src/crypto/cbc.c @@ -53,18 +53,18 @@ static void cbc_xor ( const void *src, void *dst, size_t len ) { * @v src Data to encrypt * @v dst Buffer for encrypted data * @v len Length of data - * @v cipher Underlying cipher algorithm + * @v raw_cipher Underlying cipher algorithm * @v cbc_ctx CBC context */ void cbc_encrypt ( void *ctx, const void *src, void *dst, size_t len, - struct cipher_algorithm *cipher, void *cbc_ctx ) { - size_t blocksize = cipher->blocksize; + struct cipher_algorithm *raw_cipher, void *cbc_ctx ) { + size_t blocksize = raw_cipher->blocksize; assert ( ( len % blocksize ) == 0 ); while ( len ) { cbc_xor ( src, cbc_ctx, blocksize ); - cipher_encrypt ( cipher, ctx, cbc_ctx, dst, blocksize ); + cipher_encrypt ( raw_cipher, ctx, cbc_ctx, dst, blocksize ); memcpy ( cbc_ctx, dst, blocksize ); dst += blocksize; src += blocksize; @@ -79,17 +79,17 @@ void cbc_encrypt ( void *ctx, const void *src, void *dst, size_t len, * @v src Data to decrypt * @v dst Buffer for decrypted data * @v len Length of data - * @v cipher Underlying cipher algorithm + * @v raw_cipher Underlying cipher algorithm * @v cbc_ctx CBC context */ void cbc_decrypt ( void *ctx, const void *src, void *dst, size_t len, - struct cipher_algorithm *cipher, void *cbc_ctx ) { - size_t blocksize = cipher->blocksize; + struct cipher_algorithm *raw_cipher, void *cbc_ctx ) { + size_t blocksize = raw_cipher->blocksize; assert ( ( len % blocksize ) == 0 ); while ( len ) { - cipher_decrypt ( cipher, ctx, src, dst, blocksize ); + cipher_decrypt ( raw_cipher, ctx, src, dst, blocksize ); cbc_xor ( cbc_ctx, dst, blocksize ); memcpy ( cbc_ctx, src, blocksize ); dst += blocksize; |