Skip to content

Commit 21dcbeb

Browse files
author
Rich Salz
committed
Copyright consolidation 03/10
Reviewed-by: Richard Levitte <[email protected]>
1 parent 440e5d8 commit 21dcbeb

Some content is hidden

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

85 files changed

+520
-4248
lines changed

‎crypto/include/internal/async.h

+5-53
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,10 @@
11
/*
2-
* Written by Matt Caswell 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/)"
37-
*
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-
* ====================================================================
51-
*
52-
* This product includes cryptographic software written by Eric Young
53-
* ([email protected]). This product includes software written by Tim
54-
* Hudson ([email protected]).
2+
* Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
553
*
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
568
*/
579

5810
#include <openssl/async.h>

‎include/internal/bio.h

+6-51
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,10 @@
1-
/* ====================================================================
2-
* Copyright (c) 2016 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 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
*/
549

5510
#include <openssl/bio.h>

‎include/internal/comp.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/*
2-
* Licensed under the OpenSSL licenses, (the "License");
3-
* you may not use this file except in compliance with the License.
4-
* You may obtain a copy of the License at
2+
* Copyright 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
57
* https://www.openssl.org/source/license.html
6-
* or in the file LICENSE in the source distribution.
78
*/
89

910
#include <openssl/comp.h>

‎include/internal/conf.h

+5-35
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,10 @@
11
/*
2-
* Copyright (c) 2014 The OpenSSL Project. All rights reserved.
2+
* Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
33
*
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-
* 1. Redistributions of source code must retain the copyright
8-
* notice, this list of conditions and the following disclaimer.
9-
* 2. Redistributions in binary form must reproduce the above copyright
10-
* notice, this list of conditions and the following disclaimer in the
11-
* documentation and/or other materials provided with the distribution.
12-
* 3. All advertising materials mentioning features or use of this software
13-
* must display the following acknowledgement:
14-
* "This product includes cryptographic software written by
15-
* Eric Young ([email protected])"
16-
* The word 'cryptographic' can be left out if the rouines from the library
17-
* being used are not cryptographic related :-).
18-
* 4. If you include any Windows specific code (or a derivative thereof) from
19-
* the apps directory (application code) you must include an acknowledgement:
20-
* "This product includes software written by Tim Hudson ([email protected])"
21-
*
22-
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
23-
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
24-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
25-
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
26-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28-
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30-
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31-
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32-
* SUCH DAMAGE.
33-
*
34-
* The licence and distribution terms for any publically available version or
35-
* derivative of this code cannot be changed. i.e. this code cannot simply be
36-
* copied and put under another distribution licence
37-
* [including the GNU Public Licence.]
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
388
*/
399

4010
#ifndef HEADER_INTERNAL_CONF_H

‎include/internal/constant_time_locl.h

+6-42
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,10 @@
1-
/*-
2-
* Utilities for constant-time cryptography.
3-
*
4-
* Author: Emilia Kasper ([email protected])
5-
* Based on previous work by Bodo Moeller, Emilia Kasper, Adam Langley
6-
* (Google).
7-
* ====================================================================
8-
* Copyright (c) 2014 The OpenSSL Project. All rights reserved.
9-
*
10-
* Redistribution and use in source and binary forms, with or without
11-
* modification, are permitted provided that the following conditions
12-
* are met:
13-
* 1. Redistributions of source code must retain the copyright
14-
* notice, this list of conditions and the following disclaimer.
15-
* 2. Redistributions in binary form must reproduce the above copyright
16-
* notice, this list of conditions and the following disclaimer in the
17-
* documentation and/or other materials provided with the distribution.
18-
* 3. All advertising materials mentioning features or use of this software
19-
* must display the following acknowledgement:
20-
* "This product includes cryptographic software written by
21-
* Eric Young ([email protected])"
22-
* The word 'cryptographic' can be left out if the rouines from the library
23-
* being used are not cryptographic related :-).
24-
* 4. If you include any Windows specific code (or a derivative thereof) from
25-
* the apps directory (application code) you must include an acknowledgement:
26-
* "This product includes software written by Tim Hudson ([email protected])"
27-
*
28-
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
29-
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
30-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
31-
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
32-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
33-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
34-
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
35-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
36-
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
37-
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
38-
* SUCH DAMAGE.
1+
/*
2+
* Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
393
*
40-
* The licence and distribution terms for any publically available version or
41-
* derivative of this code cannot be changed. i.e. this code cannot simply be
42-
* copied and put under another distribution licence
43-
* [including the GNU Public Licence.]
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
448
*/
459

4610
#ifndef HEADER_CONSTANT_TIME_LOCL_H

‎include/internal/dane.h

+6-54
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,12 @@
11
/*
2-
* Written by Viktor Dukhovni ([email protected]) for the OpenSSL project
3-
* 2015.
4-
*/
5-
/* ====================================================================
6-
* Copyright (c) 2015 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 2015-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
*/
9+
5810
#ifndef HEADER_INTERNAL_DANE_H
5911
#define HEADER_INTERNAL_DANE_H
6012

‎include/internal/dso.h

+5-54
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,10 @@
11
/*
2-
* Written by Geoff Thorpe ([email protected]) for the OpenSSL project
3-
* 2000.
4-
*/
5-
/* ====================================================================
6-
* Copyright (c) 2000 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 2000-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
#ifndef HEADER_DSO_H

0 commit comments

Comments
 (0)