aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-06-23 10:55:43 -0400
committerJack Lloyd <[email protected]>2017-06-23 10:55:43 -0400
commit62c94693cb1cf5ddc5e8e43a787561e7d8351258 (patch)
treec9a20ffdb70eaa6a0f0fb7e2a6a5e9537e8bebcf
parent9ab9ebde03d55e572672ea0c9856b86844d8a620 (diff)
parent988fe06fb1b3559e42293d18032627e8bbde93ca (diff)
Merge GH #1087 Update Doxygen comment for X509_Certificate::subject_info [ci skip]
-rw-r--r--src/lib/x509/x509cert.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/x509/x509cert.h b/src/lib/x509/x509cert.h
index ceadf88c5..3a81d1108 100644
--- a/src/lib/x509/x509cert.h
+++ b/src/lib/x509/x509cert.h
@@ -75,14 +75,16 @@ class BOTAN_DLL X509_Certificate : public X509_Object
/**
* Get a value for a specific subject_info parameter name.
- * @param name the name of the parameter to look up. Possible names are
+ * @param name the name of the parameter to look up. Possible names include
* "X509.Certificate.version", "X509.Certificate.serial",
* "X509.Certificate.start", "X509.Certificate.end",
* "X509.Certificate.v2.key_id", "X509.Certificate.public_key",
* "X509v3.BasicConstraints.path_constraint",
* "X509v3.BasicConstraints.is_ca", "X509v3.NameConstraints",
* "X509v3.ExtendedKeyUsage", "X509v3.CertificatePolicies",
- * "X509v3.SubjectKeyIdentifier" or "X509.Certificate.serial".
+ * "X509v3.SubjectKeyIdentifier", "X509.Certificate.serial",
+ * "X520.CommonName", "X520.Organization", "X520.Country",
+ * "RFC822" (Email in SAN) or "PKCS9.EmailAddress" (Email in DN).
* @return value(s) of the specified parameter
*/
std::vector<std::string> subject_info(const std::string& name) const;