Replace deprecated des_ and fix LibreSSL build

uses deprecated des_ methods and types that were marked deprecated by
OpenSSL 0.9.7 and will be removed in OpenSSL 1.1.0 . This patch replaces
the des_ methods and types with their new DES_ counterparts. This
enables building with LibreSSL as OpenSSL library.
This commit is contained in:
Bernard Spil 2015-03-12 08:57:57 +01:00
commit ae324d6544
3 changed files with 12 additions and 12 deletions

View file

@ -176,17 +176,17 @@ static void MakeKey(unsigned char *key, unsigned char *des_key) {
des_key[6] = Get7Bits(key, 42);
des_key[7] = Get7Bits(key, 49);
des_set_odd_parity((des_cblock *) des_key);
DES_set_odd_parity((DES_cblock *) des_key);
}
/* Do the DesEncryption */
void DesEncrypt(unsigned char *clear, unsigned char *key, unsigned char *cipher) {
des_cblock des_key;
des_key_schedule key_schedule;
DES_cblock des_key;
DES_key_schedule key_schedule;
MakeKey(key, des_key);
des_set_key(&des_key, key_schedule);
des_ecb_encrypt((des_cblock *) clear, (des_cblock *) cipher, key_schedule, 1);
DES_set_key(&des_key, &key_schedule);
DES_ecb_encrypt((DES_cblock *) clear, (DES_cblock *) cipher, &key_schedule, 1);
}
/*