Removed libgnutls_hpke.la

Signed-off-by: David Dudas <david.dudas03@e-uvt.ro>

diff --git a/.gitignore b/.gitignore
index 38694d3cd42edde1a59a3f6326f7366e5b588ebb..be3356be62f7f108ae0ea84bfa9debf062cc125e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -251,6 +251,7 @@ lib/x509/Makefile.in
 lib/x509/supported_exts.h
 lib/x509/x509-api.texi
 lib/*_asn1_tab.c
+lib/hpke/libgnutls_hpke.la
 *.lo
 *.log
 m4/*

diff --git a/lib/hpke/libgnutls_hpke.la b/lib/hpke/libgnutls_hpke.la
deleted file mode 100644 (file)
index bcca10d..0000000
--- a/lib/hpke/libgnutls_hpke.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libgnutls_hpke.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.5.4
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names=''
-
-# The name of the static archive.
-old_library='libgnutls_hpke.a'
-
-# Linker flags that cannot go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=''
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libgnutls_hpke.
-current=
-age=
-revision=
-
-# Is this an already installed library?
-installed=no
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir=''

diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
index 8e60b1c737bb286b2d6644e8ba2160078c658856..058c63837d95c39925696dc5a8eef1784b18d2e7 100644 (file)
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -678,6 +678,7 @@ int gnutls_certificate_set_key(gnutls_certificate_credentials_t res,
 int gnutls_pubkey_print(gnutls_pubkey_t pubkey,
                        gnutls_certificate_print_formats_t format,
                        gnutls_datum_t *out);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/nettle/pk.c b/lib/nettle/pk.c
index e9521028b2c20e71d94007fad0636267fd4dfbd5..9186aef4b59ce1fb364fdc945d4591e989467d18 100644 (file)
--- a/lib/nettle/pk.c
+++ b/lib/nettle/pk.c
@@ -5183,7 +5183,7 @@ static int wrap_nettle_pk_fixup(gnutls_pk_algorithm_t algo,
                _gnutls_free_key_datum(&k);
                break;
        default:
-               return 0;
+               break;
        }
 
        return ret;