Merge pull request #2373 from mpalmer/more-error-messages

Add some more generic error messages

include/types.h

@@ -535,6 +535,10 @@ typedef enum parser_rc
   PARSER_TOKEN_LENGTH         = -35,
   PARSER_INSUFFICIENT_ENTROPY = -36,
   PARSER_PKZIP_CT_UNMATCHED   = -37,
+  PARSER_KEY_SIZE             = -38,
+  PARSER_BLOCK_SIZE           = -39,
+  PARSER_CIPHER               = -40,
+  PARSER_FILE_SIZE            = -41,
   PARSER_UNKNOWN_ERROR        = -255
 
 } parser_rc_t;

src/shared.c

@@ -53,6 +53,10 @@ static const char *PA_034 = "Token encoding exception";
 static const char *PA_035 = "Token length exception";
 static const char *PA_036 = "Insufficient entropy exception";
 static const char *PA_037 = "Hash contains unsupported compression type for current mode";
+static const char *PA_038 = "Invalid key size";
+static const char *PA_039 = "Invalid block size";
+static const char *PA_040 = "Invalid or unsupported cipher";
+static const char *PA_041 = "Invalid filesize";
 static const char *PA_255 = "Unknown error";
 
 static const char *OPTI_STR_OPTIMIZED_KERNEL     = "Optimized-Kernel";
@@ -1022,6 +1026,10 @@ const char *strparser (const u32 parser_status)
     case PARSER_TOKEN_LENGTH:         return PA_035;
     case PARSER_INSUFFICIENT_ENTROPY: return PA_036;
     case PARSER_PKZIP_CT_UNMATCHED:   return PA_037;
+    case PARSER_KEY_SIZE:             return PA_038;
+    case PARSER_BLOCK_SIZE:           return PA_039;
+    case PARSER_CIPHER:               return PA_040;
+    case PARSER_FILE_SIZE:            return PA_041;
   }
 
   return PA_255;