[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_2_9_3-45-gb021e01
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_2_9_3-45-gb021e01 |
|
Date: |
Mon, 31 Aug 2009 10:51:21 +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=b021e015a0e40d6b1d26c7031227cea79fd3ebac
The branch, master has been updated
via b021e015a0e40d6b1d26c7031227cea79fd3ebac (commit)
via a4e6ad48e6b6c66afc7acfc0da2c9ff51e90d47b (commit)
via 8b77db9fef4055e8445957b7a71ad8288e28dbec (commit)
via 77418029937fb1c23f8e5513832a8384ddafdb58 (commit)
via f1005919e0cf0cb0c68a0cf334333712e5798538 (commit)
via 44ededfbbf9f2ce99c772297e5039ec1696ad01e (commit)
via f3822a2d0abf30abd00cd4a86dc0c41dd101e50f (commit)
via b9c21aed41cf2cbd3c0949742e201f6a94cece35 (commit)
via a4e715e4db224147b942aba170730d3188a822d3 (commit)
via 63c767de777fdc23e48718abb8457fa08644ce0f (commit)
via 05bbf08b39e67a91b1de34af18550cab347bbd28 (commit)
via 62edfa4eb29d6ed91d236312a5efa83c70c9c8cd (commit)
via 1c9e7839dbd93f16a84b4a8b22e9756d059a0ef4 (commit)
via 0e769157370b2bf25602b6fa81cb3ad06371e674 (commit)
via e78b476ef131043fe8fec52d4e56b0f779e7aae8 (commit)
via 8dad53f17382310e79ff98e7816cad8c94e87126 (commit)
via 3fd12d05225f79f95b9d7d8961b40d154a3deef3 (commit)
via 978781f3ae7c5fb5deac03df615eedbda8783c3c (commit)
from 2807d80e446538357bd40a2365ec164cc93bdee4 (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 b021e015a0e40d6b1d26c7031227cea79fd3ebac
Author: Simon Josefsson <address@hidden>
Date: Mon Aug 31 12:51:06 2009 +0200
Add.
commit a4e6ad48e6b6c66afc7acfc0da2c9ff51e90d47b
Author: Fabian Keil <address@hidden>
Date: Tue Aug 25 18:42:17 2009 +0200
Remove dead store in listen_socket().
Signed-off-by: Simon Josefsson <address@hidden>
commit 8b77db9fef4055e8445957b7a71ad8288e28dbec
Author: Fabian Keil <address@hidden>
Date: Tue Aug 25 18:39:41 2009 +0200
Remove dead store in _gnutls_io_write_buffered().
Signed-off-by: Simon Josefsson <address@hidden>
commit 77418029937fb1c23f8e5513832a8384ddafdb58
Author: Fabian Keil <address@hidden>
Date: Mon Aug 24 20:08:35 2009 +0200
Remove dead store in gnutls_x509_crt_list_import().
Signed-off-by: Simon Josefsson <address@hidden>
commit f1005919e0cf0cb0c68a0cf334333712e5798538
Author: Fabian Keil <address@hidden>
Date: Mon Aug 24 19:33:09 2009 +0200
Remove dead store in pwd_put_values().
Signed-off-by: Simon Josefsson <address@hidden>
commit 44ededfbbf9f2ce99c772297e5039ec1696ad01e
Author: Fabian Keil <address@hidden>
Date: Mon Aug 24 19:30:49 2009 +0200
Remove dead store in pkcs12_info().
Signed-off-by: Simon Josefsson <address@hidden>
commit f3822a2d0abf30abd00cd4a86dc0c41dd101e50f
Author: Fabian Keil <address@hidden>
Date: Tue Aug 25 18:50:58 2009 +0200
Remove write-only variable info in _gnutls_proc_cert_cert_req().
Signed-off-by: Simon Josefsson <address@hidden>
commit b9c21aed41cf2cbd3c0949742e201f6a94cece35
Author: Fabian Keil <address@hidden>
Date: Tue Aug 25 18:48:41 2009 +0200
Remove write-only variable info in gen_rsa_export_server_kx().
Signed-off-by: Simon Josefsson <address@hidden>
commit a4e715e4db224147b942aba170730d3188a822d3
Author: Fabian Keil <address@hidden>
Date: Tue Aug 25 18:44:25 2009 +0200
Remove write-only variable sep_ar_idx in split_multi_arg().
Signed-off-by: Simon Josefsson <address@hidden>
commit 63c767de777fdc23e48718abb8457fa08644ce0f
Author: Fabian Keil <address@hidden>
Date: Mon Aug 24 20:12:29 2009 +0200
Remove write-only variable tmp_size in _pkcs12_decode_safe_content().
Signed-off-by: Simon Josefsson <address@hidden>
commit 05bbf08b39e67a91b1de34af18550cab347bbd28
Author: Fabian Keil <address@hidden>
Date: Sat Aug 29 11:47:29 2009 +0200
Remove duplicates. Two exact ones and a pretty close one.
Signed-off-by: Simon Josefsson <address@hidden>
commit 62edfa4eb29d6ed91d236312a5efa83c70c9c8cd
Author: Fabian Keil <address@hidden>
Date: Tue Aug 25 18:15:35 2009 +0200
Mark what looks like a bug in in _gnutls_srp_pwd_read_entry()
Signed-off-by: Simon Josefsson <address@hidden>
commit 1c9e7839dbd93f16a84b4a8b22e9756d059a0ef4
Author: Fabian Keil <address@hidden>
Date: Mon Aug 24 20:16:11 2009 +0200
In main(), rename salt to salt_size and don't bother reading info.salt
which we don't use anyway.
Signed-off-by: Simon Josefsson <address@hidden>
commit 0e769157370b2bf25602b6fa81cb3ad06371e674
Author: Simon Josefsson <address@hidden>
Date: Mon Aug 31 12:32:23 2009 +0200
(cdk_strlist_next): Handle NULL root value better.
Based on report by Fabian Keil <address@hidden>.
commit e78b476ef131043fe8fec52d4e56b0f779e7aae8
Author: Fabian Keil <address@hidden>
Date: Mon Aug 24 19:09:22 2009 +0200
In print_extensions(), declare the *_idx variables as int instead of size_t.
While it shouldn't make a difference, it makes more sense to me.
It's also consistent with (at least) print_crl().
Signed-off-by: Simon Josefsson <address@hidden>
commit 8dad53f17382310e79ff98e7816cad8c94e87126
Author: Fabian Keil <address@hidden>
Date: Mon Aug 24 19:06:43 2009 +0200
In print_extensions(), initialize *_idx variables once before entering the
for loop instead of each run.
Otherwise checking them is pointless as they always will be zero.
Signed-off-by: Simon Josefsson <address@hidden>
commit 3fd12d05225f79f95b9d7d8961b40d154a3deef3
Author: Fabian Keil <address@hidden>
Date: Mon Aug 24 19:19:41 2009 +0200
In print_crq(), initialize challenge and extensions once before entering
the for loop instead of each run.
Signed-off-by: Simon Josefsson <address@hidden>
commit 978781f3ae7c5fb5deac03df615eedbda8783c3c
Author: Fabian Keil <address@hidden>
Date: Mon Aug 24 18:59:13 2009 +0200
In print_crl(), initialize aki_idx and crl_nr once before entering the for
loop instead of each run.
Otherwise the "error: more than one AKI extension\n" and
"error: more than one CRL number\n" checks want work.
Signed-off-by: Simon Josefsson <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
THANKS | 4 +---
lib/auth_cert.c | 3 ---
lib/auth_rsa_export.c | 2 --
lib/auth_srp_passwd.c | 4 ++--
lib/gnutls_buffers.c | 1 -
lib/opencdk/misc.c | 7 +++++--
lib/x509/output.c | 24 ++++++++++++------------
lib/x509/pkcs12.c | 3 +--
lib/x509/x509.c | 1 -
src/certtool.c | 2 --
src/cfg/shared.c | 4 +---
src/crypt.c | 8 +++-----
src/serv.c | 1 -
13 files changed, 25 insertions(+), 39 deletions(-)
diff --git a/THANKS b/THANKS
index 3d09fc8..c1702c3 100644
--- a/THANKS
+++ b/THANKS
@@ -35,7 +35,6 @@ Stéphane LOEUILLET <address@hidden>
Aleix Conchillo Flaque <address@hidden>
Martijn Koster <address@hidden>
Marcin Garski <address@hidden>
-Martijn Koster <address@hidden>
Martin Lambers <address@hidden>
Michael Ringe <address@hidden>
Daniel Black <address@hidden>
@@ -49,7 +48,6 @@ Thomas Klausner <address@hidden>
Matthias Urlichs <address@hidden>
Ralph Giles <address@hidden>
Daniel Stenberg <address@hidden>
-Thomas Klausner <address@hidden>
Jouni Malinen <address@hidden>
Evgeny Legerov <address@hidden>
John Heiden <address@hidden>
@@ -102,7 +100,7 @@ Fabian Keil <address@hidden>
Brad Hards <address@hidden>
Daiki Ueno <address@hidden>
Tomas Hoger <address@hidden>
-Tim Kosse <address@hidden>
+Fabian Keil <address@hidden>
----------------------------------------------------------------------
Copying and distribution of this file, with or without modification,
diff --git a/lib/auth_cert.c b/lib/auth_cert.c
index a5244c8..5b8c163 100644
--- a/lib/auth_cert.c
+++ b/lib/auth_cert.c
@@ -1299,7 +1299,6 @@ _gnutls_proc_cert_cert_req (gnutls_session_t session,
opaque * data,
int size, ret;
opaque *p;
gnutls_certificate_credentials_t cred;
- cert_auth_info_t info;
ssize_t dsize;
int i, j;
gnutls_pk_algorithm_t pk_algos[MAX_SIGN_ALGOS];
@@ -1322,8 +1321,6 @@ _gnutls_proc_cert_cert_req (gnutls_session_t session,
opaque * data,
return ret;
}
- info = _gnutls_get_auth_info (session);
-
p = data;
dsize = data_size;
diff --git a/lib/auth_rsa_export.c b/lib/auth_rsa_export.c
index b561063..606f85c 100644
--- a/lib/auth_rsa_export.c
+++ b/lib/auth_rsa_export.c
@@ -76,7 +76,6 @@ gen_rsa_export_server_kx (gnutls_session_t session, opaque **
data)
gnutls_privkey *apr_pkey;
int apr_cert_list_length;
gnutls_datum_t signature, ddata;
- cert_auth_info_t info;
gnutls_certificate_credentials_t cred;
cred = (gnutls_certificate_credentials_t)
@@ -122,7 +121,6 @@ gen_rsa_export_server_kx (gnutls_session_t session, opaque
** data)
return ret;
}
- info = _gnutls_get_auth_info (session);
_gnutls_rsa_export_set_pubkey (session, rsa_mpis[1], rsa_mpis[0]);
_gnutls_mpi_print (rsa_mpis[0], NULL, &n_m);
diff --git a/lib/auth_srp_passwd.c b/lib/auth_srp_passwd.c
index 4475abb..6a1e986 100644
--- a/lib/auth_srp_passwd.c
+++ b/lib/auth_srp_passwd.c
@@ -65,7 +65,6 @@ pwd_put_values (SRP_PWD_ENTRY * entry, char *str)
*p = '\0';
p++;
- len = strlen (p);
indx = atoi (p);
if (indx == 0)
{
@@ -347,7 +346,8 @@ _gnutls_srp_pwd_read_entry (gnutls_session_t state, char
*username,
/* Keep the last index in memory, so we can retrieve fake
parameters (g,n)
* when the user does not exist.
*/
- last_idx = idx;
+ /* XXX: last_idx will not be read as both if block branches
return. */
+ last_idx = idx;
if (pwd_read_conf (cred->password_conf_file, entry, idx) == 0)
{
return 0;
diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
index 6faa5ea..4e54df6 100644
--- a/lib/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
@@ -664,7 +664,6 @@ _gnutls_io_write_buffered (gnutls_session_t session,
_gnutls_write_log ("WRITE: Will write %d bytes to %p.\n", (int)n, fd);
- i = 0;
left = n;
while (left > 0)
{
diff --git a/lib/opencdk/misc.c b/lib/opencdk/misc.c
index 50977bf..0df82a1 100644
--- a/lib/opencdk/misc.c
+++ b/lib/opencdk/misc.c
@@ -109,7 +109,7 @@ cdk_strlist_add (cdk_strlist_t * list, const char *string)
* cdk_strlist_next:
* @root: the opaque string list.
* @r_str: optional argument to store the string data.
- *
+ *
* Return the next string list node from @root. The optional
* argument @r_str return the data of the current (!) node.
**/
@@ -118,7 +118,10 @@ cdk_strlist_next (cdk_strlist_t root, const char **r_str)
{
cdk_strlist_t node;
- if (root && r_str)
+ if (!root)
+ return NULL;
+
+ if (r_str)
*r_str = root->d;
for (node = root->next; node; node = node->next)
return node;
diff --git a/lib/x509/output.c b/lib/x509/output.c
index c04beb1..854affb 100644
--- a/lib/x509/output.c
+++ b/lib/x509/output.c
@@ -691,20 +691,20 @@ print_extensions (gnutls_string * str, const char
*prefix, int type,
cert_type_t cert)
{
int i, err;
+ int san_idx = 0;
+ int proxy_idx = 0;
+ int basic_idx = 0;
+ int keyusage_idx = 0;
+ int keypurpose_idx = 0;
+ int ski_idx = 0;
+ int aki_idx = 0;
+ int crldist_idx = 0;
for (i = 0;; i++)
{
char oid[MAX_OID_SIZE] = "";
size_t sizeof_oid = sizeof (oid);
int critical;
- size_t san_idx = 0;
- size_t proxy_idx = 0;
- size_t basic_idx = 0;
- size_t keyusage_idx = 0;
- size_t keypurpose_idx = 0;
- size_t ski_idx = 0;
- size_t aki_idx = 0;
- size_t crldist_idx = 0;
if (type == TYPE_CRT)
err = gnutls_x509_crt_get_extension_info (cert.crt, i,
@@ -1555,14 +1555,14 @@ print_crl (gnutls_string * str, gnutls_x509_crl_t crl,
int notsigned)
{
size_t i;
int err = 0;
+ int aki_idx = 0;
+ int crl_nr = 0;
for (i = 0;; i++)
{
char oid[MAX_OID_SIZE] = "";
size_t sizeof_oid = sizeof (oid);
int critical;
- int crl_nr = 0;
- int aki_idx = 0;
err = gnutls_x509_crl_get_extension_info (crl, i,
oid, &sizeof_oid,
@@ -1919,13 +1919,13 @@ print_crq (gnutls_string * str, gnutls_x509_crq_t cert)
{
size_t i;
int err = 0;
+ int extensions = 0;
+ int challenge = 0;
for (i = 0;; i++)
{
char oid[MAX_OID_SIZE] = "";
size_t sizeof_oid = sizeof (oid);
- int extensions = 0;
- int challenge = 0;
err = gnutls_x509_crq_get_attribute_info (cert, i, oid, &sizeof_oid);
if (err < 0)
diff --git a/lib/x509/pkcs12.c b/lib/x509/pkcs12.c
index a0f8312..3434e7f 100644
--- a/lib/x509/pkcs12.c
+++ b/lib/x509/pkcs12.c
@@ -50,7 +50,7 @@ _decode_pkcs12_auth_safe (ASN1_TYPE pkcs12, ASN1_TYPE *
authen_safe,
char oid[MAX_OID_SIZE];
ASN1_TYPE c2 = ASN1_TYPE_EMPTY;
gnutls_datum_t auth_safe = { NULL, 0 };
- int tmp_size, len, result;
+ int len, result;
char error_str[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
len = sizeof (oid) - 1;
@@ -71,7 +71,6 @@ _decode_pkcs12_auth_safe (ASN1_TYPE pkcs12, ASN1_TYPE *
authen_safe,
/* Step 1. Read the content data
*/
- tmp_size = 0;
result =
_gnutls_x509_read_value (pkcs12, "authSafe.content", &auth_safe, 1);
if (result < 0)
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index e1746a4..2fa3c6b 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -2894,7 +2894,6 @@ gnutls_x509_crt_list_import (gnutls_x509_crt_t * certs,
gnutls_assert ();
return GNUTLS_E_BASE64_DECODING_ERROR;
}
- size = data->size - (ptr - (char *) data->data);
count = 0;
diff --git a/src/certtool.c b/src/certtool.c
index 9e972b2..c1f4134 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -2734,8 +2734,6 @@ pkcs12_info (void)
if (result < 0)
error (0, 0, "verify_mac: %s", gnutls_strerror (result));
- indx = 0;
-
for (indx = 0;; indx++)
{
result = gnutls_pkcs12_bag_init (&bag);
diff --git a/src/cfg/shared.c b/src/cfg/shared.c
index 1219f47..ef919c0 100644
--- a/src/cfg/shared.c
+++ b/src/cfg/shared.c
@@ -837,7 +837,7 @@ split_multi_arg(arg, ar, quote_prefix_ar, quote_postfix_ar,
separator_ar)
char **separator_ar;
{ /* {{{ */
register int i;
- int sep_ar_idx, quote_idx, sep_size, tmp_sep_size;
+ int quote_idx, sep_size, tmp_sep_size;
char *p_quote, *p_sep, *tmp_s;
char *arg_base = arg;
@@ -850,7 +850,6 @@ split_multi_arg(arg, ar, quote_prefix_ar, quote_postfix_ar,
separator_ar)
and set quotation variables */
p_quote = PLATON_FUNC(strdyn_str2)(arg, quote_prefix_ar,
"e_idx);
p_sep = NULL; /* pointer to separator */
- sep_ar_idx = -1; /* index of separator */
sep_size = 0; /* length of separator string */
/* Searching first separator string (p_sep) */
@@ -858,7 +857,6 @@ split_multi_arg(arg, ar, quote_prefix_ar, quote_postfix_ar,
separator_ar)
if ((tmp_s = PLATON_FUNC(str_white_str)(arg,
separator_ar[i], &tmp_sep_size))
!= NULL && (p_sep == NULL || tmp_s <
p_sep)) {
p_sep = tmp_s;
- sep_ar_idx = i;
sep_size = tmp_sep_size;
}
}
diff --git a/src/crypt.c b/src/crypt.c
index e7e872d..a9b71d2 100644
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -394,7 +394,7 @@ main (int argc, char **argv)
{
gaainfo info;
const char *passwd;
- int salt, ret;
+ int salt_size, ret;
struct passwd *pwd;
set_program_name (argv[0]);
@@ -413,8 +413,6 @@ main (int argc, char **argv)
return -1;
}
- salt = info.salt;
-
if (info.create_conf != NULL)
{
return generate_create_conf (info.create_conf);
@@ -443,7 +441,7 @@ main (int argc, char **argv)
#endif
}
- salt = 16;
+ salt_size = 16;
passwd = getpass ("Enter password: ");
if (passwd == NULL)
@@ -460,7 +458,7 @@ main (int argc, char **argv)
}
- return crypt_int (info.username, passwd, salt,
+ return crypt_int (info.username, passwd, salt_size,
info.passwd_conf, info.passwd, info.index);
}
diff --git a/src/serv.c b/src/serv.c
index ede5117..aaeda8e 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -697,7 +697,6 @@ listen_socket (const char *name, int listen_port)
fprintf (stderr, "getaddrinfo() failed: %s\n", gai_strerror (s));
return -1;
}
- s = -1;
for (ptr = res; ptr != NULL; ptr = ptr->ai_next)
{
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_2_9_3-45-gb021e01,
Simon Josefsson <=