Skip to content
Snippets Groups Projects
Commit 60000ceb authored by Henrik (Grubba) Grubbström's avatar Henrik (Grubba) Grubbström
Browse files

Nettle: Support new DES API in Nettle 2.1.

parent c0f06aea
Branches
Tags
No related merge requests found
......@@ -571,6 +571,12 @@ pike_des_set_key(void *c,
if (!des_set_key(ctx, (const uint8_t *)key))
{
#ifndef DES_WEAK_KEY
/* Nettle 2.1 and later. */
if (!force)
Pike_error("DES_INFO: Key is weak.\n");
#else
/* Nettle 2.0 and earlier. */
switch (ctx->status)
{
case DES_WEAK_KEY:
......@@ -588,6 +594,7 @@ pike_des_set_key(void *c,
default:
Pike_error("DES_INFO: Unexpected error, please send a bug report.\n");
}
#endif
}
}
......@@ -746,6 +753,13 @@ pike_des3_set_key(void *c,
* individual keys by ourself. */
for (i = 0; i<3; i++, key += DES_KEY_SIZE)
if (!des_set_key(&ctx->des[i], (const uint8_t *)key))
{
#ifndef DES_WEAK_KEY
/* Nettle 2.1 and later. */
if (!force)
Pike_error("DES3_INFO: Key is weak.\n");
#else
/* Nettle 2.0 and earlier. */
switch (ctx->des[i].status)
{
case DES_WEAK_KEY:
......@@ -763,6 +777,8 @@ pike_des3_set_key(void *c,
default:
Pike_error("DES3_INFO: Unexpected error, please send a bug report.\n");
}
#endif
}
}
#define pike_des3_set_encrypt_key pike_des3_set_key
#define pike_des3_set_decrypt_key pike_des3_set_key
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment