Kris Kennaway f06df90bde Resolve conflicts

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

..

bio_ssl.c

…

Makefile.save

…

Makefile.ssl

Import of OpenSSL 0.9.6-STABLE snapshot dated 2001-02-10

2001-02-18 03:17:36 +00:00

s2_clnt.c

Resolve conflicts

2001-02-18 03:23:30 +00:00

s2_enc.c

Resolve conflicts, and garbage collect some local changes that are no

2000-11-13 02:20:29 +00:00

s2_lib.c

Resolve conflicts

2001-02-18 03:23:30 +00:00

s2_meth.c

…

s2_pkt.c

Resolve conflicts

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

s2_srvr.c

Resolve conflicts, and garbage collect some local changes that are no

2000-11-13 02:20:29 +00:00

s3_both.c

Import of OpenSSL 0.9.6-STABLE snapshot dated 2001-02-10

2001-02-18 03:17:36 +00:00

s3_clnt.c

Import of OpenSSL 0.9.6-STABLE snapshot dated 2001-02-10

2001-02-18 03:17:36 +00:00

s3_enc.c

Initial import of OpenSSL 0.9.6a

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

s3_lib.c

Initial import of OpenSSL 0.9.6a

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

s3_meth.c

…

s3_pkt.c

Import of OpenSSL 0.9.6-STABLE snapshot dated 2001-02-10

2001-02-18 03:17:36 +00:00

s3_srvr.c

Import of OpenSSL 0.9.6-STABLE snapshot dated 2001-02-10

2001-02-18 03:17:36 +00:00

s23_clnt.c

Resolve conflicts, and garbage collect some local changes that are no

2000-11-13 02:20:29 +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

…

s23_srvr.c

Resolve conflicts, and garbage collect some local changes that are no

2000-11-13 02:20:29 +00:00

ssl2.h

Import of OpenSSL 0.9.6-STABLE snapshot dated 2001-02-10

2001-02-18 03:17:36 +00:00

ssl3.h

…

ssl23.h

…

ssl_algs.c

Import of OpenSSL 0.9.6-STABLE snapshot dated 2001-02-10

2001-02-18 03:17:36 +00:00

ssl_asn1.c

…

ssl_cert.c

Initial import of OpenSSL 0.9.6a

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

ssl_ciph.c

…

ssl_err2.c

…

ssl_err.c

Initial import of OpenSSL 0.9.6a

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

ssl_lib.c

Initial import of OpenSSL 0.9.6a

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

ssl_locl.h

Initial import of OpenSSL 0.9.6a

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

ssl_rsa.c

…

ssl_sess.c

Import of OpenSSL 0.9.6-STABLE snapshot dated 2001-02-10

2001-02-18 03:17:36 +00:00

ssl_stat.c

…

ssl_task.c

…

ssl_txt.c

…

ssl.h

Initial import of OpenSSL 0.9.6a

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

ssltest.c

…

t1_clnt.c

…

t1_enc.c

Initial import of OpenSSL 0.9.6a

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

t1_lib.c

…

t1_meth.c

…

t1_srvr.c

…

tls1.h

…