WL5602

Author: Kristofer Pettersson

include/crypt_genhash_impl.h

@@ -20,12 +20,12 @@ int extract_user_salt(char **salt_begin,
                       char **salt_end);
 C_MODE_START
 char *
-crypt_genhash_impl(char *ctbuffer,
-                   size_t ctbufflen,
-                   const char *plaintext,
-                   int plaintext_len,
-                   const char *switchsalt,
-                   const char **params);
+my_crypt_genhash(char *ctbuffer,
+                 size_t ctbufflen,
+                 const char *plaintext,
+                 int plaintext_len,
+                 const char *switchsalt,
+                 const char **params);
 void generate_user_salt(char *buffer, int buffer_len);
 void xor_string(char *to, int to_len, char *pattern, int pattern_len);
 

mysql-test/suite/sys_vars/r/all_vars.result

@@ -10,9 +10,5 @@ There should be *no* long test name listed below:
 select variable_name as `There should be *no* variables listed below:` from t2
 left join t1 on variable_name=test_name where test_name is null ORDER BY variable_name;
 There should be *no* variables listed below:
-SHA256_PASSWORD_PRIVATE_KEY_PATH
-SHA256_PASSWORD_PRIVATE_KEY_PATH
-SHA256_PASSWORD_PUBLIC_KEY_PATH
-SHA256_PASSWORD_PUBLIC_KEY_PATH
 drop table t1;
 drop table t2;

sql-common/crypt_genhash_impl.cc

@@ -6,11 +6,12 @@
 #include <sha.hpp>
 #include <openssl/ssl.h>
 #else
-#include <sys/types.h>
 #include <openssl/sha.h>
 #include <openssl/rand.h>
 #endif
 
+#include "crypt_genhash_impl.h"
+
 /* Pre VS2010 compilers doesn't support stdint.h */
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
@@ -23,12 +24,10 @@ typedef unsigned char uint8_t;
 #endif
 #endif // !HAVE_STDINT_H
 
-#include <errno.h>
-#include <string.h>
 #include <time.h>
-#include <limits.h>
+#include <string.h>
+
 
-#include "crypt_genhash_impl.h"
 
 #ifndef HAVE_YASSL
 #define	DIGEST_CTX	SHA256_CTX
@@ -64,12 +63,6 @@ static const char crypt_alg_magic[] = "$5";
 #ifndef MIN
 #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
 #endif
-#ifndef B_FALSE
-#define B_FALSE 0
-#endif
-#ifndef B_TRUE
-#define B_TRUE 1
-#endif
 
 
 /**
@@ -123,8 +116,6 @@ static unsigned char b64t[] =		/* 0 ... 63 => ascii - 64 */
 #define	ROUNDS		"rounds="
 #define	ROUNDSLEN	(sizeof (ROUNDS) - 1)
 
-typedef bool boolean_t;
-
 /**
   Get the integer value after rounds= where ever it occurs in the string.
   if the last char after the int is a , or $ that is fine anything else is an
@@ -231,10 +222,16 @@ const char *sha256_find_digest(char *pass)
  * "Released into the Public Domain by Ulrich Drepper <drepper@redhat.com>."
  */
 
+/*
+  Due to a Solaris namespace bug DS is a reserved word. To work around this
+  DS is undefined.
+*/
+#undef DS
+
 /* ARGSUSED4 */
 extern "C"
 char *
-crypt_genhash_impl(char *ctbuffer,
+my_crypt_genhash(char *ctbuffer,
                    size_t ctbufflen,
                    const char *plaintext,
                    int plaintext_len,
@@ -250,7 +247,7 @@ crypt_genhash_impl(char *ctbuffer,
   DIGEST_CTX ctxA, ctxB, ctxC, ctxDP, ctxDS;
   int rounds = ROUNDS_DEFAULT;
   int srounds = 0;
-  boolean_t custom_rounds = B_FALSE;
+  bool custom_rounds= false;
   char *p;
   char *P, *Pp;
   char *S, *Sp;
@@ -267,7 +264,7 @@ crypt_genhash_impl(char *ctbuffer,
   srounds = getrounds(salt);
   if (srounds != 0) {
           rounds = MAX(ROUNDS_MIN, MIN(srounds, ROUNDS_MAX));
-          custom_rounds = B_TRUE;
+          custom_rounds= true;
           p = strchr(salt, '$');
           if (p != NULL)
                   salt = p + 1;

sql/password.c

@@ -407,7 +407,7 @@ void my_make_scrambled_password(char *to, const char *password,
   char salt[CRYPT_SALT_LENGTH + 1];
 
   generate_user_salt(salt, CRYPT_SALT_LENGTH + 1);
-  crypt_genhash_impl(to,
+  my_crypt_genhash(to,
                      CRYPT_MAX_PASSWORD_SIZE,
                      password,
                      pass_len,

sql/sql_acl.cc

@@ -11061,7 +11061,7 @@ static int sha256_password_authenticate(MYSQL_PLUGIN_VIO *vio,
   }
 
   /* Create hash digest */
-  crypt_genhash_impl(stage2,
+  my_crypt_genhash(stage2,
                      CRYPT_MAX_PASSWORD_SIZE,
                      (char *) pkt,
                      pkt_len-1,