2
0
mirror of https://github.com/xcat2/xNBA.git synced 2024-12-24 12:11:33 +00:00

[crypto] Rename aes_algorithm to aes_cbc_algorithm

This commit is contained in:
Michael Brown 2009-02-18 21:25:14 +00:00
parent aaa26f3bd3
commit 991f907d5b
3 changed files with 15 additions and 15 deletions

View File

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

View File

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

View File

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