Skip to content

Commit a763b50

Browse files
authored
Merge pull request #1341 from fviernau/openssl-nokia-psk-contribution-license
Add a license for the `PSK` contributions to OpenSSL
2 parents cd260b7 + 516d6b2 commit a763b50

4 files changed

Lines changed: 53 additions & 0 deletions

File tree

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
The portions of the attached software ("Contribution") is developed by
2+
Nokia Corporation and is licensed pursuant to the OpenSSL open source
3+
license.
4+
5+
The Contribution, originally written by Mika Kousa and Pasi Eronen of
6+
Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
7+
support (see RFC 4279) to OpenSSL.
8+
9+
No patent licenses or other rights except those expressly stated in
10+
the OpenSSL open source license shall be deemed granted or received
11+
expressly, by implication, estoppel, or otherwise.
12+
13+
No assurances are provided by Nokia that the Contribution does not
14+
infringe the patent or other intellectual property rights of any third
15+
party or that the license provides you with all the necessary rights
16+
to make use of the Contribution.
17+
18+
THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
19+
ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
20+
SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
21+
OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
22+
OTHERWISE.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
key: openssl-nokia-psk-contribution
2+
name: OpenSSL Nokia PSK (Pre-Shared Key) Contribution
3+
short_name: OpenSSL Nokia PSK Contribution
4+
category: Permissive
5+
owner: Nokia
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Copyright 2005 Nokia. All rights reserved.
2+
3+
The portions of the attached software ("Contribution") is developed by
4+
Nokia Corporation and is licensed pursuant to the OpenSSL open source
5+
license.
6+
7+
The Contribution, originally written by Mika Kousa and Pasi Eronen of
8+
Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
9+
support (see RFC 4279) to OpenSSL.
10+
11+
No patent licenses or other rights except those expressly stated in
12+
the OpenSSL open source license shall be deemed granted or received
13+
expressly, by implication, estoppel, or otherwise.
14+
15+
No assurances are provided by Nokia that the Contribution does not
16+
infringe the patent or other intellectual property rights of any third
17+
party or that the license provides you with all the necessary rights
18+
to make use of the Contribution.
19+
20+
THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
21+
ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
22+
SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
23+
OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
24+
OTHERWISE.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
license_expressions:
2+
- openssl-nokia-psk-contribution

0 commit comments

Comments
 (0)