diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-06-20 10:14:36 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-06-21 08:59:18 -0400 |
| commit | c80149d9f09b3a5a5b1621fa705e900d455334d4 (patch) | |
| tree | c936bc25ea255c17eaa7c1cfbf1baaf207756e70 /ssl/ssl_txt.c | |
| parent | aa74c2ec016e1056f3df22507832644e6e6ac43c (diff) | |
| download | openssl-new-c80149d9f09b3a5a5b1621fa705e900d455334d4.tar.gz | |
Merge Nokia copyright notice into standard
This is done with the kind permission of Nokia.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3722)
Diffstat (limited to 'ssl/ssl_txt.c')
| -rw-r--r-- | ssl/ssl_txt.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c index 7d4a4fd3ec..cb5e86f025 100644 --- a/ssl/ssl_txt.c +++ b/ssl/ssl_txt.c @@ -1,5 +1,6 @@ /* * Copyright 1995-2016 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 <stdio.h> #include <openssl/buffer.h> #include "ssl_locl.h" |