RubyGems - certstore_c - Versions diffs - 0.1.4 → 0.1.5 - Mend

certstore_c 0.1.4 → 0.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

checksums.yaml +4 -4
data/.clang-format +5 -0
data/README.md +2 -2
data/certstore_c.gemspec +2 -2
data/ext/certstore/certstore.h +9 -10
data/ext/certstore/certstore_util.c +9 -22
data/ext/certstore/loader.c +241 -172
data/lib/certstore/version.rb +1 -1
metadata +6 -5

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0910066063e5a1d4bbfeb144a111b6c14f663959aa52eef2e3eed7fa0b024d41'
-  data.tar.gz: b964fbfaa33f0a75cbc3df611fa7ea141870f8a2cf5791d4ffa2264067df0567
+  metadata.gz: f17868bc6c40ee22029b990df5920db1a54c51495d53907d1eeb18b1ff778f23
+  data.tar.gz: '06048cdc00d4e4613a8c9ea7bdc7f08dcec8d1791b4a8a991bbb04b10e12e560'
 SHA512:
-  metadata.gz: 5403938369f1e51832e2b299bbb08df72efb5fc7f676b17a92bb7c63836a402480503311b26ed409a07cf4ba2ca5400492c2333b79662cdb47389b4d3971d85d
-  data.tar.gz: c04387a545822a2af1c9a6fb1ff2d49dbc92a0eb09cd71e335a320754e7f4418fdc8c715475a951f27eab65d18248e0417b6367e8341a758487896e028fe3b5e
+  metadata.gz: 73b42304e47fce36a05de43bad75eaa39fc102a77fb04409aa95b67d17e1de7fe901ed13a94a6cfa11f944cbb22f16175078da50a8db58d43da742451c53b7f1
+  data.tar.gz: 8680f9c88dfb5cf78788b6bbf89befad5b5f40a05e074a391ba585980efc7b9038e4462368346fc26da94e97869e9cc83062657e4488c6cc166bdcdb7e0757a4

data/.clang-format ADDED Viewed

@@ -0,0 +1,5 @@
+BasedOnStyle: Mozilla
+ColumnLimit: 90
+BinPackParameters: true
+BinPackArguments: false
+AllowShortCaseLabelsOnASingleLine: false

data/README.md CHANGED Viewed

@@ -1,6 +1,6 @@
 # Certstore
-[![Build status](https://ci.appveyor.com/api/projects/status/0iukmyau7wq971o4/branch/master?svg=true)](https://ci.appveyor.com/project/cosmo0920/certstore-c/branch/master)
+[![Build status](https://ci.appveyor.com/api/projects/status/ecis54vyb81aset5/branch/master?svg=true)](https://ci.appveyor.com/project/cosmo0920/certstore-c-xbglu/branch/master)
 ## Prerequisites
@@ -36,4 +36,4 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 ## Contributing
-Bug reports and pull requests are welcome on GitHub at https://github.com/cosmo0920/certstore_c.
+Bug reports and pull requests are welcome on GitHub at https://github.com/fluent-plugins-nursery/certstore_c.

data/certstore_c.gemspec CHANGED Viewed

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   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"
+  spec.homepage      = "https://github.com/fluent-plugins-nursery/certstore_c"
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
     spec.metadata["allowed_push_host"] = "https://rubygems.org"
     spec.metadata["homepage_uri"] = spec.homepage
-    spec.metadata["source_code_uri"] = "https://github.com/cosmo0920/certstore_c"
+    spec.metadata["source_code_uri"] = "https://github.com/fluent-plugins-nursery/certstore_c"
   else
     raise "RubyGems 2.0 or newer is required to protect against " \
       "public gem pushes."

data/ext/certstore/certstore.h CHANGED Viewed

@@ -16,18 +16,17 @@
 #include <ruby/encoding.h>
 #ifdef __GNUC__
-# include <w32api.h>
-# define MINIMUM_WINDOWS_VERSION WindowsVista
-#else /* __GNUC__ */
-# define MINIMUM_WINDOWS_VERSION 0x0600 /* Vista */
-#endif /* __GNUC__ */
+#include <w32api.h>
+#define MINIMUM_WINDOWS_VERSION WindowsVista
+#else                                  /* __GNUC__ */
+#define MINIMUM_WINDOWS_VERSION 0x0600 /* Vista */
+#endif                                 /* __GNUC__ */
 #ifdef _WIN32_WINNT
-#  undef _WIN32_WINNT
+#undef _WIN32_WINNT
 #endif /* WIN32_WINNT */
 #define _WIN32_WINNT MINIMUM_WINDOWS_VERSION
-#define CERT_THUMBPRINT_STR_LENGTH 40
 #define CERT_THUMBPRINT_SIZE (160 / 8)
 #include <wincrypt.h>
@@ -36,12 +35,12 @@ VALUE rb_mCertstore;
 VALUE rb_cCertLoader;
 VALUE rb_eCertLoaderError;
-struct CertstoreLoader {
+struct CertstoreLoader
+{
   HCERTSTORE hStore;
 };
-TCHAR* handle_error_code(VALUE self, DWORD errCode);
-char* wstr_to_mbstr(UINT cp, const WCHAR *wstr, int clen);
+void handle_error_code(VALUE self, DWORD errCode);
 void Init_certstore_loader(VALUE rb_mCertstore);
 #endif // _WINEVT_H

data/ext/certstore/certstore_util.c CHANGED Viewed

@@ -11,35 +11,22 @@
 #include <certstore.h>
-char*
-wstr_to_mbstr(UINT cp, const WCHAR *wstr, int clen)
-{
-    char *ptr;
-    int len = WideCharToMultiByte(cp, 0, wstr, clen, NULL, 0, NULL, NULL);
-    if (!(ptr = xmalloc(len))) return NULL;
-    WideCharToMultiByte(cp, 0, wstr, clen, ptr, len, NULL, NULL);
-    return ptr;
-}
-TCHAR*
+void
 handle_error_code(VALUE self, DWORD errCode)
 {
   DWORD ret;
-  static TCHAR buffer[1024];
+  CHAR buffer[1024];
-  ret = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
-                      NULL,
-                      errCode,
-                      MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
-                      buffer,
-                      sizeof(buffer)/sizeof(buffer[0]),
-                      NULL);
+  ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM,
+                       NULL,
+                       errCode,
+                       MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
+                       buffer,
+                       sizeof(buffer) / sizeof(buffer[0]),
+                       NULL);
   if (ret) {
     rb_ivar_set(self, rb_intern("@error_code"), INT2NUM(errCode));
     rb_ivar_set(self, rb_intern("@error_message"), rb_utf8_str_new_cstr(buffer));
   }
-  return buffer;
 }

data/ext/certstore/loader.c CHANGED Viewed

@@ -10,21 +10,25 @@
 /* limitations under the License. */
 #include <certstore.h>
-#include <tchar.h>
-static void certstore_loader_free(void *certstore);
+static void certstore_loader_free(void* certstore);
 static const rb_data_type_t rb_win_certstore_loader_type = {
-  "winevt/certstore_loader", {
-    0, certstore_loader_free, 0,
-  }, NULL, NULL,
+  "winevt/certstore_loader",
+  {
+    0,
+    certstore_loader_free,
+    0,
+  },
+  NULL,
+  NULL,
   RUBY_TYPED_FREE_IMMEDIATELY
 };
 static void
-certstore_loader_free(void *ptr)
+certstore_loader_free(void* ptr)
 {
-  struct CertstoreLoader *loader = (struct CertstoreLoader *)ptr;
+  struct CertstoreLoader* loader = (struct CertstoreLoader*)ptr;
   if (loader->hStore)
     CertCloseStore(loader->hStore, 0);
@@ -35,11 +39,9 @@ static VALUE
 rb_win_certstore_loader_alloc(VALUE klass)
 {
   VALUE obj;
-  struct CertstoreLoader *loader;
-  obj = TypedData_Make_Struct(klass,
-                              struct CertstoreLoader,
-                              &rb_win_certstore_loader_type,
-                              loader);
+  struct CertstoreLoader* loader;
+  obj = TypedData_Make_Struct(
+    klass, struct CertstoreLoader, &rb_win_certstore_loader_type, loader);
   return obj;
 }
@@ -47,55 +49,62 @@ static VALUE
 rb_win_certstore_loader_initialize(VALUE self, VALUE store_name, VALUE use_enterprise)
 {
   VALUE vStoreName;
-  struct CertstoreLoader *loader;
+  struct CertstoreLoader* loader;
   DWORD len;
   DWORD errCode;
-  TCHAR buffer[1024];
-  TCHAR errBuffer[1132];
+  CHAR buffer[1024];
   DWORD ret;
   Check_Type(store_name, T_STRING);
   // store_name : To wide char
-  len = MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(store_name), RSTRING_LEN(store_name), NULL, 0);
-  PWSTR winStoreName = ALLOCV_N(WCHAR, vStoreName, len+1);
-  MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(store_name), RSTRING_LEN(store_name), winStoreName, len);
+  len = MultiByteToWideChar(
+    CP_UTF8, 0, RSTRING_PTR(store_name), RSTRING_LEN(store_name), NULL, 0);
+  PWSTR winStoreName = ALLOCV_N(WCHAR, vStoreName, len + 1);
+  MultiByteToWideChar(
+    CP_UTF8, 0, RSTRING_PTR(store_name), RSTRING_LEN(store_name), winStoreName, len);
   winStoreName[len] = L'\0';
-  TypedData_Get_Struct(self, struct CertstoreLoader, &rb_win_certstore_loader_type, loader);
+  TypedData_Get_Struct(
+    self, struct CertstoreLoader, &rb_win_certstore_loader_type, loader);
   if (RTEST(use_enterprise)) {
-    loader->hStore = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE, winStoreName);
+    loader->hStore = CertOpenStore(CERT_STORE_PROV_SYSTEM,
+                                   0,
+                                   0,
+                                   CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE,
+                                   winStoreName);
   } else {
-    loader->hStore = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_LOCAL_MACHINE, winStoreName);
+    loader->hStore = CertOpenStore(
+      CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_LOCAL_MACHINE, winStoreName);
   }
+  ALLOCV_END(vStoreName);
   errCode = GetLastError();
   switch (errCode) {
-  case ERROR_SUCCESS:
-    break;
-  case ERROR_ACCESS_DENIED: {
-    ALLOCV_END(vStoreName);
-    ret = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
-                        NULL,
-                        errCode,
-                        MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
-                        buffer,
-                        sizeof(buffer)/sizeof(buffer[0]),
-                        NULL);
-    if (ret) {
-      _snprintf_s(errBuffer, 1024, _TRUNCATE,
-                  "cannot access specified logical store. Perhaps you should do as an administrator. ErrorCode: %d, Message: %s",
-                  errCode,
-                  buffer);
-      rb_raise(rb_eCertLoaderError, errBuffer);
+    case ERROR_SUCCESS:
+      break;
+    case ERROR_ACCESS_DENIED: {
+      ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM,
+                           NULL,
+                           errCode,
+                           MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
+                           buffer,
+                           sizeof(buffer) / sizeof(buffer[0]),
+                           NULL);
+      if (!ret)
+        buffer[0] = '\0';
+      rb_raise(rb_eCertLoaderError,
+               "cannot access specified logical store. Perhaps you should do as an "
+               "administrator. ErrorCode: %lu, Message: %s",
+               errCode,
+               buffer);
+    }
+    default: {
+      handle_error_code(self, errCode);
     }
   }
-  default: {
-    handle_error_code(self, errCode);
-  }
-  }
-  ALLOCV_END(vStoreName);
   return Qnil;
 }
@@ -103,53 +112,66 @@ rb_win_certstore_loader_initialize(VALUE self, VALUE store_name, VALUE use_enter
 static VALUE
 certificate_context_to_string(PCCERT_CONTEXT pContext)
 {
-  WCHAR *wszString;
+  VALUE vWszString;
+  WCHAR* wszString;
   DWORD cchString;
-  CHAR *utf8str;
-  CHAR *certificate;
-  CHAR *certHeader = "-----BEGIN CERTIFICATE-----\n";
-  CHAR *certFooter = "\n-----END CERTIFICATE-----";
+  VALUE vUtf8str;
+  CHAR* utf8str;
+  VALUE vCertificate;
+  CHAR* certificate;
+  CHAR* certHeader = "-----BEGIN CERTIFICATE-----\n";
+  CHAR* certFooter = "\n-----END CERTIFICATE-----";
   CHAR errBuf[256];
   DWORD errCode;
+  DWORD len = 0;
 #ifndef CRYPT_STRING_NOCRLF
-  #define CRYPT_STRING_NOCRLF 0x40000000
+#define CRYPT_STRING_NOCRLF 0x40000000
 #endif
-  if (!CryptBinaryToStringW(pContext->pbCertEncoded, pContext->cbCertEncoded,
+  if (!CryptBinaryToStringW(pContext->pbCertEncoded,
+                            pContext->cbCertEncoded,
                             CRYPT_STRING_BASE64 | CRYPT_STRING_NOCRLF,
-                            NULL, &cchString)) {
+                            NULL,
+                            &cchString)) {
     rb_raise(rb_eCertLoaderError, "cannot obtain certificate string length.");
   }
-  wszString = malloc(sizeof(WCHAR) * cchString);
-  CryptBinaryToStringW(pContext->pbCertEncoded, pContext->cbCertEncoded,
+  wszString = ALLOCV_N(WCHAR, vWszString, cchString);
+  CryptBinaryToStringW(pContext->pbCertEncoded,
+                       pContext->cbCertEncoded,
                        CRYPT_STRING_BASE64 | CRYPT_STRING_NOCRLF,
-                       wszString, &cchString);
-  utf8str = wstr_to_mbstr(CP_UTF8, wszString, -1);
-  // malloc sizeof CHAR * ((base64 cert content + header + footer) length).
-  certificate = malloc(sizeof(CHAR) * (strlen(utf8str) + strlen(certHeader) + strlen(certFooter)));
-  sprintf(certificate, "%s%s%s", certHeader, utf8str, certFooter);
+                       wszString,
+                       &cchString);
+  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).
+  len = strlen(utf8str) + strlen(certHeader) + strlen(certFooter);
+  certificate = ALLOCV_N(CHAR, vCertificate, len + 1);
+  _snprintf_s(certificate, len + 1, len, "%s%s%s", certHeader, utf8str, certFooter);
   errCode = GetLastError();
   if (ERROR_SUCCESS != errCode && CRYPT_E_NOT_FOUND != errCode) {
-    _snprintf_s(errBuf, 256, _TRUNCATE, "ErrorCode(%d)", errCode);
+    _snprintf_s(errBuf, sizeof(errBuf), _TRUNCATE, "ErrorCode(%d)", errCode);
     goto error;
   }
   VALUE rb_pem = rb_utf8_str_new_cstr(certificate);
-  xfree(utf8str);
-  free(wszString);
-  free(certificate);
+  ALLOCV_END(vUtf8str);
+  ALLOCV_END(vWszString);
+  ALLOCV_END(vCertificate);
   return rb_pem;
 error:
-  xfree(utf8str);
-  free(wszString);
-  free(certificate);
+  ALLOCV_END(vUtf8str);
+  ALLOCV_END(vWszString);
+  ALLOCV_END(vCertificate);
   rb_raise(rb_eCertLoaderError, errBuf);
 }
@@ -158,28 +180,28 @@ static VALUE
 rb_win_certstore_loader_each_pem(VALUE self)
 {
   PCCERT_CONTEXT pContext = NULL;
-  struct CertstoreLoader *loader;
+  struct CertstoreLoader* loader;
   RETURN_ENUMERATOR(self, 0, 0);
-  TypedData_Get_Struct(self, struct CertstoreLoader, &rb_win_certstore_loader_type, loader);
+  TypedData_Get_Struct(
+    self, struct CertstoreLoader, &rb_win_certstore_loader_type, loader);
   while ((pContext = CertEnumCertificatesInStore(loader->hStore, pContext)) != NULL) {
     VALUE rb_certificate = certificate_context_to_string(pContext);
     rb_yield(rb_certificate);
   }
-  CertFreeCertificateContext(pContext);
   return Qnil;
 }
 static VALUE
 rb_win_certstore_loader_dispose(VALUE self)
 {
-  struct CertstoreLoader *loader;
+  struct CertstoreLoader* loader;
-  TypedData_Get_Struct(self, struct CertstoreLoader, &rb_win_certstore_loader_type, loader);
+  TypedData_Get_Struct(
+    self, struct CertstoreLoader, &rb_win_certstore_loader_type, loader);
   /* What should we dispose here? */
@@ -190,13 +212,15 @@ static VALUE
 rb_win_certstore_loader_each(VALUE self)
 {
   PCCERT_CONTEXT pContext = NULL;
-  struct CertstoreLoader *loader;
+  struct CertstoreLoader* loader;
   RETURN_ENUMERATOR(self, 0, 0);
-  TypedData_Get_Struct(self, struct CertstoreLoader, &rb_win_certstore_loader_type, loader);
+  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);
+  rb_ensure(
+    rb_win_certstore_loader_each_pem, self, rb_win_certstore_loader_dispose, self);
   return Qnil;
 }
@@ -206,87 +230,88 @@ rb_win_certstore_loader_find_certificate(VALUE self, VALUE rb_thumbprint)
 {
   VALUE vThumbprint;
   PCCERT_CONTEXT pContext = NULL;
-  struct CertstoreLoader *loader;
+  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);
+  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);
+  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;
+  CryptStringToBinaryW(winThumbprint,
+                       0,
+                       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) {
+    rb_raise(
+      rb_eCertLoaderError, "Cannot find certificates with thumbprint(%S)", winThumbprint);
+  }
   VALUE rb_certificate = certificate_context_to_string(pContext);
   CertFreeCertificateContext(pContext);
   ALLOCV_END(vThumbprint);
   return rb_certificate;
-error:
-  CertFreeCertificateContext(pContext);
-  _snprintf_s(errBuf, 256, _TRUNCATE, "Cannot find certificates with thumbprint(%S)", winThumbprint);
-  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];
+  struct CertstoreLoader* loader;
   Check_Type(rb_der_cert_bin_str, T_STRING);
-  TypedData_Get_Struct(self, struct CertstoreLoader, &rb_win_certstore_loader_type, loader);
+  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),
+  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:
-      handle_error_code(self, errCode);
-      return Qfalse;
-    default: {
-      _snprintf_s(errBuf, 256, _TRUNCATE, "Cannot add certificates. ErrorCode: %d", errCode);
-      goto error;
+    switch (errCode) {
+      case CRYPT_E_EXISTS:
+        handle_error_code(self, errCode);
+        return Qfalse;
+      default: {
+        rb_raise(rb_eCertLoaderError, "Cannot add certificates. ErrorCode: %lu", errCode);
       }
     }
   }
   return Qtrue;
-error:
-  rb_raise(rb_eCertLoaderError, errBuf);
 }
 static VALUE
@@ -294,37 +319,49 @@ rb_win_certstore_loader_delete_certificate(VALUE self, VALUE rb_thumbprint)
 {
   VALUE vThumbprint;
   PCCERT_CONTEXT pContext = NULL;
-  struct CertstoreLoader *loader;
+  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);
+  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);
+  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;
+  CryptStringToBinaryW(winThumbprint,
+                       0,
+                       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) {
+    rb_raise(
+      rb_eCertLoaderError, "Cannot find certificates with thumbprint(%S)", winThumbprint);
+  }
   BOOL result = CertDeleteCertificateFromStore(pContext);
   CertFreeCertificateContext(pContext);
@@ -334,13 +371,6 @@ rb_win_certstore_loader_delete_certificate(VALUE self, VALUE rb_thumbprint)
     return Qtrue;
   else
     return Qfalse;
-error:
-  CertFreeCertificateContext(pContext);
-  _snprintf_s(errBuf, 256, _TRUNCATE, "Cannot find certificates with thumbprint(%S)", winThumbprint);
-  rb_raise(rb_eCertLoaderError, errBuf);
 }
 static VALUE
@@ -348,42 +378,59 @@ rb_win_certstore_loader_export_pfx(VALUE self, VALUE rb_thumbprint, VALUE rb_pas
 {
   VALUE vThumbprint;
   PCCERT_CONTEXT pContext = NULL;
-  struct CertstoreLoader *loader;
+  struct CertstoreLoader* loader;
   DWORD len;
   CHAR errBuf[256];
   HCERTSTORE hMemoryStore = NULL;
   VALUE vPassword;
   CRYPT_DATA_BLOB pfxPacket;
-  TypedData_Get_Struct(self, struct CertstoreLoader, &rb_win_certstore_loader_type, loader);
+  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);
+  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';
   // password : To wide char
-  len = MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(rb_password), RSTRING_LEN(rb_password), NULL, 0);
-  WCHAR *winPassword = ALLOCV_N(WCHAR, vPassword, len+1);
-  MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(rb_password), RSTRING_LEN(rb_password), winPassword, len);
+  len = MultiByteToWideChar(
+    CP_UTF8, 0, RSTRING_PTR(rb_password), RSTRING_LEN(rb_password), NULL, 0);
+  WCHAR* winPassword = ALLOCV_N(WCHAR, vPassword, len + 1);
+  MultiByteToWideChar(
+    CP_UTF8, 0, RSTRING_PTR(rb_password), RSTRING_LEN(rb_password), winPassword, len);
   winPassword[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);
+  CryptStringToBinaryW(winThumbprint,
+                       0,
+                       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) {
-    _snprintf_s(errBuf, 256, _TRUNCATE, "Cannot find certificates with thumbprint(%S)", winThumbprint);
+    _snprintf_s(errBuf,
+                sizeof(errBuf),
+                _TRUNCATE,
+                "Cannot find certificates with thumbprint(%S)",
+                winThumbprint);
     goto error;
   }
@@ -392,15 +439,33 @@ rb_win_certstore_loader_export_pfx(VALUE self, VALUE rb_thumbprint, VALUE rb_pas
   CertAddCertificateContextToStore(hMemoryStore, pContext, CERT_STORE_ADD_ALWAYS, NULL);
   pfxPacket.pbData = NULL;
-  if (!PFXExportCertStoreEx(hMemoryStore, &pfxPacket, winPassword, NULL, EXPORT_PRIVATE_KEYS | REPORT_NO_PRIVATE_KEY | REPORT_NOT_ABLE_TO_EXPORT_PRIVATE_KEY)) {
-    _snprintf_s(errBuf, 256, _TRUNCATE, "Cannot export pfx certificate with thumbprint(%S)", winThumbprint);
+  if (!PFXExportCertStoreEx(hMemoryStore,
+                            &pfxPacket,
+                            winPassword,
+                            NULL,
+                            EXPORT_PRIVATE_KEYS | REPORT_NO_PRIVATE_KEY |
+                              REPORT_NOT_ABLE_TO_EXPORT_PRIVATE_KEY)) {
+    _snprintf_s(errBuf,
+                sizeof(errBuf),
+                _TRUNCATE,
+                "Cannot export pfx certificate with thumbprint(%S)",
+                winThumbprint);
     goto error;
   }
   pfxPacket.pbData = (LPBYTE)CryptMemAlloc(pfxPacket.cbData);
-  if (!PFXExportCertStoreEx(hMemoryStore, &pfxPacket, winPassword, NULL, EXPORT_PRIVATE_KEYS | REPORT_NO_PRIVATE_KEY | REPORT_NOT_ABLE_TO_EXPORT_PRIVATE_KEY)) {
-    _snprintf_s(errBuf, 256, _TRUNCATE, "Cannot export pfx certificate with thumbprint(%S)", winThumbprint);
+  if (!PFXExportCertStoreEx(hMemoryStore,
+                            &pfxPacket,
+                            winPassword,
+                            NULL,
+                            EXPORT_PRIVATE_KEYS | REPORT_NO_PRIVATE_KEY |
+                              REPORT_NOT_ABLE_TO_EXPORT_PRIVATE_KEY)) {
+    _snprintf_s(errBuf,
+                sizeof(errBuf),
+                _TRUNCATE,
+                "Cannot export pfx certificate with thumbprint(%S)",
+                winThumbprint);
     CryptMemFree(pfxPacket.pbData);
@@ -433,14 +498,18 @@ void
 Init_certstore_loader(VALUE rb_mCertstore)
 {
   rb_cCertLoader = rb_define_class_under(rb_mCertstore, "Loader", rb_cObject);
-  rb_eCertLoaderError = rb_define_class_under(rb_cCertLoader, "LoaderError", rb_eStandardError);
+  rb_eCertLoaderError =
+    rb_define_class_under(rb_cCertLoader, "LoaderError", rb_eStandardError);
   rb_define_alloc_func(rb_cCertLoader, rb_win_certstore_loader_alloc);
   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, "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);
   rb_ivar_set(rb_cCertLoader, rb_intern("@error_code"), INT2NUM(0));

data/lib/certstore/version.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: certstore_c
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,7 @@ extensions:
 - ext/certstore/extconf.rb
 extra_rdoc_files: []
 files:
+- ".clang-format"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
@@ -114,13 +115,13 @@ files:
 - lib/certstore/loader.rb
 - lib/certstore/openssl/loader.rb
 - lib/certstore/version.rb
-homepage: https://github.com/cosmo0920/certstore_c
+homepage: https://github.com/fluent-plugins-nursery/certstore_c
 licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-  homepage_uri: https://github.com/cosmo0920/certstore_c
-  source_code_uri: https://github.com/cosmo0920/certstore_c
+  homepage_uri: https://github.com/fluent-plugins-nursery/certstore_c
+  source_code_uri: https://github.com/fluent-plugins-nursery/certstore_c
 post_install_message:
 rdoc_options: []
 require_paths: