summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2017-06-20 10:14:36 -0400
committerRich Salz <rsalz@openssl.org>2017-06-21 08:59:18 -0400
commitc80149d9f09b3a5a5b1621fa705e900d455334d4 (patch)
treec936bc25ea255c17eaa7c1cfbf1baaf207756e70 /doc
parentaa74c2ec016e1056f3df22507832644e6e6ac43c (diff)
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 'doc')
-rw-r--r--doc/man3/SSL_CTX_set_psk_client_callback.pod2
-rw-r--r--doc/man3/SSL_CTX_use_psk_identity_hint.pod2
-rw-r--r--doc/man3/SSL_get_psk_identity.pod2
3 files changed, 0 insertions, 6 deletions
diff --git a/doc/man3/SSL_CTX_set_psk_client_callback.pod b/doc/man3/SSL_CTX_set_psk_client_callback.pod
index e7080eb799..6aa60bb206 100644
--- a/doc/man3/SSL_CTX_set_psk_client_callback.pod
+++ b/doc/man3/SSL_CTX_set_psk_client_callback.pod
@@ -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
diff --git a/doc/man3/SSL_CTX_use_psk_identity_hint.pod b/doc/man3/SSL_CTX_use_psk_identity_hint.pod
index c1ee5ed767..41384ac626 100644
--- a/doc/man3/SSL_CTX_use_psk_identity_hint.pod
+++ b/doc/man3/SSL_CTX_use_psk_identity_hint.pod
@@ -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
diff --git a/doc/man3/SSL_get_psk_identity.pod b/doc/man3/SSL_get_psk_identity.pod
index 5cd406c353..2930a3b6df 100644
--- a/doc/man3/SSL_get_psk_identity.pod
+++ b/doc/man3/SSL_get_psk_identity.pod
@@ -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