[glib-networking/nacho/openssl-utils: 11/11] openssl: remove openssl-util

[Ignacio Casal Quinteiro <icq src gnome org>]

commit a2268a3b02bc6eacc4a4d2b702543968b38622fb
Author: Ignacio Casal Quinteiro <qignacio amazon com>
Date:   Wed Aug 11 09:47:59 2021 +0200

    openssl: remove openssl-util
    
    These were needed to support old versions of openssl where
    those methods were not yet exposed in the public api.

 tls/openssl/gtlscertificate-openssl.c |   5 +-
 tls/openssl/meson.build               |   1 -
 tls/openssl/openssl-util.c            | 490 ----------------------------------
 tls/openssl/openssl-util.h            |  94 -------
 4 files changed, 2 insertions(+), 588 deletions(-)
---
diff --git a/tls/openssl/gtlscertificate-openssl.c b/tls/openssl/gtlscertificate-openssl.c
index 16dfcb03..01ed1773 100644
--- a/tls/openssl/gtlscertificate-openssl.c
+++ b/tls/openssl/gtlscertificate-openssl.c
@@ -29,7 +29,6 @@
 #include "openssl-include.h"
 
 #include "gtlscertificate-openssl.h"
-#include "openssl-util.h"
 #include <glib/gi18n-lib.h>
 
 struct _GTlsCertificateOpenssl
@@ -663,7 +662,7 @@ verify_identity_hostname (GTlsCertificateOpenssl *openssl,
   else
     return FALSE;
 
-  return g_tls_X509_check_host (openssl->cert, hostname, strlen (hostname), 0, NULL) == 1;
+  return X509_check_host (openssl->cert, hostname, strlen (hostname), 0, NULL) == 1;
 }
 
 static gboolean
@@ -695,7 +694,7 @@ verify_identity_ip (GTlsCertificateOpenssl *openssl,
   addr_bytes = g_inet_address_to_bytes (addr);
   addr_size = g_inet_address_get_native_size (addr);
 
-  ret = g_tls_X509_check_ip (openssl->cert, addr_bytes, addr_size, 0) == 1;
+  ret = X509_check_ip (openssl->cert, addr_bytes, addr_size, 0) == 1;
 
   g_object_unref (addr);
   return ret;
diff --git a/tls/openssl/meson.build b/tls/openssl/meson.build
index feb10b16..fe01e18c 100644
--- a/tls/openssl/meson.build
+++ b/tls/openssl/meson.build
@@ -8,7 +8,6 @@ sources = files(
   'gtlsdatabase-openssl.c',
   'gtlsfiledatabase-openssl.c',
   'gtlsbio.c',
-  'openssl-util.c',
 )
 
 incs = [top_inc]