List:Commits« Previous MessageNext Message »
From:Nirbhay Choubey Date:February 14 2012 10:52am
Subject:bzr push into mysql-trunk branch (nirbhay.choubey:3747 to 3748) WL#5605
View as plain text  
 3748 Nirbhay Choubey	2012-02-14
      WL#5605 : Assert that MySQL uses an approved random
                number generator
      
      Fix for build failure on Windows and GPLicense info.

    modified:
      include/my_rnd.h
      sql/my_rnd.cc
 3747 Nirbhay Choubey	2012-02-13
      WL#5605 : Assert that MySQL uses an approved random
                number generator
      
      Reverted the changes done in pre-4.1 authentication
      methods as the old auth algorithm rely on seeded
      random number generator.

    modified:
      sql/password.c
=== modified file 'include/my_rnd.h'
--- a/include/my_rnd.h	2012-02-10 08:20:50 +0000
+++ b/include/my_rnd.h	2012-02-14 10:50:45 +0000
@@ -2,7 +2,7 @@
 #define MY_RANDOM_INCLUDED
 
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,7 +21,8 @@
   A wrapper to use OpenSSL/YaSSL PRNGs.
 */
 
-#include <mysql.h>
+#include <my_global.h>
+#include <mysql_com.h>
 #include <limits.h>
 
 #ifdef __cplusplus

=== modified file 'sql/my_rnd.cc'
--- a/sql/my_rnd.cc	2012-02-10 08:20:50 +0000
+++ b/sql/my_rnd.cc	2012-02-14 10:50:45 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 #define RAND_bytes yaRAND_bytes
 #endif /* YASSL_PREFIX */
 
-#include <../extra/yassl/include/openssl/ssl.h>
+#include <openssl/ssl.h>
 
 #elif defined(HAVE_OPENSSL)
 #include <openssl/rand.h>
@@ -59,7 +59,7 @@ double my_rnd_ssl(struct rand_struct *ra
   rc= yaSSL::RAND_bytes((unsigned char *) &res, sizeof (unsigned int));
 #else
   rc= RAND_bytes((unsigned char *) &res, sizeof (unsigned int));
-#endif
+#endif /* HAVE_YASSL */
 
   if (rc)
     return (double)res / (double)UINT_MAX;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (nirbhay.choubey:3747 to 3748) WL#5605Nirbhay Choubey14 Feb