Revision dd642deea83d0f5b4accee9855e36c36699653cc authored by Matt Caswell on 05 August 2015, 12:33:52 UTC, committed by Matt Caswell on 01 September 2015, 23:31:33 UTC
Commit f0348c842e7 introduced a problem with session resumption. The version for the session is fixed when the session is created. By moving the creation of the session earlier in the process the version is fixed *before* version negotiation has completed when processing the ServerHello on the client side. This fix updates the session version after version neg has completed. Reviewed-by: Emilia Käsper <emilia@openssl.org> (cherry picked from commit dc0c888811cebfa2d21c844be0d81335fb2361da)
1 parent 927f7a8
| File | Mode | Size |
|---|---|---|
| demoCA | ||
| demoSRP | ||
| set | ||
| .cvsignore | -rw-r--r-- | 77 bytes |
| CA.com | -rw-r--r-- | 6.6 KB |
| CA.pl.in | -rw-r--r-- | 5.6 KB |
| CA.sh | -rw-r--r-- | 5.1 KB |
| Makefile | -rw-r--r-- | 59.5 KB |
| app_rand.c | -rw-r--r-- | 8.5 KB |
| apps.c | -rw-r--r-- | 81.1 KB |
| apps.h | -rw-r--r-- | 14.8 KB |
| asn1pars.c | -rw-r--r-- | 13.6 KB |
| ca-cert.srl | -rw-r--r-- | 3 bytes |
| ca-key.pem | -rw-r--r-- | 887 bytes |
| ca-req.pem | -rw-r--r-- | 631 bytes |
| ca.c | -rw-r--r-- | 92.7 KB |
| cert.pem | -rw-r--r-- | 623 bytes |
| ciphers.c | -rw-r--r-- | 7.3 KB |
| client.pem | -rw-r--r-- | 3.2 KB |
| cms.c | -rw-r--r-- | 42.1 KB |
| crl.c | -rw-r--r-- | 13.9 KB |
| crl2p7.c | -rw-r--r-- | 10.8 KB |
| dgst.c | -rw-r--r-- | 19.4 KB |
| dh.c | -rw-r--r-- | 10.7 KB |
| dh1024.pem | -rw-r--r-- | 492 bytes |
| dh2048.pem | -rw-r--r-- | 588 bytes |
| dh4096.pem | -rw-r--r-- | 1016 bytes |
| dh512.pem | -rw-r--r-- | 402 bytes |
| dhparam.c | -rw-r--r-- | 17.8 KB |
| dsa-ca.pem | -rw-r--r-- | 2.1 KB |
| dsa-pca.pem | -rw-r--r-- | 2.5 KB |
| dsa.c | -rw-r--r-- | 12.3 KB |
| dsa1024.pem | -rw-r--r-- | 455 bytes |
| dsa512.pem | -rw-r--r-- | 280 bytes |
| dsap.pem | -rw-r--r-- | 276 bytes |
| dsaparam.c | -rw-r--r-- | 14.4 KB |
| ec.c | -rw-r--r-- | 12.1 KB |
| ecparam.c | -rw-r--r-- | 22.8 KB |
| enc.c | -rw-r--r-- | 22.9 KB |
| engine.c | -rw-r--r-- | 17.4 KB |
| errstr.c | -rw-r--r-- | 4.7 KB |
| gendh.c | -rw-r--r-- | 7.9 KB |
| gendsa.c | -rw-r--r-- | 9.7 KB |
| genpkey.c | -rw-r--r-- | 11.6 KB |
| genrsa.c | -rw-r--r-- | 11.2 KB |
| install-apps.com | -rwxr-xr-x | 2.4 KB |
| makeapps.com | -rw-r--r-- | 26.0 KB |
| nseq.c | -rw-r--r-- | 5.7 KB |
| ocsp.c | -rw-r--r-- | 42.6 KB |
| oid.cnf | -rw-r--r-- | 330 bytes |
| openssl-vms.cnf | -rw-r--r-- | 10.6 KB |
| openssl.c | -rw-r--r-- | 22.5 KB |
| openssl.cnf | -rw-r--r-- | 10.6 KB |
| passwd.c | -rw-r--r-- | 15.3 KB |
| pca-cert.srl | -rw-r--r-- | 3 bytes |
| pca-key.pem | -rw-r--r-- | 887 bytes |
| pca-req.pem | -rw-r--r-- | 631 bytes |
| pkcs12.c | -rw-r--r-- | 34.5 KB |
| pkcs7.c | -rw-r--r-- | 9.6 KB |
| pkcs8.c | -rw-r--r-- | 12.8 KB |
| pkey.c | -rw-r--r-- | 8.0 KB |
| pkeyparam.c | -rw-r--r-- | 5.8 KB |
| pkeyutl.c | -rw-r--r-- | 15.7 KB |
| prime.c | -rw-r--r-- | 4.7 KB |
| privkey.pem | -rw-r--r-- | 963 bytes |
| progs.h | -rw-r--r-- | 10.6 KB |
| progs.pl | -rw-r--r-- | 3.6 KB |
| rand.c | -rw-r--r-- | 6.9 KB |
| req.c | -rw-r--r-- | 54.6 KB |
| req.pem | -rw-r--r-- | 627 bytes |
| rsa.c | -rw-r--r-- | 14.7 KB |
| rsa8192.pem | -rw-r--r-- | 6.2 KB |
| rsautl.c | -rw-r--r-- | 11.3 KB |
| s1024key.pem | -rw-r--r-- | 891 bytes |
| s1024req.pem | -rw-r--r-- | 643 bytes |
| s512-key.pem | -rw-r--r-- | 497 bytes |
| s512-req.pem | -rw-r--r-- | 460 bytes |
| s_apps.h | -rw-r--r-- | 8.4 KB |
| s_cb.c | -rw-r--r-- | 27.8 KB |
| s_client.c | -rw-r--r-- | 70.6 KB |
| s_server.c | -rw-r--r-- | 95.8 KB |
| s_socket.c | -rw-r--r-- | 17.3 KB |
| s_time.c | -rw-r--r-- | 18.0 KB |
| server.pem | -rw-r--r-- | 3.2 KB |
| server.srl | -rw-r--r-- | 3 bytes |
| server2.pem | -rw-r--r-- | 3.2 KB |
| sess_id.c | -rw-r--r-- | 9.3 KB |
| smime.c | -rw-r--r-- | 26.4 KB |
| speed.c | -rw-r--r-- | 86.5 KB |
| spkac.c | -rw-r--r-- | 9.5 KB |
| srp.c | -rw-r--r-- | 25.4 KB |
| testCA.pem | -rw-r--r-- | 432 bytes |
| testdsa.h | -rw-r--r-- | 11.6 KB |
| testrsa.h | -rw-r--r-- | 31.2 KB |
| timeouts.h | -rw-r--r-- | 2.9 KB |
| ts.c | -rw-r--r-- | 34.2 KB |
| tsget | -rw-r--r-- | 6.3 KB |
| verify.c | -rw-r--r-- | 11.4 KB |
| version.c | -rw-r--r-- | 8.2 KB |
| vms_decc_init.c | -rw-r--r-- | 4.8 KB |
| winrand.c | -rw-r--r-- | 5.1 KB |
| x509.c | -rw-r--r-- | 41.3 KB |
Computing file changes ...
