Commit aa8f3d76 authored by Rich Salz's avatar Rich Salz
Browse files

Modify Sun copyright to follow OpenSSL style 



Approved by Oracle.

Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/3585)
parent 0c9d6818

apps/ecparam.c

+1 −14
Original line number Diff line number Diff line 
/*

 * 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
@@ -7,20 +8,6 @@ 
 * 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

apps/s_server.c

+1 −5
Original line number Diff line number Diff line 
/*

 * 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
@@ -7,11 +8,6 @@ 
 * 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.

 *

apps/speed.c

+1 −14
Original line number Diff line number Diff line 
/*

 * 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
@@ -7,20 +8,6 @@ 
 * 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

crypto/bn/bn_gf2m.c

+1 −11
Original line number Diff line number Diff line 
/*

 * 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
@@ -7,17 +8,6 @@ 
 * 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>

crypto/cryptlib.c

+1 −6
Original line number Diff line number Diff line 
/*

 * 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
@@ -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 "internal/cryptlib_int.h"

#include <openssl/safestack.h>