christos 50a9cbc98b Resolve conflicts: ... 1. Instead of trying to cleanup the ugly ifdefs, we leave them alone so that there are going to be fewer conflicts in the future. 2. Where we make changes to override things #ifdef __NetBSD__ around them so that it is clear what we are changing. This is still missing in some places, notably in opensslconf.h because it would make things messier.		2005-11-25 19:14:11 +00:00
..
Makefile	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
bio_ssl.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
d1_both.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
d1_clnt.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
d1_enc.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
d1_lib.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
d1_meth.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
d1_pkt.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
d1_srvr.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
dtls1.h	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
install.com	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
kssl.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
kssl.h	from www.openssl.org	2005-04-23 19:10:56 +00:00
kssl_lcl.h	…
s2_clnt.c	Resolve conflicts:	2005-11-25 19:14:11 +00:00
s2_enc.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
s2_lib.c	Resolve conflicts:	2005-11-25 19:14:11 +00:00
s2_meth.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
s2_pkt.c	Import OpenSSL 0.9.7d to address:	2004-03-20 04:22:06 +00:00
s2_srvr.c	Resolve conflicts:	2005-11-25 19:14:11 +00:00
s3_both.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
s3_clnt.c	Resolve conflicts:	2005-11-25 19:14:11 +00:00
s3_enc.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
s3_lib.c	Resolve conflicts:	2005-11-25 19:14:11 +00:00
s3_meth.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
s3_pkt.c	Resolve conflicts:	2005-11-25 19:14:11 +00:00
s3_srvr.c	Resolve conflicts:	2005-11-25 19:14:11 +00:00
s23_clnt.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
s23_lib.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
s23_meth.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
s23_pkt.c	…
s23_srvr.c	Resolve conflicts:	2005-11-25 19:14:11 +00:00
ssl-lib.com	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
ssl.h	Resolve conflicts:	2005-11-25 19:14:11 +00:00
ssl2.h	Resolve conflicts:	2005-11-25 19:14:11 +00:00
ssl3.h	Resolve conflicts:	2005-11-25 19:14:11 +00:00
ssl23.h	…
ssl_algs.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
ssl_asn1.c	Resolve conflicts:	2005-11-25 19:14:11 +00:00
ssl_cert.c	Resolve conflicts:	2005-11-25 19:14:11 +00:00
ssl_ciph.c	Resolve conflicts:	2005-11-25 19:14:11 +00:00
ssl_err.c	Resolve conflicts:	2005-11-25 19:14:11 +00:00
ssl_err2.c	…
ssl_lib.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
ssl_locl.h	Resolve conflicts:	2005-11-25 19:14:11 +00:00
ssl_rsa.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
ssl_sess.c	Resolve conflicts:	2005-11-25 19:14:11 +00:00
ssl_stat.c	…
ssl_task.c	…
ssl_txt.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
ssltest.c	Resolve conflicts:	2005-11-25 19:14:11 +00:00
t1_clnt.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
t1_enc.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
t1_lib.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
t1_meth.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
t1_srvr.c	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00
tls1.h	from http://www.openssl.org/source	2005-11-25 03:02:45 +00:00