[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-347-g67c2033
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-347-g67c2033 |
|
Date: |
Sat, 26 Mar 2011 00:05:08 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".
http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=67c2033498bc183785d261c854a0b5707357a21e
The branch, master has been updated
via 67c2033498bc183785d261c854a0b5707357a21e (commit)
via 5d0d34299c2697da3ce87c126a1eb68205ada254 (commit)
via bb8aa3ecf3e500f21c5c7527f41a4714d3c564f6 (commit)
via f6e37c8174029f089f1f7f1f8bed411658805eae (commit)
via 66ebfc0120a47c350c4485e195f72ff851296e30 (commit)
via c9bdfc6258d7ca977afca6610e4be98117017823 (commit)
via 0c2ff8cb9ce34004be1eaf32dab824ca1fccc45a (commit)
via d3389a3241067f83d8cece214d10c19b4b96538a (commit)
via e98e23c6cd2696d60fd6924f236bc317986e38f2 (commit)
via 2e67eb28ae742bd3f56fc69b002fdaa2470ba60e (commit)
from 31d5b03d2581554cd80a88a989a9668c17abc3ac (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 67c2033498bc183785d261c854a0b5707357a21e
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Mar 26 01:02:50 2011 +0100
e-mail addresses are not directly recognizable.
commit 5d0d34299c2697da3ce87c126a1eb68205ada254
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Mar 26 01:01:17 2011 +0100
Corrected access to freed memory location. Reported by Vitaly Kruglikov.
commit bb8aa3ecf3e500f21c5c7527f41a4714d3c564f6
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Mar 26 00:55:19 2011 +0100
added Mark and Vitaly to THANKS.
commit f6e37c8174029f089f1f7f1f8bed411658805eae
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Mar 26 00:53:51 2011 +0100
Corrected windows system_errno() function. Reported and patch by Mark Brand.
commit 66ebfc0120a47c350c4485e195f72ff851296e30
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Mar 26 00:52:01 2011 +0100
C++ compatibility fix for compat.h. Suggested by Mark Brand.
commit c9bdfc6258d7ca977afca6610e4be98117017823
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Mar 25 20:31:11 2011 +0100
Corrected uninitialized var deinitiation. Reported by Vitaly Kruglikov.
commit 0c2ff8cb9ce34004be1eaf32dab824ca1fccc45a
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Mar 25 20:20:22 2011 +0100
eliminate compiler warning. Reported by Andreas Metzler.
commit d3389a3241067f83d8cece214d10c19b4b96538a
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Mar 25 20:18:00 2011 +0100
Fix size of gnutls_openpgp_keyid_t by using the GNUTLS_OPENPGP_KEYID_SIZE
definition.
Reported by Andreas Metzler.
commit e98e23c6cd2696d60fd6924f236bc317986e38f2
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Thu Mar 24 19:44:12 2011 +0100
included news of 2.12.0
commit 2e67eb28ae742bd3f56fc69b002fdaa2470ba60e
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Thu Mar 24 19:34:29 2011 +0100
added missing files.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 30 ++++++
THANKS | 208 +++++++++++++++++++++--------------------
guile/tests/Makefile.am | 1 +
lib/gnutls_sig.c | 4 +-
lib/includes/gnutls/compat.h | 9 ++
lib/includes/gnutls/openpgp.h | 3 +-
lib/opencdk/stream.c | 4 +-
lib/opencdk/verify.c | 2 +
lib/openpgp/gnutls_openpgp.c | 6 +-
lib/openpgp/pgp.c | 4 +-
lib/openpgp/privkey.c | 4 +-
lib/system.c | 2 +-
12 files changed, 162 insertions(+), 115 deletions(-)
diff --git a/NEWS b/NEWS
index a7333f4..c73464a 100644
--- a/NEWS
+++ b/NEWS
@@ -80,6 +80,36 @@ gnutls_ia_set_server_avp_function: REMOVED
gnutls_ia_set_server_avp_ptr: REMOVED
gnutls_ia_verify_endphase: REMOVED
+
+* Version 2.12.0 (released 2011-03-24)
+
+** certtool: Warns on generation of DSA keys of over 1024 bits, about
+the incompatibility with TLS other than 1.2.
+
+** libgnutls: Modified signature algorithm selection in client
+certificate request, to avoid failures in DSA certificates.
+
+** libgnutls: Instead of failing with internal error, return
+GNUTLS_E_INCOMPAT_DSA_KEY_WITH_TLS_PROTOCOL if an incompatible DSA
+key with the negotiated protocol is encountered.
+
+** libgnutls: Bug fixes in the RSA ciphersuite behavior with openpgp keys.
+
+** libgnutls: Force state update when fork is detected in the nettle
+rng.
+
+** libgnutls: modified gnutls_pubkey_import_openpgp() to use the preferred
+subkey instead of setting explicitly one.
+
+** libgnutls: Corrected default behavior in record version of Client Hellos.
+
+** libgnutls-openssl: modified to use modern gnutls' functions.
+This introduces an ABI incompatibility with previous versions.
+
+** API and ABI modifications:
+gnutls_pubkey_import_openpgp: MODIFIED
+
+
* Version 2.11.7
** libgnutls: The deprecated gnutls_x509_privkey_sign_hash() was
diff --git a/THANKS b/THANKS
index b01a1f3..14eaca3 100644
--- a/THANKS
+++ b/THANKS
@@ -7,109 +7,111 @@ Here is a list of people, who helped in GnuTLS development.
Please
help us to keep it complete and free of errors. We apologise to those
whom we no doubt have forgotten.
-Werner Koch <address@hidden>
-Tarun Upadhyay <address@hidden>
-Neil Spring <address@hidden>
-Paul Sheer <address@hidden>
-Jon Nelson <address@hidden>
-Simon Josefsson <address@hidden>
-Marco d'Itri <address@hidden>
-Mike Siers <address@hidden>
-Marc Huber <address@hidden>
-Guillaume Morin <address@hidden>
-Jeff Johnson <address@hidden>
-David Taylor <address@hidden>
-Ivo Timmermans <address@hidden>
-Ian Peters <address@hidden>
-Arne Thomassen <address@hidden>
-Casey Marshall <address@hidden>
-Dimitri Papadopoulos-Orfanos <address@hidden>
-Michael Heironimus <address@hidden>
-Niels Bjergstrom <address@hidden>
-Robey Pointer <address@hidden>
-Simon Posnjak <address@hidden>
-Gerrit P. Haase <address@hidden>
-Yoann Vandoorselaere <address@hidden>
-Joe Orton <address@hidden>
-Stéphane LOEUILLET <address@hidden>
-Aleix Conchillo Flaque <address@hidden>
-Martijn Koster <address@hidden>
-Marcin Garski <address@hidden>
-Martin Lambers <address@hidden>
-Michael Ringe <address@hidden>
-Daniel Black <address@hidden>
-Scott Bronson <address@hidden>
-Rupert Kittinger <address@hidden>
-Eric Leblond <address@hidden>
-Adam Langley <address@hidden>
-Sergey Lipnevich <address@hidden>
-Mike Castle <address@hidden>
-Thomas Klausner <address@hidden>
-Matthias Urlichs <address@hidden>
-Ralph Giles <address@hidden>
-Daniel Stenberg <address@hidden>
-Jouni Malinen <address@hidden>
-Evgeny Legerov <address@hidden>
-John Heiden <address@hidden>
-Andreas Metzler <address@hidden>
-Mario Lenz <address@hidden>
-Jefferson Ogata <address@hidden>
-Sascha Ziemann <address@hidden>
-Roman Bogorodskiy <address@hidden>
-Robert Millan <address@hidden>
-Kataja Kai <address@hidden>
-Georg Schwarz <address@hidden>
-Michael C. Vergallen <address@hidden>
-Andrey Nosenko <address@hidden>
-Nate Nielsen <address@hidden>
-Max Kellermann <address@hidden>
-Ludovic Courtès <address@hidden>
-Paul Millar <address@hidden>
-Pavlov Konstantin <address@hidden>
-Matthias Wimmer <address@hidden>
-Howard Chu <address@hidden>
-Dennis Vshivkov <address@hidden>
-Kristofer T. Karas <address@hidden>
-Marc Haber <address@hidden>
-Tim Mooney <address@hidden>
-Daniel Kahn Gillmor <address@hidden>
-Rainer Gerhards <address@hidden>
-John Brooks <address@hidden>
-Massimo Gaspari <address@hidden>
-Marc F. Clemente <address@hidden>
-Daniel Dehennin <address@hidden>
-martin f krafft <address@hidden>
-Sam Varshavchik <address@hidden>
-Tomas Mraz <address@hidden>
-Matthias Koenig <address@hidden>
-Christian Grothoff <address@hidden>
-James Westby <address@hidden>
-Kevin Quick <address@hidden>
-Arfrever Frehtes Taifersar Arahesis <address@hidden>
-Jonathan Manktelow <address@hidden>
-Thomas Viehmann <address@hidden>
-Aaron Ucko <address@hidden>
-Anton Lavrentiev <address@hidden>
-Martin von Gagern <address@hidden>
-Douglas E. Engert <address@hidden>
-Dagobert Michelsen <address@hidden>
-Tom G. Christensen <address@hidden>
-Peter Hendrickson <address@hidden>
-Tim Kosse <address@hidden>
-Fabian Keil <address@hidden>
-Brad Hards <address@hidden>
-Daiki Ueno <address@hidden>
-Tomas Hoger <address@hidden>
-Fabian Keil <address@hidden>
-Jason Pettiss <address@hidden>
-Ilari Liusvaara <address@hidden>
-Steve Dispensa <address@hidden>
-Vitaly Mayatskikh <address@hidden>
-Claudio Saavedra <address@hidden>
-Vincent Torri <address@hidden>
-Sjoerd Simons <address@hidden>
-Micah Anderson <address@hidden>
-Michael Rommel <address@hidden>
+Werner Koch <wk [at] gnupg.org>
+Tarun Upadhyay <tarun [at] poboxes.com>
+Neil Spring <nspring [at] saavie.org>
+Paul Sheer <psheer [at] icon.co.za>
+Jon Nelson <jnelson [at] securepipe.com>
+Simon Josefsson <jas [at] extundo.com>
+Marco d'Itri <md [at] linux.it>
+Mike Siers <mikes [at] poliac.com>
+Marc Huber <Marc.Huber [at] web.de>
+Guillaume Morin <guillaume [at] morinfr.org>
+Jeff Johnson <jbj [at] redhat.com>
+David Taylor <dtaylor [at] swiftdsl.com.au>
+Ivo Timmermans <ivo [at] o2w.nl>
+Ian Peters <itp [at] ximian.com>
+Arne Thomassen <arne [at] arne-thomassen.de>
+Casey Marshall <rsdio [at] metastatic.org>
+Dimitri Papadopoulos-Orfanos <papadopo [at] shfj.cea.fr>
+Michael Heironimus <mkh01 [at] earthlink.net>
+Niels Bjergstrom <njb [at] chi-publishing.com>
+Robey Pointer <robey [at] danger.com>
+Simon Posnjak <simon.posnjak [at] cetrtapot.si>
+Gerrit P. Haase <gp [at] familiehaase.de>
+Yoann Vandoorselaere <yoann [at] prelude-ids.org>
+Joe Orton <joe [at] manyfish.co.uk>
+Stéphane LOEUILLET <stephane.loeuillet [at] tiscali.fr>
+Aleix Conchillo Flaque <aleix [at] member.fsf.org>
+Martijn Koster <mak [at] greenhills.co.uk>
+Marcin Garski <mgarski [at] post.pl>
+Martin Lambers <marlam [at] web.de>
+Michael Ringe <Michael.Ringe [at] aachen.utimaco.de>
+Daniel Black <dragonheart [at] gentoo.org>
+Scott Bronson <bronson [at] rinspin.com>
+Rupert Kittinger <rkit [at] mur.at>
+Eric Leblond <eleblond [at] inl.fr>
+Adam Langley <alangley [at] gmail.com>
+Sergey Lipnevich <sergey [at] optimaltec.com>
+Mike Castle <dalgoda [at] ix.netcom.com>
+Thomas Klausner <tk [at] giga.or.at>
+Matthias Urlichs <smurf [at] smurf.noris.de>
+Ralph Giles <giles [at] onlinegamegroup.com>
+Daniel Stenberg <daniel [at] haxx.se>
+Jouni Malinen <jkmaline [at] cc.hut.fi>
+Evgeny Legerov <admin [at] gleg.net>
+John Heiden <JHeiden [at] UTNet.UToledo.Edu>
+Andreas Metzler <ametzler [at] downhill.at.eu.org>
+Mario Lenz <mario.lenz [at] gmx.net>
+Jefferson Ogata <Jefferson.Ogata [at] noaa.gov>
+Sascha Ziemann <sascha.ziemann [at] secunet.com>
+Roman Bogorodskiy <novel [at] FreeBSD.org>
+Robert Millan <rmillan [at] ackstorm.es>
+Kataja Kai <kai.kataja [at] op.fi>
+Georg Schwarz <georg.schwarz [at] freenet.de>
+Michael C. Vergallen <mvergall [at] telenet.be>
+Andrey Nosenko <andrew.w.nosenko [at] gmail.com>
+Nate Nielsen <nielsen-list [at] memberwebs.com>
+Max Kellermann <max [at] duempel.org>
+Ludovic Courtès <ludovic.courtes [at] laas.fr>
+Paul Millar <p.millar [at] physics.gla.ac.uk>
+Pavlov Konstantin <thresh [at] altlinux.ru>
+Matthias Wimmer <m [at] tthias.eu>
+Howard Chu <hyc [at] symas.com>
+Dennis Vshivkov <walrus [at] amur.ru>
+Kristofer T. Karas <ktk [at] enterprise.bidmc.harvard.edu>
+Marc Haber <mh+debian-bugs [at] zugschlus.de>
+Tim Mooney <tim [at] tim-the-enchanter.org>
+Daniel Kahn Gillmor <dkg-debian.org [at] fifthhorseman.net>
+Rainer Gerhards <rgerhards [at] gmail.com>
+John Brooks <aspecialj [at] gmail.com>
+Massimo Gaspari <massimo.gaspari [at] alice.it>
+Marc F. Clemente <marc [at] mclemente.net>
+Daniel Dehennin <nebuchadnezzar [at] asgardr.info>
+martin f krafft <madduck [at] debian.org>
+Sam Varshavchik <mrsam [at] courier-mta.com>
+Tomas Mraz <tmraz [at] redhat.com>
+Matthias Koenig <mkoenig [at] suse.de>
+Christian Grothoff <christian [at] grothoff.org>
+James Westby <jw+debian [at] jameswestby.net>
+Kevin Quick <quick [at] sparq.org>
+Arfrever Frehtes Taifersar Arahesis <arfrever.fta [at] gmail.com>
+Jonathan Manktelow <jonathan [at] dyalog.com>
+Thomas Viehmann <tv [at] beamnet.de>
+Aaron Ucko <ucko [at] ncbi.nlm.nih.gov>
+Anton Lavrentiev <lavr [at] ncbi.nlm.nih.gov>
+Martin von Gagern <Martin.vGagern [at] gmx.net>
+Douglas E. Engert <deengert [at] anl.gov>
+Dagobert Michelsen <dam [at] opencsw.org>
+Tom G. Christensen <tgc [at] jupiterrise.com>
+Peter Hendrickson <pdh [at] wiredyne.com>
+Tim Kosse <tim.kosse [at] filezilla-project.org>
+Fabian Keil <fk [at] fabiankeil.de>
+Brad Hards <bradh [at] frogmouth.net>
+Daiki Ueno <ueno [at] unixuser.org>
+Tomas Hoger <thoger [at] redhat.com>
+Fabian Keil <fk [at] fabiankeil.de>
+Jason Pettiss <jpettiss [at] yahoo.com>
+Ilari Liusvaara <ilari.liusvaara [at] elisanet.fi>
+Steve Dispensa <dispensa [at] phonefactor.com>
+Vitaly Mayatskikh <v.mayatskih [at] gmail.com>
+Claudio Saavedra <csaavedra [at] igalia.com>
+Vincent Torri <vincent.torri [at] gmail.com>
+Sjoerd Simons <sjoerd.simons [at] collabora.co.uk>
+Micah Anderson <micah [at] riseup.net>
+Michael Rommel <rommel [at] layer-7.net>
+Mark Brand <mabrand [at] mabrand.nl>
+Vitaly Kruglikov <vitaly.kruglikov [at] palm.com>
----------------------------------------------------------------------
Copying and distribution of this file, with or without modification,
diff --git a/guile/tests/Makefile.am b/guile/tests/Makefile.am
index 49aaf54..ad73ea9 100644
--- a/guile/tests/Makefile.am
+++ b/guile/tests/Makefile.am
@@ -35,6 +35,7 @@ TESTS_ENVIRONMENT = \
EXTRA_DIST = $(TESTS) openpgp-pub.asc openpgp-sec.asc \
+ openpgp-elg-pub.asc openpgp-elg-sec.asc \
openpgp-keyring.gpg openpgp-keyring.asc \
rsa-parameters.pem dh-parameters.pem \
x509-certificate.pem x509-key.pem
diff --git a/lib/gnutls_sig.c b/lib/gnutls_sig.c
index 02c0711..0932936 100644
--- a/lib/gnutls_sig.c
+++ b/lib/gnutls_sig.c
@@ -607,9 +607,9 @@ _gnutls_handshake_sign_cert_vrfy12 (gnutls_session_t
session,
gnutls_sign_algorithm_get_name (sign_algo),
gnutls_mac_get_name (hash_algo));
- if (hash_algo ==
session->internals.handshake_mac_handle.tls12.sha1.algorithm)
+ if ((gnutls_mac_algorithm_t)hash_algo ==
session->internals.handshake_mac_handle.tls12.sha1.algorithm)
handshake_td = &session->internals.handshake_mac_handle.tls12.sha1;
- else if (hash_algo ==
session->internals.handshake_mac_handle.tls12.sha256.algorithm)
+ else if ((gnutls_mac_algorithm_t)hash_algo ==
session->internals.handshake_mac_handle.tls12.sha256.algorithm)
handshake_td = &session->internals.handshake_mac_handle.tls12.sha256;
else
return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR); /* too bad we only
support SHA1 and SHA256 */
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index 9399e0b..e6b9277 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -3,6 +3,11 @@
#ifndef _GNUTLS_COMPAT_H
#define _GNUTLS_COMPAT_H
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
#ifdef __GNUC__
#define _GNUTLS_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 +
__GNUC_PATCHLEVEL__)
@@ -286,4 +291,8 @@ gnutls_sign_callback_get (gnutls_session_t session, void
**userdata)
const int *list)
_GNUTLS_GCC_ATTR_DEPRECATED;
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _GNUTLS_COMPAT_H */
diff --git a/lib/includes/gnutls/openpgp.h b/lib/includes/gnutls/openpgp.h
index 4b0d853..6dfa786 100644
--- a/lib/includes/gnutls/openpgp.h
+++ b/lib/includes/gnutls/openpgp.h
@@ -53,7 +53,8 @@ extern "C"
GNUTLS_OPENPGP_FMT_BASE64
} gnutls_openpgp_crt_fmt_t;
- typedef unsigned char gnutls_openpgp_keyid_t[8];
+#define GNUTLS_OPENPGP_KEYID_SIZE 8
+ typedef unsigned char gnutls_openpgp_keyid_t[GNUTLS_OPENPGP_KEYID_SIZE];
/* gnutls_openpgp_cert_t should be defined in gnutls.h
*/
diff --git a/lib/opencdk/stream.c b/lib/opencdk/stream.c
index 29bea09..a9e0af3 100644
--- a/lib/opencdk/stream.c
+++ b/lib/opencdk/stream.c
@@ -761,6 +761,7 @@ stream_fp_replace (cdk_stream_t s, FILE ** tmp)
rc = fclose (s->fp);
if (rc)
{
+ s->fp = NULL;
gnutls_assert ();
return CDK_File_Error;
}
@@ -822,6 +823,7 @@ stream_filter_write (cdk_stream_t s)
{
_gnutls_read_log ("filter [close]: fd=%d\n", fileno (f->tmp));
fclose (f->tmp);
+ f->tmp = NULL;
break;
}
}
@@ -960,7 +962,7 @@ cdk_stream_read (cdk_stream_t s, void *buf, size_t buflen)
if (rc)
{
s->error = rc;
- if (feof (s->fp))
+ if (s->fp && feof (s->fp))
s->flags.eof = 1;
gnutls_assert ();
return EOF;
diff --git a/lib/opencdk/verify.c b/lib/opencdk/verify.c
index 957eb98..397b3ed 100644
--- a/lib/opencdk/verify.c
+++ b/lib/opencdk/verify.c
@@ -179,6 +179,8 @@ file_verify_clearsign (cdk_ctx_t hd, const char *file,
const char *output)
int err;
cdk_error_t rc;
+ memset(&md, 0, sizeof(md));
+
if (output)
{
rc = cdk_stream_create (output, &out);
diff --git a/lib/openpgp/gnutls_openpgp.c b/lib/openpgp/gnutls_openpgp.c
index ba7cd27..5917447 100644
--- a/lib/openpgp/gnutls_openpgp.c
+++ b/lib/openpgp/gnutls_openpgp.c
@@ -321,7 +321,7 @@ gnutls_certificate_set_openpgp_key_file
(gnutls_certificate_credentials_t res,
static int
get_keyid (gnutls_openpgp_keyid_t keyid, const char *str)
{
- size_t keyid_size = sizeof (keyid);
+ size_t keyid_size = GNUTLS_OPENPGP_KEYID_SIZE;
if (strlen (str) != 16)
{
@@ -744,7 +744,7 @@ _gnutls_openpgp_crt_to_gcert (gnutls_cert * gcert,
gnutls_openpgp_crt_t cert)
_gnutls_debug_log
("Importing Openpgp cert and using openpgp sub key: %s\n",
- _gnutls_bin2hex (keyid, sizeof (keyid), err_buf, sizeof (err_buf),
+ _gnutls_bin2hex (keyid, GNUTLS_OPENPGP_KEYID_SIZE, err_buf, sizeof
(err_buf),
NULL));
KEYID_IMPORT (kid32, keyid);
@@ -762,7 +762,7 @@ _gnutls_openpgp_crt_to_gcert (gnutls_cert * gcert,
gnutls_openpgp_crt_t cert)
gnutls_openpgp_crt_get_subkey_usage (cert, idx, &gcert->key_usage);
gcert->use_subkey = 1;
- memcpy (gcert->subkey_id, keyid, sizeof (keyid));
+ memcpy (gcert->subkey_id, keyid, GNUTLS_OPENPGP_KEYID_SIZE);
ret =
_gnutls_openpgp_crt_get_mpis (cert, kid32, gcert->params,
diff --git a/lib/openpgp/pgp.c b/lib/openpgp/pgp.c
index 75be8ad..cd204bc 100644
--- a/lib/openpgp/pgp.c
+++ b/lib/openpgp/pgp.c
@@ -1568,7 +1568,7 @@ gnutls_openpgp_crt_get_preferred_key_id
(gnutls_openpgp_crt_t key,
return GNUTLS_E_INVALID_REQUEST;
}
- memcpy (keyid, key->preferred_keyid, sizeof (gnutls_openpgp_keyid_t));
+ memcpy (keyid, key->preferred_keyid, GNUTLS_OPENPGP_KEYID_SIZE);
return 0;
}
@@ -1606,7 +1606,7 @@ gnutls_openpgp_crt_set_preferred_key_id
(gnutls_openpgp_crt_t key,
}
key->preferred_set = 1;
- memcpy (key->preferred_keyid, keyid, sizeof (gnutls_openpgp_keyid_t));
+ memcpy (key->preferred_keyid, keyid, GNUTLS_OPENPGP_KEYID_SIZE);
return 0;
}
diff --git a/lib/openpgp/privkey.c b/lib/openpgp/privkey.c
index 3b831a2..f1ef139 100644
--- a/lib/openpgp/privkey.c
+++ b/lib/openpgp/privkey.c
@@ -1186,7 +1186,7 @@ gnutls_openpgp_privkey_get_preferred_key_id
(gnutls_openpgp_privkey_t key,
return GNUTLS_E_INVALID_REQUEST;
}
- memcpy (keyid, key->preferred_keyid, sizeof (gnutls_openpgp_keyid_t));
+ memcpy (keyid, key->preferred_keyid, GNUTLS_OPENPGP_KEYID_SIZE);
return 0;
}
@@ -1224,7 +1224,7 @@ gnutls_openpgp_privkey_set_preferred_key_id
(gnutls_openpgp_privkey_t key,
}
key->preferred_set = 1;
- memcpy (key->preferred_keyid, keyid, sizeof (gnutls_openpgp_keyid_t));
+ memcpy (key->preferred_keyid, keyid, GNUTLS_OPENPGP_KEYID_SIZE);
return 0;
}
diff --git a/lib/system.c b/lib/system.c
index 120fc8b..f9db0fb 100644
--- a/lib/system.c
+++ b/lib/system.c
@@ -50,7 +50,7 @@
#ifdef _WIN32
int
-system_errno (gnutls_transport_ptr)
+system_errno (gnutls_transport_ptr p)
{
int tmperr = WSAGetLastError ();
int ret = 0;
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-347-g67c2033,
Nikos Mavrogiannopoulos <=