mirror of
https://github.com/openssl/openssl.git
synced 2024-12-03 05:41:46 +08:00
720b6cbe4a
s_server has traditionally been very brittle in PSK mode. If the client offered any PSK identity other than "Client_identity" s_server would simply abort. This is breakage for breakage's sake, and unlike most other parts of s_server, which tend to allow more flexible connections. This change accomplishes two things: * when the client's psk_identity does *not* match the identity expected by the server, just warn, don't fail. * allow the server to expect instead a different psk_identity from the client besides "Client_identity" Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net> Reviewed-by: Ben Kaduk <kaduk@mit.edu> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3605) |
||
|---|---|---|
| .. | ||
| demoSRP | ||
| app_rand.c | ||
| apps.c | ||
| apps.h | ||
| asn1pars.c | ||
| build.info | ||
| ca-cert.srl | ||
| ca-key.pem | ||
| ca-req.pem | ||
| ca.c | ||
| CA.pl.in | ||
| cert.pem | ||
| ciphers.c | ||
| client.pem | ||
| cms.c | ||
| crl2p7.c | ||
| crl.c | ||
| ct_log_list.cnf | ||
| dgst.c | ||
| dh1024.pem | ||
| dh2048.pem | ||
| dh4096.pem | ||
| dhparam.c | ||
| dsa512.pem | ||
| dsa1024.pem | ||
| dsa-ca.pem | ||
| dsa-pca.pem | ||
| dsa.c | ||
| dsap.pem | ||
| dsaparam.c | ||
| ec.c | ||
| ecparam.c | ||
| enc.c | ||
| engine.c | ||
| errstr.c | ||
| gendsa.c | ||
| genpkey.c | ||
| genrsa.c | ||
| nseq.c | ||
| ocsp.c | ||
| openssl-vms.cnf | ||
| openssl.c | ||
| openssl.cnf | ||
| opt.c | ||
| passwd.c | ||
| pca-cert.srl | ||
| pca-key.pem | ||
| pca-req.pem | ||
| pkcs7.c | ||
| pkcs8.c | ||
| pkcs12.c | ||
| pkey.c | ||
| pkeyparam.c | ||
| pkeyutl.c | ||
| prime.c | ||
| privkey.pem | ||
| progs.h | ||
| progs.pl | ||
| rand.c | ||
| rehash.c | ||
| req.c | ||
| req.pem | ||
| rsa8192.pem | ||
| rsa.c | ||
| rsautl.c | ||
| s512-key.pem | ||
| s512-req.pem | ||
| s1024key.pem | ||
| s1024req.pem | ||
| s_apps.h | ||
| s_cb.c | ||
| s_client.c | ||
| s_server.c | ||
| s_socket.c | ||
| s_time.c | ||
| server2.pem | ||
| server.pem | ||
| server.srl | ||
| sess_id.c | ||
| smime.c | ||
| speed.c | ||
| spkac.c | ||
| srp.c | ||
| testCA.pem | ||
| testdsa.h | ||
| testrsa.h | ||
| timeouts.h | ||
| ts.c | ||
| tsget.in | ||
| verify.c | ||
| version.c | ||
| vms_decc_init.c | ||
| vms_term_sock.c | ||
| vms_term_sock.h | ||
| win32_init.c | ||
| x509.c | ||