1
Description: gcrypt: replace occurences of gcry_sexp_nth_mpi (..., 0)
2
with gcry_sexp_nth_mpi (..., GCRYMPI_FMT_USG) to fix errors with gcrypt 1.5.0
3
Author: Andreas Metzler <ametzler@debian.org>
4
Forwarded: http://lists.gnu.org/archive/html/gnutls-devel/2011-07/msg00020.html
6
--- gnutls26-2.10.5.orig/lib/pk-libgcrypt.c
7
+++ gnutls26-2.10.5/lib/pk-libgcrypt.c
8
@@ -112,7 +112,7 @@ _wrap_gcry_pk_encrypt (gnutls_pk_algorit
12
- res = gcry_sexp_nth_mpi (list, 1, 0);
13
+ res = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
14
gcry_sexp_release (list);
17
@@ -202,7 +202,7 @@ _wrap_gcry_pk_decrypt (gnutls_pk_algorit
21
- res = gcry_sexp_nth_mpi (s_plain, 0, 0);
22
+ res = gcry_sexp_nth_mpi (s_plain, 0, GCRYMPI_FMT_USG);
26
@@ -327,7 +327,7 @@ _wrap_gcry_pk_sign (gnutls_pk_algorithm_
30
- res[0] = gcry_sexp_nth_mpi (list, 1, 0);
31
+ res[0] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
32
gcry_sexp_release (list);
34
list = gcry_sexp_find_token (s_sig, "s", 0);
35
@@ -338,7 +338,7 @@ _wrap_gcry_pk_sign (gnutls_pk_algorithm_
39
- res[1] = gcry_sexp_nth_mpi (list, 1, 0);
40
+ res[1] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
41
gcry_sexp_release (list);
43
ret = _gnutls_encode_ber_rs (signature, res[0], res[1]);
44
@@ -360,7 +360,7 @@ _wrap_gcry_pk_sign (gnutls_pk_algorithm_
48
- res[0] = gcry_sexp_nth_mpi (list, 1, 0);
49
+ res[0] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
50
gcry_sexp_release (list);
52
ret = _gnutls_mpi_dprint (res[0], signature);
53
@@ -559,7 +559,7 @@ _dsa_generate_params (bigint_t * resarr,
54
return GNUTLS_E_INTERNAL_ERROR;
57
- resarr[0] = gcry_sexp_nth_mpi (list, 1, 0);
58
+ resarr[0] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
59
gcry_sexp_release (list);
61
list = gcry_sexp_find_token (key, "q", 0);
62
@@ -570,7 +570,7 @@ _dsa_generate_params (bigint_t * resarr,
63
return GNUTLS_E_INTERNAL_ERROR;
66
- resarr[1] = gcry_sexp_nth_mpi (list, 1, 0);
67
+ resarr[1] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
68
gcry_sexp_release (list);
70
list = gcry_sexp_find_token (key, "g", 0);
71
@@ -581,7 +581,7 @@ _dsa_generate_params (bigint_t * resarr,
72
return GNUTLS_E_INTERNAL_ERROR;
75
- resarr[2] = gcry_sexp_nth_mpi (list, 1, 0);
76
+ resarr[2] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
77
gcry_sexp_release (list);
79
list = gcry_sexp_find_token (key, "y", 0);
80
@@ -592,7 +592,7 @@ _dsa_generate_params (bigint_t * resarr,
81
return GNUTLS_E_INTERNAL_ERROR;
84
- resarr[3] = gcry_sexp_nth_mpi (list, 1, 0);
85
+ resarr[3] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
86
gcry_sexp_release (list);
89
@@ -604,7 +604,7 @@ _dsa_generate_params (bigint_t * resarr,
90
return GNUTLS_E_INTERNAL_ERROR;
93
- resarr[4] = gcry_sexp_nth_mpi (list, 1, 0);
94
+ resarr[4] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
96
gcry_sexp_release (list);
97
gcry_sexp_release (key);
98
@@ -653,7 +653,7 @@ _rsa_generate_params (bigint_t * resarr,
99
return GNUTLS_E_INTERNAL_ERROR;
102
- resarr[0] = gcry_sexp_nth_mpi (list, 1, 0);
103
+ resarr[0] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
104
gcry_sexp_release (list);
106
list = gcry_sexp_find_token (key, "e", 0);
107
@@ -664,7 +664,7 @@ _rsa_generate_params (bigint_t * resarr,
108
return GNUTLS_E_INTERNAL_ERROR;
111
- resarr[1] = gcry_sexp_nth_mpi (list, 1, 0);
112
+ resarr[1] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
113
gcry_sexp_release (list);
115
list = gcry_sexp_find_token (key, "d", 0);
116
@@ -675,7 +675,7 @@ _rsa_generate_params (bigint_t * resarr,
117
return GNUTLS_E_INTERNAL_ERROR;
120
- resarr[2] = gcry_sexp_nth_mpi (list, 1, 0);
121
+ resarr[2] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
122
gcry_sexp_release (list);
124
list = gcry_sexp_find_token (key, "p", 0);
125
@@ -686,7 +686,7 @@ _rsa_generate_params (bigint_t * resarr,
126
return GNUTLS_E_INTERNAL_ERROR;
129
- resarr[3] = gcry_sexp_nth_mpi (list, 1, 0);
130
+ resarr[3] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
131
gcry_sexp_release (list);
134
@@ -698,7 +698,7 @@ _rsa_generate_params (bigint_t * resarr,
135
return GNUTLS_E_INTERNAL_ERROR;
138
- resarr[4] = gcry_sexp_nth_mpi (list, 1, 0);
139
+ resarr[4] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
140
gcry_sexp_release (list);
143
@@ -710,7 +710,7 @@ _rsa_generate_params (bigint_t * resarr,
144
return GNUTLS_E_INTERNAL_ERROR;
147
- resarr[5] = gcry_sexp_nth_mpi (list, 1, 0);
148
+ resarr[5] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
150
gcry_sexp_release (list);
151
gcry_sexp_release (key);