Fix arguments to gnutls_pubkey_verify_data2

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/gnutls.c b/gnutls.c
index d787ee23b63d11afb8eab105aa4d60ec74298a9d..b01d79c20ed6017d75805cb41e9ac81fd714fcb9 100644 (file)
--- a/gnutls.c
+++ b/gnutls.c
@@ -1368,7 +1368,7 @@ static int load_certificate(struct openconnect_info *vpninfo)
                                gnutls_pubkey_deinit(pubkey);
                                continue;
                        }
-                       err = gnutls_pubkey_verify_data2(pubkey, 0, algo, &fdata, &pkey_sig);
+                       err = gnutls_pubkey_verify_data2(pubkey, algo, 0, &fdata, &pkey_sig);
                        gnutls_pubkey_deinit(pubkey);
 
                        if (err >= 0) {

diff --git a/www/changelog.xml b/www/changelog.xml
index 1340c0f9e45a2263bb34ae004a5174aaf9128a38..fe87c01dc5d3be887ea62af729e87aefd624980c 100644 (file)
--- a/www/changelog.xml
+++ b/www/changelog.xml
@@ -18,6 +18,7 @@
    <li><b>OpenConnect HEAD</b>
      <ul>
        <li>Use GnuTLS by default instead of OpenSSL.</li>
+       <li>Avoid using deprecated <tt>gnutls_pubkey_verify_data()</tt> function..</li>
      </ul><br/>
   </li>
   <li><b><a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-4.99.tar.gz">OpenConnect v4.99</a></b>