From 33787ef39d00958da619d0e6fdec2803ef9aaf9f Mon Sep 17 00:00:00 2001
From: Kevin Froman <beardog@firemail.cc>
Date: Tue, 10 Jul 2018 01:17:30 -0500
Subject: [PATCH] * fixed broken block metadata validation, incorrect time
 integer check and missing size value for encryptType

---
 onionr/onionrutils.py  | 5 +++--
 onionr/onionrvalues.py | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/onionr/onionrutils.py b/onionr/onionrutils.py
index c5b2929c..7f3aa914 100644
--- a/onionr/onionrutils.py
+++ b/onionr/onionrutils.py
@@ -329,6 +329,7 @@ class OnionrUtils:
                         break
                 if i == 'time':
                     if not self.isIntegerString(metadata[i]):
+                        logger.warn('Block metadata time stamp is not integer string')
                         break
             else:
                 # if metadata loop gets no errors, it does not break, therefore metadata is valid
@@ -358,9 +359,9 @@ class OnionrUtils:
         try:
             int(data)
         except ValueError:
-            return True
-        else:
             return False
+        else:
+            return True
 
     def validateID(self, id):
         '''
diff --git a/onionr/onionrvalues.py b/onionr/onionrvalues.py
index b9fd4a2b..b8c36b05 100644
--- a/onionr/onionrvalues.py
+++ b/onionr/onionrvalues.py
@@ -21,4 +21,4 @@
 class OnionrValues:
     def __init__(self):
         self.passwordLength = 20
-        self.blockMetadataLengths = {'meta': 1000, 'sig': 88, 'signer': 64, 'time': 10, 'powRandomToken': '1000'}
\ No newline at end of file
+        self.blockMetadataLengths = {'meta': 1000, 'sig': 88, 'signer': 64, 'time': 10, 'powRandomToken': 1000, 'encryptType': 4}
\ No newline at end of file