Merge chanserv-live into default.

[irc/quakenet/newserv.git] / chanserv / chanservcrypto.c

diff --git a/chanserv/chanservcrypto.c b/chanserv/chanservcrypto.c
index 05f70058ac3642fac949a8a25e9e398fb89a2ccb..455b226526c592476d0acfc88828b789adfb0d41 100644 (file)
--- a/chanserv/chanservcrypto.c
+++ b/chanserv/chanservcrypto.c
@@ -65,7 +65,7 @@ void chanservcryptoinit(void) {
   codesecret=combinesecret("codegenerator");
 
   ticketsecret=getcopyconfigitem("chanserv","ticketsecret","",256);
-  if(!ticketsecret || !ticketsecret->content || !ticketsecret->content[0]) {
+  if(!ticketsecret || !ticketsecret->content[0]) {
     Error("chanserv",ERR_WARNING,"Ticket secret not set, ticketauth disabled.");
     freesstring(ticketsecret);
     ticketsecret = NULL;
@@ -119,7 +119,7 @@ int crsha1(char *username, const char *password, const char *challenge, const ch
 
   hmac_printhex(digest, hexbuf, sizeof(digest));
 
-  if(!strcasecmp(hmac_printhex(digest, hexbuf, sizeof(digest)), response))
+  if(!hmac_strcmp(hmac_printhex(digest, hexbuf, sizeof(digest)), response))
     return 1;
 
   return 0;
@@ -148,7 +148,7 @@ int crsha256(char *username, const char *password, const char *challenge, const
   hmacsha256_update(&hmac, (unsigned char *)challenge, strlen(challenge));
   hmacsha256_final(&hmac, digest);
 
-  if(!strcasecmp(hmac_printhex(digest, hexbuf, sizeof(digest)), response))
+  if(!hmac_strcmp(hmac_printhex(digest, hexbuf, sizeof(digest)), response))
     return 1;
 
   return 0;
@@ -177,7 +177,7 @@ int crmd5(char *username, const char *password, const char *challenge, const cha
   hmacmd5_update(&hmac, (unsigned char *)challenge, strlen(challenge));
   hmacmd5_final(&hmac, digest);
 
-  if(!strcasecmp(hmac_printhex(digest, hexbuf, sizeof(digest)), response))
+  if(!hmac_strcmp(hmac_printhex(digest, hexbuf, sizeof(digest)), response))
     return 1;
 
   return 0;
@@ -194,7 +194,7 @@ int crlegacymd5(char *username, const char *password, const char *challenge, con
   MD5Update(&ctx, (unsigned char *)challenge, strlen(challenge));
   MD5Final(digest, &ctx);
 
-  if(!strcasecmp(hmac_printhex(digest, hexbuf, sizeof(digest)), response))
+  if(!hmac_strcmp(hmac_printhex(digest, hexbuf, sizeof(digest)), response))
     return 1;
 
   return 0;
@@ -242,7 +242,7 @@ int cs_checkhashpass(const char *username, const char *password, const char *jun
   MD5Update(&ctx, (unsigned char *)buf, strlen(buf));
   MD5Final(digest, &ctx);
 
-  if(strcasecmp(hash, hmac_printhex(digest, hexbuf, sizeof(digest))))
+  if(hmac_strcmp(hash, hmac_printhex(digest, hexbuf, sizeof(digest))))
     return 0;
 
   return 1;
@@ -286,7 +286,7 @@ int csc_verifyqticket(char *data, char *digest) {
 
   hmac_printhex(digestbuf, hexbuf, sizeof(digestbuf));
 
-  if(!strcasecmp(hexbuf, digest))
+  if(!hmac_strcmp(hexbuf, digest))
     return 0;
 
   return 1;