#include <stdint.h>
#include <string.h>
-struct expanded_key {
- uint32_t l[16], r[16];
-};
+#include "crypt_des.h"
#define _PASSWORD_EFMT1 '_'
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;
unsigned int shifts, round, i, ibit;
/*
* 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 count, uint32_t saltbits, const struct expanded_key *ekey)
{
((uint32_t)in[5] << 16) |
((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[1] = l_out >> 16;
const unsigned char *key = (const unsigned char *)_key;
const unsigned char *setting = (const unsigned char *)_setting;
struct expanded_key ekey;
- union {
- unsigned char c[8];
- uint32_t i[2];
- } keybuf;
+ unsigned char keybuf[8];
unsigned char *p, *q;
uint32_t count, salt, l, r0, r1;
unsigned int i;
* Copy the key, shifting each character left by one bit and padding
* with zeroes.
*/
- q = keybuf.c;
- while (q <= &keybuf.c[sizeof(keybuf.c) - 1]) {
+ q = keybuf;
+ while (q <= &keybuf[sizeof(keybuf) - 1]) {
*q++ = *key << 1;
if (*key)
key++;
}
- des_setkey(keybuf.c, &ekey);
+ __des_setkey(keybuf, &ekey);
if (*setting == _PASSWORD_EFMT1) {
/*
return NULL;
count |= value << (i - 1) * 6;
}
- if (!count || count > 262143)
+ if (!count)
return NULL;
for (i = 5, salt = 0; i < 9; i++) {
/*
* Encrypt the key with itself.
*/
- des_cipher(keybuf.c, keybuf.c, 1, 0, &ekey);
+ des_cipher(keybuf, keybuf, 1, 0, &ekey);
/*
* And XOR with the next 8 characters of the key.
*/
- q = keybuf.c;
- while (q <= &keybuf.c[sizeof(keybuf.c) - 1] && *key)
+ q = keybuf;
+ while (q <= &keybuf[sizeof(keybuf) - 1] && *key)
*q++ ^= *key++ << 1;
- des_setkey(keybuf.c, &ekey);
+ __des_setkey(keybuf, &ekey);
}
memcpy(output, setting, 9);
/*
* 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...