narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[crypto] Rename aes_algorithm to aes_cbc_algorithm

pull/1/head
Michael Brown 2009-02-18 21:25:14 +00:00
parent aaa26f3bd3
commit 991f907d5b
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/crypto/axtls_aes.c
View File

@ -4,7 +4,7 @@
#include <gpxe/crypto.h> #include <gpxe/crypto.h>
#include <gpxe/aes.h> #include <gpxe/aes.h>
static int aes_setkey ( void *ctx, const void *key, size_t keylen ) { static int aes_cbc_setkey ( void *ctx, const void *key, size_t keylen ) {
AES_CTX *aesctx = ctx; AES_CTX *aesctx = ctx;
AES_MODE mode; AES_MODE mode;
@ -23,32 +23,32 @@ static int aes_setkey ( void *ctx, const void *key, size_t keylen ) {
return 0; return 0;
} }
static void aes_setiv ( void *ctx, const void *iv ) { static void aes_cbc_setiv ( void *ctx, const void *iv ) {
AES_CTX *aesctx = ctx; AES_CTX *aesctx = ctx;
memcpy ( aesctx->iv, iv, sizeof ( aesctx->iv ) ); memcpy ( aesctx->iv, iv, sizeof ( aesctx->iv ) );
} }
static void aes_encrypt ( void *ctx, const void *data, void *dst, static void aes_cbc_encrypt ( void *ctx, const void *data, void *dst,
size_t len ) { size_t len ) {
AES_CTX *aesctx = ctx; AES_CTX *aesctx = ctx;
AES_cbc_encrypt ( aesctx, data, dst, len ); AES_cbc_encrypt ( aesctx, data, dst, len );
} }
static void aes_decrypt ( void *ctx, const void *data, void *dst, static void aes_cbc_decrypt ( void *ctx, const void *data, void *dst,
size_t len ) { size_t len ) {
AES_CTX *aesctx = ctx; AES_CTX *aesctx = ctx;
AES_cbc_decrypt ( aesctx, data, dst, len ); AES_cbc_decrypt ( aesctx, data, dst, len );
} }
struct crypto_algorithm aes_algorithm = { struct crypto_algorithm aes_cbc_algorithm = {
.name = "aes", .name = "aes_cbc",
.ctxsize = sizeof ( AES_CTX ), .ctxsize = sizeof ( AES_CTX ),
.blocksize = 16, .blocksize = 16,
.setkey = aes_setkey, .setkey = aes_cbc_setkey,
.setiv = aes_setiv, .setiv = aes_cbc_setiv,
.encode = aes_encrypt, .encode = aes_cbc_encrypt,
.decode = aes_decrypt, .decode = aes_cbc_decrypt,
}; };

2
src/include/gpxe/aes.h
View File

@ -3,6 +3,6 @@
struct crypto_algorithm; struct crypto_algorithm;
extern struct crypto_algorithm aes_algorithm; extern struct crypto_algorithm aes_cbc_algorithm;
#endif /* _GPXE_AES_H */ #endif /* _GPXE_AES_H */

4
src/net/tls.c
View File

@ -486,12 +486,12 @@ static int tls_select_cipher ( struct tls_session *tls,
switch ( cipher_suite ) { switch ( cipher_suite ) {
case htons ( TLS_RSA_WITH_AES_128_CBC_SHA ): case htons ( TLS_RSA_WITH_AES_128_CBC_SHA ):
key_len = ( 128 / 8 ); key_len = ( 128 / 8 );
cipher = &aes_algorithm; cipher = &aes_cbc_algorithm;
digest = &sha1_algorithm; digest = &sha1_algorithm;
break; break;
case htons ( TLS_RSA_WITH_AES_256_CBC_SHA ): case htons ( TLS_RSA_WITH_AES_256_CBC_SHA ):
key_len = ( 256 / 8 ); key_len = ( 256 / 8 );
cipher = &aes_algorithm; cipher = &aes_cbc_algorithm;
digest = &sha1_algorithm; digest = &sha1_algorithm;
break; break;
default: default: