diff options
| author | djm <> | 2006-06-27 05:07:03 +0000 |
|---|---|---|
| committer | djm <> | 2006-06-27 05:07:03 +0000 |
| commit | 7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d (patch) | |
| tree | 224c33f66b0b932c84dda315d9ba4236bf125b1c /src/lib/libcrypto/des | |
| parent | 3f764f48d2626a43b6eeef7652c28303269d1204 (diff) | |
| download | openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.gz openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.bz2 openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/des')
| -rw-r--r-- | src/lib/libcrypto/des/des_locl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/des/des_locl.h b/src/lib/libcrypto/des/des_locl.h index e44e8e98b2..8f04b18c50 100644 --- a/src/lib/libcrypto/des/des_locl.h +++ b/src/lib/libcrypto/des/des_locl.h | |||
| @@ -421,7 +421,7 @@ | |||
| 421 | PERM_OP(l,r,tt, 4,0x0f0f0f0fL); \ | 421 | PERM_OP(l,r,tt, 4,0x0f0f0f0fL); \ |
| 422 | } | 422 | } |
| 423 | 423 | ||
| 424 | OPENSSL_EXTERN const DES_LONG DES_SPtrans[8][64]; | 424 | extern const DES_LONG DES_SPtrans[8][64]; |
| 425 | 425 | ||
| 426 | void fcrypt_body(DES_LONG *out,DES_key_schedule *ks, | 426 | void fcrypt_body(DES_LONG *out,DES_key_schedule *ks, |
| 427 | DES_LONG Eswap0, DES_LONG Eswap1); | 427 | DES_LONG Eswap0, DES_LONG Eswap1); |