jkim
a8c44ea5cf
Merge OpenSSL 1.0.1f.
...
Approved by: so (delphij), benl (silence)
2014-01-22 19:57:11 +00:00
jkim
754bee5776
Merge OpenSSL 1.0.1e.
...
Approved by: secteam (simon), benl (silence)
2013-02-13 23:07:20 +00:00
pfg
245e35ae97
Clean some 'svn:executable' properties in the tree.
...
Submitted by: Christoph Mallon
MFC after: 3 days
2013-01-26 22:08:21 +00:00
jkim
e393e47b1e
Merge OpenSSL 1.0.1c.
...
Approved by: benl (maintainer)
2012-07-12 19:30:53 +00:00
jkim
299ab12592
Merge OpenSSL 0.9.8x.
...
Reviewed by: stas
Approved by: benl (maintainer)
MFC after: 3 days
2012-06-27 18:44:36 +00:00
simon
7a23485c98
Merge OpenSSL 0.9.8p into head.
...
Security: CVE-2010-3864
Security: http://www.openssl.org/news/secadv_20101116.txt
2010-11-22 18:23:44 +00:00
simon
0d816bbd98
Merge OpenSSL 0.9.8m into head.
...
This also "reverts" some FreeBSD local changes so we should now
be back to using entirely stock OpenSSL. The local changes were
simple $FreeBSD$ lines additions, which were required in the CVS
days, and the patch for FreeBSD-SA-09:15.ssl which has been
superseded with OpenSSL 0.9.8m's RFC5746 'TLS renegotiation
extension' support.
MFC after: 3 weeks
2010-03-13 19:22:41 +00:00
simon
5fb395764b
Merge OpenSSL 0.9.8k into head.
...
Approved by: re
2009-06-14 19:45:16 +00:00
simon
64fcbc70db
Flatten OpenSSL vendor tree.
2008-08-23 10:51:00 +00:00
simon
ee48ceb6a8
Vendor import of OpenSSL 0.9.8e.
2007-03-15 20:03:30 +00:00
simon
699a8581f9
This commit was generated by cvs2svn to compensate for changes in r167612,
...
which included commits to RCS files with non-trunk default branches.
2007-03-15 20:03:30 +00:00
simon
de193995a6
Resolve conflicts after import of OpenSSL 0.9.8d.
2006-10-01 07:46:16 +00:00
simon
387e65d767
Vendor import of OpenSSL 0.9.8d.
2006-10-01 07:38:44 +00:00
simon
b2881e9eb1
This commit was generated by cvs2svn to compensate for changes in r162911,
...
which included commits to RCS files with non-trunk default branches.
2006-10-01 07:38:44 +00:00
simon
e07cc0214a
Resolve conflicts after import of OpenSSL 0.9.8b.
2006-07-29 19:14:51 +00:00
simon
fb3c70eda8
Vendor import of OpenSSL 0.9.8b
2006-07-29 19:10:21 +00:00
simon
9159ca2b0e
This commit was generated by cvs2svn to compensate for changes in r160814,
...
which included commits to RCS files with non-trunk default branches.
2006-07-29 19:10:21 +00:00
nectar
ced877b043
Resolve conflicts after import of OpenSSL 0.9.7e.
2005-02-25 05:49:44 +00:00
nectar
78a59572b3
Vendor import of OpenSSL 0.9.7e.
2005-02-25 05:39:05 +00:00
nectar
52bc459a40
This commit was generated by cvs2svn to compensate for changes in r142425,
...
which included commits to RCS files with non-trunk default branches.
2005-02-25 05:39:05 +00:00
nectar
a55ec1447a
Clean up the OpenSSL vendor branch by removing files that are not
...
part of recent releases.
2005-02-25 05:25:37 +00:00
nectar
0f095e8a2a
Vendor import of OpenSSL 0.9.7d.
2004-03-17 15:49:33 +00:00
nectar
15b921d648
This commit was generated by cvs2svn to compensate for changes in r127128,
...
which included commits to RCS files with non-trunk default branches.
2004-03-17 15:49:33 +00:00
nectar
367ddb50f9
Merge conflicts after import of OpenSSL 0.9.7c.
2003-10-01 12:37:51 +00:00
nectar
ee25ce74b3
Vendor import of OpenSSL 0.9.7c
2003-10-01 12:32:41 +00:00
nectar
d8e0ea4b40
This commit was generated by cvs2svn to compensate for changes in r120631,
...
which included commits to RCS files with non-trunk default branches.
2003-10-01 12:32:41 +00:00
nectar
6c9986c446
Vendor import of OpenSSL 0.9.7a.
2003-02-19 23:17:42 +00:00
nectar
21bb0e5fa9
This commit was generated by cvs2svn to compensate for changes in r111147,
...
which included commits to RCS files with non-trunk default branches.
2003-02-19 23:17:42 +00:00
markm
3f245d6325
Merge conflicts.
...
This is cunning doublespeak for "use vendor code".
2003-01-28 22:34:21 +00:00
markm
aad1d64cb5
Vendor import of OpenSSL release 0.9.7. This release includes
...
support for AES and OpenBSD's hardware crypto.
2003-01-28 21:43:22 +00:00
markm
33af127a88
This commit was generated by cvs2svn to compensate for changes in r109998,
...
which included commits to RCS files with non-trunk default branches.
2003-01-28 21:43:22 +00:00
nectar
c99c2264cb
Import of OpenSSL 0.9.6f.
2002-08-10 01:46:10 +00:00
nectar
45bf128dcc
This commit was generated by cvs2svn to compensate for changes in r101615,
...
which included commits to RCS files with non-trunk default branches.
2002-08-10 01:46:10 +00:00
nectar
2f13e09165
Import of OpenSSL 0.9.6e.
2002-07-30 13:38:06 +00:00
nectar
9b2d850453
This commit was generated by cvs2svn to compensate for changes in r100936,
...
which included commits to RCS files with non-trunk default branches.
2002-07-30 13:38:06 +00:00
nectar
0518ae8674
Remove many obsolete files. The majority of these are simply no
...
longer included as part of the OpenSSL distribution. However, a few
we just don't need and are explicitly excluded in FREEBSD-Xlist.
2002-07-30 12:51:09 +00:00
nectar
0aed2eea83
Import of OpenSSL 0.9.6d.
2002-07-30 12:44:15 +00:00
nectar
050218e0d0
This commit was generated by cvs2svn to compensate for changes in r100928,
...
which included commits to RCS files with non-trunk default branches.
2002-07-30 12:44:15 +00:00
kris
1f8c2aa176
Initial import of OpenSSL 0.9.6c
2002-01-27 03:13:07 +00:00
kris
0b3d98771f
This commit was generated by cvs2svn to compensate for changes in r89837,
...
which included commits to RCS files with non-trunk default branches.
2002-01-27 03:13:07 +00:00
kris
12896e829e
Initial import of OpenSSL 0.9.6a
2001-05-20 03:07:21 +00:00
kris
d8a086ad88
This commit was generated by cvs2svn to compensate for changes in r76866,
...
which included commits to RCS files with non-trunk default branches.
2001-05-20 03:07:21 +00:00
kris
7e55354aa4
Import of OpenSSL 0.9.6-STABLE snapshot dated 2001-02-10
2001-02-18 03:17:36 +00:00
kris
68872806ec
This commit was generated by cvs2svn to compensate for changes in r72613,
...
which included commits to RCS files with non-trunk default branches.
2001-02-18 03:17:36 +00:00
kris
76c54c9ba3
Resolve conflicts, and garbage collect some local changes that are no
...
longer required
2000-11-13 02:20:29 +00:00
kris
539b977eff
Initial import of OpenSSL 0.9.6
2000-11-13 01:03:58 +00:00
kris
f648020584
This commit was generated by cvs2svn to compensate for changes in r68651,
...
which included commits to RCS files with non-trunk default branches.
2000-11-13 01:03:58 +00:00
markm
f8f9ad64d4
Internat diff reducer.
2000-04-16 17:49:31 +00:00
kris
54c77f990d
Initial import of OpenSSL 0.9.5a
2000-04-13 06:33:22 +00:00
kris
2e467dc342
Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent
...
infringement reasons.
2000-01-10 06:22:05 +00:00