Correct Oracle copyrights & clarify.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3684)

diff --git a/crypto/aria/aria.c b/crypto/aria/aria.c
index b59b4a44aa44bfc5a6bf0d8f67e73fff032123b4..a3c31d6b10528205ece80d86787a18c98f7f1fdd 100644 (file)
--- a/crypto/aria/aria.c
+++ b/crypto/aria/aria.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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.
  */
 
  * Public domain version is distributed above.
  */
 

-/* ====================================================================
- * Copyright (c) 2017 Oracle and/or its affiliates.  All rights reserved.
- */
-

 #include <openssl/e_os2.h>
 #include "internal/aria.h"
 
 #include <openssl/e_os2.h>
 #include "internal/aria.h"
 

diff --git a/crypto/evp/e_aria.c b/crypto/evp/e_aria.c
index 8745bfeb269e4635b2c3211def18ad17b5fac4d5..6e72c7795841049c2899d0c70708e02a1927428e 100644 (file)
--- 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 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
  *
  * 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
  */
 
  * 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 <openssl/evp.h>
 #include "internal/cryptlib.h"
 #ifndef OPENSSL_NO_ARIA
 # include <openssl/evp.h>

diff --git a/crypto/include/internal/aria.h b/crypto/include/internal/aria.h
index 116f3ce9741eac02776f6f3e99396bf6fc767e9f..0ba093922d22755643ef5c8292a99edfa82c5cad 100644 (file)
--- 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 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
  *
  * 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
  */
 
  * 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
  /* 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 6aa21f2a9202ee2b801ccdcd38dc9a6f467335d7..a0d377eb9c86164b080291283f69e58d203444dc 100644 (file)
--- a/test/lhash_test.c
+++ b/test/lhash_test.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/*
- * Copyright (c) 2017 Oracle and/or its affiliates.  All rights reserved.
- */
-

 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 

diff --git a/test/recipes/01-test_test.t b/test/recipes/01-test_test.t
index 90c8314f9eb71f12291c008271a5a80b64622e50..efc970e7b33a7d868eba12eb039b647f927a06fc 100644 (file)
--- 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.
 #! /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
 #
 # 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;
 
 
 use OpenSSL::Test::Simple;
 

diff --git a/test/recipes/02-test_lhash.t b/test/recipes/02-test_lhash.t
index 28eb306714eb514dec75c7728c86a0fc17062bed..613a10d0f636586e4b2487418efdae256c07ac76 100644 (file)
--- 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.
 #! /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
 #
 # 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;
 
 
 use OpenSSL::Test::Simple;
 

diff --git a/test/recipes/02-test_stack.t b/test/recipes/02-test_stack.t
index 548f1ebb709efaeddd56cca3d04fb2bf10634b98..6f906dbd99eabd215b812a395b19ea28652cae73 100644 (file)
--- 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.
 #! /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
 #
 # 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;
 
 
 use OpenSSL::Test::Simple;
 

diff --git a/test/recipes/20-test_enc_more.t b/test/recipes/20-test_enc_more.t
index b4cef6941ad977333657ac48fe05b0a5d3c39242..2691060c75c6e90e62871e8aad24e08cbce0c27b 100644 (file)
--- 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.
 #! /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
 #
 # 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;
 
 
 use strict;

diff --git a/test/recipes/60-test_x509_dup_cert.t b/test/recipes/60-test_x509_dup_cert.t
index 7588d8dbb791527da7b63b11f5cc02fd3db09d07..7cae05c6e3be7dc108991e717f13ef62e0628edb 100644 (file)
--- 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.
 #! /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
 #
 # 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/;
 
 
 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 912dd35bc78c6602288fce4129f959b8c44d018a..e1616914a77f2f9e06238d559ab2fa0645dfbc46 100755 (executable)
--- 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.
 #!/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
 #
 # 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
 
 #
 # OpenSSL external testing using the Python Cryptography module

diff --git a/test/stack_test.c b/test/stack_test.c
index 96870ce2de9ea34f95e0b74cee84c5d10fa8d98d..dbf5c91118fab1966c426e532e55bfb34596f3c1 100644 (file)
--- a/test/stack_test.c
+++ b/test/stack_test.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright (c) 2017 Oracle and/or its affiliates.  All rights reserved.
- */
-

 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 

diff --git a/test/test_test.c b/test/test_test.c
index cab580c1524917d5333af463faca783bbbbf3225..a1b04561b3a164e187e971d93cf519d513534ba1 100644 (file)
--- a/test/test_test.c
+++ b/test/test_test.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/*
- * Copyright (c) 2017 Oracle and/or its affiliates.  All rights reserved.
- */
-

 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 

diff --git a/test/x509_dup_cert_test.c b/test/x509_dup_cert_test.c
index adeb8ea92933554b9c8db740ea874540d02e5514..2ce469aa8379c6122a3619dcbebcfbce93f0764f 100644 (file)
--- 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 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
  *
  * 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
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright (c) 2017 Oracle and/or its affiliates.  All rights reserved.
- */
-

 #include <stdio.h>
 #include <openssl/err.h>
 #include <openssl/x509_vfy.h>
 #include <stdio.h>
 #include <openssl/err.h>
 #include <openssl/x509_vfy.h>