diff options
| author | djm <djm> | 2010-10-07 11:06:42 +0000 |
|---|---|---|
| committer | djm <djm> | 2010-10-07 11:06:42 +0000 |
| commit | 5eb23891a729877ea6ede16fbf60c3c2d24ea401 (patch) | |
| tree | e984f4c87d32c1245d1be2e347f1409413789607 /cipher-bf1.c | |
| parent | c2a7d1c228d926351acf85257e9b271eccaa67c6 (diff) | |
| download | openssh-5eb23891a729877ea6ede16fbf60c3c2d24ea401.tar.gz | |
- djm@cvs.openbsd.org 2010/10/01 23:05:32
[cipher-3des1.c cipher-bf1.c cipher-ctr.c openbsd-compat/openssl-compat.h]
adapt to API changes in openssl-1.0.0a
NB. contains compat code to select correct API for older OpenSSL
Diffstat (limited to 'cipher-bf1.c')
| -rw-r--r-- | cipher-bf1.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cipher-bf1.c b/cipher-bf1.c index e0e33b4c..309509dd 100644 --- a/cipher-bf1.c +++ b/cipher-bf1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cipher-bf1.c,v 1.5 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: cipher-bf1.c,v 1.6 2010/10/01 23:05:32 djm Exp $ */ /* * Copyright (c) 2003 Markus Friedl. All rights reserved. * @@ -76,10 +76,12 @@ static void bf_ssh1_init (EVP_CIPHER_CTX * ctx, const unsigned char *key, } #endif -static int (*orig_bf)(EVP_CIPHER_CTX *, u_char *, const u_char *, u_int) = NULL; +static int (*orig_bf)(EVP_CIPHER_CTX *, u_char *, + const u_char *, LIBCRYPTO_EVP_INL_TYPE) = NULL; static int -bf_ssh1_cipher(EVP_CIPHER_CTX *ctx, u_char *out, const u_char *in, u_int len) +bf_ssh1_cipher(EVP_CIPHER_CTX *ctx, u_char *out, const u_char *in, + LIBCRYPTO_EVP_INL_TYPE len) { int ret; |