diff options
author | Rich Salz <rsalz@openssl.org> | 2017-06-15 10:16:46 -0400 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2017-06-20 11:13:45 -0400 |
commit | aa8f3d76fcf1502586435631be16faa1bef3cdf7 (patch) | |
tree | ace71b2ca5b2c1c438e98a716ab55e77d36d0ec9 /crypto/engine | |
parent | 0c9d6818c85ad185ac7a8904c70486724473420b (diff) |
Modify Sun copyright to follow OpenSSL style
Approved by Oracle.
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/3585)
Diffstat (limited to 'crypto/engine')
-rw-r--r-- | crypto/engine/eng_fat.c | 7 | ||||
-rw-r--r-- | crypto/engine/eng_int.h | 7 | ||||
-rw-r--r-- | crypto/engine/eng_list.c | 7 | ||||
-rw-r--r-- | crypto/engine/eng_openssl.c | 7 |
4 files changed, 4 insertions, 24 deletions
diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c index 631aa39612..0ca41329cd 100644 --- a/crypto/engine/eng_fat.c +++ b/crypto/engine/eng_fat.c @@ -1,5 +1,6 @@ /* * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (c) 2002, 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,12 +8,6 @@ * https://www.openssl.org/source/license.html */ -/* ==================================================================== - * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. - * ECDH support in OpenSSL originally developed by - * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project. - */ - #include "eng_int.h" #include <openssl/conf.h> diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h index f7bc706f16..0af8b8f8f9 100644 --- a/crypto/engine/eng_int.h +++ b/crypto/engine/eng_int.h @@ -1,5 +1,6 @@ /* * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (c) 2002, 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,12 +8,6 @@ * https://www.openssl.org/source/license.html */ -/* ==================================================================== - * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. - * ECDH support in OpenSSL originally developed by - * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project. - */ - #ifndef HEADER_ENGINE_INT_H # define HEADER_ENGINE_INT_H diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c index fddebf44b8..b335ac1651 100644 --- a/crypto/engine/eng_list.c +++ b/crypto/engine/eng_list.c @@ -1,5 +1,6 @@ /* * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (c) 2002, 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,12 +8,6 @@ * https://www.openssl.org/source/license.html */ -/* ==================================================================== - * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. - * ECDH support in OpenSSL originally developed by - * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project. - */ - #include "eng_int.h" /* diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c index 9208f7eafc..dce5cccfd8 100644 --- a/crypto/engine/eng_openssl.c +++ b/crypto/engine/eng_openssl.c @@ -1,5 +1,6 @@ /* * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (c) 2002, 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,12 +8,6 @@ * https://www.openssl.org/source/license.html */ -/* ==================================================================== - * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. - * ECDH support in OpenSSL originally developed by - * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project. - */ - #include <stdio.h> #include <openssl/crypto.h> #include "internal/cryptlib.h" |