upd: openssl to 1.1.0

[cassiopeia.git] / lib / openssl / doc / ssl / SSL_CTX_set_psk_client_callback.pod

diff --git a/lib/openssl/doc/ssl/SSL_CTX_set_psk_client_callback.pod b/lib/openssl/doc/ssl/SSL_CTX_set_psk_client_callback.pod
index 573f89a9220069f7248aade9c60c03df651cd0dd..a4175081c5b63e4293c05995ce2dfd2a18a8f6e6 100644 (file)
--- a/lib/openssl/doc/ssl/SSL_CTX_set_psk_client_callback.pod
+++ b/lib/openssl/doc/ssl/SSL_CTX_set_psk_client_callback.pod
@@ -1,34 +1,5 @@
 =pod
 
 =pod
 

-=begin comment
-
-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.
-
-=end comment
-

 =head1 NAME
 
 SSL_CTX_set_psk_client_callback, SSL_set_psk_client_callback - set PSK client callback
 =head1 NAME
 
 SSL_CTX_set_psk_client_callback, SSL_set_psk_client_callback - set PSK client callback


@@ -38,13 +9,13 @@ SSL_CTX_set_psk_client_callback, SSL_set_psk_client_callback - set PSK client ca
  #include <openssl/ssl.h>
 
  void SSL_CTX_set_psk_client_callback(SSL_CTX *ctx,
  #include <openssl/ssl.h>
 
  void SSL_CTX_set_psk_client_callback(SSL_CTX *ctx,

-       unsigned int (*callback)(SSL *ssl, const char *hint,
-       char *identity, unsigned int max_identity_len,
-       unsigned char *psk, unsigned int max_psk_len));
+        unsigned int (*callback)(SSL *ssl, const char *hint,
+        char *identity, unsigned int max_identity_len,
+        unsigned char *psk, unsigned int max_psk_len));

  void SSL_set_psk_client_callback(SSL *ssl,
  void SSL_set_psk_client_callback(SSL *ssl,

-       unsigned int (*callback)(SSL *ssl, const char *hint,
-       char *identity, unsigned int max_identity_len,
-       unsigned char *psk, unsigned int max_psk_len));
+        unsigned int (*callback)(SSL *ssl, const char *hint,
+        char *identity, unsigned int max_identity_len,
+        unsigned char *psk, unsigned int max_psk_len));

 
 
 =head1 DESCRIPTION
 
 
 =head1 DESCRIPTION


@@ -59,7 +30,7 @@ The callback is set using functions SSL_CTX_set_psk_client_callback()
 or SSL_set_psk_client_callback(). The callback function is given the
 connection in parameter B<ssl>, a B<NULL>-terminated PSK identity hint
 sent by the server in parameter B<hint>, a buffer B<identity> of
 or SSL_set_psk_client_callback(). The callback function is given the
 connection in parameter B<ssl>, a B<NULL>-terminated PSK identity hint
 sent by the server in parameter B<hint>, a buffer B<identity> of

-length B<max_identity_len> bytes where the the resulting
+length B<max_identity_len> bytes where the resulting

 B<NULL>-terminated identity is to be stored, and a buffer B<psk> of
 length B<max_psk_len> bytes where the resulting pre-shared key is to
 be stored.
 B<NULL>-terminated identity is to be stored, and a buffer B<psk> of
 length B<max_psk_len> bytes where the resulting pre-shared key is to
 be stored.


@@ -78,4 +49,15 @@ the length (> 0) of B<psk> in bytes is returned.
 Otherwise or on errors callback should return 0. In this case
 the connection setup fails.
 
 Otherwise or on errors callback should return 0. In this case
 the connection setup fails.
 

+=head1 COPYRIGHT
+
+Copyright 2006-2016 The OpenSSL Project Authors. 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
+in the file LICENSE in the source distribution or at
+L<https://www.openssl.org/source/license.html>.
+
+Copyright 2005 Nokia.
+

 =cut
 =cut