From 59f503d6436e31a21e2a2f5fffd640253f4147db Mon Sep 17 00:00:00 2001
From: John Jones <jmjatlanta@gmail.com>
Date: Fri, 1 Jun 2018 19:00:48 -0500
Subject: [PATCH] adjust asserts in fc/crypto

---
 src/crypto/elliptic_common.cpp | 4 ++--
 src/crypto/pke.cpp             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/crypto/elliptic_common.cpp b/src/crypto/elliptic_common.cpp
index b736e24..7d8b6ed 100644
--- a/src/crypto/elliptic_common.cpp
+++ b/src/crypto/elliptic_common.cpp
@@ -140,7 +140,7 @@ namespace fc { namespace ecc {
     std::string public_key::to_base58( const public_key_data &key )
     {
       uint32_t check = (uint32_t)sha256::hash(key.data, sizeof(key))._hash[0];
-      assert(key.size() + sizeof(check) == 37);
+      static_assert(sizeof(key) + sizeof(check) == 37, "Elliptic public key size (or its hash) is incorrect");
       array<char, 37> data;
       memcpy(data.data, key.begin(), key.size());
       memcpy(data.begin() + key.size(), (const char*)&check, sizeof(check));
@@ -192,7 +192,7 @@ namespace fc { namespace ecc {
         BN_mod(secexp, secexp, order, ctx);
 
         fc::sha256 secret;
-        assert(BN_num_bytes(secexp) <= int64_t(sizeof(secret)));
+        FC_ASSERT(BN_num_bytes(secexp) <= int64_t(sizeof(secret)));
         auto shift = sizeof(secret) - BN_num_bytes(secexp);
         BN_bn2bin(secexp, ((unsigned char*)&secret)+shift);
         return regenerate( secret );
diff --git a/src/crypto/pke.cpp b/src/crypto/pke.cpp
index 3ec0199..28cd60d 100644
--- a/src/crypto/pke.cpp
+++ b/src/crypto/pke.cpp
@@ -75,13 +75,13 @@ namespace fc {
 
     bool public_key::verify( const sha1& digest, const signature& sig )const
     {
-       assert( sig.size() == 2048/8 );
+       static_assert( sig.size() == 2048/8, "Invalid signature size" );
        return 0 != RSA_verify( NID_sha1, (const uint8_t*)&digest, 20,
                                (uint8_t*)sig.data(), 2048/8, my->rsa );
     }
     bool public_key::verify( const sha256& digest, const signature& sig )const
     {
-       assert( sig.size() == 2048/8 );
+       static_assert( sig.size() == 2048/8, "Invalid signature size" );
        return 0 != RSA_verify( NID_sha256, (const uint8_t*)&digest, 32,
                                (uint8_t*)sig.data(), 2048/8, my->rsa );
     }