From: Georgi Kodinov Date: October 5 2010 2:24pm Subject: bzr push into mysql-5.0-bugteam branch (Georgi.Kodinov:2885 to 2887) Bug#56428 List-Archive: http://lists.mysql.com/commits/120007 X-Bug: 56428 Message-Id: <201010051425.o95EP6Bf008764@magare.local> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7905031326484922987==" --===============7905031326484922987== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 2887 Georgi Kodinov 2010-10-05 Bug #56428: Replace copyright notice removed from SHA1 code (.h) modified: include/sha1.h 2886 Georgi Kodinov 2010-10-05 Bug #56427 : Replace copyright notice removed from SHA1 code modified: mysys/sha1.c 2885 Georgi Kodinov 2010-10-05 Disable NDB tests to run by default. modified: mysql-test/lib/mtr_cases.pl mysql-test/mysql-test-run-shell.sh mysql-test/mysql-test-run.pl === modified file 'include/sha1.h' --- a/include/sha1.h 2006-12-31 00:02:27 +0000 +++ b/include/sha1.h 2010-10-05 14:05:37 +0000 @@ -6,12 +6,13 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ /* This is the header file for code which implements the Secure @@ -25,6 +26,38 @@ Please read the file sha1.c for more information. Modified 2002 by Peter Zaitsev to better follow MySQL standards + + Original Source from: http://www.faqs.org/rfcs/rfc3174.html + + Copyright (C) The Internet Society (2001). All Rights Reserved. + + This document and translations of it may be copied and furnished to + others, and derivative works that comment on or otherwise explain it + or assist in its implementation may be prepared, copied, published + and distributed, in whole or in part, without restriction of any + kind, provided that the above copyright notice and this paragraph are + included on all such copies and derivative works. However, this + document itself may not be modified in any way, such as by removing + the copyright notice or references to the Internet Society or other + Internet organizations, except as needed for the purpose of + developing Internet standards in which case the procedures for + copyrights defined in the Internet Standards process must be + followed, or as required to translate it into languages other than + English. + + The limited permissions granted above are perpetual and will not be + revoked by the Internet Society or its successors or assigns. + + This document and the information contained herein is provided on an + "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING + TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING + BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION + HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF + MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + + Acknowledgement + Funding for the RFC Editor function is currently provided by the + Internet Society. */ === modified file 'mysys/sha1.c' --- a/mysys/sha1.c 2007-01-22 12:10:46 +0000 +++ b/mysys/sha1.c 2010-10-05 14:03:04 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2004, 2006 MySQL AB +/* Copyright (c) 2002, 2004, 2006 MySQL AB 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 @@ -6,26 +6,57 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ /* Original Source from: http://www.faqs.org/rfcs/rfc3174.html + Copyright (C) The Internet Society (2001). All Rights Reserved. + + This document and translations of it may be copied and furnished to + others, and derivative works that comment on or otherwise explain it + or assist in its implementation may be prepared, copied, published + and distributed, in whole or in part, without restriction of any + kind, provided that the above copyright notice and this paragraph are + included on all such copies and derivative works. However, this + document itself may not be modified in any way, such as by removing + the copyright notice or references to the Internet Society or other + Internet organizations, except as needed for the purpose of + developing Internet standards in which case the procedures for + copyrights defined in the Internet Standards process must be + followed, or as required to translate it into languages other than + English. + + The limited permissions granted above are perpetual and will not be + revoked by the Internet Society or its successors or assigns. + + This document and the information contained herein is provided on an + "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING + TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING + BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION + HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF + MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + + Acknowledgement + Funding for the RFC Editor function is currently provided by the + Internet Society. + DESCRIPTION - This file implements the Secure Hashing Algorithm 1 as - defined in FIPS PUB 180-1 published April 17, 1995. + This file implements the Secure Hashing Algorithm 1 as + defined in FIPS PUB 180-1 published April 17, 1995. - The SHA-1, produces a 160-bit message digest for a given data - stream. It should take about 2**n steps to find a message with the - same digest as a given message and 2**(n/2) to find any two - messages with the same digest, when n is the digest size in bits. - Therefore, this algorithm can serve as a means of providing a - "fingerprint" for a message. + The SHA-1, produces a 160-bit message digest for a given data + stream. It should take about 2**n steps to find a message with the + same digest as a given message and 2**(n/2) to find any two + messages with the same digest, when n is the digest size in bits. + Therefore, this algorithm can serve as a means of providing a + "fingerprint" for a message. PORTABILITY ISSUES SHA-1 is defined in terms of 32-bit "words". This code uses --===============7905031326484922987== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/georgi.kodinov@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: georgi.kodinov@stripped\ # nw2feprakb4ug61z # target_branch: file:///home/kgeorge/mysql/work/merge-5.0-bugteam/ # testament_sha1: ca4c4364318d43620614bc7f27eefffed53eca99 # timestamp: 2010-10-05 17:25:06 +0300 # source_branch: file:///home/kgeorge/mysql/work/mysql-5.0/ # base_revision_id: georgi.kodinov@stripped\ # fc7vmant0icj2w0r # # Begin bundle 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 ZSZGoA== --===============7905031326484922987==--