[openssl-commits] [openssl] master update
Tim Hudson
tjh at openssl.org
Thu Jun 15 06:01:05 UTC 2017
The branch master has been updated
via 5aba2b6e88d1d7fc921d2161af27a0835f966ea9 (commit)
from 594da712ffe416e61eeedc736d0332fa4664b24f (commit)
- Log -----------------------------------------------------------------
commit 5aba2b6e88d1d7fc921d2161af27a0835f966ea9
Author: Pauli <paul.dale at oracle.com>
Date: Thu Jun 15 13:34:28 2017 +1000
Correct Oracle copyrights & clarify.
Reviewed-by: Tim Hudson <tjh at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3684)
-----------------------------------------------------------------------
Summary of changes:
crypto/aria/aria.c | 5 +----
crypto/evp/e_aria.c | 5 +----
crypto/include/internal/aria.h | 5 +----
test/lhash_test.c | 5 +----
test/recipes/01-test_test.t | 4 +---
test/recipes/02-test_lhash.t | 4 +---
test/recipes/02-test_stack.t | 4 +---
test/recipes/20-test_enc_more.t | 4 +---
test/recipes/60-test_x509_dup_cert.t | 4 +---
test/recipes/95-test_external_pyca_data/cryptography.sh | 5 +----
test/stack_test.c | 5 +----
test/test_test.c | 5 +----
test/x509_dup_cert_test.c | 5 +----
13 files changed, 13 insertions(+), 47 deletions(-)
diff --git a/crypto/aria/aria.c b/crypto/aria/aria.c
index b59b4a4..a3c31d6 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 <openssl/e_os2.h>
#include "internal/aria.h"
diff --git a/crypto/evp/e_aria.c b/crypto/evp/e_aria.c
index 8745bfe..6e72c77 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 <openssl/evp.h>
diff --git a/crypto/include/internal/aria.h b/crypto/include/internal/aria.h
index 116f3ce..0ba0939 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 6aa21f2..a0d377e 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 <stdio.h>
#include <string.h>
diff --git a/test/recipes/01-test_test.t b/test/recipes/01-test_test.t
index 90c8314..efc970e 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 28eb306..613a10d 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 548f1eb..6f906db 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 b4cef69..2691060 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 7588d8d..7cae05c 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 912dd35..e161691 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 96870ce..dbf5c91 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 <stdio.h>
#include <string.h>
diff --git a/test/test_test.c b/test/test_test.c
index cab580c..a1b0456 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 <stdio.h>
#include <string.h>
diff --git a/test/x509_dup_cert_test.c b/test/x509_dup_cert_test.c
index adeb8ea..2ce469a 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 <stdio.h>
#include <openssl/err.h>
#include <openssl/x509_vfy.h>
More information about the openssl-commits
mailing list