From 49b35f093034af6ff14df4df2073a6111614c9d0 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Fri, 3 Aug 2012 21:51:08 +0200 Subject: [PATCH] gtlscertificate: Don't confuse certificate and public key in docs * A certificate sorta acts as a public key, but more specifically it contains a public key (in its subjectPublicKeyInfo) field. * Documentation was confusing and could have read like the certificate and certificate-pem properties were returning the public key part of the certificate. https://bugzilla.gnome.org/show_bug.cgi?id=681158 --- gio/gtlscertificate.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gio/gtlscertificate.c b/gio/gtlscertificate.c index 6c0437840..ea5f1df2f 100644 --- a/gio/gtlscertificate.c +++ b/gio/gtlscertificate.c @@ -35,9 +35,9 @@ * @see_also: #GTlsConnection * * A certificate used for TLS authentication and encryption. - * This can represent either a public key only (eg, the certificate + * This can represent either a certificate only (eg, the certificate * received by a client from a server), or the combination of - * a public key and a private key (which is needed when acting as a + * a certificate and a private key (which is needed when acting as a * #GTlsServerConnection). * * Since: 2.28 @@ -98,10 +98,9 @@ g_tls_certificate_class_init (GTlsCertificateClass *class) /** * GTlsCertificate:certificate: * - * The DER (binary) encoded representation of the certificate's - * public key. This property and the - * #GTlsCertificate:certificate-pem property represent the same - * data, just in different forms. + * The DER (binary) encoded representation of the certificate. + * This property and the #GTlsCertificate:certificate-pem property + * represent the same data, just in different forms. * * Since: 2.28 */ @@ -116,8 +115,8 @@ g_tls_certificate_class_init (GTlsCertificateClass *class) /** * GTlsCertificate:certificate-pem: * - * The PEM (ASCII) encoded representation of the certificate's - * public key. This property and the #GTlsCertificate:certificate + * The PEM (ASCII) encoded representation of the certificate. + * This property and the #GTlsCertificate:certificate * property represent the same data, just in different forms. * * Since: 2.28