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

Play games to move make make-proto not see this EVP_hcrypto_aes.

Browse Source 
Disable DES.
Add krb5_enctype_enable().

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23589 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-08-17 14:09:45 +00:00
parent 357e5964a9
commit 6872e73f4d
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/krb5/crypto.c
View File

@@ -41,8 +41,10 @@ static void krb5_crypto_debug(krb5_context, int, size_t, krb5_keyblock*);
#endif #endif
#ifdef HAVE_OPENSSL /* XXX forward decl for hcrypto glue */ #ifdef HAVE_OPENSSL /* XXX forward decl for hcrypto glue */
const EVP_CIPHER * EVP_hcrypto_aes_128_cts(void); const EVP_CIPHER * _krb5_EVP_hcrypto_aes_128_cts(void);
const EVP_CIPHER * EVP_hcrypto_aes_256_cts(void); const EVP_CIPHER * _krb5_EVP_hcrypto_aes_256_cts(void);
#define EVP_hcrypto_aes_128_cts _krb5_EVP_hcrypto_aes_128_cts
#define EVP_hcrypto_aes_256_cts _krb5_EVP_hcrypto_aes_256_cts
#endif #endif
struct key_data { struct key_data {
@@ -2533,7 +2535,7 @@ static struct encryption_type enctype_des_cbc_crc = {
&keytype_des, &keytype_des,
&checksum_crc32, &checksum_crc32,
NULL, NULL,
0, F_DISABLED,
evp_des_encrypt_key_ivec, evp_des_encrypt_key_ivec,
0, 0,
NULL NULL
@@ -2547,7 +2549,7 @@ static struct encryption_type enctype_des_cbc_md4 = {
&keytype_des, &keytype_des,
&checksum_rsa_md4, &checksum_rsa_md4,
&checksum_rsa_md4_des, &checksum_rsa_md4_des,
0, F_DISABLED,
evp_des_encrypt_null_ivec, evp_des_encrypt_null_ivec,
0, 0,
NULL NULL
@@ -2561,7 +2563,7 @@ static struct encryption_type enctype_des_cbc_md5 = {
&keytype_des, &keytype_des,
&checksum_rsa_md5, &checksum_rsa_md5,
&checksum_rsa_md5_des, &checksum_rsa_md5_des,
0, F_DISABLED,
evp_des_encrypt_null_ivec, evp_des_encrypt_null_ivec,
0, 0,
NULL NULL
@@ -2659,7 +2661,7 @@ static struct encryption_type enctype_des_cbc_none = {
&keytype_des, &keytype_des,
&checksum_none, &checksum_none,
NULL, NULL,
F_PSEUDO, F_PSEUDO|F_DISABLED,
evp_des_encrypt_null_ivec, evp_des_encrypt_null_ivec,
0, 0,
NULL NULL
@@ -2673,7 +2675,7 @@ static struct encryption_type enctype_des_cfb64_none = {
&keytype_des_old, &keytype_des_old,
&checksum_none, &checksum_none,
NULL, NULL,
F_PSEUDO, F_PSEUDO|F_DISABLED,
DES_CFB64_encrypt_null_ivec, DES_CFB64_encrypt_null_ivec,
0, 0,
NULL NULL
@@ -2687,7 +2689,7 @@ static struct encryption_type enctype_des_pcbc_none = {
&keytype_des_old, &keytype_des_old,
&checksum_none, &checksum_none,
NULL, NULL,
F_PSEUDO, F_PSEUDO|F_DISABLED,
DES_PCBC_encrypt_key_ivec, DES_PCBC_encrypt_key_ivec,
0, 0,
NULL NULL