(etypes): remove NEW_DES3_CODE, enable des3-cbc-sha1 and keep
old-des3-cbc-sha1 for backwards compatability git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6834 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1402,7 +1402,6 @@ static struct encryption_type etypes[] = {
|
||||
0,
|
||||
DES3_CBC_encrypt,
|
||||
},
|
||||
#if NEW_DES3_CODE
|
||||
{
|
||||
ETYPE_DES3_CBC_SHA1,
|
||||
"des3-cbc-sha1",
|
||||
@@ -1414,21 +1413,9 @@ static struct encryption_type etypes[] = {
|
||||
F_DERIVED,
|
||||
DES3_CBC_encrypt,
|
||||
},
|
||||
#else
|
||||
{
|
||||
ETYPE_NEW_DES3_CBC_SHA1,
|
||||
"new-des3-cbc-sha1",
|
||||
8,
|
||||
8,
|
||||
&keytype_des3_derived,
|
||||
&checksum_sha1,
|
||||
&checksum_hmac_sha1_des3,
|
||||
F_DERIVED,
|
||||
DES3_CBC_encrypt,
|
||||
},
|
||||
{
|
||||
ETYPE_DES3_CBC_SHA1,
|
||||
"des3-cbc-sha1",
|
||||
ETYPE_OLD_DES3_CBC_SHA1,
|
||||
"old-des3-cbc-sha1",
|
||||
8,
|
||||
8,
|
||||
&keytype_des3,
|
||||
@@ -1437,7 +1424,6 @@ static struct encryption_type etypes[] = {
|
||||
0,
|
||||
DES3_CBC_encrypt,
|
||||
},
|
||||
#endif
|
||||
{
|
||||
ETYPE_DES_CBC_NONE,
|
||||
"des-cbc-none",
|
||||
|
Reference in New Issue
Block a user