diff options
| author | djm <> | 2005-04-29 05:39:33 +0000 |
|---|---|---|
| committer | djm <> | 2005-04-29 05:39:33 +0000 |
| commit | 68edd00d9258df93b1366c71ac124e0cadf7bc08 (patch) | |
| tree | 3ce4ae2a9747bbc11aed1f95f9bbea92c41f8683 /src/lib/libcrypto/des/destest.c | |
| parent | f396ed0f5ce0af56bfde2e75e15cf1f52924c779 (diff) | |
| download | openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.gz openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.bz2 openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/des/destest.c')
| -rw-r--r-- | src/lib/libcrypto/des/destest.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/des/destest.c b/src/lib/libcrypto/des/destest.c index 3983ac8e5f..e3e9d77f14 100644 --- a/src/lib/libcrypto/des/destest.c +++ b/src/lib/libcrypto/des/destest.c | |||
| @@ -439,8 +439,8 @@ int main(int argc, char *argv[]) | |||
| 439 | memcpy(in,plain_data[i],8); | 439 | memcpy(in,plain_data[i],8); |
| 440 | memset(out,0,8); | 440 | memset(out,0,8); |
| 441 | memset(outin,0,8); | 441 | memset(outin,0,8); |
| 442 | des_ecb2_encrypt(&in,&out,ks,ks2,DES_ENCRYPT); | 442 | des_ecb2_encrypt(in,out,ks,ks2,DES_ENCRYPT); |
| 443 | des_ecb2_encrypt(&out,&outin,ks,ks2,DES_DECRYPT); | 443 | des_ecb2_encrypt(out,outin,ks,ks2,DES_DECRYPT); |
| 444 | 444 | ||
| 445 | if (memcmp(out,cipher_ecb2[i],8) != 0) | 445 | if (memcmp(out,cipher_ecb2[i],8) != 0) |
| 446 | { | 446 | { |