[packages/gnutls.git] / gnutls-libgcrypt.patch

--- gnutls-0.8.9/lib/gnutls_mpi.h.orig	2003-02-04 13:52:24.000000000 +0100
+++ gnutls-0.8.9/lib/gnutls_mpi.h	2003-08-03 04:38:49.000000000 +0200
@@ -24,6 +24,7 @@
 
 # define _gnutls_mpi_alloc_like(x) _gnutls_mpi_new(_gnutls_mpi_get_nbits(x)) 
 
+typedef gcry_mpi_t MPI;
 void _gnutls_mpi_release( MPI* x);
 
 int _gnutls_mpi_scan( GNUTLS_MPI *ret_mpi, const opaque *buffer, size_t *nbytes );
--- gnutls-0.8.9/lib/gnutls_hash_int.c.orig	2003-01-09 23:10:45.000000000 +0100
+++ gnutls-0.8.9/lib/gnutls_hash_int.c	2003-08-03 04:41:10.000000000 +0200
@@ -37,7 +37,7 @@
 		ret = gnutls_malloc(sizeof(GNUTLS_MAC_HANDLE_INT));
 		if (ret == NULL)
 			return GNUTLS_HASH_FAILED;
-		ret->handle = gcry_md_open(GCRY_MD_SHA1, 0);
+		gcry_md_open(&ret->handle, GCRY_MD_SHA1, 0);
 		if (!ret->handle) {
 			gnutls_free(ret);
 			ret = GNUTLS_HASH_FAILED;
@@ -48,7 +48,7 @@
 		ret = gnutls_malloc(sizeof(GNUTLS_MAC_HANDLE_INT));
 		if (ret == NULL)
 			return GNUTLS_HASH_FAILED;
-		ret->handle = gcry_md_open(GCRY_MD_MD5, 0);
+		gcry_md_open(&ret->handle, GCRY_MD_MD5, 0);
 		if (!ret->handle) {
 			gnutls_free(ret);
 			ret = GNUTLS_HASH_FAILED;
@@ -104,7 +104,7 @@
 	ret->key = NULL;	/* it's a hash anyway */
 	ret->keysize = 0;
 
-	ret->handle = gcry_md_copy(handle->handle);
+	gcry_md_copy(&ret->handle, handle->handle);
 
 	if (ret->handle == NULL) {
 		gnutls_free(ret);
@@ -147,8 +147,7 @@
 		if (ret == NULL)
 			return GNUTLS_MAC_FAILED;
 
-		ret->handle =
-		    gcry_md_open(GCRY_MD_SHA1, GCRY_MD_FLAG_HMAC);
+		gcry_md_open(&ret->handle, GCRY_MD_SHA1, GCRY_MD_FLAG_HMAC);
 
 		if (!ret->handle)
 			ret = GNUTLS_MAC_FAILED;
@@ -158,7 +157,7 @@
 		if (ret == NULL)
 			return GNUTLS_MAC_FAILED;
 
-		ret->handle = gcry_md_open(GCRY_MD_MD5, GCRY_MD_FLAG_HMAC);
+		gcry_md_open(&ret->handle, GCRY_MD_MD5, GCRY_MD_FLAG_HMAC);
 
 		if (!ret->handle)
 			ret = GNUTLS_MAC_FAILED;
--- gnutls-0.8.9/lib/gnutls_cipher_int.c.orig	2003-01-09 22:28:46.000000000 +0100
+++ gnutls-0.8.9/lib/gnutls_cipher_int.c	2003-08-03 04:42:22.000000000 +0200
@@ -33,20 +33,20 @@
 		ret = GNUTLS_CIPHER_FAILED;
 		break;
 	case GNUTLS_CIPHER_RIJNDAEL_128_CBC:
-		ret = gcry_cipher_open(GCRY_CIPHER_RIJNDAEL, GCRY_CIPHER_MODE_CBC, 0);
+		gcry_cipher_open(&ret, GCRY_CIPHER_RIJNDAEL, GCRY_CIPHER_MODE_CBC, 0);
 		break;
 	case GNUTLS_CIPHER_RIJNDAEL_256_CBC:
-		ret = gcry_cipher_open(GCRY_CIPHER_RIJNDAEL256, GCRY_CIPHER_MODE_CBC, 0);
+		gcry_cipher_open(&ret, GCRY_CIPHER_RIJNDAEL256, GCRY_CIPHER_MODE_CBC, 0);
 		break;
 	case GNUTLS_CIPHER_TWOFISH_128_CBC:
-		ret = gcry_cipher_open(GCRY_CIPHER_TWOFISH, GCRY_CIPHER_MODE_CBC, 0);
+		gcry_cipher_open(&ret, GCRY_CIPHER_TWOFISH, GCRY_CIPHER_MODE_CBC, 0);
 		break;
 	case GNUTLS_CIPHER_3DES_CBC:
-		ret = gcry_cipher_open(GCRY_CIPHER_3DES, GCRY_CIPHER_MODE_CBC, 0);
+		gcry_cipher_open(&ret, GCRY_CIPHER_3DES, GCRY_CIPHER_MODE_CBC, 0);
 		break;
 	case GNUTLS_CIPHER_ARCFOUR_128:
 	case GNUTLS_CIPHER_ARCFOUR_40:
-		ret = gcry_cipher_open(GCRY_CIPHER_ARCFOUR, GCRY_CIPHER_MODE_STREAM, 0);
+		gcry_cipher_open(&ret, GCRY_CIPHER_ARCFOUR, GCRY_CIPHER_MODE_STREAM, 0);
 		break;
 	default:
 		ret = GNUTLS_CIPHER_FAILED;
--- gnutls-0.8.9/lib/gnutls_mpi.c.orig	2003-02-04 13:52:24.000000000 +0100
+++ gnutls-0.8.9/lib/gnutls_mpi.c	2003-08-03 04:44:22.000000000 +0200
@@ -41,7 +41,7 @@
 int _gnutls_mpi_scan( GNUTLS_MPI *ret_mpi, const opaque *buffer, size_t *nbytes ) {
 	int ret;
 	
-	ret = gcry_mpi_scan( ret_mpi, GCRYMPI_FMT_USG, buffer, nbytes);
+	ret = gcry_mpi_scan( ret_mpi, GCRYMPI_FMT_USG, buffer, *nbytes, nbytes);
 	if (ret) return ret;
 	
 	/* MPIs with 0 bits are illegal
@@ -56,7 +56,7 @@
 
 int _gnutls_mpi_scan_pgp( GNUTLS_MPI *ret_mpi, const opaque *buffer, size_t *nbytes ) {
 int ret;
-	ret = gcry_mpi_scan( ret_mpi, GCRYMPI_FMT_PGP, buffer, nbytes);
+	ret = gcry_mpi_scan( ret_mpi, GCRYMPI_FMT_PGP, buffer, *nbytes, nbytes);
 
 	if (ret) return ret;
 
@@ -71,12 +71,12 @@
 }
 
 int _gnutls_mpi_print( opaque *buffer, size_t *nbytes, const GNUTLS_MPI a ) {
-	return gcry_mpi_print( GCRYMPI_FMT_USG, buffer, nbytes, a);
+	return gcry_mpi_print( GCRYMPI_FMT_USG, buffer, *nbytes, nbytes, a);
 }
 
 /* Always has the first bit zero */
 int _gnutls_mpi_print_lz( opaque *buffer, size_t *nbytes, const GNUTLS_MPI a ) {
-	return gcry_mpi_print( GCRYMPI_FMT_STD, buffer, nbytes, a);
+	return gcry_mpi_print( GCRYMPI_FMT_STD, buffer, *nbytes, nbytes, a);
 }
 
 
--- gnutls-0.8.9/src/prime.c.orig	2003-02-04 13:52:26.000000000 +0100
+++ gnutls-0.8.9/src/prime.c	2003-08-03 04:51:21.000000000 +0200
@@ -26,6 +26,7 @@
 #include <gcrypt.h>
 #include <gnutls/gnutls.h>
 #include "../lib/defines.h"
+typedef gcry_mpi_t MPI;
 
 MPI _gcry_generate_elg_prime( int mode, unsigned pbits, unsigned qbits,
 	                MPI g, MPI **ret_factors );
@@ -60,10 +61,10 @@
 
 	/* print generator */
 	size = 0;
-	gcry_mpi_print(GCRYMPI_FMT_USG, NULL, &size, g);
+	gcry_mpi_print(GCRYMPI_FMT_USG, NULL, size, &size, g);
 
 	tmp = malloc(size);
-   	gcry_mpi_print(GCRYMPI_FMT_USG, tmp, &size, g);
+   	gcry_mpi_print(GCRYMPI_FMT_USG, tmp, size, &size, g);
 
 	printf( "/* generator - %d bits */\n", gcry_mpi_get_nbits(g)); 
 	printf( "\nconst uint8 g[%d] = { ", size);
@@ -79,10 +80,10 @@
 
 	/* print prime */
 	size = 0;
-	gcry_mpi_print(GCRYMPI_FMT_USG, NULL, &size, prime);
+	gcry_mpi_print(GCRYMPI_FMT_USG, NULL, size, &size, prime);
 
 	tmp = malloc(size);
-   	gcry_mpi_print(GCRYMPI_FMT_USG, tmp, &size, prime);
+   	gcry_mpi_print(GCRYMPI_FMT_USG, tmp, size, &size, prime);
 
 	printf( "/* prime - %d bits */\n",  gcry_mpi_get_nbits(prime)); 
 	printf( "\nconst uint8 prime[%d] = { ", size);
--- gnutls-0.8.9/libextra/gnutls_openssl.c.orig	2003-06-29 08:48:11.000000000 +0200
+++ gnutls-0.8.9/libextra/gnutls_openssl.c	2003-08-03 04:49:00.000000000 +0200
@@ -896,7 +896,7 @@
 
 void MD5_Init(MD5_CTX *ctx)
 {
-    ctx->handle = gcry_md_open(GCRY_MD_MD5, 0);
+    gcry_md_open(&ctx->handle, GCRY_MD_MD5, 0);
 }
 
 void MD5_Update(MD5_CTX *ctx, const void *buf, int len)
@@ -934,7 +934,7 @@
 
 void RIPEMD160_Init(RIPEMD160_CTX *ctx)
 {
-    ctx->handle = gcry_md_open(GCRY_MD_RMD160, 0);
+     gcry_md_open(&ctx->handle, GCRY_MD_RMD160, 0);
 }
 
 void RIPEMD160_Update(RIPEMD160_CTX *ctx, const void *buf, int len)
Commit	Line	Data
74be7fb4 JB	1	--- gnutls-0.8.9/lib/gnutls_mpi.h.orig 2003-02-04 13:52:24.000000000 +0100
	2	+++ gnutls-0.8.9/lib/gnutls_mpi.h 2003-08-03 04:38:49.000000000 +0200
	3	@@ -24,6 +24,7 @@
	4
	5	# define _gnutls_mpi_alloc_like(x) _gnutls_mpi_new(_gnutls_mpi_get_nbits(x))
	6
	7	+typedef gcry_mpi_t MPI;
	8	void _gnutls_mpi_release( MPI* x);
	9
	10	int _gnutls_mpi_scan( GNUTLS_MPI ret_mpi, const opaque buffer, size_t *nbytes );
	11	--- gnutls-0.8.9/lib/gnutls_hash_int.c.orig 2003-01-09 23:10:45.000000000 +0100
	12	+++ gnutls-0.8.9/lib/gnutls_hash_int.c 2003-08-03 04:41:10.000000000 +0200
	13	@@ -37,7 +37,7 @@
	14	ret = gnutls_malloc(sizeof(GNUTLS_MAC_HANDLE_INT));
	15	if (ret == NULL)
	16	return GNUTLS_HASH_FAILED;
	17	- ret->handle = gcry_md_open(GCRY_MD_SHA1, 0);
	18	+ gcry_md_open(&ret->handle, GCRY_MD_SHA1, 0);
	19	if (!ret->handle) {
	20	gnutls_free(ret);
	21	ret = GNUTLS_HASH_FAILED;
	22	@@ -48,7 +48,7 @@
	23	ret = gnutls_malloc(sizeof(GNUTLS_MAC_HANDLE_INT));
	24	if (ret == NULL)
	25	return GNUTLS_HASH_FAILED;
	26	- ret->handle = gcry_md_open(GCRY_MD_MD5, 0);
	27	+ gcry_md_open(&ret->handle, GCRY_MD_MD5, 0);
	28	if (!ret->handle) {
	29	gnutls_free(ret);
	30	ret = GNUTLS_HASH_FAILED;
	31	@@ -104,7 +104,7 @@
	32	ret->key = NULL; /* it's a hash anyway */
	33	ret->keysize = 0;
	34
	35	- ret->handle = gcry_md_copy(handle->handle);
	36	+ gcry_md_copy(&ret->handle, handle->handle);
	37
	38	if (ret->handle == NULL) {
	39	gnutls_free(ret);
	40	@@ -147,8 +147,7 @@
	41	if (ret == NULL)
	42	return GNUTLS_MAC_FAILED;
	43
	44	- ret->handle =
	45	- gcry_md_open(GCRY_MD_SHA1, GCRY_MD_FLAG_HMAC);
	46	+ gcry_md_open(&ret->handle, GCRY_MD_SHA1, GCRY_MD_FLAG_HMAC);
	47
	48	if (!ret->handle)
	49	ret = GNUTLS_MAC_FAILED;
	50	@@ -158,7 +157,7 @@
	51	if (ret == NULL)
	52	return GNUTLS_MAC_FAILED;
	53
	54	- ret->handle = gcry_md_open(GCRY_MD_MD5, GCRY_MD_FLAG_HMAC);
	55	+ gcry_md_open(&ret->handle, GCRY_MD_MD5, GCRY_MD_FLAG_HMAC);
	56
	57	if (!ret->handle)
	58	ret = GNUTLS_MAC_FAILED;
	59	--- gnutls-0.8.9/lib/gnutls_cipher_int.c.orig 2003-01-09 22:28:46.000000000 +0100
	60	+++ gnutls-0.8.9/lib/gnutls_cipher_int.c 2003-08-03 04:42:22.000000000 +0200
	61	@@ -33,20 +33,20 @@
	62	ret = GNUTLS_CIPHER_FAILED;
	63	break;
	64	case GNUTLS_CIPHER_RIJNDAEL_128_CBC:
65	- ret = gcry_cipher_open(GCRY_CIPHER_RIJNDAEL, GCRY_CIPHER_MODE_CBC, 0);
66	+ gcry_cipher_open(&ret, GCRY_CIPHER_RIJNDAEL, GCRY_CIPHER_MODE_CBC, 0);
67	break;
68	case GNUTLS_CIPHER_RIJNDAEL_256_CBC:
69	- ret = gcry_cipher_open(GCRY_CIPHER_RIJNDAEL256, GCRY_CIPHER_MODE_CBC, 0);
70	+ gcry_cipher_open(&ret, GCRY_CIPHER_RIJNDAEL256, GCRY_CIPHER_MODE_CBC, 0);
71	break;
72	case GNUTLS_CIPHER_TWOFISH_128_CBC:
73	- ret = gcry_cipher_open(GCRY_CIPHER_TWOFISH, GCRY_CIPHER_MODE_CBC, 0);
74	+ gcry_cipher_open(&ret, GCRY_CIPHER_TWOFISH, GCRY_CIPHER_MODE_CBC, 0);
75	break;
76	case GNUTLS_CIPHER_3DES_CBC:
77	- ret = gcry_cipher_open(GCRY_CIPHER_3DES, GCRY_CIPHER_MODE_CBC, 0);
78	+ gcry_cipher_open(&ret, GCRY_CIPHER_3DES, GCRY_CIPHER_MODE_CBC, 0);
79	break;
80	case GNUTLS_CIPHER_ARCFOUR_128:
81	case GNUTLS_CIPHER_ARCFOUR_40:
82	- ret = gcry_cipher_open(GCRY_CIPHER_ARCFOUR, GCRY_CIPHER_MODE_STREAM, 0);
83	+ gcry_cipher_open(&ret, GCRY_CIPHER_ARCFOUR, GCRY_CIPHER_MODE_STREAM, 0);
84	break;
85	default:
86	ret = GNUTLS_CIPHER_FAILED;
87	--- gnutls-0.8.9/lib/gnutls_mpi.c.orig 2003-02-04 13:52:24.000000000 +0100
88	+++ gnutls-0.8.9/lib/gnutls_mpi.c 2003-08-03 04:44:22.000000000 +0200
89	@@ -41,7 +41,7 @@
90	int _gnutls_mpi_scan( GNUTLS_MPI ret_mpi, const opaque buffer, size_t *nbytes ) {
91	int ret;
92
93	- ret = gcry_mpi_scan( ret_mpi, GCRYMPI_FMT_USG, buffer, nbytes);
94	+ ret = gcry_mpi_scan( ret_mpi, GCRYMPI_FMT_USG, buffer, *nbytes, nbytes);
95	if (ret) return ret;
96
97	/* MPIs with 0 bits are illegal
98	@@ -56,7 +56,7 @@
99
100	int _gnutls_mpi_scan_pgp( GNUTLS_MPI ret_mpi, const opaque buffer, size_t *nbytes ) {
101	int ret;
102	- ret = gcry_mpi_scan( ret_mpi, GCRYMPI_FMT_PGP, buffer, nbytes);
103	+ ret = gcry_mpi_scan( ret_mpi, GCRYMPI_FMT_PGP, buffer, *nbytes, nbytes);
104
105	if (ret) return ret;
106
107	@@ -71,12 +71,12 @@
108	}
109
110	int _gnutls_mpi_print( opaque buffer, size_t nbytes, const GNUTLS_MPI a ) {
111	- return gcry_mpi_print( GCRYMPI_FMT_USG, buffer, nbytes, a);
112	+ return gcry_mpi_print( GCRYMPI_FMT_USG, buffer, *nbytes, nbytes, a);
113	}
114
115	/* Always has the first bit zero */
116	int _gnutls_mpi_print_lz( opaque buffer, size_t nbytes, const GNUTLS_MPI a ) {
117	- return gcry_mpi_print( GCRYMPI_FMT_STD, buffer, nbytes, a);
118	+ return gcry_mpi_print( GCRYMPI_FMT_STD, buffer, *nbytes, nbytes, a);
119	}
120
121
122	--- gnutls-0.8.9/src/prime.c.orig 2003-02-04 13:52:26.000000000 +0100
123	+++ gnutls-0.8.9/src/prime.c 2003-08-03 04:51:21.000000000 +0200
124	@@ -26,6 +26,7 @@
125	#include <gcrypt.h>
126	#include <gnutls/gnutls.h>
127	#include "../lib/defines.h"
128	+typedef gcry_mpi_t MPI;
129
130	MPI _gcry_generate_elg_prime( int mode, unsigned pbits, unsigned qbits,
131	MPI g, MPI **ret_factors );
132	@@ -60,10 +61,10 @@
133
134	/* print generator */
135	size = 0;
136	- gcry_mpi_print(GCRYMPI_FMT_USG, NULL, &size, g);
137	+ gcry_mpi_print(GCRYMPI_FMT_USG, NULL, size, &size, g);
138
139	tmp = malloc(size);
140	- gcry_mpi_print(GCRYMPI_FMT_USG, tmp, &size, g);
141	+ gcry_mpi_print(GCRYMPI_FMT_USG, tmp, size, &size, g);
142
143	printf( "/* generator - %d bits */\n", gcry_mpi_get_nbits(g));
144	printf( "\nconst uint8 g[%d] = { ", size);
145	@@ -79,10 +80,10 @@
146
147	/* print prime */
148	size = 0;
149	- gcry_mpi_print(GCRYMPI_FMT_USG, NULL, &size, prime);
150	+ gcry_mpi_print(GCRYMPI_FMT_USG, NULL, size, &size, prime);
151
152	tmp = malloc(size);
153	- gcry_mpi_print(GCRYMPI_FMT_USG, tmp, &size, prime);
154	+ gcry_mpi_print(GCRYMPI_FMT_USG, tmp, size, &size, prime);
155
156	printf( "/* prime - %d bits */\n", gcry_mpi_get_nbits(prime));
157	printf( "\nconst uint8 prime[%d] = { ", size);
158	--- gnutls-0.8.9/libextra/gnutls_openssl.c.orig 2003-06-29 08:48:11.000000000 +0200
159	+++ gnutls-0.8.9/libextra/gnutls_openssl.c 2003-08-03 04:49:00.000000000 +0200
160	@@ -896,7 +896,7 @@
161
162	void MD5_Init(MD5_CTX *ctx)
163	{
164	- ctx->handle = gcry_md_open(GCRY_MD_MD5, 0);
165	+ gcry_md_open(&ctx->handle, GCRY_MD_MD5, 0);
166	}
167
168	void MD5_Update(MD5_CTX ctx, const void buf, int len)
169	@@ -934,7 +934,7 @@
170
171	void RIPEMD160_Init(RIPEMD160_CTX *ctx)
172	{
173	- ctx->handle = gcry_md_open(GCRY_MD_RMD160, 0);
174	+ gcry_md_open(&ctx->handle, GCRY_MD_RMD160, 0);
175	}
176
177	void RIPEMD160_Update(RIPEMD160_CTX ctx, const void buf, int len)