Skip to content

Commit b6cff31

Browse files
author
Rich Salz
committed
Manual fixes after copyright consolidation
Reviewed-by: Richard Levitte <[email protected]>
1 parent 6ddbb4c commit b6cff31

Some content is hidden

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

44 files changed

+267
-1919
lines changed

‎NEWS

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
Major changes between OpenSSL 1.0.2h and OpenSSL 1.1.0 [in pre-release]
99

10+
o Copyright text was shrunk to a boilerplate that points to the license
1011
o "shared" builds are now the default when possible
1112
o Added support for "pipelining"
1213
o Added the AFALG engine

‎crypto/asn1/asn1_err.c

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

‎crypto/async/async_err.c

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

‎crypto/bn/bn_err.c

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

‎crypto/bn/bn_prime.h

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
/*
2+
* WARNING: do not edit!
3+
* Generated by crypto/bn/bn_prime.pl
4+
*
25
* Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved.
36
*
47
* Licensed under the OpenSSL license (the "License"). You may not use

‎crypto/bn/bn_prime.pl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /usr/bin/env perl
2-
# Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
2+
# Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved.
33
#
44
# Licensed under the OpenSSL license (the "License"). You may not use
55
# this file except in compliance with the License. You can obtain a copy
@@ -11,7 +11,7 @@
1111
* WARNING: do not edit!
1212
* Generated by crypto/bn/bn_prime.pl
1313
*
14-
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
14+
* Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved.
1515
*
1616
* Licensed under the OpenSSL license (the "License"). You may not use
1717
* this file except in compliance with the License. You can obtain a copy

‎crypto/buffer/buf_err.c

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

‎crypto/cms/cms_err.c

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

0 commit comments

Comments
 (0)