|
Line 0
Link Here
|
|
|
1 |
--- crypto.c.orig 2004-06-14 11:55:41.000000000 +0200 |
| 2 |
+++ crypto.c 2015-02-28 13:23:13.232107608 +0100 |
| 3 |
@@ -100,7 +100,7 @@ |
| 4 |
|
| 5 |
/* Hmm, the function prototypes for des are really dumb */ |
| 6 |
#ifdef __OpenBSD__ |
| 7 |
-#define DC (des_cblock *) |
| 8 |
+#define DC (DES_cblock *) |
| 9 |
#else |
| 10 |
#define DC (void *) |
| 11 |
#endif |
| 12 |
@@ -109,8 +109,8 @@ |
| 13 |
des1_init(struct keystate *ks, u_int8_t *key, u_int16_t len) |
| 14 |
{ |
| 15 |
/* des_set_key returns -1 for parity problems, and -2 for weak keys */ |
| 16 |
- des_set_odd_parity(DC key); |
| 17 |
- switch (des_set_key(DC key, ks->ks_des[0])) { |
| 18 |
+ DES_set_odd_parity(DC key); |
| 19 |
+ switch (DES_set_key(DC key, &ks->ks_des[0])) { |
| 20 |
case -2: |
| 21 |
return EWEAKKEY; |
| 22 |
default: |
| 23 |
@@ -121,14 +121,14 @@ |
| 24 |
void |
| 25 |
des1_encrypt(struct keystate *ks, u_int8_t *d, u_int16_t len) |
| 26 |
{ |
| 27 |
- des_cbc_encrypt(DC d, DC d, len, ks->ks_des[0], DC ks->riv, |
| 28 |
+ DES_cbc_encrypt(DC d, DC d, len, &ks->ks_des[0], DC ks->riv, |
| 29 |
DES_ENCRYPT); |
| 30 |
} |
| 31 |
|
| 32 |
void |
| 33 |
des1_decrypt(struct keystate *ks, u_int8_t *d, u_int16_t len) |
| 34 |
{ |
| 35 |
- des_cbc_encrypt(DC d, DC d, len, ks->ks_des[0], DC ks->riv, |
| 36 |
+ DES_cbc_encrypt(DC d, DC d, len, &ks->ks_des[0], DC ks->riv, |
| 37 |
DES_DECRYPT); |
| 38 |
} |
| 39 |
|
| 40 |
@@ -136,14 +136,14 @@ |
| 41 |
enum cryptoerr |
| 42 |
des3_init(struct keystate *ks, u_int8_t *key, u_int16_t len) |
| 43 |
{ |
| 44 |
- des_set_odd_parity(DC key); |
| 45 |
- des_set_odd_parity(DC(key + 8)); |
| 46 |
- des_set_odd_parity(DC(key + 16)); |
| 47 |
+ DES_set_odd_parity(DC key); |
| 48 |
+ DES_set_odd_parity(DC(key + 8)); |
| 49 |
+ DES_set_odd_parity(DC(key + 16)); |
| 50 |
|
| 51 |
/* As of the draft Tripe-DES does not check for weak keys */ |
| 52 |
- des_set_key(DC key, ks->ks_des[0]); |
| 53 |
- des_set_key(DC(key + 8), ks->ks_des[1]); |
| 54 |
- des_set_key(DC(key + 16), ks->ks_des[2]); |
| 55 |
+ DES_set_key(DC key, &ks->ks_des[0]); |
| 56 |
+ DES_set_key(DC(key + 8), &ks->ks_des[1]); |
| 57 |
+ DES_set_key(DC(key + 16), &ks->ks_des[2]); |
| 58 |
|
| 59 |
return EOKAY; |
| 60 |
} |
| 61 |
@@ -154,8 +154,8 @@ |
| 62 |
u_int8_t iv[MAXBLK]; |
| 63 |
|
| 64 |
memcpy(iv, ks->riv, ks->xf->blocksize); |
| 65 |
- des_ede3_cbc_encrypt(DC data, DC data, len, ks->ks_des[0], |
| 66 |
- ks->ks_des[1], ks->ks_des[2], DC iv, DES_ENCRYPT); |
| 67 |
+ DES_ede3_cbc_encrypt(DC data, DC data, len, &ks->ks_des[0], |
| 68 |
+ &ks->ks_des[1], &ks->ks_des[2], DC iv, DES_ENCRYPT); |
| 69 |
} |
| 70 |
|
| 71 |
void |
| 72 |
@@ -164,8 +164,8 @@ |
| 73 |
u_int8_t iv[MAXBLK]; |
| 74 |
|
| 75 |
memcpy(iv, ks->riv, ks->xf->blocksize); |
| 76 |
- des_ede3_cbc_encrypt(DC data, DC data, len, ks->ks_des[0], |
| 77 |
- ks->ks_des[1], ks->ks_des[2], DC iv, DES_DECRYPT); |
| 78 |
+ DES_ede3_cbc_encrypt(DC data, DC data, len, &ks->ks_des[0], |
| 79 |
+ &ks->ks_des[1], &ks->ks_des[2], DC iv, DES_DECRYPT); |
| 80 |
} |
| 81 |
#undef DC |
| 82 |
#endif /* USE_TRIPLEDES */ |