aboutsummaryrefslogtreecommitdiff
path: root/ssl/ssl_ciph.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2017-06-15 10:16:46 -0400
committerRich Salz <rsalz@openssl.org>2017-06-20 11:13:45 -0400
commitaa8f3d76fcf1502586435631be16faa1bef3cdf7 (patch)
treeace71b2ca5b2c1c438e98a716ab55e77d36d0ec9 /ssl/ssl_ciph.c
parent0c9d6818c85ad185ac7a8904c70486724473420b (diff)
downloadopenssl-aa8f3d76fcf1502586435631be16faa1bef3cdf7.zip
openssl-aa8f3d76fcf1502586435631be16faa1bef3cdf7.tar.gz
openssl-aa8f3d76fcf1502586435631be16faa1bef3cdf7.tar.bz2
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 'ssl/ssl_ciph.c')
-rw-r--r--ssl/ssl_ciph.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index f05e86f..4d7eaf8 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1,5 +1,6 @@
/*
* Copyright 1995-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
@@ -8,11 +9,6 @@
*/
/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECC cipher suite support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-/* ====================================================================
* Copyright 2005 Nokia. All rights reserved.
*
* The portions of the attached software ("Contribution") is developed by