Skip to content

Commit c80149d

Browse files
author
Rich Salz
committed
Merge Nokia copyright notice into standard
This is done with the kind permission of Nokia. Reviewed-by: Matt Caswell <[email protected]> (Merged from #3722)
1 parent aa74c2e commit c80149d

20 files changed

+17
-465
lines changed

‎apps/s_client.c

+1-27
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,13 @@
11
/*
22
* Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
3+
* Copyright 2005 Nokia. All rights reserved.
34
*
45
* Licensed under the OpenSSL license (the "License"). You may not use
56
* this file except in compliance with the License. You can obtain a copy
67
* in the file LICENSE in the source distribution or at
78
* https://www.openssl.org/source/license.html
89
*/
910

10-
/* ====================================================================
11-
* Copyright 2005 Nokia. All rights reserved.
12-
*
13-
* The portions of the attached software ("Contribution") is developed by
14-
* Nokia Corporation and is licensed pursuant to the OpenSSL open source
15-
* license.
16-
*
17-
* The Contribution, originally written by Mika Kousa and Pasi Eronen of
18-
* Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
19-
* support (see RFC 4279) to OpenSSL.
20-
*
21-
* No patent licenses or other rights except those expressly stated in
22-
* the OpenSSL open source license shall be deemed granted or received
23-
* expressly, by implication, estoppel, or otherwise.
24-
*
25-
* No assurances are provided by Nokia that the Contribution does not
26-
* infringe the patent or other intellectual property rights of any third
27-
* party or that the license provides you with all the necessary rights
28-
* to make use of the Contribution.
29-
*
30-
* THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
31-
* ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
32-
* SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
33-
* OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
34-
* OTHERWISE.
35-
*/
36-
3711
#include <ctype.h>
3812
#include <stdio.h>
3913
#include <stdlib.h>

‎apps/s_server.c

+1-27
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,14 @@
11
/*
22
* Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
33
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
4+
* Copyright 2005 Nokia. All rights reserved.
45
*
56
* Licensed under the OpenSSL license (the "License"). You may not use
67
* this file except in compliance with the License. You can obtain a copy
78
* in the file LICENSE in the source distribution or at
89
* https://www.openssl.org/source/license.html
910
*/
1011

11-
/* ====================================================================
12-
* Copyright 2005 Nokia. All rights reserved.
13-
*
14-
* The portions of the attached software ("Contribution") is developed by
15-
* Nokia Corporation and is licensed pursuant to the OpenSSL open source
16-
* license.
17-
*
18-
* The Contribution, originally written by Mika Kousa and Pasi Eronen of
19-
* Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
20-
* support (see RFC 4279) to OpenSSL.
21-
*
22-
* No patent licenses or other rights except those expressly stated in
23-
* the OpenSSL open source license shall be deemed granted or received
24-
* expressly, by implication, estoppel, or otherwise.
25-
*
26-
* No assurances are provided by Nokia that the Contribution does not
27-
* infringe the patent or other intellectual property rights of any third
28-
* party or that the license provides you with all the necessary rights
29-
* to make use of the Contribution.
30-
*
31-
* THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
32-
* ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
33-
* SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
34-
* OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
35-
* OTHERWISE.
36-
*/
37-
3812
#include <ctype.h>
3913
#include <stdio.h>
4014
#include <stdlib.h>

‎doc/man3/SSL_CTX_set_psk_client_callback.pod

-2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,4 @@ this file except in compliance with the License. You can obtain a copy
5858
in the file LICENSE in the source distribution or at
5959
L<https://www.openssl.org/source/license.html>.
6060

61-
Copyright 2005 Nokia.
62-
6361
=cut

‎doc/man3/SSL_CTX_use_psk_identity_hint.pod

-2
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,4 @@ this file except in compliance with the License. You can obtain a copy
8686
in the file LICENSE in the source distribution or at
8787
L<https://www.openssl.org/source/license.html>.
8888

89-
Copyright 2005 Nokia.
90-
9189
=cut

‎doc/man3/SSL_get_psk_identity.pod

-2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,4 @@ this file except in compliance with the License. You can obtain a copy
3838
in the file LICENSE in the source distribution or at
3939
L<https://www.openssl.org/source/license.html>.
4040

41-
Copyright 2005 Nokia.
42-
4341
=cut

‎include/openssl/ssl.h

+1-27
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,14 @@
11
/*
22
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
33
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
4+
* Copyright 2005 Nokia. All rights reserved.
45
*
56
* Licensed under the OpenSSL license (the "License"). You may not use
67
* this file except in compliance with the License. You can obtain a copy
78
* in the file LICENSE in the source distribution or at
89
* https://www.openssl.org/source/license.html
910
*/
1011

11-
/* ====================================================================
12-
* Copyright 2005 Nokia. All rights reserved.
13-
*
14-
* The portions of the attached software ("Contribution") is developed by
15-
* Nokia Corporation and is licensed pursuant to the OpenSSL open source
16-
* license.
17-
*
18-
* The Contribution, originally written by Mika Kousa and Pasi Eronen of
19-
* Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
20-
* support (see RFC 4279) to OpenSSL.
21-
*
22-
* No patent licenses or other rights except those expressly stated in
23-
* the OpenSSL open source license shall be deemed granted or received
24-
* expressly, by implication, estoppel, or otherwise.
25-
*
26-
* No assurances are provided by Nokia that the Contribution does not
27-
* infringe the patent or other intellectual property rights of any third
28-
* party or that the license provides you with all the necessary rights
29-
* to make use of the Contribution.
30-
*
31-
* THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
32-
* ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
33-
* SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
34-
* OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
35-
* OTHERWISE.
36-
*/
37-
3812
#ifndef HEADER_SSL_H
3913
# define HEADER_SSL_H
4014

‎include/openssl/tls1.h

+1-27
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,14 @@
11
/*
22
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
33
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
4+
* Copyright 2005 Nokia. All rights reserved.
45
*
56
* Licensed under the OpenSSL license (the "License"). You may not use
67
* this file except in compliance with the License. You can obtain a copy
78
* in the file LICENSE in the source distribution or at
89
* https://www.openssl.org/source/license.html
910
*/
1011

11-
/* ====================================================================
12-
* Copyright 2005 Nokia. All rights reserved.
13-
*
14-
* The portions of the attached software ("Contribution") is developed by
15-
* Nokia Corporation and is licensed pursuant to the OpenSSL open source
16-
* license.
17-
*
18-
* The Contribution, originally written by Mika Kousa and Pasi Eronen of
19-
* Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
20-
* support (see RFC 4279) to OpenSSL.
21-
*
22-
* No patent licenses or other rights except those expressly stated in
23-
* the OpenSSL open source license shall be deemed granted or received
24-
* expressly, by implication, estoppel, or otherwise.
25-
*
26-
* No assurances are provided by Nokia that the Contribution does not
27-
* infringe the patent or other intellectual property rights of any third
28-
* party or that the license provides you with all the necessary rights
29-
* to make use of the Contribution.
30-
*
31-
* THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
32-
* ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
33-
* SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
34-
* OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
35-
* OTHERWISE.
36-
*/
37-
3812
#ifndef HEADER_TLS1_H
3913
# define HEADER_TLS1_H
4014

‎ssl/s3_enc.c

+1-27
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,13 @@
11
/*
22
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
3+
* Copyright 2005 Nokia. All rights reserved.
34
*
45
* Licensed under the OpenSSL license (the "License"). You may not use
56
* this file except in compliance with the License. You can obtain a copy
67
* in the file LICENSE in the source distribution or at
78
* https://www.openssl.org/source/license.html
89
*/
910

10-
/* ====================================================================
11-
* Copyright 2005 Nokia. All rights reserved.
12-
*
13-
* The portions of the attached software ("Contribution") is developed by
14-
* Nokia Corporation and is licensed pursuant to the OpenSSL open source
15-
* license.
16-
*
17-
* The Contribution, originally written by Mika Kousa and Pasi Eronen of
18-
* Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
19-
* support (see RFC 4279) to OpenSSL.
20-
*
21-
* No patent licenses or other rights except those expressly stated in
22-
* the OpenSSL open source license shall be deemed granted or received
23-
* expressly, by implication, estoppel, or otherwise.
24-
*
25-
* No assurances are provided by Nokia that the Contribution does not
26-
* infringe the patent or other intellectual property rights of any third
27-
* party or that the license provides you with all the necessary rights
28-
* to make use of the Contribution.
29-
*
30-
* THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
31-
* ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
32-
* SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
33-
* OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
34-
* OTHERWISE.
35-
*/
36-
3711
#include <stdio.h>
3812
#include "ssl_locl.h"
3913
#include <openssl/evp.h>

‎ssl/s3_lib.c

+1-27
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,14 @@
11
/*
22
* Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
33
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
4+
* Copyright 2005 Nokia. All rights reserved.
45
*
56
* Licensed under the OpenSSL license (the "License"). You may not use
67
* this file except in compliance with the License. You can obtain a copy
78
* in the file LICENSE in the source distribution or at
89
* https://www.openssl.org/source/license.html
910
*/
1011

11-
/* ====================================================================
12-
* Copyright 2005 Nokia. All rights reserved.
13-
*
14-
* The portions of the attached software ("Contribution") is developed by
15-
* Nokia Corporation and is licensed pursuant to the OpenSSL open source
16-
* license.
17-
*
18-
* The Contribution, originally written by Mika Kousa and Pasi Eronen of
19-
* Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
20-
* support (see RFC 4279) to OpenSSL.
21-
*
22-
* No patent licenses or other rights except those expressly stated in
23-
* the OpenSSL open source license shall be deemed granted or received
24-
* expressly, by implication, estoppel, or otherwise.
25-
*
26-
* No assurances are provided by Nokia that the Contribution does not
27-
* infringe the patent or other intellectual property rights of any third
28-
* party or that the license provides you with all the necessary rights
29-
* to make use of the Contribution.
30-
*
31-
* THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
32-
* ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
33-
* SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
34-
* OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
35-
* OTHERWISE.
36-
*/
37-
3812
#include <stdio.h>
3913
#include <openssl/objects.h>
4014
#include "ssl_locl.h"

‎ssl/ssl_asn1.c

+1-27
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,13 @@
11
/*
22
* Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
3+
* Copyright 2005 Nokia. All rights reserved.
34
*
45
* Licensed under the OpenSSL license (the "License"). You may not use
56
* this file except in compliance with the License. You can obtain a copy
67
* in the file LICENSE in the source distribution or at
78
* https://www.openssl.org/source/license.html
89
*/
910

10-
/* ====================================================================
11-
* Copyright 2005 Nokia. All rights reserved.
12-
*
13-
* The portions of the attached software ("Contribution") is developed by
14-
* Nokia Corporation and is licensed pursuant to the OpenSSL open source
15-
* license.
16-
*
17-
* The Contribution, originally written by Mika Kousa and Pasi Eronen of
18-
* Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
19-
* support (see RFC 4279) to OpenSSL.
20-
*
21-
* No patent licenses or other rights except those expressly stated in
22-
* the OpenSSL open source license shall be deemed granted or received
23-
* expressly, by implication, estoppel, or otherwise.
24-
*
25-
* No assurances are provided by Nokia that the Contribution does not
26-
* infringe the patent or other intellectual property rights of any third
27-
* party or that the license provides you with all the necessary rights
28-
* to make use of the Contribution.
29-
*
30-
* THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
31-
* ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
32-
* SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
33-
* OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
34-
* OTHERWISE.
35-
*/
36-
3711
#include <stdio.h>
3812
#include <stdlib.h>
3913
#include "ssl_locl.h"

‎ssl/ssl_ciph.c

+1-27
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,14 @@
11
/*
22
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
33
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
4+
* Copyright 2005 Nokia. All rights reserved.
45
*
56
* Licensed under the OpenSSL license (the "License"). You may not use
67
* this file except in compliance with the License. You can obtain a copy
78
* in the file LICENSE in the source distribution or at
89
* https://www.openssl.org/source/license.html
910
*/
1011

11-
/* ====================================================================
12-
* Copyright 2005 Nokia. All rights reserved.
13-
*
14-
* The portions of the attached software ("Contribution") is developed by
15-
* Nokia Corporation and is licensed pursuant to the OpenSSL open source
16-
* license.
17-
*
18-
* The Contribution, originally written by Mika Kousa and Pasi Eronen of
19-
* Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
20-
* support (see RFC 4279) to OpenSSL.
21-
*
22-
* No patent licenses or other rights except those expressly stated in
23-
* the OpenSSL open source license shall be deemed granted or received
24-
* expressly, by implication, estoppel, or otherwise.
25-
*
26-
* No assurances are provided by Nokia that the Contribution does not
27-
* infringe the patent or other intellectual property rights of any third
28-
* party or that the license provides you with all the necessary rights
29-
* to make use of the Contribution.
30-
*
31-
* THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
32-
* ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
33-
* SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
34-
* OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
35-
* OTHERWISE.
36-
*/
37-
3812
#include <stdio.h>
3913
#include <ctype.h>
4014
#include <openssl/objects.h>

‎ssl/ssl_lib.c

+1-27
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,14 @@
11
/*
22
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
33
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
4+
* Copyright 2005 Nokia. All rights reserved.
45
*
56
* Licensed under the OpenSSL license (the "License"). You may not use
67
* this file except in compliance with the License. You can obtain a copy
78
* in the file LICENSE in the source distribution or at
89
* https://www.openssl.org/source/license.html
910
*/
1011

11-
/* ====================================================================
12-
* Copyright 2005 Nokia. All rights reserved.
13-
*
14-
* The portions of the attached software ("Contribution") is developed by
15-
* Nokia Corporation and is licensed pursuant to the OpenSSL open source
16-
* license.
17-
*
18-
* The Contribution, originally written by Mika Kousa and Pasi Eronen of
19-
* Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
20-
* support (see RFC 4279) to OpenSSL.
21-
*
22-
* No patent licenses or other rights except those expressly stated in
23-
* the OpenSSL open source license shall be deemed granted or received
24-
* expressly, by implication, estoppel, or otherwise.
25-
*
26-
* No assurances are provided by Nokia that the Contribution does not
27-
* infringe the patent or other intellectual property rights of any third
28-
* party or that the license provides you with all the necessary rights
29-
* to make use of the Contribution.
30-
*
31-
* THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
32-
* ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
33-
* SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
34-
* OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
35-
* OTHERWISE.
36-
*/
37-
3812
#include <stdio.h>
3913
#include "ssl_locl.h"
4014
#include <openssl/objects.h>

0 commit comments

Comments
 (0)