swh:1:snp:dc2a5002442a00b1c0eda7c65d04ea7455e166cd
Revision 13ce52be1b9b0d5b409d079b846b748c069b2b69 authored by Adam Langley on 20 June 2014, 19:00:00 UTC, committed by Emilia Kasper on 05 September 2014, 10:22:50 UTC
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> (cherry picked from commit be0d851732bad7370640702bc9c4a33189ede287)
1 parent 11853c5
Tip revision: 0fdf965bf0b1f87d4a5d52c71994ffdda5235718 authored by Neil Horman on 11 September 2024, 13:53:49 UTC
review fixups for quic-hq-interop
review fixups for quic-hq-interop
Tip revision: 0fdf965
File | Mode | Size |
---|---|---|
MacOS | ||
Netware | ||
VMS | ||
apps | ||
bugs | ||
certs | ||
crypto | ||
demos | ||
doc | ||
engines | ||
include | ||
ms | ||
os2 | ||
perl | ||
shlib | ||
ssl | ||
test | ||
times | ||
tools | ||
util | ||
.cvsignore | -rw-r--r-- | 193 bytes |
.gitignore | -rw-r--r-- | 1.0 KB |
ACKNOWLEDGMENTS | -rw-r--r-- | 1.0 KB |
CHANGES | -rw-r--r-- | 438.3 KB |
CHANGES.SSLeay | -rw-r--r-- | 41.7 KB |
Configure | -rwxr-xr-x | 103.8 KB |
FAQ | -rw-r--r-- | 45.4 KB |
INSTALL | -rw-r--r-- | 14.3 KB |
INSTALL.DJGPP | -rw-r--r-- | 2.0 KB |
INSTALL.MacOS | -rw-r--r-- | 3.2 KB |
INSTALL.NW | -rw-r--r-- | 18.4 KB |
INSTALL.OS2 | -rw-r--r-- | 744 bytes |
INSTALL.VMS | -rw-r--r-- | 10.7 KB |
INSTALL.W32 | -rw-r--r-- | 11.6 KB |
INSTALL.W64 | -rw-r--r-- | 2.1 KB |
INSTALL.WCE | -rw-r--r-- | 3.2 KB |
LICENSE | -rw-r--r-- | 6.1 KB |
Makefile.org | -rw-r--r-- | 23.6 KB |
Makefile.shared | -rw-r--r-- | 21.4 KB |
NEWS | -rw-r--r-- | 30.5 KB |
PROBLEMS | -rw-r--r-- | 8.5 KB |
README | -rw-r--r-- | 8.9 KB |
README.ASN1 | -rw-r--r-- | 7.5 KB |
README.ENGINE | -rw-r--r-- | 15.7 KB |
TABLE | -rw-r--r-- | 155.1 KB |
config | -rwxr-xr-x | 27.7 KB |
e_os.h | -rw-r--r-- | 23.2 KB |
e_os2.h | -rw-r--r-- | 10.2 KB |
install.com | -rw-r--r-- | 3.6 KB |
makevms.com | -rwxr-xr-x | 38.8 KB |
openssl.doxy | -rw-r--r-- | 137 bytes |
openssl.spec | -rw-r--r-- | 7.7 KB |

Computing file changes ...