[glib: 4/4] Merge branch 'tpm-keys-in-pem-files' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 09533387044d0ca327766bda90eea3e05ca58d02
Merge: 46900e55e a437a5069
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Dec 19 11:53:17 2018 +0000

    Merge branch 'tpm-keys-in-pem-files' into 'master'
    
    gtlscertificate: Add support for TPM keys in PEM files
    
    See merge request GNOME/glib!522

 gio/gtlscertificate.c                       |  69 +++++++--------
 gio/tests/Makefile.am                       |  23 +++--
 gio/tests/cert-tests/cert-crlf.pem          |  17 ++++
 gio/tests/cert-tests/key-crlf.pem           |  15 ++++
 gio/tests/cert-tests/key8enc.pem            |  18 ++++
 gio/tests/cert-tests/key_missing-footer.pem |  14 +++
 gio/tests/cert-tests/key_missing-header.pem |  14 +++
 gio/tests/tls-certificate.c                 | 129 ++++++++++++++++++++++------
 8 files changed, 229 insertions(+), 70 deletions(-)
---