From: Pauli Date: Thu, 15 Jun 2017 03:34:28 +0000 (+1000) Subject: Correct Oracle copyrights & clarify. X-Git-Tag: OpenSSL_1_1_1-pre1~1313 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5aba2b6e88d1d7fc921d2161af27a0835f966ea9;p=thirdparty%2Fopenssl.git Correct Oracle copyrights & clarify. Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/3684) --- diff --git a/crypto/aria/aria.c b/crypto/aria/aria.c index b59b4a44aa4..a3c31d6b105 100644 --- a/crypto/aria/aria.c +++ b/crypto/aria/aria.c @@ -1,5 +1,6 @@ /* * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -17,10 +18,6 @@ * Public domain version is distributed above. */ -/* ==================================================================== - * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. - */ - #include #include "internal/aria.h" diff --git a/crypto/evp/e_aria.c b/crypto/evp/e_aria.c index 8745bfeb269..6e72c779584 100644 --- a/crypto/evp/e_aria.c +++ b/crypto/evp/e_aria.c @@ -1,5 +1,6 @@ /* * Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -7,10 +8,6 @@ * https://www.openssl.org/source/license.html */ -/* ==================================================================== - * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. - */ - #include "internal/cryptlib.h" #ifndef OPENSSL_NO_ARIA # include diff --git a/crypto/include/internal/aria.h b/crypto/include/internal/aria.h index 116f3ce9741..0ba093922d2 100644 --- a/crypto/include/internal/aria.h +++ b/crypto/include/internal/aria.h @@ -1,5 +1,6 @@ /* * Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -7,10 +8,6 @@ * https://www.openssl.org/source/license.html */ -/* ==================================================================== - * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. - */ - /* Copyright (c) 2017 National Security Resarch Institute. All rights reserved. */ #ifndef HEADER_ARIA_H diff --git a/test/lhash_test.c b/test/lhash_test.c index 6aa21f2a920..a0d377eb9c8 100644 --- a/test/lhash_test.c +++ b/test/lhash_test.c @@ -1,5 +1,6 @@ /* * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -7,10 +8,6 @@ * https://www.openssl.org/source/license.html */ -/* - * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. - */ - #include #include diff --git a/test/recipes/01-test_test.t b/test/recipes/01-test_test.t index 90c8314f9eb..efc970e7b33 100644 --- a/test/recipes/01-test_test.t +++ b/test/recipes/01-test_test.t @@ -1,13 +1,11 @@ #! /usr/bin/env perl # Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. +# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy # in the file LICENSE in the source distribution or at # https://www.openssl.org/source/license.html -# -# ====================================================================== -# Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. use OpenSSL::Test::Simple; diff --git a/test/recipes/02-test_lhash.t b/test/recipes/02-test_lhash.t index 28eb306714e..613a10d0f63 100644 --- a/test/recipes/02-test_lhash.t +++ b/test/recipes/02-test_lhash.t @@ -1,13 +1,11 @@ #! /usr/bin/env perl # Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. +# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy # in the file LICENSE in the source distribution or at # https://www.openssl.org/source/license.html -# -# ====================================================================== -# Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. use OpenSSL::Test::Simple; diff --git a/test/recipes/02-test_stack.t b/test/recipes/02-test_stack.t index 548f1ebb709..6f906dbd99e 100644 --- a/test/recipes/02-test_stack.t +++ b/test/recipes/02-test_stack.t @@ -1,13 +1,11 @@ #! /usr/bin/env perl # Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. +# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy # in the file LICENSE in the source distribution or at # https://www.openssl.org/source/license.html -# -# ====================================================================== -# Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. use OpenSSL::Test::Simple; diff --git a/test/recipes/20-test_enc_more.t b/test/recipes/20-test_enc_more.t index b4cef6941ad..2691060c75c 100644 --- a/test/recipes/20-test_enc_more.t +++ b/test/recipes/20-test_enc_more.t @@ -1,13 +1,11 @@ #! /usr/bin/env perl # Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. +# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy # in the file LICENSE in the source distribution or at # https://www.openssl.org/source/license.html -# -# ====================================================================== -# Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. use strict; diff --git a/test/recipes/60-test_x509_dup_cert.t b/test/recipes/60-test_x509_dup_cert.t index 7588d8dbb79..7cae05c6e3b 100644 --- a/test/recipes/60-test_x509_dup_cert.t +++ b/test/recipes/60-test_x509_dup_cert.t @@ -1,13 +1,11 @@ #! /usr/bin/env perl # Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. +# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy # in the file LICENSE in the source distribution or at # https://www.openssl.org/source/license.html -# -# ====================================================================== -# Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. use OpenSSL::Test qw/:DEFAULT srctop_file/; diff --git a/test/recipes/95-test_external_pyca_data/cryptography.sh b/test/recipes/95-test_external_pyca_data/cryptography.sh index 912dd35bc78..e1616914a77 100755 --- a/test/recipes/95-test_external_pyca_data/cryptography.sh +++ b/test/recipes/95-test_external_pyca_data/cryptography.sh @@ -1,15 +1,12 @@ #!/bin/sh # # Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. +# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy # in the file LICENSE in the source distribution or at # https://www.openssl.org/source/license.html -# -# ==================================================================== -# Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. -# # # OpenSSL external testing using the Python Cryptography module diff --git a/test/stack_test.c b/test/stack_test.c index 96870ce2de9..dbf5c91118f 100644 --- a/test/stack_test.c +++ b/test/stack_test.c @@ -1,5 +1,6 @@ /* * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -7,10 +8,6 @@ * https://www.openssl.org/source/license.html */ -/* ==================================================================== - * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. - */ - #include #include diff --git a/test/test_test.c b/test/test_test.c index cab580c1524..a1b04561b3a 100644 --- a/test/test_test.c +++ b/test/test_test.c @@ -1,5 +1,6 @@ /* * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -7,10 +8,6 @@ * https://www.openssl.org/source/license.html */ -/* - * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. - */ - #include #include diff --git a/test/x509_dup_cert_test.c b/test/x509_dup_cert_test.c index adeb8ea9293..2ce469aa837 100644 --- a/test/x509_dup_cert_test.c +++ b/test/x509_dup_cert_test.c @@ -1,5 +1,6 @@ /* * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -7,10 +8,6 @@ * https://www.openssl.org/source/license.html */ -/* ==================================================================== - * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. - */ - #include #include #include