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)

diff --git a/apps/ecparam.c b/apps/ecparam.c
index a3696c9d9525ba3159f2d96480e6bc1493b306e4..3661a88fccc8f1925590e4697938e4398c89f5ac 100644 (file)
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2002-2017 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 2002-2017 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
  *
  * 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,20 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * The elliptic curve binary polynomial software is originally written by
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-

 #include <openssl/opensslconf.h>
 #ifdef OPENSSL_NO_EC
 NON_EMPTY_TRANSLATION_UNIT
 #include <openssl/opensslconf.h>
 #ifdef OPENSSL_NO_EC
 NON_EMPTY_TRANSLATION_UNIT

diff --git a/apps/s_server.c b/apps/s_server.c
index 930ef6e4a863bf727bbdc701270b1fb0eb2c123d..d07ab719e12224990671a67ccadfbc58bb9c25a3 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 1995-2017 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
  *
  * 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,11 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * 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.
  *
 /* ====================================================================
  * Copyright 2005 Nokia. All rights reserved.
  *

diff --git a/apps/speed.c b/apps/speed.c
index 3a1f9602cad7fd64de6bd5e967e04f819b7ddf34..c2787a0eccc37d7273330df54fcdd5abe4f1bdd1 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 1995-2017 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
  *
  * 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,20 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * The ECDH and ECDSA speed test software is originally written by
- * Sumit Gupta of Sun Microsystems Laboratories.
- *
- */
-

 #undef SECONDS
 #define SECONDS                 3
 #define PRIME_SECONDS   10
 #undef SECONDS
 #define SECONDS                 3
 #define PRIME_SECONDS   10

diff --git a/crypto/bn/bn_gf2m.c b/crypto/bn/bn_gf2m.c
index b1987f55dd2fbf63944b39fc7ba1a9fdf5c0055d..c118b39be872f73d3bbacc92de85cc9117932a55 100644 (file)
--- a/crypto/bn/bn_gf2m.c
+++ b/crypto/bn/bn_gf2m.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 2002-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
  *
  * 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,17 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
- * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
- * to the OpenSSL project.
- *
- * The ECC Code is licensed pursuant to the OpenSSL open source
- * license provided below.
- */
-

 #include <assert.h>
 #include <limits.h>
 #include <stdio.h>
 #include <assert.h>
 #include <limits.h>
 #include <stdio.h>

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 3151e1a8844c313e0387338825c13311d1088f28..4fe6a451406ce97c9d6edbd49cd1e6d0ef2853d9 100644 (file)
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 1998-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
  *
  * 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
  */
 
  * 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 "internal/cryptlib_int.h"
 #include <openssl/safestack.h>
 
 #include "internal/cryptlib_int.h"
 #include <openssl/safestack.h>
 

diff --git a/crypto/ec/ec2_mult.c b/crypto/ec/ec2_mult.c
index e4a1ec5737ff63e872b4926e6289f325cc1f18bc..891e8102b45b7eae6782a6de03298bc13b277363 100644 (file)
--- a/crypto/ec/ec2_mult.c
+++ b/crypto/ec/ec2_mult.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 2002-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
  *
  * 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,21 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
- * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
- * to the OpenSSL project.
- *
- * The ECC Code is licensed pursuant to the OpenSSL open source
- * license provided below.
- *
- * The software is originally written by Sheueling Chang Shantz and
- * Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-

 #include <openssl/err.h>
 
 #include "internal/bn_int.h"
 #include <openssl/err.h>
 
 #include "internal/bn_int.h"

diff --git a/crypto/ec/ec2_oct.c b/crypto/ec/ec2_oct.c
index ea88ce860a9a05c9ae02c7226f05bff81e79050a..24c32ae623436eff87843154b4803ef4bc642cc9 100644 (file)
--- a/crypto/ec/ec2_oct.c
+++ b/crypto/ec/ec2_oct.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 2011-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
  *
  * 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,21 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
- * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
- * to the OpenSSL project.
- *
- * The ECC Code is licensed pursuant to the OpenSSL open source
- * license provided below.
- *
- * The software is originally written by Sheueling Chang Shantz and
- * Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-

 #include <openssl/err.h>
 
 #include "ec_lcl.h"
 #include <openssl/err.h>
 
 #include "ec_lcl.h"

diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c
index cfeef5fc7495106189a0c66ca6877113462a8d5e..08e4592a96c409cd7c5d5cfa345951c0d998bc3e 100644 (file)
--- a/crypto/ec/ec2_smpl.c
+++ b/crypto/ec/ec2_smpl.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 2002-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
  *
  * 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,21 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
- * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
- * to the OpenSSL project.
- *
- * The ECC Code is licensed pursuant to the OpenSSL open source
- * license provided below.
- *
- * The software is originally written by Sheueling Chang Shantz and
- * Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-

 #include <openssl/err.h>
 
 #include "internal/bn_int.h"
 #include <openssl/err.h>
 
 #include "internal/bn_int.h"

diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c
index f8a3846fd5660e074165c47f43b00e805fca095e..b9eb9939c49c415963ed9e075344174fc1aa0ce2 100644 (file)
--- a/crypto/ec/ec_curve.c
+++ b/crypto/ec/ec_curve.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 2002-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
  *
  * 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,20 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * The elliptic curve binary polynomial software is originally written by
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-

 #include <string.h>
 #include "ec_lcl.h"
 #include <openssl/err.h>
 #include <string.h>
 #include "ec_lcl.h"
 #include <openssl/err.h>

diff --git a/crypto/ec/ec_cvt.c b/crypto/ec/ec_cvt.c
index bfff6d65f7b4f0f8bbcd7c9fd77999a9f305ae6a..13218237debc042f1a0a8a22fe68a267390f6765 100644 (file)
--- a/crypto/ec/ec_cvt.c
+++ b/crypto/ec/ec_cvt.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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,20 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * The elliptic curve binary polynomial software is originally written by
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-

 #include <openssl/err.h>
 #include "ec_lcl.h"
 
 #include <openssl/err.h>
 #include "ec_lcl.h"
 

diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index 96411c0b6acd46897b9cd0e219ff90cff24b60ee..97a394fad66170de19b79f09a03c7bc51a664cb4 100644 (file)
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 2002-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
  *
  * 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
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * Portions originally developed by SUN MICROSYSTEMS, INC., and
- * contributed to the OpenSSL project.
- */
-

 #include <internal/cryptlib.h>
 #include <string.h>
 #include "ec_lcl.h"
 #include <internal/cryptlib.h>
 #include <string.h>
 #include "ec_lcl.h"

diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h
index 10c0ac140f3b9a31ec0069600d0892bbb08caa06..4b65c325af72d609687fe6adfee81ab971e80362 100644 (file)
--- a/crypto/ec/ec_lcl.h
+++ b/crypto/ec/ec_lcl.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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,20 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * The elliptic curve binary polynomial software is originally written by
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-

 #include <stdlib.h>
 
 #include <openssl/obj_mac.h>
 #include <stdlib.h>
 
 #include <openssl/obj_mac.h>

diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c
index 9e45a3183209ce790554ac523f86192003097306..47318d672a2b4a82bea519f7e9844e0afa1f655c 100644 (file)
--- a/crypto/ec/ec_lib.c
+++ b/crypto/ec/ec_lib.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * Binary polynomial ECC support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-

 #include <string.h>
 
 #include <openssl/err.h>
 #include <string.h>
 
 #include <openssl/err.h>

diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
index a3fb8940e743c2f204715ed8117ecd406f95b56a..308cb52d495e0bf9ff20e038a853992ea7cb7d6f 100644 (file)
--- a/crypto/ec/ec_mult.c
+++ b/crypto/ec/ec_mult.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * Portions of this software developed by SUN MICROSYSTEMS, INC.,
- * and contributed to the OpenSSL project.
- */
-

 #include <string.h>
 #include <openssl/err.h>
 
 #include <string.h>
 #include <openssl/err.h>
 

diff --git a/crypto/ec/ec_oct.c b/crypto/ec/ec_oct.c
index effc42a344da4687fea5664e2d291cc0758ffa27..4a3e54ae17d2844d3cade9536711b88ffaafeb3d 100644 (file)
--- a/crypto/ec/ec_oct.c
+++ b/crypto/ec/ec_oct.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 2011-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
  *
  * 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
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * Binary polynomial ECC support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-

 #include <string.h>
 
 #include <openssl/err.h>
 #include <string.h>
 
 #include <openssl/err.h>

diff --git a/crypto/ec/ecdh_ossl.c b/crypto/ec/ecdh_ossl.c
index a865145974d14fc258a1380342c640568abbefa6..3302050c87a5144dae97299b82581e7c77d0f0d8 100644 (file)
--- a/crypto/ec/ecdh_ossl.c
+++ b/crypto/ec/ecdh_ossl.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 2002-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
  *
  * 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,21 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
- * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
- * to the OpenSSL project.
- *
- * The ECC Code is licensed pursuant to the OpenSSL open source
- * license provided below.
- *
- * The ECDH software is originally written by Douglas Stebila of
- * Sun Microsystems Laboratories.
- *
- */
-

 #include <string.h>
 #include <limits.h>
 
 #include <string.h>
 #include <limits.h>
 

diff --git a/crypto/ec/eck_prn.c b/crypto/ec/eck_prn.c
index 3e826cb138f8e6cd320d05642b056105d5fd7892..1422b390a8c630b7e9f81f9a552775c52364d6bd 100644 (file)
--- a/crypto/ec/eck_prn.c
+++ b/crypto/ec/eck_prn.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 2006-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
  *
  * 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
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * Portions originally developed by SUN MICROSYSTEMS, INC., and
- * contributed to the OpenSSL project.
- */
-

 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>

diff --git a/crypto/ec/ecp_mont.c b/crypto/ec/ecp_mont.c
index 994cc1d0fff5f79c59c771f6fd3b43132dca6952..1a760d123912a0c32804a89c0174a68beaaf9d0a 100644 (file)
--- a/crypto/ec/ecp_mont.c
+++ b/crypto/ec/ecp_mont.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * Portions of this software developed by SUN MICROSYSTEMS, INC.,
- * and contributed to the OpenSSL project.
- */
-

 #include <openssl/err.h>
 
 #include "ec_lcl.h"
 #include <openssl/err.h>
 
 #include "ec_lcl.h"

diff --git a/crypto/ec/ecp_nist.c b/crypto/ec/ecp_nist.c
index 615563bc38e0c9d020c6e84941e498cbcc3a688e..16c4cce313f32a2bf02b3dab689beb5cf840c3f2 100644 (file)
--- a/crypto/ec/ecp_nist.c
+++ b/crypto/ec/ecp_nist.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * Portions of this software developed by SUN MICROSYSTEMS, INC.,
- * and contributed to the OpenSSL project.
- */
-

 #include <limits.h>
 
 #include <openssl/err.h>
 #include <limits.h>
 
 #include <openssl/err.h>

diff --git a/crypto/ec/ecp_oct.c b/crypto/ec/ecp_oct.c
index 4d142a4ab96cee746d80ca49da50f19e11f9c2ae..7b876cc687ad67cc47b426c082ee573060b7f614 100644 (file)
--- a/crypto/ec/ecp_oct.c
+++ b/crypto/ec/ecp_oct.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 2011-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
  *
  * 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
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * Portions of this software developed by SUN MICROSYSTEMS, INC.,
- * and contributed to the OpenSSL project.
- */
-

 #include <openssl/err.h>
 #include <openssl/symhacks.h>
 
 #include <openssl/err.h>
 #include <openssl/symhacks.h>
 

diff --git a/crypto/ec/ecp_smpl.c b/crypto/ec/ecp_smpl.c
index 76e0caf907ffea00e8fdc96081cd454de6894e0d..15ff19170cd5d1f20c026ab1c98c4e09e0aa8d97 100644 (file)
--- a/crypto/ec/ecp_smpl.c
+++ b/crypto/ec/ecp_smpl.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * Portions of this software developed by SUN MICROSYSTEMS, INC.,
- * and contributed to the OpenSSL project.
- */
-

 #include <openssl/err.h>
 #include <openssl/symhacks.h>
 
 #include <openssl/err.h>
 #include <openssl/symhacks.h>
 

diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c
index 631aa39612ff74c22cbd17f7a5c759d734a1f1e6..0ca41329cd41099b9d9868159d26a0c1cccd41f3 100644 (file)
--- 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 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
  *
  * 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
  */
 
  * 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>
 
 #include "eng_int.h"
 #include <openssl/conf.h>
 

diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h
index f7bc706f161c173cd8d78bcaa49d5cd06dede339..0af8b8f8f91e9500894a4af2a8ed715242c5ed59 100644 (file)
--- 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 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
  *
  * 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
  */
 
  * 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
 
 #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 fddebf44b8088262ad22a4e421960c54bbc6eec4..b335ac1651dea36ecdbc5d927ace193ef8996f83 100644 (file)
--- 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 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
  *
  * 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
  */
 
  * 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 "eng_int.h"
 
 /*

diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
index 9208f7eafc502650cf4634ed3f682ae8c7c4e274..dce5cccfd844769dd1a54676ffbcc4164710c47e 100644 (file)
--- 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 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
  *
  * 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
  */
 
  * 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"
 #include <stdio.h>
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"

diff --git a/include/openssl/bn.h b/include/openssl/bn.h
index 2b0a37a295873609597d94b702f983040070606a..cca17355547576ab038db19b7c46744612f79771 100644 (file)
--- a/include/openssl/bn.h
+++ b/include/openssl/bn.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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,20 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the Eric Young open source
- * license provided above.
- *
- * The binary polynomial arithmetic software is originally written by
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-

 #ifndef HEADER_BN_H
 # define HEADER_BN_H
 
 #ifndef HEADER_BN_H
 # define HEADER_BN_H
 

diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index 90847af15230b6d0b2f22b22224fe5320a8889e9..5c7d1139d63800f458c56a336328033be04150ba 100644 (file)
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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
  */
 
  * 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_CRYPTO_H
 # define HEADER_CRYPTO_H
 
 #ifndef HEADER_CRYPTO_H
 # define HEADER_CRYPTO_H
 

diff --git a/include/openssl/ec.h b/include/openssl/ec.h
index f418df3cebb1f90ae0a7d7101dfa8197bcb763b1..e1653c9e9448b94969a5df1284cb10f98de64a43 100644 (file)
--- a/include/openssl/ec.h
+++ b/include/openssl/ec.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 2002-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
  *
  * 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,20 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * The elliptic curve binary polynomial software is originally written by
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-

 #ifndef HEADER_EC_H
 # define HEADER_EC_H
 
 #ifndef HEADER_EC_H
 # define HEADER_EC_H
 

diff --git a/include/openssl/engine.h b/include/openssl/engine.h
index 2d0cda43a83cf8903ca3a0c3488a97a8e35a1c27..760281e65a0858da5b0563f9e14c461f54e30b8d 100644 (file)
--- a/include/openssl/engine.h
+++ b/include/openssl/engine.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 2000-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
  *
  * 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
  */
 
  * 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_H
 # define HEADER_ENGINE_H
 
 #ifndef HEADER_ENGINE_H
 # define HEADER_ENGINE_H
 

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 2b8344956bc5ae28cbf157ce9c2092dda13e5ee0..62e5c5897b001ce908be2b3f9e7fa1a654f00482 100644 (file)
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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,11 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * 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.
  *
 /* ====================================================================
  * Copyright 2005 Nokia. All rights reserved.
  *

diff --git a/include/openssl/ssl3.h b/include/openssl/ssl3.h
index 01131c75efdeb7645e6b5670e45be2741f0148a9..0bdd7ed3765099dda7fb52a3819628efdf994d5c 100644 (file)
--- a/include/openssl/ssl3.h
+++ b/include/openssl/ssl3.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * 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.
- */
-

 #ifndef HEADER_SSL3_H
 # define HEADER_SSL3_H
 
 #ifndef HEADER_SSL3_H
 # define HEADER_SSL3_H
 

diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h
index aef65cdb04144f0454e742e92abd7f7aef910f11..d3271871b0353aa1e6dea0c40024491ae9d7ffd6 100644 (file)
--- a/include/openssl/tls1.h
+++ b/include/openssl/tls1.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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,19 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * ECC cipher suite support in OpenSSL originally written by
- * Vipul Gupta and Sumit Gupta of Sun Microsystems Laboratories.
- *
- */

 /* ====================================================================
  * Copyright 2005 Nokia. All rights reserved.
  *
 /* ====================================================================
  * Copyright 2005 Nokia. All rights reserved.
  *

diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index 7d07eb74a8997ebc70475d25eda23cfc57f9b689..286c399aa2f651e28aa701c55c659aadabd999b6 100644 (file)
--- a/include/openssl/x509.h
+++ b/include/openssl/x509.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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
  */
 
  * 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_X509_H
 # define HEADER_X509_H
 
 #ifndef HEADER_X509_H
 # define HEADER_X509_H
 

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 41c44ce62e3dcab009a2d12eb7b5380c04f883b3..586f1ebc635aa5c9fabadce7b45e737c1a5342f2 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 1995-2017 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
  *
  * 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,19 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * ECC cipher suite support in OpenSSL originally written by
- * Vipul Gupta and Sumit Gupta of Sun Microsystems Laboratories.
- *
- */

 /* ====================================================================
  * Copyright 2005 Nokia. All rights reserved.
  *
 /* ====================================================================
  * Copyright 2005 Nokia. All rights reserved.
  *

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index f8e141aa99dd95022d328b74be4cd7aaa0a38f93..d7f6602d50baa7184f56c4d3fda72cbea3be90fc 100644 (file)
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 1995-2017 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
  *
  * 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
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * 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.
- */
-

 #include <stdio.h>
 
 #include "e_os.h"
 #include <stdio.h>
 
 #include "e_os.h"

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index f05e86f0c5d756484aa27067231354be51efc0b1..4d7eaf80e7a20a8730f49f4eda1476d7bb0c3a3b 100644 (file)
--- 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 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
  *
  * 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,11 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * 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.
  *
 /* ====================================================================
  * Copyright 2005 Nokia. All rights reserved.
  *

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 068df4200dba7b2b1fe1ab6a5814ccf5ecbce659..9ab91679509beab4ca61794924c54e124e32f051 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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,11 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * 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.
  *
 /* ====================================================================
  * Copyright 2005 Nokia. All rights reserved.
  *

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 85944ecfe70d1a5917c3c250b22933e8a7f4b420..da80f64aa95d5c9f4169aa7431194a686f3d11c1 100644 (file)
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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,11 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * 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.
  *
 /* ====================================================================
  * Copyright 2005 Nokia. All rights reserved.
  *

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 7dd921eeff0757c4b42fdca60ffe4cfd7171a2b1..671bc5c8a1e2b127604a837aec0accd0241df5ad 100644 (file)
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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,19 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * ECC cipher suite support in OpenSSL originally written by
- * Vipul Gupta and Sumit Gupta of Sun Microsystems Laboratories.
- *
- */

 /* ====================================================================
  * Copyright 2005 Nokia. All rights reserved.
  *
 /* ====================================================================
  * Copyright 2005 Nokia. All rights reserved.
  *

diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 4f3eb5e9d975cf3072c71ae1a6302cc2a5c269d0..0a5d7b406707f9e8c594f4579fb7ee87ada6ff3c 100644 (file)
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * 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.
- */
-

 #include <limits.h>
 #include <string.h>
 #include <stdio.h>
 #include <limits.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 6f578168101e3d98f486fbe44daa10cad577b412..efa35a28ce67bdea0e877c9f0e34a1b2d6b116d5 100644 (file)
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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,19 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * ECC cipher suite support in OpenSSL originally written by
- * Vipul Gupta and Sumit Gupta of Sun Microsystems Laboratories.
- *
- */

 /* ====================================================================
  * Copyright 2005 Nokia. All rights reserved.
  *
 /* ====================================================================
  * Copyright 2005 Nokia. All rights reserved.
  *

diff --git a/test/ecdsatest.c b/test/ecdsatest.c
index a3234814d47df88abd92664fc2677deaf90f4325..54f1a526d94257b73668efb421d90d9507db0592 100644 (file)
--- a/test/ecdsatest.c
+++ b/test/ecdsatest.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 2002-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
  *
  * 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,20 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * The elliptic curve binary polynomial software is originally written by
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/test/ectest.c b/test/ectest.c
index 37bffc65e1932c4f4e7e833571620cffad0b8edb..84e099716948a068d3e844e98271c4c74a3c50ae 100644 (file)
--- a/test/ectest.c
+++ b/test/ectest.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * Copyright 2001-2017 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
  *
  * 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,20 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * The elliptic curve binary polynomial software is originally written by
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-

 #include "e_os.h"
 #include "testutil.h"
 
 #include "e_os.h"
 #include "testutil.h"
 

diff --git a/test/ssltest_old.c b/test/ssltest_old.c
index e0d5a08c9657a9d2354a794696d9dde8f6164db0..04e7a91a9f7714de244d13dd2381c3c9b9fdd4f9 100644 (file)
--- a/test/ssltest_old.c
+++ b/test/ssltest_old.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 /*
  * 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
  *
  * 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,11 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-/* ====================================================================
- * 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.
  *
 /* ====================================================================
  * Copyright 2005 Nokia. All rights reserved.
  *