Skip to content

Commit 50796a0

Browse files
author
mtaylor@qualinost.(none)
committed
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
2 parents d394d66 + 8da5745 commit 50796a0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+1819
-2288
lines changed

‎extra/yassl/README

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*****************yaSSL Release notes, version 1.5.0 (1/10/07)
1+
*****************yaSSL Release notes, version 1.5.8 (1/10/07)
22

33
This release of yaSSL contains bug fixes, portability enhancements, and
44
support for GCC 4.1.1 and vs2005 sp1.
@@ -23,7 +23,7 @@
2323
SSL_METHOD *TLSv1_1_client_method(void);
2424

2525
or the SSLv23 versions (even though yaSSL doesn't support SSL 2.0 the v23
26-
means to pick the highest of SSL 3.0, TLS 1.0, or TLS 1.1.
26+
means to pick the highest of SSL 3.0, TLS 1.0, or TLS 1.1).
2727

2828

2929
See normal build instructions below under 1.0.6.

‎extra/yassl/include/buffer.hpp

+17-24
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
1-
/* buffer.hpp
2-
*
3-
* Copyright (C) 2003 Sawtooth Consulting Ltd.
4-
*
5-
* This file is part of yaSSL.
6-
*
7-
* yaSSL is free software; you can redistribute it and/or modify
8-
* it under the terms of the GNU General Public License as published by
9-
* the Free Software Foundation; either version 2 of the License, or
10-
* (at your option) any later version.
11-
*
12-
* There are special exceptions to the terms and conditions of the GPL as it
13-
* is applied to yaSSL. View the full text of the exception in the file
14-
* FLOSS-EXCEPTIONS in the directory of this software distribution.
15-
*
16-
* yaSSL is distributed in the hope that it will be useful,
17-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19-
* GNU General Public License for more details.
20-
*
21-
* You should have received a copy of the GNU General Public License
22-
* along with this program; if not, write to the Free Software
23-
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
24-
*/
1+
/*
2+
Copyright (C) 2000-2007 MySQL AB
3+
4+
This program is free software; you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation; version 2 of the License.
7+
8+
This program is distributed in the hope that it will be useful,
9+
but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
GNU General Public License for more details.
12+
13+
You should have received a copy of the GNU General Public License
14+
along with this program; see the file COPYING. If not, write to the
15+
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
16+
MA 02110-1301 USA.
17+
*/
2518

2619

2720
/* yaSSL buffer header defines input and output buffers to simulate streaming

‎extra/yassl/include/cert_wrapper.hpp

+17-24
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
1-
/* cert_wrapper.hpp
2-
*
3-
* Copyright (C) 2003 Sawtooth Consulting Ltd.
4-
*
5-
* This file is part of yaSSL.
6-
*
7-
* yaSSL is free software; you can redistribute it and/or modify
8-
* it under the terms of the GNU General Public License as published by
9-
* the Free Software Foundation; either version 2 of the License, or
10-
* (at your option) any later version.
11-
*
12-
* There are special exceptions to the terms and conditions of the GPL as it
13-
* is applied to yaSSL. View the full text of the exception in the file
14-
* FLOSS-EXCEPTIONS in the directory of this software distribution.
15-
*
16-
* yaSSL is distributed in the hope that it will be useful,
17-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19-
* GNU General Public License for more details.
20-
*
21-
* You should have received a copy of the GNU General Public License
22-
* along with this program; if not, write to the Free Software
23-
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
24-
*/
1+
/*
2+
Copyright (C) 2000-2007 MySQL AB
3+
4+
This program is free software; you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation; version 2 of the License.
7+
8+
This program is distributed in the hope that it will be useful,
9+
but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
GNU General Public License for more details.
12+
13+
You should have received a copy of the GNU General Public License
14+
along with this program; see the file COPYING. If not, write to the
15+
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
16+
MA 02110-1301 USA.
17+
*/
2518

2619

2720
/* The certificate wrapper header defines certificate management functions

‎extra/yassl/include/crypto_wrapper.hpp

+17-24
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
1-
/* crypto_wrapper.hpp
2-
*
3-
* Copyright (C) 2003 Sawtooth Consulting Ltd.
4-
*
5-
* This file is part of yaSSL.
6-
*
7-
* yaSSL is free software; you can redistribute it and/or modify
8-
* it under the terms of the GNU General Public License as published by
9-
* the Free Software Foundation; either version 2 of the License, or
10-
* (at your option) any later version.
11-
*
12-
* There are special exceptions to the terms and conditions of the GPL as it
13-
* is applied to yaSSL. View the full text of the exception in the file
14-
* FLOSS-EXCEPTIONS in the directory of this software distribution.
15-
*
16-
* yaSSL is distributed in the hope that it will be useful,
17-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19-
* GNU General Public License for more details.
20-
*
21-
* You should have received a copy of the GNU General Public License
22-
* along with this program; if not, write to the Free Software
23-
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
24-
*/
1+
/*
2+
Copyright (C) 2000-2007 MySQL AB
3+
4+
This program is free software; you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation; version 2 of the License.
7+
8+
This program is distributed in the hope that it will be useful,
9+
but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
GNU General Public License for more details.
12+
13+
You should have received a copy of the GNU General Public License
14+
along with this program; see the file COPYING. If not, write to the
15+
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
16+
MA 02110-1301 USA.
17+
*/
2518

2619

2720
/* The crypto wrapper header is used to define policies for the cipher

‎extra/yassl/include/factory.hpp

+17-24
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
1-
/* factory.hpp
2-
*
3-
* Copyright (C) 2003 Sawtooth Consulting Ltd.
4-
*
5-
* This file is part of yaSSL.
6-
*
7-
* yaSSL is free software; you can redistribute it and/or modify
8-
* it under the terms of the GNU General Public License as published by
9-
* the Free Software Foundation; either version 2 of the License, or
10-
* (at your option) any later version.
11-
*
12-
* There are special exceptions to the terms and conditions of the GPL as it
13-
* is applied to yaSSL. View the full text of the exception in the file
14-
* FLOSS-EXCEPTIONS in the directory of this software distribution.
15-
*
16-
* yaSSL is distributed in the hope that it will be useful,
17-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19-
* GNU General Public License for more details.
20-
*
21-
* You should have received a copy of the GNU General Public License
22-
* along with this program; if not, write to the Free Software
23-
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
24-
*/
1+
/*
2+
Copyright (C) 2000-2007 MySQL AB
3+
4+
This program is free software; you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation; version 2 of the License.
7+
8+
This program is distributed in the hope that it will be useful,
9+
but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
GNU General Public License for more details.
12+
13+
You should have received a copy of the GNU General Public License
14+
along with this program; see the file COPYING. If not, write to the
15+
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
16+
MA 02110-1301 USA.
17+
*/
2518

2619
/* The factory header defines an Object Factory, used by SSL message and
2720
* handshake types.

‎extra/yassl/include/handshake.hpp

+17-24
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
1-
/* handshake.hpp
2-
*
3-
* Copyright (C) 2003 Sawtooth Consulting Ltd.
4-
*
5-
* This file is part of yaSSL.
6-
*
7-
* yaSSL is free software; you can redistribute it and/or modify
8-
* it under the terms of the GNU General Public License as published by
9-
* the Free Software Foundation; either version 2 of the License, or
10-
* (at your option) any later version.
11-
*
12-
* There are special exceptions to the terms and conditions of the GPL as it
13-
* is applied to yaSSL. View the full text of the exception in the file
14-
* FLOSS-EXCEPTIONS in the directory of this software distribution.
15-
*
16-
* yaSSL is distributed in the hope that it will be useful,
17-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19-
* GNU General Public License for more details.
20-
*
21-
* You should have received a copy of the GNU General Public License
22-
* along with this program; if not, write to the Free Software
23-
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
24-
*/
1+
/*
2+
Copyright (C) 2000-2007 MySQL AB
3+
4+
This program is free software; you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation; version 2 of the License.
7+
8+
This program is distributed in the hope that it will be useful,
9+
but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
GNU General Public License for more details.
12+
13+
You should have received a copy of the GNU General Public License
14+
along with this program; see the file COPYING. If not, write to the
15+
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
16+
MA 02110-1301 USA.
17+
*/
2518

2619
/* The handshake header declares function prototypes for creating and reading
2720
* the various handshake messages.

‎extra/yassl/include/lock.hpp

+17-24
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
1-
/* lock.hpp
2-
*
3-
* Copyright (C) 2003 Sawtooth Consulting Ltd.
4-
*
5-
* This file is part of yaSSL.
6-
*
7-
* yaSSL is free software; you can redistribute it and/or modify
8-
* it under the terms of the GNU General Public License as published by
9-
* the Free Software Foundation; either version 2 of the License, or
10-
* (at your option) any later version.
11-
*
12-
* There are special exceptions to the terms and conditions of the GPL as it
13-
* is applied to yaSSL. View the full text of the exception in the file
14-
* FLOSS-EXCEPTIONS in the directory of this software distribution.
15-
*
16-
* yaSSL is distributed in the hope that it will be useful,
17-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19-
* GNU General Public License for more details.
20-
*
21-
* You should have received a copy of the GNU General Public License
22-
* along with this program; if not, write to the Free Software
23-
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
24-
*/
1+
/*
2+
Copyright (C) 2000-2007 MySQL AB
3+
4+
This program is free software; you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation; version 2 of the License.
7+
8+
This program is distributed in the hope that it will be useful,
9+
but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
GNU General Public License for more details.
12+
13+
You should have received a copy of the GNU General Public License
14+
along with this program; see the file COPYING. If not, write to the
15+
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
16+
MA 02110-1301 USA.
17+
*/
2518

2619
/* lock.hpp provides an os specific Lock, locks mutex on entry and unlocks
2720
* automatically upon exit, no-ops provided for Single Threaded

‎extra/yassl/include/log.hpp

+17-24
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
1-
/* log.hpp
2-
*
3-
* Copyright (C) 2003 Sawtooth Consulting Ltd.
4-
*
5-
* This file is part of yaSSL.
6-
*
7-
* yaSSL is free software; you can redistribute it and/or modify
8-
* it under the terms of the GNU General Public License as published by
9-
* the Free Software Foundation; either version 2 of the License, or
10-
* (at your option) any later version.
11-
*
12-
* There are special exceptions to the terms and conditions of the GPL as it
13-
* is applied to yaSSL. View the full text of the exception in the file
14-
* FLOSS-EXCEPTIONS in the directory of this software distribution.
15-
*
16-
* yaSSL is distributed in the hope that it will be useful,
17-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19-
* GNU General Public License for more details.
20-
*
21-
* You should have received a copy of the GNU General Public License
22-
* along with this program; if not, write to the Free Software
23-
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
24-
*/
1+
/*
2+
Copyright (C) 2000-2007 MySQL AB
3+
4+
This program is free software; you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation; version 2 of the License.
7+
8+
This program is distributed in the hope that it will be useful,
9+
but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
GNU General Public License for more details.
12+
13+
You should have received a copy of the GNU General Public License
14+
along with this program; see the file COPYING. If not, write to the
15+
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
16+
MA 02110-1301 USA.
17+
*/
2518

2619

2720
/* yaSSL log interface

‎extra/yassl/include/openssl/ssl.h

+17-24
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
1-
/* ssl.h
2-
*
3-
* Copyright (C) 2003 Sawtooth Consulting Ltd.
4-
*
5-
* This file is part of yaSSL.
6-
*
7-
* yaSSL is free software; you can redistribute it and/or modify
8-
* it under the terms of the GNU General Public License as published by
9-
* the Free Software Foundation; either version 2 of the License, or
10-
* (at your option) any later version.
11-
*
12-
* There are special exceptions to the terms and conditions of the GPL as it
13-
* is applied to yaSSL. View the full text of the exception in the file
14-
* FLOSS-EXCEPTIONS in the directory of this software distribution.
15-
*
16-
* yaSSL is distributed in the hope that it will be useful,
17-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19-
* GNU General Public License for more details.
20-
*
21-
* You should have received a copy of the GNU General Public License
22-
* along with this program; if not, write to the Free Software
23-
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
24-
*/
1+
/*
2+
Copyright (C) 2000-2007 MySQL AB
3+
4+
This program is free software; you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation; version 2 of the License.
7+
8+
This program is distributed in the hope that it will be useful,
9+
but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
GNU General Public License for more details.
12+
13+
You should have received a copy of the GNU General Public License
14+
along with this program; see the file COPYING. If not, write to the
15+
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
16+
MA 02110-1301 USA.
17+
*/
2518

2619
/* ssl.h defines openssl compatibility layer
2720
*

0 commit comments

Comments
 (0)