oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

break out the hcrypto part

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23550 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-08-16 23:00:59 +00:00
parent 765920bf4e
commit 5fadb08d38
1 changed files with 3 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
lib/hcrypto/evp.c
View File

@@ -49,7 +49,6 @@ RCSID("$Id$");
#include <krb5-types.h> #include <krb5-types.h>
#include <aes.h>
#include "camellia.h" #include "camellia.h"
#include <des.h> #include <des.h>
#include <sha.h> #include <sha.h>
@@ -1124,42 +1123,6 @@ EVP_des_ede3_cbc(void)
return &des_ede3_cbc; return &des_ede3_cbc;
} }
/*
*
*/
static int
aes_init(EVP_CIPHER_CTX *ctx,
const unsigned char * key,
const unsigned char * iv,
int encp)
{
AES_KEY *k = ctx->cipher_data;
if (ctx->encrypt)
AES_set_encrypt_key(key, ctx->cipher->key_len * 8, k);
else
AES_set_decrypt_key(key, ctx->cipher->key_len * 8, k);
return 1;
}
static int
aes_do_cipher(EVP_CIPHER_CTX *ctx,
unsigned char *out,
const unsigned char *in,
unsigned int size)
{
AES_KEY *k = ctx->cipher_data;
AES_cbc_encrypt(in, out, size, k, ctx->iv, ctx->encrypt);
return 1;
}
static int
aes_cleanup(EVP_CIPHER_CTX *ctx)
{
memset(ctx->cipher_data, 0, sizeof(AES_KEY));
return 1;
}
/** /**
* The AES-128 cipher type * The AES-128 cipher type
* *
@@ -1171,22 +1134,7 @@ aes_cleanup(EVP_CIPHER_CTX *ctx)
const EVP_CIPHER * const EVP_CIPHER *
EVP_aes_128_cbc(void) EVP_aes_128_cbc(void)
{ {
static const EVP_CIPHER aes_128_cbc = { return EVP_hcrypto_aes_128_cbc();
0,
16,
16,
16,
EVP_CIPH_CBC_MODE,
aes_init,
aes_do_cipher,
aes_cleanup,
sizeof(AES_KEY),
NULL,
NULL,
NULL,
NULL
};
return &aes_128_cbc;
} }
/** /**
@@ -1200,22 +1148,7 @@ EVP_aes_128_cbc(void)
const EVP_CIPHER * const EVP_CIPHER *
EVP_aes_192_cbc(void) EVP_aes_192_cbc(void)
{ {
static const EVP_CIPHER aes_192_cbc = { return EVP_hcrypto_aes_192_cbc();
0,
16,
24,
16,
EVP_CIPH_CBC_MODE,
aes_init,
aes_do_cipher,
aes_cleanup,
sizeof(AES_KEY),
NULL,
NULL,
NULL,
NULL
};
return &aes_192_cbc;
} }
/** /**
@@ -1229,22 +1162,7 @@ EVP_aes_192_cbc(void)
const EVP_CIPHER * const EVP_CIPHER *
EVP_aes_256_cbc(void) EVP_aes_256_cbc(void)
{ {
static const EVP_CIPHER aes_256_cbc = { return EVP_hcrypto_aes_256_cbc();
0,
16,
32,
16,
EVP_CIPH_CBC_MODE,
aes_init,
aes_do_cipher,
aes_cleanup,
sizeof(AES_KEY),
NULL,
NULL,
NULL,
NULL
};
return &aes_256_cbc;
} }
static int static int