openssl_rsa_pss_verify 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af0176c1dba9f84f2f57ea4eb05049f8fc6bf02b
-  data.tar.gz: 95b797966ec7f45481703f74d957fd4663be3c5d
+  metadata.gz: e663505c105b6385aeef89f9e4aea3ba5a1b708c
+  data.tar.gz: ee40c100e8ddc9a36c6cdf3da3f91c8bd792e042
 SHA512:
-  metadata.gz: efe83c77ad8ee6469ebce3b77ab1ec5a461b8469c69109cc46ef360f45934b5da9aed9dc92516f641027641c9d147ab043c3ae91470aa70acfdd10ebacc3646b
-  data.tar.gz: fe05719b3f4ffca9cf1e5249d084de42a4151533aad10e95a83130afcb2a3cfa138ec8edab1e443856e5ed88ff1579bb71cba901dfea3c55c69778637ca044dc
+  metadata.gz: 0302ffddae907311bd11cf5512377e3cf58ab63f82c1f9e4fd26872120622844dca6c9977603764911dd22d83b4c3a0153622da465abfee84327a50e3fc9d29b
+  data.tar.gz: 375d73cd12f52f8ba9f33acafa111d0f539cd4e024232694344b9becc808a9657bff8735fc0b247427ce863b3526d201b64cc476af99180e2ce8f82c3c87f564

data/Gemfile.lock

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

data/ext/openssl_rsa_pss_verify/openssl_rsa_pss_verify_ext.c

@@ -16,6 +16,9 @@ static VALUE rb_mPKey;
 static VALUE rb_cRSA;
 static VALUE rb_cRSAError;
 
+#define ORPV_MAX_ERRS 10
+#define OSSL_ERR_STR_LEN 120
+
 enum ORPV_errors {
   OK,
   EXTERNAL,
@@ -31,11 +34,36 @@ enum ORPV_errors {
   SET_SALTLEN,
 };
 
-#define BIND_ERR_STR(str_p) \
-  if (ERR_peek_error()) ERR_error_string(ERR_get_error(), (str_p));
+static void bind_err_strs(char * strs, int max) {
+  int i;
+  char last_err[OSSL_ERR_STR_LEN] = "";
+
+  if (! ERR_peek_error()) {
+    strcat(strs, "[no internal OpenSSL error was flagged]");
+    return;
+  }
+
+  for(i = 0; ERR_peek_error() && i < max - 1; ++i) {
+    strncat(strs, ERR_error_string(ERR_get_error(), NULL), OSSL_ERR_STR_LEN);
+    strcat(strs, "\n");
+  }
+
+  if (i == (max-1) && ERR_peek_error()) {
+    strncat(last_err, ERR_error_string(ERR_get_error(), NULL), OSSL_ERR_STR_LEN);
+    
+    if (ERR_peek_error()) {
+      // Still yet another error past max
+      strcat(strs, "\n[additional errors truncated]");
+      while(ERR_get_error());
+    } else {
+      strcat(strs, "\n");
+      strcat(strs, last_err);
+    }
+  }
+}
 
 
-VALUE ORPV__verify_pss_sha1(VALUE self, VALUE vPubKey, VALUE vSig, VALUE vHashData, VALUE vSaltLen) {
+static VALUE ORPV__verify_pss_sha1(VALUE self, VALUE vPubKey, VALUE vSig, VALUE vHashData, VALUE vSaltLen) {
   enum ORPV_errors err = OK;
 
   BIO * pkey_bio = NULL;
@@ -45,7 +73,7 @@ VALUE ORPV__verify_pss_sha1(VALUE self, VALUE vPubKey, VALUE vSig, VALUE vHashDa
   char * pub_key = NULL;
   
   int verify_rval = -1, salt_len;
-  char ossl_err_str[120] = "[no internal OpenSSL error was flagged]";
+  char ossl_err_strs[(OSSL_ERR_STR_LEN + 2) * ORPV_MAX_ERRS] = "";
 
   if (ERR_peek_error()) {
     err = EXTERNAL;
@@ -139,14 +167,14 @@ Cleanup:
         case 0:
           return Qfalse;
         default:
-          BIND_ERR_STR(ossl_err_str)
-          rb_raise(rb_cRSAError, "An error occurred during validation.\n%s", ossl_err_str);
+          bind_err_strs(ossl_err_strs, ORPV_MAX_ERRS);
+          rb_raise(rb_cRSAError, "An error occurred during validation.\n%s", ossl_err_strs);
       }
       break;
 
     case EXTERNAL:
-      BIND_ERR_STR(ossl_err_str);
-      rb_raise(rb_eRuntimeError, "OpenSSL was in an error state prior to invoking this verification.\n%s", ossl_err_str);
+      bind_err_strs(ossl_err_strs, ORPV_MAX_ERRS);
+      rb_raise(rb_eRuntimeError, "OpenSSL was in an error state prior to invoking this verification.\n%s", ossl_err_strs);
       break;
     case KEY_OVERFLOW:
       rb_raise(rb_cRSAError, "Your public key is too big. How is that even possible?");
@@ -155,40 +183,40 @@ Cleanup:
       rb_raise(rb_const_get_at(rb_mErrno, rb_intern("ENOMEM")), "Insufficient memory to allocate pubkey copy. Woof.");
       break;
     case PUBKEY_PARSE:
-      BIND_ERR_STR(ossl_err_str);
-      rb_raise(rb_cRSAError, "Error parsing public key\n%s", ossl_err_str);
+      bind_err_strs(ossl_err_strs, ORPV_MAX_ERRS);
+      rb_raise(rb_cRSAError, "Error parsing public key\n%s", ossl_err_strs);
       break;
     case PKEY_INIT:
-      BIND_ERR_STR(ossl_err_str);
-      rb_raise(rb_cRSAError, "Failed to initialize PKEY\n%s", ossl_err_str);
+      bind_err_strs(ossl_err_strs, ORPV_MAX_ERRS);
+      rb_raise(rb_cRSAError, "Failed to initialize PKEY\n%s", ossl_err_strs);
       break;
     case RSA_ASSIGN:
-      BIND_ERR_STR(ossl_err_str);
-      rb_raise(rb_cRSAError, "Failed to assign RSA object to PKEY\n%s", ossl_err_str);
+      bind_err_strs(ossl_err_strs, ORPV_MAX_ERRS);
+      rb_raise(rb_cRSAError, "Failed to assign RSA object to PKEY\n%s", ossl_err_strs);
       break;
     case PKEY_CTX_INIT:
-      BIND_ERR_STR(ossl_err_str);
-      rb_raise(rb_cRSAError, "Failed to initialize PKEY context.\n%s", ossl_err_str);
+      bind_err_strs(ossl_err_strs, ORPV_MAX_ERRS);
+      rb_raise(rb_cRSAError, "Failed to initialize PKEY context.\n%s", ossl_err_strs);
       break;
     case VERIFY_INIT:
-      BIND_ERR_STR(ossl_err_str);
-      rb_raise(rb_cRSAError, "Failed to initialize verification process.\n%s", ossl_err_str);
+      bind_err_strs(ossl_err_strs, ORPV_MAX_ERRS);
+      rb_raise(rb_cRSAError, "Failed to initialize verification process.\n%s", ossl_err_strs);
       break;
     case SET_SIG_MD:
-      BIND_ERR_STR(ossl_err_str);
-      rb_raise(rb_cRSAError, "Failed to set signature message digest to SHA1.\n%s", ossl_err_str);
+      bind_err_strs(ossl_err_strs, ORPV_MAX_ERRS);
+      rb_raise(rb_cRSAError, "Failed to set signature message digest to SHA1.\n%s", ossl_err_strs);
       break;
     case SET_PADDING:
-      BIND_ERR_STR(ossl_err_str);
-      rb_raise(rb_cRSAError, "Failed to set PSS padding.\n%s", ossl_err_str);
+      bind_err_strs(ossl_err_strs, ORPV_MAX_ERRS);
+      rb_raise(rb_cRSAError, "Failed to set PSS padding.\n%s", ossl_err_strs);
       break;
     case SET_SALTLEN:
-      BIND_ERR_STR(ossl_err_str);
-      rb_raise(rb_cRSAError, "Failed to set salt length.\n%s", ossl_err_str);
+      bind_err_strs(ossl_err_strs, ORPV_MAX_ERRS);
+      rb_raise(rb_cRSAError, "Failed to set salt length.\n%s", ossl_err_strs);
       break;
     default:
-      BIND_ERR_STR(ossl_err_str);
-      rb_raise(rb_eRuntimeError, "Something has gone horribly wrong.\n%s", ossl_err_str);
+      bind_err_strs(ossl_err_strs, ORPV_MAX_ERRS);
+      rb_raise(rb_eRuntimeError, "Something has gone horribly wrong.\n%s", ossl_err_strs);
   }
 
   return Qnil;

data/lib/openssl_rsa_pss_verify/version.rb

@@ -1,3 +1,3 @@
 module OpenSSL_RSA_PSS_Verify
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

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