openssl_rsa_pss_verify 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48c4bb71d22cbc145e4979556197252e5a843fd8
-  data.tar.gz: 7a64d7620ba2eefccfb4b112597aad5aec82876e
+  metadata.gz: cfb554544bf4570782eab25d1176881330016c4e
+  data.tar.gz: c01a12c25c075dc9c6605c11f7ce594e3b91b34e
 SHA512:
-  metadata.gz: d509de63265a6db4882985b2c3d3e40ab68f6f880738b7d537ad8e4fe56cef357aea8bb9b3aaab9ae7c5efa43234039f75ef81c27fd268bae591d4bc16e88cbc
-  data.tar.gz: d48eda8588b3bffe41e7e42217dbdb24de8c73e3818aa9558969b3dd8ce456828eaab9b877e0dc37158a50b93962822d9afbbc669130bcee5cf1785721011501
+  metadata.gz: 9efc75ce48e569a316c13a077b0510399162e46071b039ce3a9db0e3f1e1468332d0a6b0dfa91c3b2a0d7b3c133e39b5183e3f3fb2062a0ba3d3feb6afee758e
+  data.tar.gz: dfe8f49cc6f6688cf54392496bc601af61e5161f97d55bea294fafb02dd1349f729c682799acdebd3063e1d29e3c34df8cafe869eb41257d5e0a744b5bb3b698

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openssl_rsa_pss_verify (0.1.0)
+    openssl_rsa_pss_verify (0.1.1)
 
 GEM
   remote: http://rubygems.org/

data/ext/openssl_rsa_pss_verify/openssl_rsa_pss_verify_ext.c

@@ -30,6 +30,10 @@ static enum ORPV_errors {
   SET_SALTLEN,
 } err = OK;
 
+#define BIND_ERR_STR(str_p) \
+  if (ERR_peek_error()) ERR_error_string(ERR_get_error(), (str_p));
+
+
 VALUE ORPV__verify_pss_sha1(VALUE self, VALUE vPubKey, VALUE vSig, VALUE vHashData, VALUE vSaltLen) {
   BIO * pkey_bio = NULL;
   RSA * rsa_pub_key = NULL;
@@ -38,7 +42,7 @@ VALUE ORPV__verify_pss_sha1(VALUE self, VALUE vPubKey, VALUE vSig, VALUE vHashDa
   char * pub_key = NULL;
   
   int verify_rval = -1, salt_len;
-  unsigned long ossl_errcode;
+  char ossl_err_str[120] = "[no internal OpenSSL error was flagged]";
 
   vPubKey = StringValue(vPubKey);
   vSig = StringValue(vSig);
@@ -127,11 +131,8 @@ Cleanup:
         case 0:
           return Qfalse;
         default:
-          ossl_errcode = ERR_get_error();
-          if (ossl_errcode)
-            rb_raise(rb_cRSAError, "%s", ERR_error_string(ossl_errcode, NULL));
-          else
-            rb_raise(rb_cRSAError, "An unknown error occurred during validation.");
+          BIND_ERR_STR(ossl_err_str)
+          rb_raise(rb_cRSAError, "An error occurred during validation.\n%s", ossl_err_str);
       }
       break;
 
@@ -139,34 +140,43 @@ Cleanup:
       rb_raise(rb_cRSAError, "Your public key is too big. How is that even possible?");
       break;
     case NOMEM:
-      rb_raise(rb_const_get_at(rb_mErrno, rb_intern("ENOMEM")), NULL);
+      rb_raise(rb_const_get_at(rb_mErrno, rb_intern("ENOMEM")), "Insufficient memory to allocate pubkey copy. Woof.");
       break;
     case PUBKEY_PARSE:
-      rb_raise(rb_cRSAError, "Error parsing public key");
+      BIND_ERR_STR(ossl_err_str);
+      rb_raise(rb_cRSAError, "Error parsing public key\n%s", ossl_err_str);
       break;
     case PKEY_INIT:
-      rb_raise(rb_cRSAError, "Failed to initialize PKEY");
+      BIND_ERR_STR(ossl_err_str);
+      rb_raise(rb_cRSAError, "Failed to initialize PKEY\n%s", ossl_err_str);
       break;
     case RSA_ASSIGN:
-      rb_raise(rb_cRSAError, "Failed to assign RSA object to PKEY");
+      BIND_ERR_STR(ossl_err_str);
+      rb_raise(rb_cRSAError, "Failed to assign RSA object to PKEY\n%s", ossl_err_str);
       break;
     case PKEY_CTX_INIT:
-      rb_raise(rb_cRSAError, "Failed to initialize PKEY context.");
+      BIND_ERR_STR(ossl_err_str);
+      rb_raise(rb_cRSAError, "Failed to initialize PKEY context.\n%s", ossl_err_str);
       break;
     case VERIFY_INIT:
-      rb_raise(rb_cRSAError, "Failed to initialize verification process.");
+      BIND_ERR_STR(ossl_err_str);
+      rb_raise(rb_cRSAError, "Failed to initialize verification process.\n%s", ossl_err_str);
       break;
     case SET_SIG_MD:
-      rb_raise(rb_cRSAError, "Failed to set signature message digest to SHA1.");
+      BIND_ERR_STR(ossl_err_str);
+      rb_raise(rb_cRSAError, "Failed to set signature message digest to SHA1.\n%s", ossl_err_str);
       break;
     case SET_PADDING:
-      rb_raise(rb_cRSAError, "Failed to set PSS padding.");
+      BIND_ERR_STR(ossl_err_str);
+      rb_raise(rb_cRSAError, "Failed to set PSS padding.\n%s", ossl_err_str);
       break;
     case SET_SALTLEN:
-      rb_raise(rb_cRSAError, "Failed to set salt length.");
+      BIND_ERR_STR(ossl_err_str);
+      rb_raise(rb_cRSAError, "Failed to set salt length.\n%s", ossl_err_str);
       break;
     default:
-      rb_raise(rb_eRuntimeError, "Something has gone horribly wrong.");
+      BIND_ERR_STR(ossl_err_str);
+      rb_raise(rb_eRuntimeError, "Something has gone horribly wrong.\n%s", ossl_err_str);
   }
 
   return Qnil;

data/lib/openssl_rsa_pss_verify/version.rb

@@ -1,3 +1,3 @@
 module OpenSSL_RSA_PSS_Verify
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openssl_rsa_pss_verify
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jon Distad