summaryrefslogtreecommitdiffstats
path: root/crypto/aria/aria.c
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2017-06-15 05:34:28 +0200
committerTim Hudson <tjh@openssl.org>2017-06-15 07:50:50 +0200
commit5aba2b6e88d1d7fc921d2161af27a0835f966ea9 (patch)
treeaf1cbc00ced6c240004c7fe4188ed540e19c9b64 /crypto/aria/aria.c
parentRemove OLD_STR_TO_KEY compile option (diff)
downloadopenssl-5aba2b6e88d1d7fc921d2161af27a0835f966ea9.tar.xz
openssl-5aba2b6e88d1d7fc921d2161af27a0835f966ea9.zip
Correct Oracle copyrights & clarify.
Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3684)
Diffstat (limited to 'crypto/aria/aria.c')
-rw-r--r--crypto/aria/aria.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/crypto/aria/aria.c b/crypto/aria/aria.c
index b59b4a44aa..a3c31d6b10 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"