{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1752653339, "reponame":"openssl", "desc":"OpenSSL", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/openssl", "f":3, "items": [ {"schema":"libjg2-1", "cid":"0141f3edca5e622f91feea6023db216b", "commit": {"type":"commit", "time": 1498052736, "time_ofs": 60, "oid_tree": { "oid": "adec727ac9f8a1be60d2421d940e096b7d859bce", "alias": []}, "oid":{ "oid": "8ead6158a961c9b86bc086fbe96c9fbbe715a8c5", "alias": []}, "msg": "Document SSL_set_psk_find_session_callback() and SSL_CTX equivalent", "sig_commit": { "git_time": { "time": 1498052736, "offset": 60 }, "name": "Matt Caswell", "email": "matt@openssl.org", "md5": "10f7b441a32d5790efad9fc68cae4af2" }, "sig_author": { "git_time": { "time": 1497881023, "offset": 60 }, "name": "Matt Caswell", "email": "matt@openssl.org", "md5": "10f7b441a32d5790efad9fc68cae4af2" }}, "body": "Document SSL_set_psk_find_session_callback() and SSL_CTX equivalent\n\nReviewed-by: Rich Salz \u003crsalz@openssl.org\u003e\n(Merged from https://github.com/openssl/openssl/pull/3670)\n" , "diff": "diff --git a/doc/man3/SSL_CTX_set_psk_client_callback.pod b/doc/man3/SSL_CTX_set_psk_client_callback.pod\nindex 6a37e7d..7e8fffe 100644\n--- a/doc/man3/SSL_CTX_set_psk_client_callback.pod\n+++ b/doc/man3/SSL_CTX_set_psk_client_callback.pod\n@@ -106,7 +106,7 @@ should not be freed by the application.\n \n It is also possible for the callback to succeed but not supply a PSK. In this\n case no PSK will be sent to the server but the handshake will continue. To do\n-this the callback should return successfully and ensure that the B\u003c*sess\u003e is\n+this the callback should return successfully and ensure that B\u003c*sess\u003e is\n NULL. The contents of B\u003c*id\u003e and B\u003c*idlen\u003e will be ignored.\n \n \u003dhead1 NOTES\ndiff --git a/doc/man3/SSL_CTX_use_psk_identity_hint.pod b/doc/man3/SSL_CTX_use_psk_identity_hint.pod\nindex 9375180..9dd14f8 100644\n--- a/doc/man3/SSL_CTX_use_psk_identity_hint.pod\n+++ b/doc/man3/SSL_CTX_use_psk_identity_hint.pod\n@@ -77,6 +77,11 @@ case no PSK will be used but the handshake will continue. To do this the\n callback should return successfully and ensure that B\u003c*sess\u003e is\n NULL.\n \n+\u003dhead1 NOTES\n+\n+A connection established via a TLSv1.3 PSK will appear as if session resumption\n+has occurred so that L\u003cSSL_session_reused(3)\u003e will return true.\n+\n \u003dhead1 RETURN VALUES\n \n SSL_CTX_use_psk_identity_hint() and SSL_use_psk_identity_hint() return\ndiff --git a/util/private.num b/util/private.num\nindex 10fa954..2ad754f 100644\n--- a/util/private.num\n+++ b/util/private.num\n@@ -23,6 +23,8 @@ OPENSSL_Applink external\n SSL_CTX_keylog_cb_func datatype\n SSL_early_cb_fn datatype\n SSL_psk_client_cb_func datatype\n+SSL_psk_find_session_cb_func datatype\n+SSL_psk_server_cb_func datatype\n SSL_psk_use_session_cb_func datatype\n SSL_verify_cb datatype\n UI datatype\n","s":{"c":1752653339,"u": 30201}} ],"g": 31643,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}