Attachment #73455 for bug #113399




  0,          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
};

const char* crypto_hash_name_arr[CRYPTO_HASH_COUNT] = {
  "None",
  "MD5",
  "SHA-1",
  "RIPEMD-160",
  "SHA-512",
  "SHA-384",
  "SHA-256"
};

const char* crypto_name(const char** tab, int count, int v) {
  if ( v < 0 || v >= count) return "Unkown";
  return tab[v];
    if ( (int)tab[i][0] == v )
      return (char*)(tab[i][1]);
  return "Unknown";
}

unsigned int crypto_name_rev(const char** tab, int count, const char *str) {
  unsigned int i;
  str = &str[strspn(str," \t\n\r")];
  for (i=0; i<count; i++) {
    if ( strncasecmp(tab[i], str, strlen(tab[i])) == 0
        &&  strlen(str) == strlen(tab[i]))
      return i;
      return (int)tab[i][0];
  }
  return 0;
}


Lines 84-92 Link Here

(-)hashsum/hasher/hashcom.h (-3 / +3 lines)
84	CRYPTO_HASH_COUNT /* LEAVE THIS HERE! */	84	CRYPTO_HASH_COUNT /* LEAVE THIS HERE! */
85	} hash_t;	85	} hash_t;
86		86
87	extern const void* crypto_hash_name_arr[CRYPTO_HASH_COUNT][2];	87	extern const char* crypto_hash_name_arr[CRYPTO_HASH_COUNT];
88	extern const char* crypto_name(const void* tab[][2], int count, int v);	88	extern const char* crypto_name(const char** tab, int count, int v);
89	extern unsigned int crypto_name_rev(const void* tab[][2], int count, const char *str);	89	extern unsigned int crypto_name_rev(const char** tab, int count, const char *str);
90	#define crypto_hash_name(HASH_T)\	90	#define crypto_hash_name(HASH_T)\
91	crypto_name(crypto_hash_name_arr, CRYPTO_HASH_COUNT, HASH_T)	91	crypto_name(crypto_hash_name_arr, CRYPTO_HASH_COUNT, HASH_T)
92	#define crypto_hash_name_rev(STR)\	92	#define crypto_hash_name_rev(STR)\

Return to bug 113399

Lines 75-105 Link Here

(-)hashsum/hasher/hashcom.c (-20 / +18 lines)
75	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	75	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
76	};	76	};
77		77
78	const void* crypto_hash_name_arr[CRYPTO_HASH_COUNT][2] = {	78	const char* crypto_hash_name_arr[CRYPTO_HASH_COUNT] = {
79	{(void*)CRYPTO_HASH_NONE, "None"},	79	"None",
80	{(void*)CRYPTO_HASH_MD5, "MD5"},	80	"MD5",
81	{(void*)CRYPTO_HASH_SHA1, "SHA-1"},	81	"SHA-1",
82	{(void*)CRYPTO_HASH_RIPEMD160, "RIPEMD-160"},	82	"RIPEMD-160",
83	{(void*)CRYPTO_HASH_SHA512, "SHA-512"},	83	"SHA-512",
84	{(void*)CRYPTO_HASH_SHA384, "SHA-384"},	84	"SHA-384",
85	{(void*)CRYPTO_HASH_SHA256, "SHA-256"},	85	"SHA-256"
86	};	86	};
87		87
88	const char* crypto_name(const void* tab[][2], int count, int v) {	88	const char* crypto_name(const char** tab, int count, int v) {
89	int i;	89	if ( v < 0 \|\| v >= count) return "Unkown";
90	for (i=0; i<count; i++)	90	return tab[v];
91	if ( (int)tab[i][0] == v )
92	return (char*)(tab[i][1]);
93	return "Unknown";
94	}	91	}
95		92
96	unsigned int crypto_name_rev(const void* tab[][2], int count, const char *str) {	93	unsigned int crypto_name_rev(const char** tab, int count, const char *str) {
97	int i;	94	unsigned int i;
		95	str = &str[strspn(str," \t\n\r")];
98	for (i=0; i<count; i++) {	96	for (i=0; i<count; i++) {
99	str = &str[strspn(str," \t\n\r")];	97	if ( strncasecmp(tab[i], str, strlen(tab[i])) == 0
100	if ( strncasecmp((char)tab[i][1], str, strlen((char)tab[i][1])) == 0	98	&& strlen(str) == strlen(tab[i]))
101	&& strlen(str) == strlen((char*)tab[i][1]))	99	return i;
102	return (int)tab[i][0];
103	}	100	}
104	return 0;	101	return 0;
105	}	102	}
		103