From: Date: September 22 2005 12:19pm
Subject: bk commit into 5.0 tree (msvensson:1.1944) BUG#13164
List-Archive: http://lists.mysql.com/internals/30197
X-Bug: 13164
Message-Id: <20050922101915.2572F25DF2E@blaudden.homeip.net>

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1944 05/09/22 12:19:09 msvensson@neptunus.(none) +1 -0
  Bug #13164  yassl: "SSL connection error" on several platforms
   - it's a requirement fo yaSSL that either /dev/urandom or /dev/random is available on the target system.
   - Added a fix that tries to open /dev/random if /dev/urandom is not available.

  extra/yassl/taocrypt/src/random.cpp
    1.6 05/09/22 12:19:05 msvensson@neptunus.(none) +4 -0
    Try to open /dev/ranom if /dev/urandom is not available.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug13164/my50-bug13164

--- 1.5/extra/yassl/taocrypt/src/random.cpp	2005-07-01 17:00:55 +02:00
+++ 1.6/extra/yassl/taocrypt/src/random.cpp	2005-09-22 12:19:05 +02:00
@@ -95,7 +95,11 @@
 {
     fd_ = open("/dev/urandom",O_RDONLY);
     if (fd_ == -1)
+    {
+      fd_ = open("/dev/random",O_RDONLY);
+      if (fd_ == -1)
         error_.SetError(OPEN_RAN_E);
+    }
 }