diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2010-10-01 23:05:33 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2010-10-01 23:05:33 +0000 |
| commit | 90a58705f66b7f999e7bfded264b689334791b7d (patch) | |
| tree | 5860c911fa7e88763d15e69131e5741140ac6d9b /usr.bin/ssh/cipher-ctr.c | |
| parent | 7e189a36fef87ecfd338af01d14747a9471efd25 (diff) | |
adapt to API changes in openssl-1.0.0a
Diffstat (limited to 'usr.bin/ssh/cipher-ctr.c')
| -rw-r--r-- | usr.bin/ssh/cipher-ctr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/cipher-ctr.c b/usr.bin/ssh/cipher-ctr.c index a067ff890e9..0c7b886b9fe 100644 --- a/usr.bin/ssh/cipher-ctr.c +++ b/usr.bin/ssh/cipher-ctr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cipher-ctr.c,v 1.10 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: cipher-ctr.c,v 1.11 2010/10/01 23:05:32 djm Exp $ */ /* * Copyright (c) 2003 Markus Friedl <markus@openbsd.org> * @@ -26,7 +26,7 @@ #include "log.h" const EVP_CIPHER *evp_aes_128_ctr(void); -void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, u_int); +void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, size_t); struct ssh_aes_ctr_ctx { @@ -40,7 +40,7 @@ struct ssh_aes_ctr_ctx * (LSB at ctr[len-1], MSB at ctr[0]) */ static void -ssh_ctr_inc(u_char *ctr, u_int len) +ssh_ctr_inc(u_char *ctr, size_t len) { int i; @@ -51,10 +51,10 @@ ssh_ctr_inc(u_char *ctr, u_int len) static int ssh_aes_ctr(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src, - u_int len) + size_t len) { struct ssh_aes_ctr_ctx *c; - u_int n = 0; + size_t n = 0; u_char buf[AES_BLOCK_SIZE]; if (len == 0) @@ -105,7 +105,7 @@ ssh_aes_ctr_cleanup(EVP_CIPHER_CTX *ctx) } void -ssh_aes_ctr_iv(EVP_CIPHER_CTX *evp, int doset, u_char * iv, u_int len) +ssh_aes_ctr_iv(EVP_CIPHER_CTX *evp, int doset, u_char * iv, size_t len) { struct ssh_aes_ctr_ctx *c; |