From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 21 Jul 2012 15:54:18 +0000 (+0200)
Subject: doc fix
X-Git-Tag: gnutls_3_1_0pre0~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85bf56607c0d41d69468992c74b0fa8311e43134;p=thirdparty%2Fgnutls.git

doc fix
---

diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 66affffffb..e4bb73c32d 100644
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -1857,8 +1857,7 @@ int
  * be called more than once (in case multiple keys/certificates exist
  * for the server).
  *
- * MAC:ed PKCS#12 files are supported.  Encrypted PKCS#12 bags are
- * supported.  Encrypted PKCS#8 private keys are supported.  However,
+ * Encrypted PKCS#12 bags and PKCS#8 private keys are supported.  However,
  * only password based security, and the same password for all
  * operations, are supported.
  *
diff --git a/lib/x509/pkcs12.c b/lib/x509/pkcs12.c
index d66f91a9e0..ebbf954240 100644
--- a/lib/x509/pkcs12.c
+++ b/lib/x509/pkcs12.c
@@ -1388,8 +1388,7 @@ skip:
  * and both may be set to %NULL. If either is non-%NULL, then both must
  * be.
  * 
- * MAC:ed PKCS#12 files are supported.  Encrypted PKCS#12 bags are
- * supported.  Encrypted PKCS#8 private keys are supported.  However,
+ * Encrypted PKCS#12 bags and PKCS#8 private keys are supported.  However,
  * only password based security, and the same password for all
  * operations, are supported.
  *