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

maybe this should work...

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23571 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-08-17 14:05:53 +00:00
parent 754267da67
commit acdb0765bd
1 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
lib/hcrypto/evp-crypt.c
View File

@@ -62,18 +62,6 @@ struct generic_key {
HCRYPTKEY *hKey; HCRYPTKEY *hKey;
}; };
static int
crypto_des_ede3_cbc_init(EVP_CIPHER_CTX *ctx,
const unsigned char * key,
const unsigned char * iv,
int encp)
{
struct generic_key *gk = ctx->cipher_data;
BYTE *k = key->key->keyvalue.data;
gk->hKey = importKey3DES_CBC(&k[0], &k[8], &k[16]);
return 1;
}
static int static int
generic_cbc_do_cipher(EVP_CIPHER_CTX *ctx, generic_cbc_do_cipher(EVP_CIPHER_CTX *ctx,
unsigned char *out, unsigned char *out,
@@ -82,19 +70,17 @@ generic_cbc_do_cipher(EVP_CIPHER_CTX *ctx,
{ {
struct generic_key *gk = ctx->cipher_data; struct generic_key *gk = ctx->cipher_data;
BOOL bResult; BOOL bResult;
DWORD paramData; DWORD length = size;
bResult = CryptSetKeyParam(gk->hKey, KP_IV, ctx->iv, 0); bResult = CryptSetKeyParam(gk->hKey, KP_IV, ctx->iv, 0);
_ASSERT(bResult); _ASSERT(bResult);
paramData = CRYPT_MODE_CBC; memcpy(out, in, size);
bResult = CryptSetKeyParam(gk->hKey, KP_MODE, (BYTE*)&paramData, 0);
_ASSERT(bResult);
if (ctx->encrypt) if (ctx->encrypt)
bResult = encryptData(in, out, size, gk->hKey); bResult = CryptEncrypt(gk->hKey, 0, TRUE, 0, out, &length, size);
else else
bResult = decryptData(in, out, size, gk->hKey); bResult = CryptDecrypt(gk->hKey, 0, TRUE, 0, out, &length);
_ASSERT(bResult); _ASSERT(bResult);
return 1; return 1;
@@ -109,8 +95,52 @@ generic_cleanup(EVP_CIPHER_CTX *ctx)
return 1; return 1;
} }
static HCRYPTKEY
import_key(int alg, const unsigned char *key, size_t keylen)
{
struct {
BLOBHEADER hdr;
DWORD len;
BYTE key[1];
} *key_blob;
size_t bloblen = sizeof(*key_blob) - 1 + keylen;
key_blob = malloc(bloblen);
key_blob->hdr.bType = PLAINTEXTKEYBLOB;
key_blob->hdr.bVersion = CUR_BLOB_VERSION;
key_blob->hdr.reserved = 0;
key_blob->hdr.aiKeyAlg = alg;
key_blob->len = 24;
memcpy(key_blob->key, key, keylen);
bResult = CryptImportKey(hCryptProv,
(void *)key_blob, bloblen, 0, 0,
&gk->hKey);
free(key_blob);
_ASSERT(bResult);
return hKey;
}
static int
crypto_des_ede3_cbc_init(EVP_CIPHER_CTX *ctx,
const unsigned char * key,
const unsigned char * iv,
int encp)
{
struct generic_key *gk = ctx->cipher_data;
DWORD paramData;
gk->hKey = import_key(CALG_3DES,
key->key->keyvalue.data,
key->key->keyvalue.len);
return 1;
}
/** /**
* The tripple DES cipher type * The tripple DES cipher type (Micrsoft crypt provider)
* *
* @return the DES-EDE3-CBC EVP_CIPHER pointer. * @return the DES-EDE3-CBC EVP_CIPHER pointer.
* *