diff options
Diffstat (limited to 'src/lib/libcrypto/des')
| -rw-r--r-- | src/lib/libcrypto/des/des_enc.c | 5 | ||||
| -rw-r--r-- | src/lib/libcrypto/des/fcrypt_b.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/libcrypto/des/des_enc.c b/src/lib/libcrypto/des/des_enc.c index 53705b9f5b..0fe4e0b2ad 100644 --- a/src/lib/libcrypto/des/des_enc.c +++ b/src/lib/libcrypto/des/des_enc.c | |||
| @@ -58,6 +58,8 @@ | |||
| 58 | 58 | ||
| 59 | #include "des_locl.h" | 59 | #include "des_locl.h" |
| 60 | 60 | ||
| 61 | #ifndef OPENBSD_DES_ASM | ||
| 62 | |||
| 61 | void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc) | 63 | void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc) |
| 62 | { | 64 | { |
| 63 | register DES_LONG l,r,t,u; | 65 | register DES_LONG l,r,t,u; |
| @@ -246,7 +248,8 @@ void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc) | |||
| 246 | data[1]=ROTATE(r,3)&0xffffffffL; | 248 | data[1]=ROTATE(r,3)&0xffffffffL; |
| 247 | l=r=t=u=0; | 249 | l=r=t=u=0; |
| 248 | } | 250 | } |
| 249 | #endif | 251 | |
| 252 | #endif /* OPENBSD_DES_ASM */ | ||
| 250 | 253 | ||
| 251 | void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1, | 254 | void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1, |
| 252 | DES_key_schedule *ks2, DES_key_schedule *ks3) | 255 | DES_key_schedule *ks2, DES_key_schedule *ks3) |
diff --git a/src/lib/libcrypto/des/fcrypt_b.c b/src/lib/libcrypto/des/fcrypt_b.c index 1390138787..c56b461e91 100644 --- a/src/lib/libcrypto/des/fcrypt_b.c +++ b/src/lib/libcrypto/des/fcrypt_b.c | |||
| @@ -68,6 +68,8 @@ | |||
| 68 | #include "des_locl.h" | 68 | #include "des_locl.h" |
| 69 | #undef DES_FCRYPT | 69 | #undef DES_FCRYPT |
| 70 | 70 | ||
| 71 | #ifndef OPENBSD_DES_ASM | ||
| 72 | |||
| 71 | #undef PERM_OP | 73 | #undef PERM_OP |
| 72 | #define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\ | 74 | #define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\ |
| 73 | (b)^=(t),\ | 75 | (b)^=(t),\ |
| @@ -143,3 +145,4 @@ void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0, | |||
| 143 | out[1]=l; | 145 | out[1]=l; |
| 144 | } | 146 | } |
| 145 | 147 | ||
| 148 | #endif /* OPENBSD_DES_ASM */ | ||
