Correct Oracle copyrights & clarify.

paulidale · t-j-h · commit 5aba2b6e88d1 · 2017-06-15T15:50:50.000+10:00
Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from #3684)
diff --git 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 <openssl/e_os2.h>
 #include "internal/aria.h"
 
diff --git a/crypto/evp/e_aria.c b/crypto/evp/e_aria.c
@@ -1,16 +1,13 @@
 /*
  * 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
  * 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.
- */
-
 #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
@@ -1,16 +1,13 @@
 /*
  * 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
  * 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.
- */
-
  /* 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
@@ -1,16 +1,13 @@
 /*
  * 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.
- */
-
 #include <stdio.h>
 #include <string.h>
 
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,16 +1,13 @@
 /*
  * 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.
- */
-
 #include <stdio.h>
 #include <string.h>
 
diff --git a/test/test_test.c b/test/test_test.c
@@ -1,16 +1,13 @@
 /*
  * 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.
- */
-
 #include <stdio.h>
 #include <string.h>
 
diff --git a/test/x509_dup_cert_test.c b/test/x509_dup_cert_test.c
@@ -1,16 +1,13 @@
 /*
  * 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.
- */
-
 #include <stdio.h>
 #include <openssl/err.h>
 #include <openssl/x509_vfy.h>

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,12 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`	`#`
`3`	`3`	`# Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.`
	`4`	`+# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.`
`4`	`5`	`#`
`5`	`6`	`# Licensed under the OpenSSL license (the "License"). You may not use`
`6`	`7`	`# this file except in compliance with the License. You can obtain a copy`
`7`	`8`	`# in the file LICENSE in the source distribution or at`
`8`	`9`	`# https://www.openssl.org/source/license.html`
`9`		`-#`
`10`		`-# ====================================================================`
`11`		`-# Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.`
`12`		`-#`
`13`	`10`
`14`	`11`	`#`
`15`	`12`	`# OpenSSL external testing using the Python Cryptography module`