Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c,v
rcsdiff: /ftp/cvs/cvsroot/src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.11.6.2
retrieving revision 1.11.6.3
diff -u -p -r1.11.6.2 -r1.11.6.3
--- src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c	2007/11/06 16:41:40	1.11.6.2
+++ src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c	2008/01/11 14:12:37	1.11.6.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: crypto_openssl.c,v 1.11.6.2 2007/11/06 16:41:40 vanhu Exp $	*/
+/*	$NetBSD: crypto_openssl.c,v 1.11.6.3 2008/01/11 14:12:37 vanhu Exp $	*/
 
 /* Id: crypto_openssl.c,v 1.47 2006/05/06 20:42:09 manubsd Exp */
 
@@ -1294,15 +1294,15 @@ eay_idea_encrypt(data, key, iv)
 	vchar_t *res;
 	IDEA_KEY_SCHEDULE ks;
 
-	idea_set_encrypt_key(key->v, &ks);
+	idea_set_encrypt_key((unsigned char *)key->v, &ks);
 
 	/* allocate buffer for result */
 	if ((res = vmalloc(data->l)) == NULL)
 		return NULL;
 
 	/* decryption data */
-	idea_cbc_encrypt(data->v, res->v, data->l,
-			&ks, iv->v, IDEA_ENCRYPT);
+	idea_cbc_encrypt((unsigned char *)data->v, (unsigned char *)res->v, data->l,
+			&ks, (unsigned char *)iv->v, IDEA_ENCRYPT);
 
 	return res;
 }
@@ -1314,7 +1314,7 @@ eay_idea_decrypt(data, key, iv)
 	vchar_t *res;
 	IDEA_KEY_SCHEDULE ks, dks;
 
-	idea_set_encrypt_key(key->v, &ks);
+	idea_set_encrypt_key((unsigned char *)key->v, &ks);
 	idea_set_decrypt_key(&ks, &dks);
 
 	/* allocate buffer for result */
@@ -1322,8 +1322,8 @@ eay_idea_decrypt(data, key, iv)
 		return NULL;
 
 	/* decryption data */
-	idea_cbc_encrypt(data->v, res->v, data->l,
-			&dks, iv->v, IDEA_DECRYPT);
+	idea_cbc_encrypt((unsigned char *)data->v, (unsigned char *)res->v, data->l,
+			&dks, (unsigned char *)iv->v, IDEA_DECRYPT);
 
 	return res;
 }
@@ -1392,15 +1392,15 @@ eay_rc5_encrypt(data, key, iv)
 	RC5_32_KEY ks;
 
 	/* in RFC 2451, there is information about the number of round. */
-	RC5_32_set_key(&ks, key->l, key->v, 16);
+	RC5_32_set_key(&ks, key->l, (unsigned char *)key->v, 16);
 
 	/* allocate buffer for result */
 	if ((res = vmalloc(data->l)) == NULL)
 		return NULL;
 
 	/* decryption data */
-	RC5_32_cbc_encrypt(data->v, res->v, data->l,
-		&ks, iv->v, RC5_ENCRYPT);
+	RC5_32_cbc_encrypt((unsigned char *)data->v, (unsigned char *)res->v, data->l,
+		&ks, (unsigned char *)iv->v, RC5_ENCRYPT);
 
 	return res;
 }
@@ -1413,15 +1413,15 @@ eay_rc5_decrypt(data, key, iv)
 	RC5_32_KEY ks;
 
 	/* in RFC 2451, there is information about the number of round. */
-	RC5_32_set_key(&ks, key->l, key->v, 16);
+	RC5_32_set_key(&ks, key->l, (unsigned char *)key->v, 16);
 
 	/* allocate buffer for result */
 	if ((res = vmalloc(data->l)) == NULL)
 		return NULL;
 
 	/* decryption data */
-	RC5_32_cbc_encrypt(data->v, res->v, data->l,
-		&ks, iv->v, RC5_DECRYPT);
+	RC5_32_cbc_encrypt((unsigned char *)data->v, (unsigned char *)res->v, data->l,
+		&ks, (unsigned char *)iv->v, RC5_DECRYPT);
 
 	return res;
 }