Chris D. Faulhaber
a6b47b5f08
Merge conflicts
2003-03-20 20:56:03 +00:00
Chris D. Faulhaber
35f304853f
This commit was generated by cvs2svn to compensate for changes in r112439,
...
which included commits to RCS files with non-trunk default branches.
2003-03-20 20:41:45 +00:00
Chris D. Faulhaber
8786792504
Import of PKCS #1 security fix.
...
http://www.openssl.org/news/secadv_20030319.txt
2003-03-20 20:41:45 +00:00
Jacques Vidrine
def0b8c9c5
Resolve conflicts after import of OpenSSL 0.9.7a.
2003-02-19 23:24:16 +00:00
Jacques Vidrine
fceca8a377
Vendor import of OpenSSL 0.9.7a.
2003-02-19 23:17:42 +00:00
Jacques Vidrine
015ec3c905
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
Jacques Vidrine
4b2eaea43f
Background:
...
When libdes was replaced with OpenSSL's libcrypto, there were a few
interfaces that the former implemented but the latter did not. Because
some software in the base system still depended upon these interfaces,
we simply included them in our libcrypto (rnd_keys.c).
Now, finally get around to removing the dependencies on these
interfaces. There were basically two cases:
des_new_random_key -- This is just a wrapper for des_random_key, and
these calls were replaced.
des_init_random_number_generator et. al. -- A few functions were used
by the application to seed libdes's PRNG. These are not necessary
when using libcrypto, as OpenSSL internally seeds the PRNG from
/dev/random. These calls were simply removed.
Again, some of the Kerberos 4 files have been taken off the vendor
branch. I do not expect there to be future imports of KTH Kerberos 4.
2003-01-29 18:14:29 +00:00
Jacques Vidrine
6e955c8f09
= Fix a bug in UI_UTIL_read_pw's error handling that caused
...
des_read_pw_string to break (and thus rather mysteriously
breaking utilities such as kinit).
= Enable the BSD /dev/crypto interface.
(These changes are being imported on the vendor branch, as they have
already been accepted and committed to the OpenSSL CVS repository.)
2003-01-29 02:25:30 +00:00
Jacques Vidrine
912e44b663
This commit was generated by cvs2svn to compensate for changes in r110018,
...
which included commits to RCS files with non-trunk default branches.
2003-01-29 02:25:30 +00:00
Mark Murray
bff3688511
Merge conflicts.
...
This is cunning doublespeak for "use vendor code".
2003-01-28 22:34:21 +00:00
Mark Murray
f1b2c95128
Remove files no longer on OpenSSL 0.9.7. crypto/des/rnd_keys.c is
...
retained as it is still used.
2003-01-28 22:12:30 +00:00
Mark Murray
5c87c606cd
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
Mark Murray
5bd38a39ed
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
Jacques Vidrine
fd35706acb
Resolve conflicts.
2002-08-10 01:50:50 +00:00
Jacques Vidrine
499810c08e
Import of OpenSSL 0.9.6g.
2002-08-10 01:48:01 +00:00
Jacques Vidrine
47e862627e
This commit was generated by cvs2svn to compensate for changes in r101618,
...
which included commits to RCS files with non-trunk default branches.
2002-08-10 01:48:01 +00:00
Jacques Vidrine
484549566e
Import of OpenSSL 0.9.6f.
2002-08-10 01:46:10 +00:00
Jacques Vidrine
d96a831475
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
Jacques Vidrine
9e6c5d1742
Import of OpenSSL 0.9.6f.
2002-08-10 01:40:00 +00:00
Jacques Vidrine
506570008c
This commit was generated by cvs2svn to compensate for changes in r101613,
...
which included commits to RCS files with non-trunk default branches.
2002-08-10 01:40:00 +00:00
Jacques Vidrine
b1357e1cec
Correct a bug in the ASN.1 decoder which was introduced with the
...
recent OpenSSL update.
Obtained from: OpenSSL CVS
2002-08-05 16:25:17 +00:00
Jacques Vidrine
cad8e82685
This commit was generated by cvs2svn to compensate for changes in r101386,
...
which included commits to RCS files with non-trunk default branches.
2002-08-05 16:25:17 +00:00
Jacques Vidrine
d57327ee50
Resolve conflicts after import of OpenSSL 0.9.6e.
2002-07-30 13:58:53 +00:00
Jacques Vidrine
4f20a5a274
Import of OpenSSL 0.9.6e.
2002-07-30 13:38:06 +00:00
Jacques Vidrine
0f881ddd5e
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
Jacques Vidrine
b55e3089db
This man page has not been referenced by anything for a while,
...
and is not part of the OpenSSL distribution. Remove it.
2002-07-30 12:54:03 +00:00
Jacques Vidrine
018cd73f8c
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
Jacques Vidrine
b325c11869
Resolve conflicts after import of OpenSSL 0.9.6d.
2002-07-30 12:46:49 +00:00
Jacques Vidrine
c1803d7836
Import of OpenSSL 0.9.6d.
2002-07-30 12:44:15 +00:00
Jacques Vidrine
0135f0027c
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
Jacques Vidrine
c8ae058fd0
Update list of files to remove prior to import of OpenSSL 0.9.6d
2002-07-30 12:38:41 +00:00
Kris Kennaway
c21ce79893
Resolve conflicts.
2002-01-27 03:17:13 +00:00
Kris Kennaway
a21b1b381e
Initial import of OpenSSL 0.9.6c
2002-01-27 03:13:07 +00:00
Kris Kennaway
a61825c7f3
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
Mark Murray
5a12e441eb
Protect names that are used elsewhere. This fixes WARNS=2 breakage
...
in crypto telnet.
2001-12-01 18:48:36 +00:00
Kris Kennaway
37b8c2dbf3
Resolve conflicts
2001-07-19 20:05:28 +00:00
Kris Kennaway
26d191b459
Initial import of OpenSSL 0.9.6b
2001-07-19 19:59:37 +00:00
Kris Kennaway
3c738b5631
This commit was generated by cvs2svn to compensate for changes in r79998,
...
which included commits to RCS files with non-trunk default branches.
2001-07-19 19:59:37 +00:00
Kris Kennaway
f06df90bde
Resolve conflicts
2001-05-20 03:17:35 +00:00
Kris Kennaway
5740a5e34c
Initial import of OpenSSL 0.9.6a
2001-05-20 03:07:21 +00:00
Kris Kennaway
4992dce6f6
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 Kennaway
b64f39b655
Resolve conflicts
2001-02-18 03:23:30 +00:00
Kris Kennaway
de7cdddab1
Import of OpenSSL 0.9.6-STABLE snapshot dated 2001-02-10
2001-02-18 03:17:36 +00:00
Kris Kennaway
a991678294
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 Kennaway
d153b54ab9
Update list of files to remove prior to import
2000-11-13 07:46:20 +00:00
Kris Kennaway
ae152dd3aa
Resolve conflicts, and garbage collect some local changes that are no
...
longer required
2000-11-13 02:20:29 +00:00
Kris Kennaway
ddd58736f0
Initial import of OpenSSL 0.9.6
2000-11-13 01:03:58 +00:00
Kris Kennaway
feb1e94b6a
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
Doug Barton
ea8f54b543
Add a CVS Id tag
2000-10-29 10:00:58 +00:00
Kris Kennaway
690a362571
Nuke RSAREF support from orbit.
...
It's the only way to be sure.
2000-09-10 00:09:37 +00:00