jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add legacy functions setkey() and encrypt()

Browse source
This commit is contained in:
Timo Teräs 2014-01-13 13:05:14 +02:00 • committed by Rich Felker
commit 16a3580ef3
2 changed files with 66 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/crypt/crypt_des.c
View file

@ -692,7 +692,7 @@ static uint32_t setup_salt(uint32_t salt)
return saltbits; return saltbits;
} }
static void des_setkey(const unsigned char *key, struct expanded_key *ekey) void __des_setkey(const unsigned char *key, struct expanded_key *ekey)
{ {
uint32_t k0, k1, rawkey0, rawkey1; uint32_t k0, k1, rawkey0, rawkey1;
unsigned int shifts, round, i, ibit; unsigned int shifts, round, i, ibit;
@ -753,7 +753,7 @@ static void des_setkey(const unsigned char *key, struct expanded_key *ekey)
/* /*
* l_in, r_in, l_out, and r_out are in pseudo-"big-endian" format. * l_in, r_in, l_out, and r_out are in pseudo-"big-endian" format.
*/ */
static void do_des(uint32_t l_in, uint32_t r_in, void __do_des(uint32_t l_in, uint32_t r_in,
uint32_t *l_out, uint32_t *r_out, uint32_t *l_out, uint32_t *r_out,
uint32_t count, uint32_t saltbits, const struct expanded_key *ekey) uint32_t count, uint32_t saltbits, const struct expanded_key *ekey)
{ {
@ -862,7 +862,7 @@ static void des_cipher(const unsigned char *in, unsigned char *out,
((uint32_t)in[5] << 16) | ((uint32_t)in[5] << 16) |
((uint32_t)in[4] << 24); ((uint32_t)in[4] << 24);
do_des(rawl, rawr, &l_out, &r_out, count, saltbits, ekey); __do_des(rawl, rawr, &l_out, &r_out, count, saltbits, ekey);
out[0] = l_out >> 24; out[0] = l_out >> 24;
out[1] = l_out >> 16; out[1] = l_out >> 16;
@ -894,7 +894,7 @@ static char *_crypt_extended_r_uut(const char *_key, const char *_setting, char
if (*key) if (*key)
key++; key++;
} }
des_setkey(keybuf, &ekey); __des_setkey(keybuf, &ekey);
if (*setting == _PASSWORD_EFMT1) { if (*setting == _PASSWORD_EFMT1) {
/* /*
@ -929,7 +929,7 @@ static char *_crypt_extended_r_uut(const char *_key, const char *_setting, char
q = keybuf; q = keybuf;
while (q <= &keybuf[sizeof(keybuf) - 1] && *key) while (q <= &keybuf[sizeof(keybuf) - 1] && *key)
*q++ ^= *key++ << 1; *q++ ^= *key++ << 1;
des_setkey(keybuf, &ekey); __des_setkey(keybuf, &ekey);
} }
memcpy(output, setting, 9); memcpy(output, setting, 9);
@ -957,7 +957,7 @@ static char *_crypt_extended_r_uut(const char *_key, const char *_setting, char
/* /*
* Do it. * Do it.
*/ */
do_des(0, 0, &r0, &r1, count, setup_salt(salt), &ekey); __do_des(0, 0, &r0, &r1, count, setup_salt(salt), &ekey);
/* /*
* Now encode the result... * Now encode the result...

60
src/crypt/encrypt.c Normal file
View file

@ -0,0 +1,60 @@
#include <stdint.h>
#include <stdlib.h>
#include <unistd.h>
struct expanded_key {
uint32_t l[16], r[16];
};
void __des_setkey(const unsigned char *key, struct expanded_key *ekey);
void __do_des(uint32_t l_in, uint32_t r_in,
uint32_t *l_out, uint32_t *r_out,
uint32_t count, uint32_t saltbits, const struct expanded_key *ekey);
static struct expanded_key __encrypt_key;
void setkey(const char *key)
{
unsigned char bkey[8];
int i, j;
for (i = 0; i < 8; i++) {
bkey[i] = 0;
for (j = 7; j >= 0; j--, key++)
bkey[i] |= (uint32_t)(*key & 1) << j;
}
__des_setkey(bkey, &__encrypt_key);
}
void encrypt(char *block, int edflag)
{
struct expanded_key decrypt_key, *key;
uint32_t b[2];
int i, j;
char *p;
p = block;
for (i = 0; i < 2; i++) {
b[i] = 0;
for (j = 31; j >= 0; j--, p++)
b[i] |= (uint32_t)(*p & 1) << j;
}
key = &__encrypt_key;
if (edflag) {
key = &decrypt_key;
for (i = 0; i < 16; i++) {
decrypt_key.l[i] = __encrypt_key.l[15-i];
decrypt_key.r[i] = __encrypt_key.r[15-i];
}
}
__do_des(b[0], b[1], b, b + 1, 1, 0, key);
p = block;
for (i = 0; i < 2; i++)
for (j = 31; j >= 0; j--)
*p++ = b[i]>>j & 1;
}