diff options
| author | unknown <msvensson@neptunus.(none)> | 2007-02-06 16:28:36 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2007-02-06 16:28:36 +0100 |
| commit | 2544aa7b9fa21a3fd6fd09a9fbaeee399d4c663d (patch) | |
| tree | fd4f2054ede48be0c34797144b581808ff674b1b /mysql-test/r/openssl_1.result | |
| parent | cbace0b7b46b5515ee92ee5313d4a98b6e0232d9 (diff) | |
| download | mariadb-git-2544aa7b9fa21a3fd6fd09a9fbaeee399d4c663d.tar.gz | |
Bug#25988 openssl_1 Test Case Fails
- Small difference in output from 'X509_NAME_Oneline' between OpenSSL and yaSSL. OpenSSL uses
an extension that allow's the email adress of the cert holder.
- Imported patch for yaSSL "add email to DN output"
extra/yassl/taocrypt/src/asn.cpp:
Import patch yassl.diff
mysql-test/r/openssl_1.result:
Update result file
mysql-test/t/openssl_1.test:
Update test to include "emailAddress=" tag in the required SUBJECT for grant.
Diffstat (limited to 'mysql-test/r/openssl_1.result')
| -rw-r--r-- | mysql-test/r/openssl_1.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/openssl_1.result b/mysql-test/r/openssl_1.result index 914fe25119f..34d8e3ab768 100644 --- a/mysql-test/r/openssl_1.result +++ b/mysql-test/r/openssl_1.result @@ -3,8 +3,8 @@ create table t1(f1 int); insert into t1 values (5); grant select on test.* to ssl_user1@localhost require SSL; grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA"; -grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB"; -grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB"; +grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer@mysql.com"; +grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer@mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB"; grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx"; flush privileges; connect(localhost,ssl_user5,,test,MASTER_PORT,MASTER_SOCKET); |