diff options
| author | djm <> | 2010-10-01 22:59:01 +0000 |
|---|---|---|
| committer | djm <> | 2010-10-01 22:59:01 +0000 |
| commit | 8922d4bc4a8b8893d72a48deb2cdf58215f98505 (patch) | |
| tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/evp/e_idea.c | |
| parent | 76262f7bf9262f965142b1b2b2105cb279c5c696 (diff) | |
| download | openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.gz openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.bz2 openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.zip | |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libcrypto/evp/e_idea.c')
| -rw-r--r-- | src/lib/libcrypto/evp/e_idea.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/evp/e_idea.c b/src/lib/libcrypto/evp/e_idea.c index 48c33a774a..806b080360 100644 --- a/src/lib/libcrypto/evp/e_idea.c +++ b/src/lib/libcrypto/evp/e_idea.c | |||
| @@ -73,7 +73,7 @@ static int idea_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | |||
| 73 | */ | 73 | */ |
| 74 | 74 | ||
| 75 | static int idea_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, | 75 | static int idea_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, |
| 76 | const unsigned char *in, unsigned int inl) | 76 | const unsigned char *in, size_t inl) |
| 77 | { | 77 | { |
| 78 | BLOCK_CIPHER_ecb_loop() | 78 | BLOCK_CIPHER_ecb_loop() |
| 79 | idea_ecb_encrypt(in + i, out + i, ctx->cipher_data); | 79 | idea_ecb_encrypt(in + i, out + i, ctx->cipher_data); |