diff options
| -rw-r--r-- | doc/cha-cert-auth.texi | 1 | ||||
| -rw-r--r-- | doc/cha-internals.texi | 1 | ||||
| -rw-r--r-- | doc/cha-library.texi | 1 | ||||
| -rw-r--r-- | lib/ext_safe_renegotiation.c | 1 | ||||
| -rw-r--r-- | lib/ext_server_name.c | 1 | ||||
| -rw-r--r-- | lib/gcrypt/init.c | 1 | ||||
| -rw-r--r-- | lib/gnutls_record.c | 1 | ||||
| -rw-r--r-- | lib/gnutls_str.c | 1 | ||||
| -rw-r--r-- | lib/locks.c | 1 | ||||
| -rw-r--r-- | lib/nettle/egd.c | 3 | ||||
| -rw-r--r-- | lib/nettle/init.c | 1 | ||||
| -rw-r--r-- | lib/system.c | 1 | ||||
| -rw-r--r-- | lib/system.h | 1 | ||||
| -rw-r--r-- | libextra/ext_inner_application.c | 1 | ||||
| -rw-r--r-- | src/certtool-common.h | 1 | ||||
| -rw-r--r-- | src/common.c | 2 | ||||
| -rw-r--r-- | src/pkcs11.c | 2 |
17 files changed, 3 insertions, 18 deletions
diff --git a/doc/cha-cert-auth.texi b/doc/cha-cert-auth.texi index b447593854..1c661169f8 100644 --- a/doc/cha-cert-auth.texi +++ b/doc/cha-cert-auth.texi @@ -669,4 +669,3 @@ then use @ref{gnutls_x509_crt_get_signature_algorithm} to find out the signing algorithm used for each certificate. If any of the intermediary certificates are using @code{GNUTLS_SIGN_RSA_MD2} or @code{GNUTLS_SIGN_RSA_MD5}, you could present a warning. - diff --git a/doc/cha-internals.texi b/doc/cha-internals.texi index fda6221699..117c023069 100644 --- a/doc/cha-internals.texi +++ b/doc/cha-internals.texi @@ -333,4 +333,3 @@ must be taken to use the same format. @end itemize If all of them are used then GnuTLS will no longer use libgcrypt. - diff --git a/doc/cha-library.texi b/doc/cha-library.texi index 9213ea69d7..ffce898ebd 100644 --- a/doc/cha-library.texi +++ b/doc/cha-library.texi @@ -185,4 +185,3 @@ should allocate and free memory using the functions shown below. @item @ref{gnutls_free} @end itemize - diff --git a/lib/ext_safe_renegotiation.c b/lib/ext_safe_renegotiation.c index 099402ce47..24d425eb75 100644 --- a/lib/ext_safe_renegotiation.c +++ b/lib/ext_safe_renegotiation.c @@ -458,4 +458,3 @@ extension_priv_data_t epriv; return priv->connection_using_safe_renegotiation; } - diff --git a/lib/ext_server_name.c b/lib/ext_server_name.c index 7b2face4bb..acda371c8d 100644 --- a/lib/ext_server_name.c +++ b/lib/ext_server_name.c @@ -462,4 +462,3 @@ error: gnutls_free(priv); return ret; } - diff --git a/lib/gcrypt/init.c b/lib/gcrypt/init.c index 175cbd0acd..4566bc217d 100644 --- a/lib/gcrypt/init.c +++ b/lib/gcrypt/init.c @@ -81,4 +81,3 @@ int gnutls_crypto_init(void) return 0; } - diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c index 972c8ad617..afc7e32719 100644 --- a/lib/gnutls_record.c +++ b/lib/gnutls_record.c @@ -1220,4 +1220,3 @@ gnutls_record_recv (gnutls_session_t session, void *data, size_t sizeofdata) return _gnutls_recv_int (session, GNUTLS_APPLICATION_DATA, -1, data, sizeofdata); } - diff --git a/lib/gnutls_str.c b/lib/gnutls_str.c index 4975ddee03..2893cabb36 100644 --- a/lib/gnutls_str.c +++ b/lib/gnutls_str.c @@ -629,4 +629,3 @@ int _gnutls_buffer_pop_data_prefix (gnutls_buffer_st * buf, void * data, size_t return 0; } - diff --git a/lib/locks.c b/lib/locks.c index ea967334ce..e1ddfc6d79 100644 --- a/lib/locks.c +++ b/lib/locks.c @@ -59,4 +59,3 @@ void gnutls_global_set_mutex(mutex_init_func init, mutex_deinit_func deinit, gnutls_mutex_lock = lock; gnutls_mutex_unlock = unlock; } - diff --git a/lib/nettle/egd.c b/lib/nettle/egd.c index 60467c6813..09c5ad8906 100644 --- a/lib/nettle/egd.c +++ b/lib/nettle/egd.c @@ -1,5 +1,5 @@ /* rndegd.c - interface to the EGD - * Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + * Copyright (C) 1999, 2000, 2002, 2003, 2010 Free Software Foundation, Inc. * * This file is part of Libgcrypt. * @@ -253,4 +253,3 @@ int _rndegd_read (int * fd, void* _output, size_t _length) return _length; /* success */ } - diff --git a/lib/nettle/init.c b/lib/nettle/init.c index 799d27646f..868ddc6898 100644 --- a/lib/nettle/init.c +++ b/lib/nettle/init.c @@ -35,4 +35,3 @@ int gnutls_crypto_init(void) { return 0; } - diff --git a/lib/system.c b/lib/system.c index 8e33090776..ec05590992 100644 --- a/lib/system.c +++ b/lib/system.c @@ -238,4 +238,3 @@ mutex_init_func gnutls_mutex_init = gnutls_system_mutex_init; mutex_deinit_func gnutls_mutex_deinit = gnutls_system_mutex_deinit; mutex_lock_func gnutls_mutex_lock = gnutls_system_mutex_lock; mutex_unlock_func gnutls_mutex_unlock = gnutls_system_mutex_unlock; - diff --git a/lib/system.h b/lib/system.h index e42e4853a3..a8257d4382 100644 --- a/lib/system.h +++ b/lib/system.h @@ -31,4 +31,3 @@ ssize_t system_read_peek(gnutls_transport_ptr ptr, void* data, size_t data_size) int _gnutls_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)); #endif /* SYSTEM_H */ - diff --git a/libextra/ext_inner_application.c b/libextra/ext_inner_application.c index bad812e4a9..f0df0f36b7 100644 --- a/libextra/ext_inner_application.c +++ b/libextra/ext_inner_application.c @@ -253,4 +253,3 @@ error: gnutls_free(priv); return ret; } - diff --git a/src/certtool-common.h b/src/certtool-common.h index bf9da58e17..d8599c8054 100644 --- a/src/certtool-common.h +++ b/src/certtool-common.h @@ -69,4 +69,3 @@ int get_bits(gnutls_pk_algorithm_t); /* prime.c */ int generate_prime (int how); - diff --git a/src/common.c b/src/common.c index 7590482d79..808146749e 100644 --- a/src/common.c +++ b/src/common.c @@ -920,7 +920,7 @@ static char cached_pin[32] = ""; /* cache */ strcpy(cached_pin, pin); - if (cached_url) free(cached_url); + free(cached_url); cached_url = strdup(token_url); return 0; diff --git a/src/pkcs11.c b/src/pkcs11.c index c0d6239628..2912b97c31 100644 --- a/src/pkcs11.c +++ b/src/pkcs11.c @@ -66,7 +66,7 @@ static char cached_pin[32] = ""; /* cache */ strcpy(cached_pin, pin); - if (cached_url) free(cached_url); + free(cached_url); cached_url = strdup(token_url); return 0; |