diff options
| author | Pauli <paul.dale@oracle.com> | 2017-06-15 13:34:28 +1000 |
|---|---|---|
| committer | Tim Hudson <tjh@openssl.org> | 2017-06-15 15:50:50 +1000 |
| commit | 5aba2b6e88d1d7fc921d2161af27a0835f966ea9 (patch) | |
| tree | af1cbc00ced6c240004c7fe4188ed540e19c9b64 /crypto | |
| parent | 594da712ffe416e61eeedc736d0332fa4664b24f (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')
| -rw-r--r-- | crypto/aria/aria.c | 5 | ||||
| -rw-r--r-- | crypto/evp/e_aria.c | 5 | ||||
| -rw-r--r-- | crypto/include/internal/aria.h | 5 |
3 files changed, 3 insertions, 12 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" diff --git a/crypto/evp/e_aria.c b/crypto/evp/e_aria.c index 8745bfeb26..6e72c77958 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 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 |