summaryrefslogtreecommitdiffstats
path: root/crypto/include
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2017-06-15 13:34:28 +1000
committerTim Hudson <tjh@openssl.org>2017-06-15 15:50:50 +1000
commit5aba2b6e88d1d7fc921d2161af27a0835f966ea9 (patch)
treeaf1cbc00ced6c240004c7fe4188ed540e19c9b64 /crypto/include
parent594da712ffe416e61eeedc736d0332fa4664b24f (diff)
Correct Oracle copyrights & clarify.
Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3684)
Diffstat (limited to 'crypto/include')
-rw-r--r--crypto/include/internal/aria.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/crypto/include/internal/aria.h b/crypto/include/internal/aria.h
index 116f3ce974..0ba093922d 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