author | Jiri Sasek <Jiri.Sasek@Oracle.COM> |
Thu, 16 Apr 2015 05:10:57 -0700 | |
changeset 4334 | e30c463e2895 |
parent 4117 | 8388cfa6a859 |
permissions | -rw-r--r-- |
4117
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1 |
# Patch origin: GnuPG/GPGME Project (upstream). |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
2 |
# URL: http://permalink.gmane.org/gmane.comp.encryption.gpg.cvs/10207 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
3 |
- Log ----------------------------------------------------------------- |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
4 |
commit 1298b14f97efebdd88a9390af3848154dbe0d259 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
5 |
Author: Joshua Rogers <[email protected]> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
6 |
Date: Tue Dec 23 00:47:50 2014 +1100 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
7 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
8 |
tools: Free variable before return |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
* tools/gpgconf-comp.c: Free 'dest_filename' before it is returned |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
11 |
upon error. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
12 |
-- |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
13 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
14 |
Signed-off-by: Joshua Rogers <[email protected]> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
15 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
16 |
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
17 |
index c43e87a..83bc24e 100644 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
18 |
--- a/tools/gpgconf-comp.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
19 |
+++ b/tools/gpgconf-comp.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
20 |
@@ -2390,7 +2390,10 @@ change_options_file (gc_component_t component, gc_backend_t backend, |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
21 |
res = link (dest_filename, orig_filename); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
22 |
#endif |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
23 |
if (res < 0 && errno != ENOENT) |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
24 |
- return -1; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
25 |
+ { |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
26 |
+ xfree (dest_filename); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
27 |
+ return -1; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
28 |
+ } |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
29 |
if (res < 0) |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
30 |
{ |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
31 |
xfree (orig_filename); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
32 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
33 |
commit ced689e12a5037c6aeca62e9eaebdc098bd9c14e |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
34 |
Author: Daniel Kahn Gillmor <[email protected]> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
35 |
Date: Fri Dec 19 18:53:34 2014 -0500 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
36 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
37 |
sm: Avoid double-free on iconv failure |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
38 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
39 |
* sm/minip12.c: (p12_build) if jnlib_iconv_open fails, avoid |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
40 |
double-free of pwbuf. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
41 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
42 |
-- |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
43 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
44 |
Observed by Joshua Rogers <[email protected]>, who proposed a |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
45 |
slightly different fix. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
46 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
47 |
Debian-Bug-Id: 773472 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
48 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
49 |
Added fix at a second place - wk. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
50 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
51 |
diff --git a/agent/minip12.c b/agent/minip12.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
52 |
index 2471717..0bcab5f 100644 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
53 |
--- a/agent/minip12.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
54 |
+++ b/agent/minip12.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
55 |
@@ -2182,6 +2182,7 @@ p12_build (gcry_mpi_t *kparms, unsigned char *cert, size_t certlen, |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
56 |
" requested charset `%s': %s\n", |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
57 |
charset, strerror (errno)); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
58 |
gcry_free (pwbuf); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
59 |
+ pwbuf = NULL; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
60 |
goto failure; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
61 |
} |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
62 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
63 |
@@ -2196,6 +2197,7 @@ p12_build (gcry_mpi_t *kparms, unsigned char *cert, size_t certlen, |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
64 |
" requested charset `%s': %s\n", |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
65 |
charset, strerror (errno)); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
66 |
gcry_free (pwbuf); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
67 |
+ pwbuf = NULL; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
68 |
jnlib_iconv_close (cd); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
69 |
goto failure; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
70 |
} |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
71 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
72 |
commit 0fd4cd8503dfe9c3e6a362003bd647b4cd882363 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
73 |
Author: Daniel Kahn Gillmor <[email protected]> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
74 |
Date: Fri Dec 19 18:07:55 2014 -0500 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
75 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
76 |
scd: Avoid double-free on error condition in scd |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
77 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
78 |
* scd/command.c (cmd_readkey): avoid double-free of cert |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
79 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
80 |
-- |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
81 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
82 |
When ksba_cert_new() fails, cert will be double-freed. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
83 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
84 |
Debian-Bug-Id: 773471 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
85 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
86 |
Original patch changed by wk to do the free only at leave. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
87 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
88 |
diff --git a/scd/command.c b/scd/command.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
89 |
index fc1f5a2..b26bd68 100644 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
90 |
--- a/scd/command.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
91 |
+++ b/scd/command.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
92 |
@@ -777,10 +777,8 @@ cmd_readkey (assuan_context_t ctx, char *line) |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
93 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
94 |
rc = ksba_cert_new (&kc); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
95 |
if (rc) |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
96 |
- { |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
97 |
- xfree (cert); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
98 |
- goto leave; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
99 |
- } |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
100 |
+ goto leave; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
101 |
+ |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
102 |
rc = ksba_cert_init_from_mem (kc, cert, ncert); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
103 |
if (rc) |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
104 |
{ |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
105 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
106 |
commit 1fc4dc541af7d4bf4dba6ef37d1d7841498a05c6 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
107 |
Author: Daniel Kahn Gillmor <[email protected]> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
108 |
Date: Fri Dec 19 17:53:36 2014 -0500 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
109 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
110 |
avoid future chance of using uninitialized memory |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
111 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
112 |
* common/iobuf.c: (iobuf_open): initialize len |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
113 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
114 |
-- |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
115 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
116 |
In iobuf_open, IOBUFCTRL_DESC and IOBUFCTRL_INIT commands are invoked |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
117 |
(via file_filter()) on fcx, passing in a pointer to an uninitialized |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
118 |
len. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
119 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
120 |
With these two commands, file_filter doesn't actually do anything with |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
121 |
the value of len, so there's no actual risk of use of uninitialized |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
122 |
memory in the code as it stands. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
123 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
124 |
However, some static analysis tools might flag this situation with a |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
125 |
warning, and initializing the value doesn't hurt anything, so i think |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
126 |
this trivial cleanup is warranted. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
127 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
128 |
Debian-Bug-Id: 773469 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
129 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
130 |
diff --git a/common/iobuf.c b/common/iobuf.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
131 |
index ae9bfa9..4c6d5b5 100644 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
132 |
--- a/common/iobuf.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
133 |
+++ b/common/iobuf.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
134 |
@@ -1303,7 +1303,7 @@ iobuf_open (const char *fname) |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
135 |
iobuf_t a; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
136 |
fp_or_fd_t fp; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
137 |
file_filter_ctx_t *fcx; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
138 |
- size_t len; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
139 |
+ size_t len = 0; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
140 |
int print_only = 0; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
141 |
int fd; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
142 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
143 |
commit f542826b04e35f13a30116564daaf6456440b1d4 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
144 |
Author: Daniel Kahn Gillmor <[email protected]> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
145 |
Date: Fri Dec 19 17:12:05 2014 -0500 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
146 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
147 |
gpgkey2ssh: clean up varargs |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
148 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
149 |
* tools/gpgkey2ssh.c (key_to_blob) : ensure that va_end is called. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
150 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
151 |
-- |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
152 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
153 |
stdarg(3) says: |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
154 |
Each invocation of va_start() must be matched by a |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
155 |
corresponding invocation of va_end() in the same function. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
156 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
157 |
Observed by Joshua Rogers <[email protected]> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
158 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
159 |
Debian-Bug-Id: 773415 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
160 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
161 |
diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
162 |
index 903fb5b..d22c5ac 100644 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
163 |
--- a/tools/gpgkey2ssh.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
164 |
+++ b/tools/gpgkey2ssh.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
165 |
@@ -224,6 +224,8 @@ key_to_blob (unsigned char **blob, size_t *blob_n, const char *identifier, ...) |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
166 |
assert (ret == 1); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
167 |
} |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
168 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
169 |
+ va_end (ap); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
170 |
+ |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
171 |
blob_new_n = ftell (stream); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
172 |
rewind (stream); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
173 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
174 |
commit 01b364b6da2fbb8850178674e1534d725cd760c8 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
175 |
Author: Werner Koch <[email protected]> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
176 |
Date: Mon Dec 22 12:44:13 2014 +0100 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
177 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
178 |
doc: Fix memory leak in yat2m. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
179 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
180 |
* doc/yat2m.c (write_th): Free NAME. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
181 |
-- |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
182 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
183 |
Reported-by: Joshua Rogers <[email protected]> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
184 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
185 |
diff --git a/doc/yat2m.c b/doc/yat2m.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
186 |
index 2ac4390..fc932d9 100644 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
187 |
--- a/doc/yat2m.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
188 |
+++ b/doc/yat2m.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
189 |
@@ -609,6 +609,7 @@ write_th (FILE *fp) |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
190 |
*p++ = 0; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
191 |
fprintf (fp, ".TH %s %s %s \"%s\" \"%s\"\n", |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
192 |
name, p, isodatestring (), opt_release, opt_source); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
193 |
+ free (name); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
194 |
return 0; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
195 |
} |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
196 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
197 |
commit 907a9a1e986b8c8266f4f01e8ed82acfc636a519 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
198 |
Author: Werner Koch <[email protected]> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
199 |
Date: Mon Dec 22 12:16:46 2014 +0100 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
200 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
201 |
gpgsm: Return NULL on fail |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
202 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
203 |
* sm/gpgsm.c (parse_keyserver_line): Set SERVER to NULL. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
204 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
205 |
-- |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
206 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
207 |
Cherry-pick of abd5f6752d693b7f313c19604f0723ecec4d39a6. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
208 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
209 |
Reported-by: Joshua Rogers <[email protected]> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
210 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
211 |
"If something inside the ldapserver_parse_one function failed, |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
212 |
'server' would be freed, then returned, leading to a |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
213 |
use-after-free. This code is likely copied from sm/gpgsm.c, which |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
214 |
was also susceptible to this bug." |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
215 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
216 |
Signed-off-by: Werner Koch <[email protected]> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
217 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
218 |
diff --git a/sm/gpgsm.c b/sm/gpgsm.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
219 |
index 97ec4bb..855de83 100644 |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
220 |
--- a/sm/gpgsm.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
221 |
+++ b/sm/gpgsm.c |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
222 |
@@ -840,6 +840,7 @@ parse_keyserver_line (char *line, |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
223 |
{ |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
224 |
log_info (_("%s:%u: skipping this line\n"), filename, lineno); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
225 |
keyserver_list_free (server); |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
226 |
+ server = NULL; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
227 |
} |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
228 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
229 |
return server; |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
230 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
231 |
----------------------------------------------------------------------- |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
232 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
233 |
Summary of changes: |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
234 |
agent/minip12.c | 2 ++ |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
235 |
common/iobuf.c | 2 +- |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
236 |
doc/yat2m.c | 1 + |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
237 |
scd/command.c | 6 ++---- |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
238 |
sm/gpgsm.c | 1 + |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
239 |
tools/gpgconf-comp.c | 5 ++++- |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
240 |
tools/gpgkey2ssh.c | 2 ++ |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
241 |
7 files changed, 13 insertions(+), 6 deletions(-) |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
242 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
243 |
hooks/post-receive |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
244 |
-- <#> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
245 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
246 |
-- |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
247 |
The GNU Privacy Guard |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
248 |
http://git.gnupg.org |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
249 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
250 |
Permalink |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
251 |
<http://permalink.gmane.org/gmane.comp.encryption.gpg.cvs/10207> | Reply |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
252 |
<http://post.gmane.org/post.php?group=gmane.comp.encryption.gpg.cvs&followup=10207> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
253 |
| |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
254 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
255 |
Navigate |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
256 |
Go to gmane.comp.encryption.gpg.cvs |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
257 |
<http://blog.gmane.org/gmane.comp.encryption.gpg.cvs>. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
258 |
Topic |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
259 |
Go to the topic |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
260 |
<http://news.gmane.org/find-root.php?group=gmane.comp.encryption.gpg.cvs&article=10207&type=blog>. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
261 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
262 |
Advertisement |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
263 |
Search Archive |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
264 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
265 |
Language |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
266 |
Change language <http://gmane.org/language.php> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
267 |
Options |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
268 |
Current view: Threads only / Showing whole messages / Not hiding cited text. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
269 |
Change to All messages, |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
270 |
<http://permalink.gmane.org/gmane.comp.encryption.gpg.cvs?set_blog_all=yes>shortened |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
271 |
messages |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
272 |
<http://permalink.gmane.org/gmane.comp.encryption.gpg.cvs?set_lines=20>, |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
273 |
or hide cited text |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
274 |
<http://permalink.gmane.org/gmane.comp.encryption.gpg.cvs?set_cite=hide>. |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
275 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
276 |
Post a message |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
277 |
<http://post.gmane.org/post.php?group=gmane.comp.encryption.gpg.cvs> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
278 |
NNTP Newsgroup <nntp://news.gmane.org/gmane.comp.encryption.gpg.cvs> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
279 |
Classic Gmane web interface |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
280 |
<http://news.gmane.org/find-root.php?message_id=E1YAqcu%2d00022P%2d1h%40lists.gnupg.org> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
281 |
XML RSS Feed <http://rss.gmane.org/gmane.comp.encryption.gpg.cvs> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
282 |
List Information <http://dir.gmane.org/gmane.comp.encryption.gpg.cvs> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
283 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
284 |
About Gmane <http://gmane.org/faq.php> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
285 |
|
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
286 |
Gmane <http://gmane.org/> |
8388cfa6a859
20334187 Upgrade GnuPG to 2.0.26
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
287 |