Jacques Vidrine d57327ee50 Resolve conflicts after import of OpenSSL 0.9.6e.

2002-07-30 13:58:53 +00:00

..

bio_ssl.c

…

Makefile.ssl

Import of OpenSSL 0.9.6e.

2002-07-30 13:38:06 +00:00

s2_clnt.c

Resolve conflicts after import of OpenSSL 0.9.6e.

2002-07-30 13:58:53 +00:00

s2_enc.c

Resolve conflicts.

2002-01-27 03:17:13 +00:00

s2_lib.c

Resolve conflicts after import of OpenSSL 0.9.6e.

2002-07-30 13:58:53 +00:00

s2_meth.c

…

s2_pkt.c

Resolve conflicts.

2002-01-27 03:17:13 +00:00

s2_srvr.c

Resolve conflicts after import of OpenSSL 0.9.6e.

2002-07-30 13:58:53 +00:00

s3_both.c

Import of OpenSSL 0.9.6d.

2002-07-30 12:44:15 +00:00

s3_clnt.c

Import of OpenSSL 0.9.6e.

2002-07-30 13:38:06 +00:00

s3_enc.c

Import of OpenSSL 0.9.6e.

2002-07-30 13:38:06 +00:00

s3_lib.c

Import of OpenSSL 0.9.6e.

2002-07-30 13:38:06 +00:00

s3_meth.c

…

s3_pkt.c

Import of OpenSSL 0.9.6d.

2002-07-30 12:44:15 +00:00

s3_srvr.c

Import of OpenSSL 0.9.6e.

2002-07-30 13:38:06 +00:00

s23_clnt.c

Resolve conflicts.

2002-01-27 03:17:13 +00:00

s23_lib.c

Resolve conflicts

2001-05-20 03:17:35 +00:00

s23_meth.c

Initial import of OpenSSL 0.9.6a

2001-05-20 03:07:21 +00:00

s23_pkt.c

Initial import of OpenSSL 0.9.6c

2002-01-27 03:13:07 +00:00

s23_srvr.c

Resolve conflicts.

2002-01-27 03:17:13 +00:00

ssl2.h

Initial import of OpenSSL 0.9.6c

2002-01-27 03:13:07 +00:00

ssl3.h

Import of OpenSSL 0.9.6d.

2002-07-30 12:44:15 +00:00

ssl23.h

…

ssl_algs.c

…

ssl_asn1.c

Import of OpenSSL 0.9.6e.

2002-07-30 13:38:06 +00:00

ssl_cert.c

Import of OpenSSL 0.9.6d.

2002-07-30 12:44:15 +00:00

ssl_ciph.c

…

ssl_err2.c

…

ssl_err.c

Import of OpenSSL 0.9.6e.

2002-07-30 13:38:06 +00:00

ssl_lib.c

Import of OpenSSL 0.9.6d.

2002-07-30 12:44:15 +00:00

ssl_locl.h

Import of OpenSSL 0.9.6e.

2002-07-30 13:38:06 +00:00

ssl_rsa.c

…

ssl_sess.c

Import of OpenSSL 0.9.6e.

2002-07-30 13:38:06 +00:00

ssl_stat.c

Initial import of OpenSSL 0.9.6c

2002-01-27 03:13:07 +00:00

ssl_task.c

…

ssl_txt.c

…

ssl.h

Import of OpenSSL 0.9.6e.

2002-07-30 13:38:06 +00:00

ssltest.c

Import of OpenSSL 0.9.6d.

2002-07-30 12:44:15 +00:00

t1_clnt.c

…

t1_enc.c

Import of OpenSSL 0.9.6e.

2002-07-30 13:38:06 +00:00

t1_lib.c

…

t1_meth.c

…

t1_srvr.c

…

tls1.h

…