diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2008-09-06 12:20:17 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2008-09-06 12:20:17 +0000 |
| commit | 18b9d3e70f6ae93aceca9cfe36e4345e900d36f7 (patch) | |
| tree | 9023ce5365fc97ff65f1059bc8a87bbbf7aa9444 /lib/libcrypto/des | |
| parent | 96de7a4399a8c71cbb70d6252fa77acfd76b3f09 (diff) | |
remerge local tweaks, update per-arch configuration headers, update
Makefiles, crank shlib_version
Diffstat (limited to 'lib/libcrypto/des')
| -rw-r--r-- | lib/libcrypto/des/des_enc.c | 5 | ||||
| -rw-r--r-- | lib/libcrypto/des/fcrypt_b.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/libcrypto/des/des_enc.c b/lib/libcrypto/des/des_enc.c index 53705b9f5be..0fe4e0b2adc 100644 --- a/lib/libcrypto/des/des_enc.c +++ b/lib/libcrypto/des/des_enc.c @@ -58,6 +58,8 @@ #include "des_locl.h" +#ifndef OPENBSD_DES_ASM + void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc) { register DES_LONG l,r,t,u; @@ -246,7 +248,8 @@ void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc) data[1]=ROTATE(r,3)&0xffffffffL; l=r=t=u=0; } -#endif + +#endif /* OPENBSD_DES_ASM */ void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1, DES_key_schedule *ks2, DES_key_schedule *ks3) diff --git a/lib/libcrypto/des/fcrypt_b.c b/lib/libcrypto/des/fcrypt_b.c index 1390138787f..c56b461e91b 100644 --- a/lib/libcrypto/des/fcrypt_b.c +++ b/lib/libcrypto/des/fcrypt_b.c @@ -68,6 +68,8 @@ #include "des_locl.h" #undef DES_FCRYPT +#ifndef OPENBSD_DES_ASM + #undef PERM_OP #define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\ (b)^=(t),\ @@ -143,3 +145,4 @@ void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0, out[1]=l; } +#endif /* OPENBSD_DES_ASM */ |