Changeset 237377 in webkit


Ignore:
Timestamp:
Oct 24, 2018 2:10:24 AM (5 years ago)
Author:
Claudio Saavedra
Message:

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

Reviewed by Žan Doberšek.

  • Shared/soup/WebCoreArgumentCodersSoup.cpp:

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

Location:
trunk/Source/WebKit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/ChangeLog

    r237367 r237377  
     12018-10-24  Claudio Saavedra  <csaavedra@igalia.com>
     2
     3        [WPE][GTK] Cleanups to the certificate encoder
     4        https://bugs.webkit.org/show_bug.cgi?id=190865
     5
     6        Reviewed by Žan Doberšek.
     7
     8        * Shared/soup/WebCoreArgumentCodersSoup.cpp:
     9        (IPC::ArgumentCoder<CertificateInfo>::encode):
     10
    1112018-10-23  Ryan Haddad  <ryanhaddad@apple.com>
    212
  • trunk/Source/WebKit/Shared/soup/WebCoreArgumentCodersSoup.cpp

    r237351 r237377  
    5757    }
    5858
    59     uint32_t chainLength = 0;
    6059    GTlsCertificate* certificate = certificateInfo.certificate();
    61     GByteArray* certificateData = 0;
    62     Vector<GByteArray*> certificatesDataList;
    63 
     60    Vector<GRefPtr<GByteArray>> certificatesDataList;
    6461    do {
    65         g_object_get(G_OBJECT(certificate), "certificate", &certificateData, NULL);
     62        GByteArray* certificateData = nullptr;
     63        g_object_get(G_OBJECT(certificate), "certificate", &certificateData, nullptr);
    6664
    6765        if (!certificateData)
     
    6967
    7068        certificatesDataList.append(certificateData);
    71         chainLength++;
    7269
    7370        certificate = g_tls_certificate_get_issuer(certificate);
    7471    } while (certificate);
    7572
    76     encoder << chainLength;
    77 
    78     if (!chainLength)
     73    encoder << static_cast<uint32_t>(certificatesDataList.size());
     74
     75    if (certificatesDataList.isEmpty())
    7976        return;
    8077
    8178    // Encode starting from the root certificate.
    82     for (uint32_t i = chainLength; i > 0; i--) {
    83         GRefPtr<GByteArray> certificate = adoptGRef(certificatesDataList[i - 1]);
     79    for (size_t i = certificatesDataList.size(); i > 0; --i) {
     80        auto& certificate = certificatesDataList[i - 1];
    8481        encoder.encodeVariableLengthByteArray(IPC::DataReference(certificate->data, certificate->len));
    8582    }
Note: See TracChangeset for help on using the changeset viewer.