提交 f1c236f8 编写于 作者: R Ralf S. Engelschall

Switch to OpenSSL name

上级 f92e687e
OpenTLS CHANGES OpenSSL CHANGES
_______________ _______________
...@@ -50,11 +50,11 @@ ...@@ -50,11 +50,11 @@
*) Added various platform portability fixes. *) Added various platform portability fixes.
[Marc J. Cox] [Marc J. Cox]
*) The Genesis of the OpenTLS rpject: *) The Genesis of the OpenSSL rpject:
We start with the latest (unreleased) SSLeay version 0.9.1b which Eric A. We start with the latest (unreleased) SSLeay version 0.9.1b which Eric A.
Joung and Tim J. Hudson created while they were working for C2Net until Joung and Tim J. Hudson created while they were working for C2Net until
summer 1998. summer 1998.
[The OpenTLS Project] [The OpenSSL Project]
Changes between 0.9.0b and 0.9.1b Changes between 0.9.0b and 0.9.1b
......
/* ==================================================================== /* ====================================================================
* Copyright (c) 1998 The OpenTLS Project. All rights reserved. * Copyright (c) 1998 The OpenSSL Project. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
...@@ -16,27 +16,27 @@ ...@@ -16,27 +16,27 @@
* *
* 3. All advertising materials mentioning features or use of this * 3. All advertising materials mentioning features or use of this
* software must display the following acknowledgment: * software must display the following acknowledgment:
* "This product includes software developed by the OpenTLS Project * "This product includes software developed by the OpenSSL Project
* for use in the OpenTLS Toolkit. (http://www.opentls.org/)" * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
* *
* 4. The names "OpenTLS Toolkit" and "OpenTLS Project" must not be used to * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
* endorse or promote products derived from this software without * endorse or promote products derived from this software without
* prior written permission. For written permission, please contact * prior written permission. For written permission, please contact
* licensing@opentls.org. * licensing@OpenSSL.org.
* *
* 5. Products derived from this software may not be called "OpenTLS" * 5. Products derived from this software may not be called "OpenSSL"
* nor may "OpenTLS" appear in their names without prior written * nor may "OpenSSL" appear in their names without prior written
* permission of the OpenTLS Project. * permission of the OpenSSL Project.
* *
* 6. Redistributions of any form whatsoever must retain the following * 6. Redistributions of any form whatsoever must retain the following
* acknowledgment: * acknowledgment:
* "This product includes software developed by the OpenTLS Project * "This product includes software developed by the OpenSSL Project
* for use in the OpenTLS Toolkit (http://www.opentls.org/)" * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
* *
* THIS SOFTWARE IS PROVIDED BY THE OPENTLS PROJECT ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OPENTLS PROJECT OR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
...@@ -47,11 +47,11 @@ ...@@ -47,11 +47,11 @@
* OF THE POSSIBILITY OF SUCH DAMAGE. * OF THE POSSIBILITY OF SUCH DAMAGE.
* ==================================================================== * ====================================================================
* *
* This product includes cryptographic software written by Eric A. Young * This product includes cryptographic software written by Eric Young
* (eay@cryptsoft.com). This product includes software written by Tim J. * (eay@cryptsoft.com). This product includes software written by Tim
* Hudson (tjh@cryptsoft.com). * Hudson (tjh@cryptsoft.com).
*
*/ */
__________________________________________________________________________ __________________________________________________________________________
Original SSLeay License Original SSLeay License
......
OpenTLS 0.9.1c 22-Dec-1998 OpenSSL 0.9.1c 22-Dec-1998
Copyright (c) 1998 The OpenTLS Project Copyright (c) 1998 The OpenSSL Project
Copyright (c) 1995-1998 Eric Young Copyright (c) 1995-1998 Eric Young
All rights reserved. All rights reserved.
The OpenTLS Project is a collaborative effort to develop a robust, The OpenSSL Project is a collaborative effort to develop a robust,
commercial-grade, fully featured, and Open Source toolkit implementing the commercial-grade, fully featured, and Open Source toolkit implementing the
Transport Layer Security (TLS v1) and Secure Sockets Layer (SSL v2/v3) Transport Layer Security (TLS v1) and Secure Sockets Layer (SSL v2/v3)
protocols with full-strength cryptography world-wide. The project is managed protocols with full-strength cryptography world-wide. The project is managed
by a worldwide community of volunteers that use the Internet to communicate, by a worldwide community of volunteers that use the Internet to communicate,
plan, and develop the OpenTLS tookit and its related documentation. plan, and develop the OpenSSL tookit and its related documentation.
OpenTLS is based on the excellent SSLeay library developed from Eric A. Young OpenSSL is based on the excellent SSLeay library developed from Eric A. Young
and Tim J. Hudson. The OpenTLS toolkit is licensed under a BSD-style licence, and Tim J. Hudson. The OpenSSL toolkit is licensed under a BSD-style licence,
which basically means that you are free to get and use it for commercial and which basically means that you are free to get and use it for commercial and
non-commercial purposes. non-commercial purposes.
......
...@@ -60,7 +60,7 @@ foreach $file (@files) ...@@ -60,7 +60,7 @@ foreach $file (@files)
while (<IN>) while (<IN>)
{ {
if ((s/(SSLeay|OpenTLS) \d\.\d.\d[^"]*(\"|\s)/\1 $ver $time\2/) || if ((s/(SSLeay|OpenSSL) \d\.\d.\d[^"]*(\"|\s)/\1 $ver $time\2/) ||
s/^(\#define\s+SSLEAY_VERSION_NUMBER\s+0x)[0-9a-zA-Z]+(.*)$/$1$xver$2/) s/^(\#define\s+SSLEAY_VERSION_NUMBER\s+0x)[0-9a-zA-Z]+(.*)$/$1$xver$2/)
{ {
print STDERR " Done"; print STDERR " Done";
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册