[glib: 2/2] Merge branch 'pgriffis/gtlscertificate-password' into 'main'

[Philip Withnall <pwithnall src gnome org>]

commit a7a5b24f86b660dadb18027a1f4353da861bf8c4
Merge: 11f591dc1 96ce3feeb
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Jan 17 11:21:18 2022 +0000

    Merge branch 'pgriffis/gtlscertificate-password' into 'main'
    
    gtlscertificate: Add ability to load PKCS#12 encrypted files
    
    See merge request GNOME/glib!2239

 docs/reference/gio/gio-sections-common.txt     |   2 +
 gio/gioenums.h                                 |   5 +-
 gio/gtlscertificate.c                          | 205 ++++++++++++++++++++++---
 gio/gtlscertificate.h                          |  10 +-
 gio/tests/cert-tests/key-cert-password-123.p12 | Bin 0 -> 1717 bytes
 gio/tests/tls-certificate.c                    |  43 ++++++
 6 files changed, 245 insertions(+), 20 deletions(-)
---