certstore_c 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d980868eb22aa3b7a16701cb9f61f349018ba203c9ea723aa263f26f48b2fbd3
-  data.tar.gz: b068d4b2c25eb8ee020923969c52bb03e24771867e371d4666bd1a2f12a1bd37
+  metadata.gz: 32b40c0e8ae962aa68d6c2fd6cb86df0ec314e21d40bdee26de0a3f06c46a42b
+  data.tar.gz: 1c03f74ab3269365b93b144065e08cb50fbf48ca23d07996a818583da550e100
 SHA512:
-  metadata.gz: 333b89dbd8a05a0a270f480ef047e34abd01657fa9c0e7bce9601c50ff0f5ad84fcfa62cd9d4f4c4c8d997c0fe22a08aadcc21c33fd7395de4897db9d226f093
-  data.tar.gz: 209ef9bc316eabf364be79c7f667c3b8e7f3ac45ad2bbbf37047280b97d57ad640f21fd965869e50855b4259be6a932741c2b9614c78b4540ce81c75fdf38eb2
+  metadata.gz: e958c5a56fa98ccf15d27ea2f3b07c853351d0e2639eb0bd19ce0e7746c1bb22041279f2e49f562c6471f4f7c5603c0a6ab39b348250394221e5f8164077868c
+  data.tar.gz: e11e7dca9a24157ef53a28d3b49ded628e3514ac58f166737731fc7ef3a80dbb9d0117ba1b9e7352b7ff118a2a9110cb606de32f26564babc45c5de629d6175a

data/certstore_c.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Hiroshi Hatake"]
   spec.email         = ["cosmo0920.wp@gmail.com"]
 
-  spec.summary       = %q{Windows CertStore loader.}
+  spec.summary       = %q{Windows CertStore loader and ruby-openssl extension for TLS connection.}
   spec.description   = spec.summary
   spec.homepage      = "https://github.com/cosmo0920/certstore_c"
 

data/ext/certstore/loader.c

@@ -220,6 +220,96 @@ error:
   rb_raise(rb_eCertLoaderError, errBuf);
 }
 
+static VALUE
+rb_win_certstore_loader_add_certificate(VALUE self, VALUE rb_der_cert_bin_str)
+{
+  struct CertstoreLoader *loader;
+  CHAR errBuf[256];
+
+  Check_Type(rb_der_cert_bin_str, T_STRING);
+
+  TypedData_Get_Struct(self, struct CertstoreLoader, &rb_win_certstore_loader_type, loader);
+
+  if (CertAddEncodedCertificateToStore(loader->hStore, X509_ASN_ENCODING,
+                                       RSTRING_PTR(rb_der_cert_bin_str), RSTRING_LEN(rb_der_cert_bin_str),
+                                       CERT_STORE_ADD_NEW,
+                                       NULL)) {
+    return Qtrue;
+  } else {
+    DWORD errCode = GetLastError();
+
+    switch (errCode){
+    case CRYPT_E_EXISTS:
+      return Qfalse;
+    default: {
+      sprintf(errBuf, "Cannot add certificates. ErrorCode: %d", GetLastError());
+      goto error;
+
+      }
+    }
+  }
+
+  return Qtrue;
+
+error:
+
+  rb_raise(rb_eCertLoaderError, errBuf);
+}
+
+static VALUE
+rb_win_certstore_loader_delete_certificate(VALUE self, VALUE rb_thumbprint)
+{
+  VALUE vThumbprint;
+  PCCERT_CONTEXT pContext = NULL;
+  struct CertstoreLoader *loader;
+  DWORD len;
+  CHAR errBuf[256];
+
+  Check_Type(rb_thumbprint, T_STRING);
+
+  TypedData_Get_Struct(self, struct CertstoreLoader, &rb_win_certstore_loader_type, loader);
+
+  // thumbprint : To wide char
+  len = MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(rb_thumbprint), RSTRING_LEN(rb_thumbprint), NULL, 0);
+  WCHAR *winThumbprint = ALLOCV_N(WCHAR, vThumbprint, len+1);
+  MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(rb_thumbprint), RSTRING_LEN(rb_thumbprint), winThumbprint, len);
+  winThumbprint[len] = L'\0';
+
+  BYTE pbThumb[CERT_THUMBPRINT_SIZE];
+  CRYPT_HASH_BLOB blob;
+  blob.cbData = CERT_THUMBPRINT_SIZE;
+  blob.pbData = pbThumb;
+  CryptStringToBinaryW(winThumbprint, CERT_THUMBPRINT_STR_LENGTH, CRYPT_STRING_HEX, pbThumb,
+                       &blob.cbData, NULL, NULL);
+
+  pContext = CertFindCertificateInStore(
+              loader->hStore,
+              X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
+              0,
+              CERT_FIND_HASH,
+              &blob,
+              pContext);
+
+  if (!pContext)
+    goto error;
+
+  BOOL result = CertDeleteCertificateFromStore(pContext);
+  CertFreeCertificateContext(pContext);
+  ALLOCV_END(vThumbprint);
+
+  if (result)
+    return Qtrue;
+  else
+    return Qfalse;
+
+error:
+
+  CertFreeCertificateContext(pContext);
+
+  sprintf(errBuf, "Cannot find certificates with thumbprint(%S)", winThumbprint);
+  rb_raise(rb_eCertLoaderError, errBuf);
+}
+
 static VALUE
 rb_win_certstore_loader_export_pfx(VALUE self, VALUE rb_thumbprint, VALUE rb_password)
 {
@@ -316,5 +406,7 @@ Init_certstore_loader(VALUE rb_mCertstore)
   rb_define_method(rb_cCertLoader, "initialize", rb_win_certstore_loader_initialize, 2);
   rb_define_method(rb_cCertLoader, "each", rb_win_certstore_loader_each, 0);
   rb_define_method(rb_cCertLoader, "find_cert", rb_win_certstore_loader_find_certificate, 1);
+  rb_define_method(rb_cCertLoader, "delete_cert", rb_win_certstore_loader_delete_certificate, 1);
+  rb_define_method(rb_cCertLoader, "add_cert", rb_win_certstore_loader_add_certificate, 1);
   rb_define_method(rb_cCertLoader, "export_pfx", rb_win_certstore_loader_export_pfx, 2);
 }

data/lib/certstore/openssl/loader.rb

@@ -60,6 +60,18 @@ module Certstore
       def valid_duration?(x509_obj)
         x509_obj.not_before < Time.now.utc && x509_obj.not_after > Time.now.utc
       end
+
+      def add_certificate(cert_path)
+        File.readable?(cert_path)
+        File.open(cert_path) do |file|
+          @loader.add_cert(::OpenSSL::X509::Certificate.new(file.read).to_der)
+        end
+      end
+
+      def delete_certificate(thumbprint)
+        thumbprint = cleanup_thumbprint(thumbprint)
+        @loader.delete_cert(thumbprint)
+      end
     end
   end
 end

data/lib/certstore/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Certstore
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: certstore_c
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-04 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,7 +86,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.3
-description: Windows CertStore loader.
+description: Windows CertStore loader and ruby-openssl extension for TLS connection.
 email:
 - cosmo0920.wp@gmail.com
 executables: []
@@ -139,5 +139,5 @@ rubyforge_project:
 rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
-summary: Windows CertStore loader.
+summary: Windows CertStore loader and ruby-openssl extension for TLS connection.
 test_files: []