jedgar
ed812d3ac4
Merge conflicts
2003-03-20 20:56:03 +00:00
jedgar
ad2b755e27
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
jedgar
5514cd4987
Import of PKCS #1 security fix.
...
http://www.openssl.org/news/secadv_20030319.txt
2003-03-20 20:41:45 +00:00
nectar
0fee824237
Resolve conflicts after import of OpenSSL 0.9.7a.
2003-02-19 23:24:16 +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
nectar
637cc179f5
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
nectar
b6c07e9a21
= 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
nectar
e99b3c8426
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
markm
3f245d6325
Merge conflicts.
...
This is cunning doublespeak for "use vendor code".
2003-01-28 22:34:21 +00:00
markm
ad7148cc98
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
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
f779e835e5
Resolve conflicts.
2002-08-10 01:50:50 +00:00
nectar
eba366e36e
Import of OpenSSL 0.9.6g.
2002-08-10 01:48:01 +00:00
nectar
fdead658fb
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
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
c48e8e3d25
Import of OpenSSL 0.9.6f.
2002-08-10 01:40:00 +00:00
nectar
15e4ff204e
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
nectar
2836f6786d
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
nectar
5a59c1aa36
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
nectar
9b13f71fee
Resolve conflicts after import of OpenSSL 0.9.6e.
2002-07-30 13:58:53 +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
7515065745
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
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
8b62a95bfc
Resolve conflicts after import of OpenSSL 0.9.6d.
2002-07-30 12:46:49 +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
nectar
ef94fba97d
Update list of files to remove prior to import of OpenSSL 0.9.6d
2002-07-30 12:38:41 +00:00
kris
7b695f1ddd
Resolve conflicts.
2002-01-27 03:17:13 +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
markm
4cff8701ff
Protect names that are used elsewhere. This fixes WARNS=2 breakage
...
in crypto telnet.
2001-12-01 18:48:36 +00:00
kris
18cbcd5eff
Resolve conflicts
2001-07-19 20:05:28 +00:00
kris
3b19ada1e8
Initial import of OpenSSL 0.9.6b
2001-07-19 19:59:37 +00:00
kris
84fabcda92
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
445c7928a1
Resolve conflicts
2001-05-20 03:17:35 +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
4fef76e966
Resolve conflicts
2001-02-18 03:23:30 +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
4b15a516e7
Update list of files to remove prior to import
2000-11-13 07:46:20 +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
dougb
353f00f96c
Add a CVS Id tag
2000-10-29 10:00:58 +00:00
kris
e4a753d311
Nuke RSAREF support from orbit.
...
It's the only way to be sure.
2000-09-10 00:09:37 +00:00