Commit e8d54211 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 

into  neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import


extra/yassl/include/openssl/ssl.h:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
extra/yassl/src/template_instnt.cpp:
  Auto merged
extra/yassl/src/yassl_imp.cpp:
  Auto merged
extra/yassl/src/yassl_int.cpp:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Auto merged
parents 4c7aeb36 f0aacbca

extra/yassl/README

+2 −2
Original line number Diff line number Diff line 
*****************yaSSL Release notes, version 1.5.0 (1/10/07)

*****************yaSSL Release notes, version 1.5.8 (1/10/07)



    This release of yaSSL contains bug fixes, portability enhancements, and

    support for GCC 4.1.1 and vs2005 sp1.
@@ -23,7 +23,7 @@ 
        SSL_METHOD *TLSv1_1_client_method(void);

    

    or the SSLv23 versions (even though yaSSL doesn't support SSL 2.0 the v23

    means to pick the highest of SSL 3.0, TLS 1.0, or TLS 1.1.

    means to pick the highest of SSL 3.0, TLS 1.0, or TLS 1.1).





See normal  build instructions below under 1.0.6.

extra/yassl/include/buffer.hpp

+17 −24
Original line number Diff line number Diff line 
/* buffer.hpp                                

 *

 * Copyright (C) 2003 Sawtooth Consulting Ltd.

 *

 * This file is part of yaSSL.

 *

 * yaSSL is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * There are special exceptions to the terms and conditions of the GPL as it

 * is applied to yaSSL. View the full text of the exception in the file

 * FLOSS-EXCEPTIONS in the directory of this software distribution.

 *

 * yaSSL 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

 * 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

/*

   Copyright (C) 2000-2007 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

   the Free Software Foundation; version 2 of the License.



   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

   GNU General Public License for more details.



   You should have received a copy of the GNU General Public License

   along with this program; see the file COPYING. If not, write to the

   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,

   MA  02110-1301  USA.

*/

extra/yassl/include/cert_wrapper.hpp

+17 −24
Original line number Diff line number Diff line 
/* cert_wrapper.hpp                          

 *

 * Copyright (C) 2003 Sawtooth Consulting Ltd.

 *

 * This file is part of yaSSL.

 *

 * yaSSL is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * There are special exceptions to the terms and conditions of the GPL as it

 * is applied to yaSSL. View the full text of the exception in the file

 * FLOSS-EXCEPTIONS in the directory of this software distribution.

 *

 * yaSSL 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

 * 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

/*

   Copyright (C) 2000-2007 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

   the Free Software Foundation; version 2 of the License.



   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

   GNU General Public License for more details.



   You should have received a copy of the GNU General Public License

   along with this program; see the file COPYING. If not, write to the

   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,

   MA  02110-1301  USA.

*/

extra/yassl/include/crypto_wrapper.hpp

+17 −24
Original line number Diff line number Diff line 
/* crypto_wrapper.hpp                          

 *

 * Copyright (C) 2003 Sawtooth Consulting Ltd.

 *

 * This file is part of yaSSL.

 *

 * yaSSL is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * There are special exceptions to the terms and conditions of the GPL as it

 * is applied to yaSSL. View the full text of the exception in the file

 * FLOSS-EXCEPTIONS in the directory of this software distribution.

 *

 * yaSSL 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

 * 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

/*

   Copyright (C) 2000-2007 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

   the Free Software Foundation; version 2 of the License.



   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

   GNU General Public License for more details.



   You should have received a copy of the GNU General Public License

   along with this program; see the file COPYING. If not, write to the

   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,

   MA  02110-1301  USA.

*/

extra/yassl/include/factory.hpp

+17 −24
Original line number Diff line number Diff line 
/* factory.hpp                                

 *

 * Copyright (C) 2003 Sawtooth Consulting Ltd.

 *

 * This file is part of yaSSL.

 *

 * yaSSL is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * There are special exceptions to the terms and conditions of the GPL as it

 * is applied to yaSSL. View the full text of the exception in the file

 * FLOSS-EXCEPTIONS in the directory of this software distribution.

 *

 * yaSSL 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

 * 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

/*

   Copyright (C) 2000-2007 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

   the Free Software Foundation; version 2 of the License.



   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

   GNU General Public License for more details.



   You should have received a copy of the GNU General Public License

   along with this program; see the file COPYING. If not, write to the

   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,

   MA  02110-1301  USA.

*/



/*  The factory header defines an Object Factory, used by SSL message and