Changeset: b71912e8e99c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b71912e8e99c
Modified Files:
common/utils/mcrypt.c
common/utils/mcrypt.h
monetdb5/mal/mal_authorize.h
Branch: default
Log Message:
mcrypt: cleanup signatures
drop stale signatures from mal_authorize, accept size_t since that's the
effective limit and some compilers don't like putting a size_t in an
int.
diffs (134 lines):
diff --git a/common/utils/mcrypt.c b/common/utils/mcrypt.c
--- a/common/utils/mcrypt.c
+++ b/common/utils/mcrypt.c
@@ -52,7 +52,7 @@ mcrypt_getHashAlgorithms(void)
* the MD5 hash of the given string.
*/
char *
-mcrypt_MD5Sum(const char *string, const int len)
+mcrypt_MD5Sum(const char *string, size_t len)
{
unsigned char md[16]; /* should be MD5_DIGEST_LENGTH */
char *ret;
@@ -75,7 +75,7 @@ mcrypt_MD5Sum(const char *string, const
* the SHA-1 hash of the given string.
*/
char *
-mcrypt_SHA1Sum(const char *string, const int len)
+mcrypt_SHA1Sum(const char *string, size_t len)
{
unsigned char md[20]; /* should be SHA_DIGEST_LENGTH */
char *ret;
@@ -98,7 +98,7 @@ mcrypt_SHA1Sum(const char *string, const
* the SHA-224 hash of the given string.
*/
char *
-mcrypt_SHA224Sum(const char *string, const int len)
+mcrypt_SHA224Sum(const char *string, size_t len)
{
unsigned char md[28];
char *ret;
@@ -125,7 +125,7 @@ mcrypt_SHA224Sum(const char *string, con
* the SHA-256 hash of the given string.
*/
char *
-mcrypt_SHA256Sum(const char *string, const int len)
+mcrypt_SHA256Sum(const char *string, size_t len)
{
unsigned char md[32];
char *ret;
@@ -154,7 +154,7 @@ mcrypt_SHA256Sum(const char *string, con
* the SHA-384 hash of the given string.
*/
char *
-mcrypt_SHA384Sum(const char *string, const int len)
+mcrypt_SHA384Sum(const char *string, size_t len)
{
unsigned char md[48];
char *ret;
@@ -187,7 +187,7 @@ mcrypt_SHA384Sum(const char *string, con
* the SHA-512 hash of the given string.
*/
char *
-mcrypt_SHA512Sum(const char *string, const int len)
+mcrypt_SHA512Sum(const char *string, size_t len)
{
unsigned char md[64];
char *ret;
@@ -225,7 +225,7 @@ mcrypt_SHA512Sum(const char *string, con
* the RIPEMD-160 hash of the given string.
*/
char *
-mcrypt_RIPEMD160Sum(const char *string, const int len)
+mcrypt_RIPEMD160Sum(const char *string, size_t len)
{
unsigned char md[20]; /* should be RIPEMD160_DIGEST_LENGTH */
char *ret;
@@ -248,7 +248,7 @@ mcrypt_RIPEMD160Sum(const char *string,
* the by the backend used hash of the given string.
*/
char *
-mcrypt_BackendSum(const char *string, const int len)
+mcrypt_BackendSum(const char *string, size_t len)
{
if (strcmp(MONETDB5_PASSWDHASH, "RIPEMD160") == 0)
return mcrypt_RIPEMD160Sum(string, len);
diff --git a/common/utils/mcrypt.h b/common/utils/mcrypt.h
--- a/common/utils/mcrypt.h
+++ b/common/utils/mcrypt.h
@@ -21,14 +21,14 @@
#define _SEEN_MCRYPT_H 1
char *mcrypt_getHashAlgorithms(void);
-char *mcrypt_MD5Sum(const char *string, const int len);
-char *mcrypt_SHA1Sum(const char *string, const int len);
-char *mcrypt_SHA224Sum(const char *string, const int len);
-char *mcrypt_SHA256Sum(const char *string, const int len);
-char *mcrypt_SHA384Sum(const char *string, const int len);
-char *mcrypt_SHA512Sum(const char *string, const int len);
-char *mcrypt_RIPEMD160Sum(const char *string, const int len);
-char *mcrypt_BackendSum(const char *string, const int len);
+char *mcrypt_MD5Sum(const char *string, size_t len);
+char *mcrypt_SHA1Sum(const char *string, size_t len);
+char *mcrypt_SHA224Sum(const char *string, size_t len);
+char *mcrypt_SHA256Sum(const char *string, size_t len);
+char *mcrypt_SHA384Sum(const char *string, size_t len);
+char *mcrypt_SHA512Sum(const char *string, size_t len);
+char *mcrypt_RIPEMD160Sum(const char *string, size_t len);
+char *mcrypt_BackendSum(const char *string, size_t len);
char *mcrypt_hashPassword(const char *algo, const char *password, const char
*challenge);
#endif
diff --git a/monetdb5/mal/mal_authorize.h b/monetdb5/mal/mal_authorize.h
--- a/monetdb5/mal/mal_authorize.h
+++ b/monetdb5/mal/mal_authorize.h
@@ -43,11 +43,6 @@ mal_export str AUTHrequireAdmin(Client *
mal_export str AUTHrequireAdminOrUser(Client *c, str *username);
mal_export str AUTHinitTables(void);
-mal_export str AUTHMD5Sum(str *ret, str *string, int *len);
-mal_export str AUTHSHA1Sum(str *ret, str *string, int *len);
-mal_export str AUTHRIPEMD160Sum(str *ret, str *string, int *len);
-mal_export str AUTHSHA2Sum(str *ret, str *string, int *len, int *number);
-mal_export str AUTHBackendSum(str *ret, str *string, int *len);
/*
* @-
@@ -63,17 +58,4 @@ mal_export str AUTHBackendSum(str *ret,
*/
mal_export str AUTHunlockVault(str *password);
-/*
- * @-
- * To avoid the password hashes from being sent over the wire in their
- * original format (and allowing repeatability attacks), MAPI starts with
- * sending a challenge with salt. This salt should be appended to the
- * password hash before it is hashed again in order to make the password
- * unreadable for eavesdroppers. The hash algorithm used is specified by
- * the client, and can be chosen from a comma separated list offered by the
- * server through the challenge (protocol >=6). As of protocol version 9
- * the crypt algorithm has been removed.
- */
-mal_export str AUTHgetHashAlgorithms(str *ret);
-
#endif /* _MAL_AUTHORIZE_H */
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
