2 files changed, 2 insertions, 54 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_asn1.c b/src/lib/libssl/src/ssl/ssl_asn1.c
index ff1d7860e1..97034c98c5 100644
--- a/src/lib/libssl/src/ssl/ssl_asn1.c
+++ b/src/lib/libssl/src/ssl/ssl_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_asn1.c,v 1.32 2014/07/13 16:39:19 jsing Exp $ */
+/* $OpenBSD: ssl_asn1.c,v 1.33 2014/07/13 16:43:37 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -55,32 +55,6 @@
 * copied and put under another distribution licence
 * [including the GNU Public Licence.]
 */
-/* ====================================================================
- * 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 <stdlib.h>
diff --git a/src/lib/libssl/ssl_asn1.c b/src/lib/libssl/ssl_asn1.c
index ff1d7860e1..97034c98c5 100644
--- a/src/lib/libssl/ssl_asn1.c
+++ b/src/lib/libssl/ssl_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_asn1.c,v 1.32 2014/07/13 16:39:19 jsing Exp $ */
+/* $OpenBSD: ssl_asn1.c,v 1.33 2014/07/13 16:43:37 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -55,32 +55,6 @@
 * copied and put under another distribution licence
 * [including the GNU Public Licence.]
 */
-/* ====================================================================
- * 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 <stdlib.h>

diff --git a/src/lib/libssl/src/ssl/ssl_asn1.c b/src/lib/libssl/src/ssl/ssl_asn1.c index ff1d7860e1..97034c98c5 100644 --- a/src/lib/libssl/src/ssl/ssl_asn1.c +++ b/src/lib/libssl/src/ssl/ssl_asn1.c
@@ -1,4 +1,4 @@
1	/* $OpenBSD: ssl_asn1.c,v 1.32 2014/07/13 16:39:19 jsing Exp $ */	1	/* $OpenBSD: ssl_asn1.c,v 1.33 2014/07/13 16:43:37 jsing Exp $ */
2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)	2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3	* All rights reserved.	3	* All rights reserved.
4	*	4	*
@@ -55,32 +55,6 @@
55	* copied and put under another distribution licence	55	* copied and put under another distribution licence
56	* [including the GNU Public Licence.]	56	* [including the GNU Public Licence.]
57	*/	57	*/
58	/* ====================================================================
59	* Copyright 2005 Nokia. All rights reserved.
60	*
61	* The portions of the attached software ("Contribution") is developed by
62	* Nokia Corporation and is licensed pursuant to the OpenSSL open source
63	* license.
64	*
65	* The Contribution, originally written by Mika Kousa and Pasi Eronen of
66	* Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
67	* support (see RFC 4279) to OpenSSL.
68	*
69	* No patent licenses or other rights except those expressly stated in
70	* the OpenSSL open source license shall be deemed granted or received
71	* expressly, by implication, estoppel, or otherwise.
72	*
73	* No assurances are provided by Nokia that the Contribution does not
74	* infringe the patent or other intellectual property rights of any third
75	* party or that the license provides you with all the necessary rights
76	* to make use of the Contribution.
77	*
78	* THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
79	* ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
80	* SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
81	* OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
82	* OTHERWISE.
83	*/
84		58
85	#include <stdio.h>	59	#include <stdio.h>
86	#include <stdlib.h>	60	#include <stdlib.h>


diff --git a/src/lib/libssl/ssl_asn1.c b/src/lib/libssl/ssl_asn1.c index ff1d7860e1..97034c98c5 100644 --- a/src/lib/libssl/ssl_asn1.c +++ b/src/lib/libssl/ssl_asn1.c
@@ -1,4 +1,4 @@
1	/* $OpenBSD: ssl_asn1.c,v 1.32 2014/07/13 16:39:19 jsing Exp $ */	1	/* $OpenBSD: ssl_asn1.c,v 1.33 2014/07/13 16:43:37 jsing Exp $ */
2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)	2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3	* All rights reserved.	3	* All rights reserved.
4	*	4	*
@@ -55,32 +55,6 @@
55	* copied and put under another distribution licence	55	* copied and put under another distribution licence
56	* [including the GNU Public Licence.]	56	* [including the GNU Public Licence.]
57	*/	57	*/
58	/* ====================================================================
59	* Copyright 2005 Nokia. All rights reserved.
60	*
61	* The portions of the attached software ("Contribution") is developed by
62	* Nokia Corporation and is licensed pursuant to the OpenSSL open source
63	* license.
64	*
65	* The Contribution, originally written by Mika Kousa and Pasi Eronen of
66	* Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
67	* support (see RFC 4279) to OpenSSL.
68	*
69	* No patent licenses or other rights except those expressly stated in
70	* the OpenSSL open source license shall be deemed granted or received
71	* expressly, by implication, estoppel, or otherwise.
72	*
73	* No assurances are provided by Nokia that the Contribution does not
74	* infringe the patent or other intellectual property rights of any third
75	* party or that the license provides you with all the necessary rights
76	* to make use of the Contribution.
77	*
78	* THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
79	* ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
80	* SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
81	* OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
82	* OTHERWISE.
83	*/
84		58
85	#include <stdio.h>	59	#include <stdio.h>
86	#include <stdlib.h>	60	#include <stdlib.h>