mirror of
https://github.com/openssl/openssl.git
synced 2025-02-11 14:22:43 +08:00
be0d851732
Fix a bug in handling of 128 byte long PSK identity in psk_client_callback. OpenSSL supports PSK identities of up to (and including) 128 bytes in length. PSK identity is obtained via the psk_client_callback, implementors of which are expected to provide a NULL-terminated identity. However, the callback is invoked with only 128 bytes of storage thus making it impossible to return a 128 byte long identity and the required additional NULL byte. This CL fixes the issue by passing in a 129 byte long buffer into the psk_client_callback. As a safety precaution, this CL also zeroes out the buffer before passing it into the callback, uses strnlen for obtaining the length of the identity returned by the callback, and aborts the handshake if the identity (without the NULL terminator) is longer than 128 bytes. (Original patch amended to achieve strnlen in a different way.) Reviewed-by: Rich Salz <rsalz@openssl.org> |
||
|---|---|---|
| .. | ||
| .cvsignore | ||
| bio_ssl.c | ||
| d1_both.c | ||
| d1_clnt.c | ||
| d1_enc.c | ||
| d1_lib.c | ||
| d1_meth.c | ||
| d1_pkt.c | ||
| d1_srtp.c | ||
| d1_srvr.c | ||
| dtls1.h | ||
| heartbeat_test.c | ||
| install-ssl.com | ||
| kssl_lcl.h | ||
| kssl.c | ||
| kssl.h | ||
| Makefile | ||
| s2_clnt.c | ||
| s2_enc.c | ||
| s2_lib.c | ||
| s2_meth.c | ||
| s2_pkt.c | ||
| s2_srvr.c | ||
| s3_both.c | ||
| s3_cbc.c | ||
| s3_clnt.c | ||
| s3_enc.c | ||
| s3_lib.c | ||
| s3_meth.c | ||
| s3_pkt.c | ||
| s3_srvr.c | ||
| s23_clnt.c | ||
| s23_lib.c | ||
| s23_meth.c | ||
| s23_pkt.c | ||
| s23_srvr.c | ||
| srtp.h | ||
| ssl2.h | ||
| ssl3.h | ||
| ssl23.h | ||
| ssl_algs.c | ||
| ssl_asn1.c | ||
| ssl_cert.c | ||
| ssl_ciph.c | ||
| ssl_conf.c | ||
| ssl_err2.c | ||
| ssl_err.c | ||
| ssl_lib.c | ||
| ssl_locl.h | ||
| ssl_rsa.c | ||
| ssl_sess.c | ||
| ssl_stat.c | ||
| ssl_task.c | ||
| ssl_txt.c | ||
| ssl_utst.c | ||
| ssl-lib.com | ||
| ssl.h | ||
| ssltest.c | ||
| t1_clnt.c | ||
| t1_enc.c | ||
| t1_ext.c | ||
| t1_lib.c | ||
| t1_meth.c | ||
| t1_reneg.c | ||
| t1_srvr.c | ||
| t1_trce.c | ||
| tls1.h | ||
| tls_srp.c | ||