Mon Jul 20 15:33:44 2009 UTC ()
catch up with openssl's abi change. do_cipher length changed from u_int to
size_t.
(christos)
diff -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/cipher-3des1.c
diff -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/cipher-bf1.c
diff -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/cipher-ctr.c
--- src/crypto/external/bsd/openssh/dist/Attic/cipher-3des1.c 2009/06/07 22:38:46 1.2
+++ src/crypto/external/bsd/openssh/dist/Attic/cipher-3des1.c 2009/07/20 15:33:44 1.3
@@ -1,4 +1,4 @@
-/* $NetBSD: cipher-3des1.c,v 1.2 2009/06/07 22:38:46 christos Exp $ */
+/* $NetBSD: cipher-3des1.c,v 1.3 2009/07/20 15:33:44 christos Exp $ */
/* $OpenBSD: cipher-3des1.c,v 1.6 2006/08/03 03:34:42 deraadt Exp $ */
/*
* Copyright (c) 2003 Markus Friedl. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: cipher-3des1.c,v 1.2 2009/06/07 22:38:46 christos Exp $");
+__RCSID("$NetBSD: cipher-3des1.c,v 1.3 2009/07/20 15:33:44 christos Exp $");
#include <sys/types.h>
#include <openssl/evp.h>
@@ -95,7 +95,7 @@
}
static int
-ssh1_3des_cbc(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src, u_int len)
+ssh1_3des_cbc(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src, size_t len)
{
struct ssh1_3des_ctx *c;
--- src/crypto/external/bsd/openssh/dist/Attic/cipher-bf1.c 2009/06/07 22:38:46 1.2
+++ src/crypto/external/bsd/openssh/dist/Attic/cipher-bf1.c 2009/07/20 15:33:44 1.3
@@ -1,4 +1,4 @@
-/* $NetBSD: cipher-bf1.c,v 1.2 2009/06/07 22:38:46 christos Exp $ */
+/* $NetBSD: cipher-bf1.c,v 1.3 2009/07/20 15:33:44 christos Exp $ */
/* $OpenBSD: cipher-bf1.c,v 1.5 2006/08/03 03:34:42 deraadt Exp $ */
/*
* Copyright (c) 2003 Markus Friedl. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: cipher-bf1.c,v 1.2 2009/06/07 22:38:46 christos Exp $");
+__RCSID("$NetBSD: cipher-bf1.c,v 1.3 2009/07/20 15:33:44 christos Exp $");
#include <sys/types.h>
#include <openssl/evp.h>
@@ -60,10 +60,10 @@
}
}
-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 *, size_t) = 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, size_t len)
{
int ret;
--- src/crypto/external/bsd/openssh/dist/Attic/cipher-ctr.c 2009/06/07 22:38:46 1.2
+++ src/crypto/external/bsd/openssh/dist/Attic/cipher-ctr.c 2009/07/20 15:33:44 1.3
@@ -1,4 +1,4 @@
-/* $NetBSD: cipher-ctr.c,v 1.2 2009/06/07 22:38:46 christos Exp $ */
+/* $NetBSD: cipher-ctr.c,v 1.3 2009/07/20 15:33:44 christos Exp $ */
/* $OpenBSD: cipher-ctr.c,v 1.10 2006/08/03 03:34:42 deraadt Exp $ */
/*
* Copyright (c) 2003 Markus Friedl <markus@openbsd.org>
@@ -17,7 +17,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: cipher-ctr.c,v 1.2 2009/06/07 22:38:46 christos Exp $");
+__RCSID("$NetBSD: cipher-ctr.c,v 1.3 2009/07/20 15:33:44 christos Exp $");
#include <sys/types.h>
#include <string.h>
@@ -29,7 +29,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
{
@@ -43,7 +43,7 @@
* (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;
@@ -54,10 +54,10 @@
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)
@@ -108,7 +108,7 @@
}
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;