summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ext/openssl/ossl_x509store.c26
2 files changed, 34 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b6ae198ab1..890b21e8c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Oct 3 04:36:11 2012 Eric Hodel <drbrain@segment7.net>
+
+ * ext/openssl/ossl_x509store.c (ossl_x509store_add_file): Added
+ documentation
+ * ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths):
+ ditto
+ * ext/openssl/ossl_x509store.c (ossl_x509store_add_cert): ditto
+
Wed Oct 3 02:23:37 2012 Shugo Maeda <shugo@ruby-lang.org>
* error.c (exc_to_s, name_err_to_s, name_err_mesg_to_str): do not
diff --git a/ext/openssl/ossl_x509store.c b/ext/openssl/ossl_x509store.c
index c03cf310e4..5e3094ee9f 100644
--- a/ext/openssl/ossl_x509store.c
+++ b/ext/openssl/ossl_x509store.c
@@ -204,6 +204,15 @@ ossl_x509store_set_time(VALUE self, VALUE time)
return time;
}
+/*
+ * call-seq:
+ * store.add_file(file) -> store
+ *
+ *
+ * Adds the certificates in +file+ to the certificate store. The +file+ can
+ * contain multiple PEM-encoded certificates.
+ */
+
static VALUE
ossl_x509store_add_file(VALUE self, VALUE file)
{
@@ -246,6 +255,16 @@ ossl_x509store_add_path(VALUE self, VALUE dir)
return self;
}
+/*
+ * call-seq:
+ * store.set_default_path
+ *
+ * Adds the default certificates to the certificate store. These certificates
+ * are loaded from the default configuration directory which can usually be
+ * determined by:
+ *
+ * File.dirname OpenSSL::Config::DEFAULT_CONFIG_FILE
+ */
static VALUE
ossl_x509store_set_default_paths(VALUE self)
{
@@ -259,6 +278,13 @@ ossl_x509store_set_default_paths(VALUE self)
return Qnil;
}
+/*
+ * call-seq:
+ * store.add_cert(cert)
+ *
+ * Adds the OpenSSL::X509::Certificate +cert+ to the certificate store.
+ */
+
static VALUE
ossl_x509store_add_cert(VALUE self, VALUE arg)
{