d774015c29
resolve conflicts
2007-03-06 23:47:18 +00:00
b22ff73a10
Import OpenSSL 0.9.8e
2007-03-06 21:12:00 +00:00
600680c6c3
merge conflicts.
2006-11-13 21:55:36 +00:00
4a5ea8ca2f
import 0.9.8d
2006-11-13 21:16:04 +00:00
ed56312e8a
resolve conflicts.
2006-06-03 01:50:19 +00:00
b8b11c345a
ftp www.openssl.org
2006-06-03 01:39:48 +00:00
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
8dc8acfeef
from http://www.openssl.org/source
2005-11-25 03:02:45 +00:00
8f1a245ebd
Use default_md = sha1 in ``req'' section too, so we don't fallback to MD5.
...
Noted by smb@.
2005-09-01 21:35:25 +00:00
98e0d8f19f
SHA1 is a better default than MD5.
...
Discussed with Steven M. Bellovin.
Closes PR/30395.
2005-08-27 12:32:15 +00:00
ed314b4eb0
from www.openssl.org
2005-04-23 19:10:56 +00:00
684dfceb07
Resolve conflicts.
2005-03-25 20:14:24 +00:00
e72fb54032
import openssl-0.9.7f from ftp.openssl.org
2005-03-25 19:05:51 +00:00
4b32eb44a7
Resolve conflicts. In particular, prefer OpenSSL's BIO_strl* and
...
BIO_strncpy over ours.
2004-03-20 04:32:34 +00:00
5a374ad0ce
Import OpenSSL 0.9.7d to address:
...
1. Null-pointer assignment during SSL handshake
2. Out-of-bounds read affects Kerberos ciphersuites
2004-03-20 04:22:06 +00:00
aec01dda91
sync w/ openssl 0.9.7c. shlib minor bump for libcrypto.
...
(ERR_release_err_state_table() added)
2003-11-04 23:54:26 +00:00
6b4e6697c9
openssl 0.9.7c. security changes are already in place
2003-11-04 23:25:09 +00:00
34439bf0c9
off-by-one. from openbsd
2003-09-22 22:12:05 +00:00
ca14877c77
reject rc5/idea/mdc2 commands if OPENSSL_NO_xx is specified
2003-08-27 21:05:02 +00:00
f4401cd869
upgrade openssl to 0.9.7b. (AES is now supported)
...
alter des.h to be friendly with openssl/des.h (you can include both in the
same file)
make libkrb to depend on libdes. bump major.
massage various portioin of heimdal to be friendly with openssl 0.9.7b.
2003-07-24 14:16:30 +00:00
2836295a36
OpenSSL 0.9.7b, major API changes included
2003-07-24 08:25:41 +00:00
46471dc1e9
cast for signed/unsigned mixup
2003-07-14 18:27:48 +00:00
1bffbcd4a1
correct ^@ incorrectly committed
2003-07-14 18:26:05 +00:00
848c8ac0ef
use bounded string ops (especially libraries)
2003-07-14 13:05:19 +00:00
50d422c24f
e_os.h is not part of exported openssl interface, so don't install it into
...
/usr/include/openssl (e_os.h has an explicit comment about it). it obviously
is a bug in openssl 0.9.6 Makefile.
based on openssl 0.9.7 snapshot.
2002-08-31 10:46:36 +00:00
1146a80999
more NO_xx cleanup. can't catch these by openssl-unifdef.pl
2002-08-17 21:41:59 +00:00
f5e63fe4c2
openssl 0.9.6f, with security fixes
2002-08-08 23:14:54 +00:00
25e766824a
OpenSSL 0.9.6e. includes major security fixes (already applied)
2002-07-30 23:57:34 +00:00
7c75b5ec2f
sync with 0.9.6d. shlib minor for libssl and libcrypto
...
is cranked for additional functions.
2002-06-09 16:12:52 +00:00
7720435b28
openssl 0.9.6d
2002-06-09 15:21:32 +00:00
7fc834dc03
upgrade to 0.9.6b. no shlib major/minor bump is necessary.
2001-07-11 06:50:53 +00:00
a549080f85
OpenSSL 0.9.6b
2001-07-11 03:53:32 +00:00
aae394a457
make it compile on macppc (or, platforms where char = unsigned char)
...
From: Dave Huang <khym@azeotrope.org>
2001-04-14 08:36:12 +00:00
35a07da1df
use openssl 0.9.6a. shlib major # is bumped for libcrypto, libssl and
...
all kerberos libraries.
2001-04-12 07:48:03 +00:00
b9e8ac0f0f
OpenSSL 0.9.6a
2001-04-12 03:06:03 +00:00
dc3402136b
Constify variables containing format strings
2000-10-05 14:32:50 +00:00
2429f6a29f
OpenSSL 0.9.5a import.
2000-07-16 05:03:53 +00:00
1dc0dc5fb1
Import OpenSSL 0.9.4 from netbsd-cryptosrc-intl.
2000-06-14 22:44:19 +00:00
mjf