Skip to content

Commit d2e9e32

Browse files
author
Rich Salz
committed
Copyright consolidation 07/10
Reviewed-by: Richard Levitte <[email protected]>
1 parent 4f22f40 commit d2e9e32

Some content is hidden

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

98 files changed

+547
-4889
lines changed

‎LICENSE

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44

55
The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
66
the OpenSSL License and the original SSLeay license apply to the toolkit.
7-
See below for the actual license texts. Actually both licenses are BSD-style
8-
Open Source licenses. In case of any license issues related to OpenSSL
9-
please contact [email protected].
7+
See below for the actual license texts.
108

119
OpenSSL License
1210
---------------

‎crypto/arm_arch.h

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved.
3+
*
4+
* Licensed under the OpenSSL license (the "License"). You may not use
5+
* this file except in compliance with the License. You can obtain a copy
6+
* in the file LICENSE in the source distribution or at
7+
* https://www.openssl.org/source/license.html
8+
*/
9+
110
#ifndef __ARM_ARCH_H__
211
# define __ARM_ARCH_H__
312

‎crypto/armcap.c

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved.
3+
*
4+
* Licensed under the OpenSSL license (the "License"). You may not use
5+
* this file except in compliance with the License. You can obtain a copy
6+
* in the file LICENSE in the source distribution or at
7+
* https://www.openssl.org/source/license.html
8+
*/
9+
110
#include <stdio.h>
211
#include <stdlib.h>
312
#include <string.h>

‎crypto/cryptlib.c

+7-107
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,12 @@
1-
/* ====================================================================
2-
* Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
3-
*
4-
* Redistribution and use in source and binary forms, with or without
5-
* modification, are permitted provided that the following conditions
6-
* are met:
7-
*
8-
* 1. Redistributions of source code must retain the above copyright
9-
* notice, this list of conditions and the following disclaimer.
10-
*
11-
* 2. Redistributions in binary form must reproduce the above copyright
12-
* notice, this list of conditions and the following disclaimer in
13-
* the documentation and/or other materials provided with the
14-
* distribution.
15-
*
16-
* 3. All advertising materials mentioning features or use of this
17-
* software must display the following acknowledgment:
18-
* "This product includes software developed by the OpenSSL Project
19-
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
20-
*
21-
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
22-
* endorse or promote products derived from this software without
23-
* prior written permission. For written permission, please contact
24-
* [email protected].
25-
*
26-
* 5. Products derived from this software may not be called "OpenSSL"
27-
* nor may "OpenSSL" appear in their names without prior written
28-
* permission of the OpenSSL Project.
29-
*
30-
* 6. Redistributions of any form whatsoever must retain the following
31-
* acknowledgment:
32-
* "This product includes software developed by the OpenSSL Project
33-
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
34-
*
35-
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
36-
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
37-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
38-
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
39-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
40-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
41-
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
42-
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
43-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
44-
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
45-
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
46-
* OF THE POSSIBILITY OF SUCH DAMAGE.
47-
* ====================================================================
48-
*
49-
* This product includes cryptographic software written by Eric Young
50-
* ([email protected]). This product includes software written by Tim
51-
* Hudson ([email protected]).
1+
/*
2+
* Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved.
523
*
4+
* Licensed under the OpenSSL license (the "License"). You may not use
5+
* this file except in compliance with the License. You can obtain a copy
6+
* in the file LICENSE in the source distribution or at
7+
* https://www.openssl.org/source/license.html
538
*/
54-
/* Copyright (C) 1995-1998 Eric Young ([email protected])
55-
* All rights reserved.
56-
*
57-
* This package is an SSL implementation written
58-
* by Eric Young ([email protected]).
59-
* The implementation was written so as to conform with Netscapes SSL.
60-
*
61-
* This library is free for commercial and non-commercial use as long as
62-
* the following conditions are aheared to. The following conditions
63-
* apply to all code found in this distribution, be it the RC4, RSA,
64-
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
65-
* included with this distribution is covered by the same copyright terms
66-
* except that the holder is Tim Hudson ([email protected]).
67-
*
68-
* Copyright remains Eric Young's, and as such any Copyright notices in
69-
* the code are not to be removed.
70-
* If this package is used in a product, Eric Young should be given attribution
71-
* as the author of the parts of the library used.
72-
* This can be in the form of a textual message at program startup or
73-
* in documentation (online or textual) provided with the package.
74-
*
75-
* Redistribution and use in source and binary forms, with or without
76-
* modification, are permitted provided that the following conditions
77-
* are met:
78-
* 1. Redistributions of source code must retain the copyright
79-
* notice, this list of conditions and the following disclaimer.
80-
* 2. Redistributions in binary form must reproduce the above copyright
81-
* notice, this list of conditions and the following disclaimer in the
82-
* documentation and/or other materials provided with the distribution.
83-
* 3. All advertising materials mentioning features or use of this software
84-
* must display the following acknowledgement:
85-
* "This product includes cryptographic software written by
86-
* Eric Young ([email protected])"
87-
* The word 'cryptographic' can be left out if the rouines from the library
88-
* being used are not cryptographic related :-).
89-
* 4. If you include any Windows specific code (or a derivative thereof) from
90-
* the apps directory (application code) you must include an acknowledgement:
91-
* "This product includes software written by Tim Hudson ([email protected])"
92-
*
93-
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
94-
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
95-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
96-
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
97-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
98-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
99-
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
100-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
101-
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
102-
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
103-
* SUCH DAMAGE.
104-
*
105-
* The licence and distribution terms for any publically available version or
106-
* derivative of this code cannot be changed. i.e. this code cannot simply be
107-
* copied and put under another distribution licence
108-
* [including the GNU Public Licence.]
109-
*/
9+
11010
/* ====================================================================
11111
* Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
11212
* ECDH support in OpenSSL originally developed by

‎crypto/ct/ct_b64.c

+5-54
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,10 @@
11
/*
2-
* Written by Rob Stradling ([email protected]) and Stephen Henson
3-
* ([email protected]) for the OpenSSL project 2014.
4-
*/
5-
/* ====================================================================
6-
* Copyright (c) 2014 The OpenSSL Project. All rights reserved.
7-
*
8-
* Redistribution and use in source and binary forms, with or without
9-
* modification, are permitted provided that the following conditions
10-
* are met:
11-
*
12-
* 1. Redistributions of source code must retain the above copyright
13-
* notice, this list of conditions and the following disclaimer.
14-
*
15-
* 2. Redistributions in binary form must reproduce the above copyright
16-
* notice, this list of conditions and the following disclaimer in
17-
* the documentation and/or other materials provided with the
18-
* distribution.
19-
*
20-
* 3. All advertising materials mentioning features or use of this
21-
* software must display the following acknowledgment:
22-
* "This product includes software developed by the OpenSSL Project
23-
* for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
24-
*
25-
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
26-
* endorse or promote products derived from this software without
27-
* prior written permission. For written permission, please contact
28-
* [email protected].
29-
*
30-
* 5. Products derived from this software may not be called "OpenSSL"
31-
* nor may "OpenSSL" appear in their names without prior written
32-
* permission of the OpenSSL Project.
33-
*
34-
* 6. Redistributions of any form whatsoever must retain the following
35-
* acknowledgment:
36-
* "This product includes software developed by the OpenSSL Project
37-
* for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
38-
*
39-
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
40-
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
41-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
42-
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
43-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
44-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
45-
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
46-
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
47-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
48-
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
49-
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50-
* OF THE POSSIBILITY OF SUCH DAMAGE.
51-
* ====================================================================
52-
*
53-
* This product includes cryptographic software written by Eric Young
54-
* ([email protected]). This product includes software written by Tim
55-
* Hudson ([email protected]).
2+
* Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
563
*
4+
* Licensed under the OpenSSL license (the "License"). You may not use
5+
* this file except in compliance with the License. You can obtain a copy
6+
* in the file LICENSE in the source distribution or at
7+
* https://www.openssl.org/source/license.html
578
*/
589

5910
#include <limits.h>

‎crypto/ct/ct_locl.h

+5-48
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,10 @@
11
/*
2-
* Written by Rob Percival ([email protected]) for the OpenSSL project.
3-
*/
4-
/* ====================================================================
5-
* Copyright (c) 2016 The OpenSSL Project. All rights reserved.
6-
*
7-
* Redistribution and use in source and binary forms, with or without
8-
* modification, are permitted provided that the following conditions
9-
* are met:
10-
*
11-
* 1. Redistributions of source code must retain the above copyright
12-
* notice, this list of conditions and the following disclaimer.
13-
*
14-
* 2. Redistributions in binary form must reproduce the above copyright
15-
* notice, this list of conditions and the following disclaimer in
16-
* the documentation and/or other materials provided with the
17-
* distribution.
18-
*
19-
* 3. All advertising materials mentioning features or use of this
20-
* software must display the following acknowledgment:
21-
* "This product includes software developed by the OpenSSL Project
22-
* for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
23-
*
24-
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
25-
* endorse or promote products derived from this software without
26-
* prior written permission. For written permission, please contact
27-
* [email protected].
28-
*
29-
* 5. Products derived from this software may not be called "OpenSSL"
30-
* nor may "OpenSSL" appear in their names without prior written
31-
* permission of the OpenSSL Project.
32-
*
33-
* 6. Redistributions of any form whatsoever must retain the following
34-
* acknowledgment:
35-
* "This product includes software developed by the OpenSSL Project
36-
* for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
2+
* Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
373
*
38-
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
39-
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
40-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
41-
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
42-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
43-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
44-
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
45-
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
46-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
47-
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
48-
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
49-
* OF THE POSSIBILITY OF SUCH DAMAGE.
50-
* ====================================================================
4+
* Licensed under the OpenSSL license (the "License"). You may not use
5+
* this file except in compliance with the License. You can obtain a copy
6+
* in the file LICENSE in the source distribution or at
7+
* https://www.openssl.org/source/license.html
518
*/
529

5310
#include <stddef.h>

‎crypto/ct/ct_log.c

+6-52
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,10 @@
1-
/* Author: Adam Eijdenberg <[email protected]>. */
2-
/* ====================================================================
3-
* Copyright (c) 1998-2016 The OpenSSL Project. All rights reserved.
4-
*
5-
* Redistribution and use in source and binary forms, with or without
6-
* modification, are permitted provided that the following conditions
7-
* are met:
8-
*
9-
* 1. Redistributions of source code must retain the above copyright
10-
* notice, this list of conditions and the following disclaimer.
11-
*
12-
* 2. Redistributions in binary form must reproduce the above copyright
13-
* notice, this list of conditions and the following disclaimer in
14-
* the documentation and/or other materials provided with the
15-
* distribution.
16-
*
17-
* 3. All advertising materials mentioning features or use of this
18-
* software must display the following acknowledgment:
19-
* "This product includes software developed by the OpenSSL Project
20-
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
21-
*
22-
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
23-
* endorse or promote products derived from this software without
24-
* prior written permission. For written permission, please contact
25-
* [email protected].
26-
*
27-
* 5. Products derived from this software may not be called "OpenSSL"
28-
* nor may "OpenSSL" appear in their names without prior written
29-
* permission of the OpenSSL Project.
30-
*
31-
* 6. Redistributions of any form whatsoever must retain the following
32-
* acknowledgment:
33-
* "This product includes software developed by the OpenSSL Project
34-
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
35-
*
36-
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
37-
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
38-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
39-
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
40-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
41-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
42-
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
43-
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
44-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
45-
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
46-
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
47-
* OF THE POSSIBILITY OF SUCH DAMAGE.
48-
* ====================================================================
49-
*
50-
* This product includes cryptographic software written by Eric Young
51-
* ([email protected]). This product includes software written by Tim
52-
* Hudson ([email protected]).
1+
/*
2+
* Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
533
*
4+
* Licensed under the OpenSSL license (the "License"). You may not use
5+
* this file except in compliance with the License. You can obtain a copy
6+
* in the file LICENSE in the source distribution or at
7+
* https://www.openssl.org/source/license.html
548
*/
559

5610
#include <stdlib.h>

0 commit comments

Comments
 (0)