Changeset 237380 in webkit

Timestamp:

Oct 24, 2018 6:45:26 AM (6 years ago)

Author:

Claudio Saavedra

Message:

[WPE][GTK] Cleanups to the certificate decoder
​https://bugs.webkit.org/show_bug.cgi?id=190867

Reviewed by Žan Doberšek.

• Shared/soup/WebCoreArgumentCodersSoup.cpp:

(IPC::ArgumentCoder<CertificateInfo>::decode):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/soup/WebCoreArgumentCodersSoup.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-10-24  Claudio Saavedra  <csaavedra@igalia.com>
+
+        [WPE][GTK] Cleanups to the certificate decoder
+        https://bugs.webkit.org/show_bug.cgi?id=190867
+
+        Reviewed by Žan Doberšek.
+
+        * Shared/soup/WebCoreArgumentCodersSoup.cpp:
+        (IPC::ArgumentCoder<CertificateInfo>::decode):
+
 2018-10-24  Claudio Saavedra  <csaavedra@igalia.com>
 

trunk/Source/WebKit/Shared/soup/WebCoreArgumentCodersSoup.cpp

@@ -94 +94 @@
         return true;
 
-    GTlsCertificate* issuer = nullptr;
-    GTlsBackend* backend = g_tls_backend_get_default();
+    GType certificateType = g_tls_backend_get_certificate_type(g_tls_backend_get_default());
     GRefPtr<GTlsCertificate> certificate;
     for (uint32_t i = 0; i < chainLength; i++) {
@@ -102 +101 @@
             return false;
 
-        GByteArray* certificateData = g_byte_array_sized_new(certificateDataReference.size());
-        certificateData = g_byte_array_append(certificateData, certificateDataReference.data(), certificateDataReference.size());
-        GRefPtr<GByteArray> certificateBytes = adoptGRef(certificateData);
+        GRefPtr<GByteArray> certificateData = g_byte_array_sized_new(certificateDataReference.size());
+        certificateData = g_byte_array_append(certificateData.get(), certificateDataReference.data(), certificateDataReference.size());
 
         certificate = adoptGRef(G_TLS_CERTIFICATE(g_initable_new(
-            g_tls_backend_get_certificate_type(backend), 0, 0, "certificate", certificateBytes.get(), "issuer", issuer, nullptr)));
-
-        issuer = certificate.get();
+            certificateType, nullptr, nullptr, "certificate", certificateData.get(), "issuer", certificate.get(), nullptr)));
     }