certstore_c 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f17868bc6c40ee22029b990df5920db1a54c51495d53907d1eeb18b1ff778f23
-  data.tar.gz: '06048cdc00d4e4613a8c9ea7bdc7f08dcec8d1791b4a8a991bbb04b10e12e560'
+  metadata.gz: 181ac6a16240752f4b6ae0b0c9c0eba99404e840bc452e182e5528c908ec0e66
+  data.tar.gz: a856de78f86953d352d8f39d43ae264a2b0698633bf7a262bb1d5a87926c8ba4
 SHA512:
-  metadata.gz: 73b42304e47fce36a05de43bad75eaa39fc102a77fb04409aa95b67d17e1de7fe901ed13a94a6cfa11f944cbb22f16175078da50a8db58d43da742451c53b7f1
-  data.tar.gz: 8680f9c88dfb5cf78788b6bbf89befad5b5f40a05e074a391ba585980efc7b9038e4462368346fc26da94e97869e9cc83062657e4488c6cc166bdcdb7e0757a4
+  metadata.gz: c6b2f662310e81a7f10466bb905328df9c21fc7f0df70b1b7cff508b05267b2febf95eaef5c11baf2a1f1dd0a088a95ed03fe3da349859907dfbe99c3333065f
+  data.tar.gz: 0f5b6f97395ffb962c2902aa9b26f53a94f806e121220a0f9a8d1a78ee8cfad3f15faf2cfdbe43af5b613b1f86b389903c50e84f112c1778fbed276890738a04

data/ext/certstore/certstore.h

@@ -35,11 +35,6 @@ VALUE rb_mCertstore;
 VALUE rb_cCertLoader;
 VALUE rb_eCertLoaderError;
 
-struct CertstoreLoader
-{
-  HCERTSTORE hStore;
-};
-
 void handle_error_code(VALUE self, DWORD errCode);
 void Init_certstore_loader(VALUE rb_mCertstore);
 

data/ext/certstore/extconf.rb

@@ -14,7 +14,7 @@ have_library("crypt32")
 have_func("PFXExportCertStoreEx", "Wincrypt.h")
 
 $LDFLAGS << " -lcrypt32"
-$CFLAGS << " -std=c99 -fPIC -fms-extensions "
+$CFLAGS << " -Wall -std=c99 -fPIC -fms-extensions "
 # $CFLAGS << " -g -O0"
 
 create_makefile("certstore/certstore")

data/ext/certstore/loader.c

@@ -11,6 +11,12 @@
 
 #include <certstore.h>
 
+struct CertstoreLoader
+{
+  HCERTSTORE hStore;
+  PCCERT_CONTEXT pContext;
+};
+
 static void certstore_loader_free(void* certstore);
 
 static const rb_data_type_t rb_win_certstore_loader_type = {
@@ -29,6 +35,8 @@ static void
 certstore_loader_free(void* ptr)
 {
   struct CertstoreLoader* loader = (struct CertstoreLoader*)ptr;
+  if (loader->pContext)
+    CertFreeCertificateContext(loader->pContext);
   if (loader->hStore)
     CertCloseStore(loader->hStore, 0);
 
@@ -42,6 +50,8 @@ rb_win_certstore_loader_alloc(VALUE klass)
   struct CertstoreLoader* loader;
   obj = TypedData_Make_Struct(
     klass, struct CertstoreLoader, &rb_win_certstore_loader_type, loader);
+  loader->hStore = NULL;
+  loader->pContext = NULL;
   return obj;
 }
 
@@ -146,7 +156,6 @@ certificate_context_to_string(PCCERT_CONTEXT pContext)
 
   len = WideCharToMultiByte(CP_UTF8, 0, wszString, -1, NULL, 0, NULL, NULL);
   utf8str = ALLOCV_N(CHAR, vUtf8str, len);
-  len = WideCharToMultiByte(CP_UTF8, 0, wszString, -1, NULL, 0, NULL, NULL);
   WideCharToMultiByte(CP_UTF8, 0, wszString, -1, utf8str, len, NULL, NULL);
   // malloc ((strlen(base64 cert content) + strlen(header) +
   // strlen(footer) + 1(null terminator)) length).
@@ -188,8 +197,10 @@ rb_win_certstore_loader_each_pem(VALUE self)
     self, struct CertstoreLoader, &rb_win_certstore_loader_type, loader);
 
   while ((pContext = CertEnumCertificatesInStore(loader->hStore, pContext)) != NULL) {
+    loader->pContext = pContext;
     VALUE rb_certificate = certificate_context_to_string(pContext);
     rb_yield(rb_certificate);
+    loader->pContext = NULL;
   }
 
   return Qnil;
@@ -203,7 +214,9 @@ rb_win_certstore_loader_dispose(VALUE self)
   TypedData_Get_Struct(
     self, struct CertstoreLoader, &rb_win_certstore_loader_type, loader);
 
-  /* What should we dispose here? */
+  if (loader->pContext)
+    CertFreeCertificateContext(loader->pContext);
+  loader->pContext = NULL;
 
   return Qnil;
 }
@@ -211,14 +224,8 @@ rb_win_certstore_loader_dispose(VALUE self)
 static VALUE
 rb_win_certstore_loader_each(VALUE self)
 {
-  PCCERT_CONTEXT pContext = NULL;
-  struct CertstoreLoader* loader;
-
   RETURN_ENUMERATOR(self, 0, 0);
 
-  TypedData_Get_Struct(
-    self, struct CertstoreLoader, &rb_win_certstore_loader_type, loader);
-
   rb_ensure(
     rb_win_certstore_loader_each_pem, self, rb_win_certstore_loader_dispose, self);
 
@@ -293,7 +300,7 @@ rb_win_certstore_loader_add_certificate(VALUE self, VALUE rb_der_cert_bin_str)
 
   if (CertAddEncodedCertificateToStore(loader->hStore,
                                        X509_ASN_ENCODING,
-                                       RSTRING_PTR(rb_der_cert_bin_str),
+                                       (const BYTE *)RSTRING_PTR(rb_der_cert_bin_str),
                                        RSTRING_LEN(rb_der_cert_bin_str),
                                        CERT_STORE_ADD_NEW,
                                        NULL)) {
@@ -474,7 +481,7 @@ rb_win_certstore_loader_export_pfx(VALUE self, VALUE rb_thumbprint, VALUE rb_pas
   ALLOCV_END(vThumbprint);
   ALLOCV_END(vPassword);
 
-  VALUE rb_str = rb_str_new(pfxPacket.pbData, pfxPacket.cbData);
+  VALUE rb_str = rb_str_new((const char *)pfxPacket.pbData, pfxPacket.cbData);
 
   CryptMemFree(pfxPacket.pbData);
   CertCloseStore(hMemoryStore, CERT_CLOSE_STORE_CHECK_FLAG);

data/lib/certstore/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Certstore
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: certstore_c
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler