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

Merge Nokia copyright notice into standard 



This is done with the kind permission of Nokia.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3722)
parent aa74c2ec

apps/s_client.c

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

 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 2005 Nokia. 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,33 +8,6 @@ 
 * https://www.openssl.org/source/license.html

 */



/* ====================================================================

 * Copyright 2005 Nokia. All rights reserved.

 *

 * The portions of the attached software ("Contribution") is developed by

 * Nokia Corporation and is licensed pursuant to the OpenSSL open source

 * license.

 *

 * The Contribution, originally written by Mika Kousa and Pasi Eronen of

 * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites

 * support (see RFC 4279) to OpenSSL.

 *

 * No patent licenses or other rights except those expressly stated in

 * the OpenSSL open source license shall be deemed granted or received

 * expressly, by implication, estoppel, or otherwise.

 *

 * No assurances are provided by Nokia that the Contribution does not

 * infringe the patent or other intellectual property rights of any third

 * party or that the license provides you with all the necessary rights

 * to make use of the Contribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN

 * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA

 * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY

 * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR

 * OTHERWISE.

 */



#include <ctype.h>

#include <stdio.h>

#include <stdlib.h>

apps/s_server.c

+1 −27
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

 * Copyright 2005 Nokia. 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,33 +9,6 @@ 
 * https://www.openssl.org/source/license.html

 */



/* ====================================================================

 * Copyright 2005 Nokia. All rights reserved.

 *

 * The portions of the attached software ("Contribution") is developed by

 * Nokia Corporation and is licensed pursuant to the OpenSSL open source

 * license.

 *

 * The Contribution, originally written by Mika Kousa and Pasi Eronen of

 * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites

 * support (see RFC 4279) to OpenSSL.

 *

 * No patent licenses or other rights except those expressly stated in

 * the OpenSSL open source license shall be deemed granted or received

 * expressly, by implication, estoppel, or otherwise.

 *

 * No assurances are provided by Nokia that the Contribution does not

 * infringe the patent or other intellectual property rights of any third

 * party or that the license provides you with all the necessary rights

 * to make use of the Contribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN

 * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA

 * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY

 * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR

 * OTHERWISE.

 */



#include <ctype.h>

#include <stdio.h>

#include <stdlib.h>

doc/man3/SSL_CTX_set_psk_client_callback.pod

+0 −2
Original line number Diff line number Diff line
@@ -58,6 +58,4 @@ this file except in compliance with the License. You can obtain a copy 
in the file LICENSE in the source distribution or at

L<https://www.openssl.org/source/license.html>.



Copyright 2005 Nokia.



=cut

doc/man3/SSL_CTX_use_psk_identity_hint.pod

+0 −2
Original line number Diff line number Diff line
@@ -86,6 +86,4 @@ this file except in compliance with the License. You can obtain a copy 
in the file LICENSE in the source distribution or at

L<https://www.openssl.org/source/license.html>.



Copyright 2005 Nokia.



=cut

doc/man3/SSL_get_psk_identity.pod

+0 −2
Original line number Diff line number Diff line
@@ -38,6 +38,4 @@ this file except in compliance with the License. You can obtain a copy 
in the file LICENSE in the source distribution or at

L<https://www.openssl.org/source/license.html>.



Copyright 2005 Nokia.



=cut