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

Add CommonCrypto support, split out all hcrypto specific code to hcrypto module

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-08-10 09:07:37 +02:00
parent 2a17be87ab
commit 8276a469ab
10 changed files with 1376 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

411
lib/hcrypto/evp.c
View File

@@ -45,17 +45,19 @@
#include <assert.h>
#include <evp.h>
#include <evp-hcrypto.h>
#include <evp-cc.h>
#include <krb5-types.h>
#include "camellia.h"
#include <des.h>
#include <sha.h>
#include <rc2.h>
#include <rc4.h>
#include <md2.h>
#include <md4.h>
#include <md5.h>
#ifndef DEF_PROVIDER
#define DEF_PROVIDER hcrypto
#endif
#define HC_CONCAT4(x,y,z,aa) x ## y ## z ## aa
#define EVP_DEF_OP(_prov,_op) HC_CONCAT4(EVP_,_prov,_,_op)()
/**
* @page page_evp EVP - generic crypto interface
@@ -138,8 +140,8 @@ EVP_MD_CTX_create(void)
* @ingroup hcrypto_evp
*/
void HC_DEPRECATED
EVP_MD_CTX_init(EVP_MD_CTX *ctx)
void
EVP_MD_CTX_init(EVP_MD_CTX *ctx) HC_DEPRECATED
{
memset(ctx, 0, sizeof(*ctx));
}
@@ -169,8 +171,8 @@ EVP_MD_CTX_destroy(EVP_MD_CTX *ctx)
* @ingroup hcrypto_evp
*/
int HC_DEPRECATED
EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx)
int
EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx) HC_DEPRECATED
{
if (ctx->md && ctx->md->cleanup)
(ctx->md->cleanup)(ctx);
@@ -351,28 +353,9 @@ EVP_Digest(const void *data, size_t dsize, void *hash, unsigned int *hsize,
const EVP_MD *
EVP_sha256(void)
{
static const struct hc_evp_md sha256 = {
32,
64,
sizeof(SHA256_CTX),
(hc_evp_md_init)SHA256_Init,
(hc_evp_md_update)SHA256_Update,
(hc_evp_md_final)SHA256_Final,
NULL
};
return &sha256;
return EVP_DEF_OP(DEF_PROVIDER, sha256);
}
static const struct hc_evp_md sha1 = {
20,
64,
sizeof(SHA_CTX),
(hc_evp_md_init)SHA1_Init,
(hc_evp_md_update)SHA1_Update,
(hc_evp_md_final)SHA1_Final,
NULL
};
/**
* The message digest SHA1
*
@@ -384,7 +367,7 @@ static const struct hc_evp_md sha1 = {
const EVP_MD *
EVP_sha1(void)
{
return &sha1;
return EVP_DEF_OP(DEF_PROVIDER, sha1);
}
/**
@@ -396,9 +379,10 @@ EVP_sha1(void)
*/
const EVP_MD *
EVP_sha(void)
EVP_sha(void) HC_DEPRECATED
{
return &sha1;
return EVP_sha1();
}
/**
@@ -410,18 +394,9 @@ EVP_sha(void)
*/
const EVP_MD *
EVP_md5(void)
EVP_md5(void) HC_DEPRECATED_CRYPTO
{
static const struct hc_evp_md md5 = {
16,
64,
sizeof(MD5_CTX),
(hc_evp_md_init)MD5_Init,
(hc_evp_md_update)MD5_Update,
(hc_evp_md_final)MD5_Final,
NULL
};
return &md5;
return EVP_DEF_OP(DEF_PROVIDER, md5);
}
/**
@@ -433,18 +408,9 @@ EVP_md5(void)
*/
const EVP_MD *
EVP_md4(void)
EVP_md4(void) HC_DEPRECATED_CRYPTO
{
static const struct hc_evp_md md4 = {
16,
64,
sizeof(MD4_CTX),
(hc_evp_md_init)MD4_Init,
(hc_evp_md_update)MD4_Update,
(hc_evp_md_final)MD4_Final,
NULL
};
return &md4;
return EVP_DEF_OP(DEF_PROVIDER, md4);
}
/**
@@ -456,18 +422,9 @@ EVP_md4(void)
*/
const EVP_MD *
EVP_md2(void)
EVP_md2(void) HC_DEPRECATED_CRYPTO
{
static const struct hc_evp_md md2 = {
16,
16,
sizeof(MD2_CTX),
(hc_evp_md_init)MD2_Init,
(hc_evp_md_update)MD2_Update,
(hc_evp_md_final)MD2_Final,
NULL
};
return &md2;
return EVP_DEF_OP(DEF_PROVIDER, md2);
}
/*
@@ -1005,48 +962,6 @@ EVP_enc_null(void)
return &enc_null;
}
/*
*
*/
struct rc2_cbc {
unsigned int maximum_effective_key;
RC2_KEY key;
};
static int
rc2_init(EVP_CIPHER_CTX *ctx,
const unsigned char * key,
const unsigned char * iv,
int encp)
{
struct rc2_cbc *k = ctx->cipher_data;
k->maximum_effective_key = EVP_CIPHER_CTX_key_length(ctx) * 8;
RC2_set_key(&k->key,
EVP_CIPHER_CTX_key_length(ctx),
key,
k->maximum_effective_key);
return 1;
}
static int
rc2_do_cipher(EVP_CIPHER_CTX *ctx,
unsigned char *out,
const unsigned char *in,
unsigned int size)
{
struct rc2_cbc *k = ctx->cipher_data;
RC2_cbc_encrypt(in, out, size, &k->key, ctx->iv, ctx->encrypt);
return 1;
}
static int
rc2_cleanup(EVP_CIPHER_CTX *ctx)
{
memset(ctx->cipher_data, 0, sizeof(struct rc2_cbc));
return 1;
}
/**
* The RC2 cipher type
*
@@ -1058,28 +973,13 @@ rc2_cleanup(EVP_CIPHER_CTX *ctx)
const EVP_CIPHER *
EVP_rc2_cbc(void)
{
static const EVP_CIPHER rc2_cbc = {
0,
RC2_BLOCK_SIZE,
RC2_KEY_LENGTH,
RC2_BLOCK_SIZE,
EVP_CIPH_CBC_MODE,
rc2_init,
rc2_do_cipher,
rc2_cleanup,
sizeof(struct rc2_cbc),
NULL,
NULL,
NULL,
NULL
};
return &rc2_cbc;
return EVP_DEF_OP(DEF_PROVIDER, rc2_cbc);
}
/**
* The RC2-40 cipher type
* The RC2 cipher type
*
* @return the RC2-40 EVP_CIPHER pointer.
* @return the RC2 EVP_CIPHER pointer.
*
* @ingroup hcrypto_evp
*/
@@ -1087,28 +987,13 @@ EVP_rc2_cbc(void)
const EVP_CIPHER *
EVP_rc2_40_cbc(void)
{
static const EVP_CIPHER rc2_40_cbc = {
0,
RC2_BLOCK_SIZE,
5,
RC2_BLOCK_SIZE,
EVP_CIPH_CBC_MODE,
rc2_init,
rc2_do_cipher,
rc2_cleanup,
sizeof(struct rc2_cbc),
NULL,
NULL,
NULL,
NULL
};
return &rc2_40_cbc;
return EVP_DEF_OP(DEF_PROVIDER, rc2_40_cbc);
}
/**
* The RC2-64 cipher type
* The RC2 cipher type
*
* @return the RC2-64 EVP_CIPHER pointer.
* @return the RC2 EVP_CIPHER pointer.
*
* @ingroup hcrypto_evp
*/
@@ -1116,22 +1001,7 @@ EVP_rc2_40_cbc(void)
const EVP_CIPHER *
EVP_rc2_64_cbc(void)
{
static const EVP_CIPHER rc2_64_cbc = {
0,
RC2_BLOCK_SIZE,
8,
RC2_BLOCK_SIZE,
EVP_CIPH_CBC_MODE,
rc2_init,
rc2_do_cipher,
rc2_cleanup,
sizeof(struct rc2_cbc),
NULL,
NULL,
NULL,
NULL
};
return &rc2_64_cbc;
return EVP_DEF_OP(DEF_PROVIDER, rc2_64_cbc);
}
/**
@@ -1145,9 +1015,7 @@ EVP_rc2_64_cbc(void)
const EVP_CIPHER *
EVP_rc4(void)
{
printf("evp rc4\n");
abort();
return NULL;
return EVP_DEF_OP(DEF_PROVIDER, rc4);
}
/**
@@ -1161,45 +1029,7 @@ EVP_rc4(void)
const EVP_CIPHER *
EVP_rc4_40(void)
{
printf("evp rc4_40\n");
abort();
return NULL;
}
/*
*
*/
static int
des_cbc_init(EVP_CIPHER_CTX *ctx,
const unsigned char * key,
const unsigned char * iv,
int encp)
{
DES_key_schedule *k = ctx->cipher_data;
DES_cblock deskey;
memcpy(&deskey, key, sizeof(deskey));
DES_set_key_unchecked(&deskey, k);
return 1;
}
static int
des_cbc_do_cipher(EVP_CIPHER_CTX *ctx,
unsigned char *out,
const unsigned char *in,
unsigned int size)
{
DES_key_schedule *k = ctx->cipher_data;
DES_cbc_encrypt(in, out, size,
k, (DES_cblock *)ctx->iv, ctx->encrypt);
return 1;
}
static int
des_cbc_cleanup(EVP_CIPHER_CTX *ctx)
{
memset(ctx->cipher_data, 0, sizeof(struct DES_key_schedule));
return 1;
return EVP_DEF_OP(DEF_PROVIDER, rc4_40);
}
/**
@@ -1213,74 +1043,7 @@ des_cbc_cleanup(EVP_CIPHER_CTX *ctx)
const EVP_CIPHER *
EVP_des_cbc(void)
{
static const EVP_CIPHER des_ede3_cbc = {
0,
8,
8,
8,
EVP_CIPH_CBC_MODE,
des_cbc_init,
des_cbc_do_cipher,
des_cbc_cleanup,
sizeof(DES_key_schedule),
NULL,
NULL,
NULL,
NULL
};
return &des_ede3_cbc;
}
/*
*
*/
struct des_ede3_cbc {
DES_key_schedule ks[3];
};
static int
des_ede3_cbc_init(EVP_CIPHER_CTX *ctx,
const unsigned char * key,
const unsigned char * iv,
int encp)
{
struct des_ede3_cbc *k = ctx->cipher_data;
DES_cblock deskey;
memcpy(&deskey, key, sizeof(deskey));
DES_set_odd_parity(&deskey);
DES_set_key_unchecked(&deskey, &k->ks[0]);
memcpy(&deskey, key + 8, sizeof(deskey));
DES_set_odd_parity(&deskey);
DES_set_key_unchecked(&deskey, &k->ks[1]);
memcpy(&deskey, key + 16, sizeof(deskey));
DES_set_odd_parity(&deskey);
DES_set_key_unchecked(&deskey, &k->ks[2]);
return 1;
}
static int
des_ede3_cbc_do_cipher(EVP_CIPHER_CTX *ctx,
unsigned char *out,
const unsigned char *in,
unsigned int size)
{
struct des_ede3_cbc *k = ctx->cipher_data;
DES_ede3_cbc_encrypt(in, out, size,
&k->ks[0], &k->ks[1], &k->ks[2],
(DES_cblock *)ctx->iv, ctx->encrypt);
return 1;
}
static int
des_ede3_cbc_cleanup(EVP_CIPHER_CTX *ctx)
{
memset(ctx->cipher_data, 0, sizeof(struct des_ede3_cbc));
return 1;
return EVP_DEF_OP(DEF_PROVIDER, des_cbc);
}
/**
@@ -1294,22 +1057,7 @@ des_ede3_cbc_cleanup(EVP_CIPHER_CTX *ctx)
const EVP_CIPHER *
EVP_des_ede3_cbc(void)
{
static const EVP_CIPHER des_ede3_cbc = {
0,
8,
24,
8,
EVP_CIPH_CBC_MODE,
des_ede3_cbc_init,
des_ede3_cbc_do_cipher,
des_ede3_cbc_cleanup,
sizeof(struct des_ede3_cbc),
NULL,
NULL,
NULL,
NULL
};
return &des_ede3_cbc;
return EVP_DEF_OP(DEF_PROVIDER, des_ede3_cbc);
}
/**
@@ -1323,7 +1071,7 @@ EVP_des_ede3_cbc(void)
const EVP_CIPHER *
EVP_aes_128_cbc(void)
{
return EVP_hcrypto_aes_128_cbc();
return EVP_DEF_OP(DEF_PROVIDER, aes_128_cbc);
}
/**
@@ -1337,7 +1085,7 @@ EVP_aes_128_cbc(void)
const EVP_CIPHER *
EVP_aes_192_cbc(void)
{
return EVP_hcrypto_aes_192_cbc();
return EVP_DEF_OP(DEF_PROVIDER, aes_192_cbc);
}
/**
@@ -1351,37 +1099,7 @@ EVP_aes_192_cbc(void)
const EVP_CIPHER *
EVP_aes_256_cbc(void)
{
return EVP_hcrypto_aes_256_cbc();
}
static int
camellia_init(EVP_CIPHER_CTX *ctx,
const unsigned char * key,
const unsigned char * iv,
int encp)
{
CAMELLIA_KEY *k = ctx->cipher_data;
k->bits = ctx->cipher->key_len * 8;
CAMELLIA_set_key(key, ctx->cipher->key_len * 8, k);
return 1;
}
static int
camellia_do_cipher(EVP_CIPHER_CTX *ctx,
unsigned char *out,
const unsigned char *in,
unsigned int size)
{
CAMELLIA_KEY *k = ctx->cipher_data;
CAMELLIA_cbc_encrypt(in, out, size, k, ctx->iv, ctx->encrypt);
return 1;
}
static int
camellia_cleanup(EVP_CIPHER_CTX *ctx)
{
memset(ctx->cipher_data, 0, sizeof(CAMELLIA_KEY));
return 1;
return EVP_DEF_OP(DEF_PROVIDER, aes_256_cbc);
}
/**
@@ -1395,22 +1113,7 @@ camellia_cleanup(EVP_CIPHER_CTX *ctx)
const EVP_CIPHER *
EVP_camellia_128_cbc(void)
{
static const EVP_CIPHER cipher = {
0,
16,
16,
16,
EVP_CIPH_CBC_MODE,
camellia_init,
camellia_do_cipher,
camellia_cleanup,
sizeof(CAMELLIA_KEY),
NULL,
NULL,
NULL,
NULL
};
return &cipher;
return EVP_DEF_OP(DEF_PROVIDER, camellia_128_cbc);
}
/**
@@ -1424,22 +1127,7 @@ EVP_camellia_128_cbc(void)
const EVP_CIPHER *
EVP_camellia_192_cbc(void)
{
static const EVP_CIPHER cipher = {
0,
16,
24,
16,
EVP_CIPH_CBC_MODE,
camellia_init,
camellia_do_cipher,
camellia_cleanup,
sizeof(CAMELLIA_KEY),
NULL,
NULL,
NULL,
NULL
};
return &cipher;
return EVP_DEF_OP(DEF_PROVIDER, camellia_192_cbc);
}
/**
@@ -1453,22 +1141,7 @@ EVP_camellia_192_cbc(void)
const EVP_CIPHER *
EVP_camellia_256_cbc(void)
{
static const EVP_CIPHER cipher = {
0,
16,
32,
16,
EVP_CIPH_CBC_MODE,
camellia_init,
camellia_do_cipher,
camellia_cleanup,
sizeof(CAMELLIA_KEY),
NULL,
NULL,
NULL,
NULL
};
return &cipher;
return EVP_DEF_OP(DEF_PROVIDER, camellia_256_cbc);
}
/*