Richard Levitte
5b9b38f0c9
Do not forget to compile comp_err.c
2001-12-20 22:11:05 +00:00
Richard Levitte
d8e2daf1e0
Another merge from the 0.9.6 branch.
2001-12-20 16:53:55 +00:00
Richard Levitte
be29c93cf4
Another merge from the 0.9.6 branch.
2001-12-20 10:17:22 +00:00
Richard Levitte
6e19a04080
merge from the 0.9.6 branch.
2001-12-20 09:43:59 +00:00
Richard Levitte
91102def2e
Make the type of hConnection consistent.
2001-12-11 07:40:51 +00:00
Richard Levitte
35933d170d
Problem:
...
1. some platforms do not have inttypes.h, and chasing them down
becomes ridiculous. Therefore, uint64_t can't be used for 64-bit
values.
2. some (other) platforms do not support "long long".
Solution: make AEP_U64 a struct with two longs unless long already is
64 bit long.
Also, restore all other types back to use unsigned char, unsigned int
and unsigned long. Make sure that AEP_U32 actually becomes 32 bits,
even on platforms where long is 64 bits (actually, we're just guessing
that int will stay at 32 bits on those...).
2001-12-11 07:37:40 +00:00
Richard Levitte
270c75c2b1
Merge in latest changes from 0.9.6-stable.
2001-11-28 07:53:13 +00:00
Geoff Thorpe
9f44f4a081
This looks to have been a typo.
2001-11-24 03:57:57 +00:00
Bodo Möller
37749c8872
merge (new stuff from OpenSSL-0_9_6-stable)
2001-11-23 21:14:00 +00:00
Bodo Möller
dae0b520a0
fixes submitted by Andy Schneider <andy.schneider@bjss.co.uk>
2001-11-23 20:56:27 +00:00
Richard Levitte
f1a185a04a
Fix unexpected difference between the 0.9.6 and the 0.9.6 [engine]
...
branches.
2001-11-21 14:05:30 +00:00
Richard Levitte
60f3f6ac2e
merge changes from the 0.9.6 branch.
2001-11-21 14:02:49 +00:00
Richard Levitte
595241e17f
inttypes.h apparently doesn't exist with VC++. Therefore, use the
...
built-in types __int8, __int16 and so on on that platform.
2001-11-21 13:26:57 +00:00
Geoff Thorpe
c6d14d26fd
Squash a VC++ warning.
2001-11-21 03:49:51 +00:00
Geoff Thorpe
832e09cd23
Testing on WIN32 turned up a faulty default value.
2001-11-20 05:19:20 +00:00
Richard Levitte
879d789a42
Extentions of the explanations to the linking problem on Win32. Provided by Andrew Gray <agray@iconsinc.com>
2001-11-19 20:47:02 +00:00
Richard Levitte
07ad3257fc
unsigned long long is not accepted anywhere, especially on certain
...
32-bit platforms. Instead, make use of inttypes.h and use the types
defined there to get 8-, 16-, 32- an 64-bit values.
There might be some operating systems where one should use int_types.h
instead of inttypes.h. Unfortunately, I don't recall which one(s).
2001-11-17 23:01:25 +00:00
Geoff Thorpe
c02efd954d
Note the new engine
2001-11-17 05:45:20 +00:00
Geoff Thorpe
b26f6ee5f2
Another ENGINE that's been working in 0.9.6-engine for a while that will
...
be included for 0.9.6c-engine.
2001-11-17 05:29:25 +00:00
Richard Levitte
b5719e9673
Use memset() instead of bzero().
2001-11-16 23:31:07 +00:00
Richard Levitte
f56412e895
unsigned char * vs. char *
2001-11-16 23:28:45 +00:00
Richard Levitte
26e922fc7f
Let's not forget the latest engines on VMS (at least see if they
...
compile properly).
2001-11-16 17:57:27 +00:00
Richard Levitte
edcace97a8
Merge in latest changes from 0.9.6-stable.
...
make update
perl util/mkerr.pl -recurse -write -rebuild
(now, just look at the effect that last thing had on the ENGINE error
strings! How did that unbalance between macros and strings happen?)
2001-11-15 13:33:08 +00:00
Richard Levitte
8d5c834b34
Merg in latest changes from 0.9.6-stable.
2001-11-15 08:15:05 +00:00
Geoff Thorpe
b0eda65f1c
"sureware" should not be "hwcrhk".
...
Also, the "to" variable used in cleanup is never non-NULL and is entirely
unused. As such, the cleanup might have been missed under genuine error
conditions and caused leaks and/or returned invalid pointers.
2001-11-15 02:51:01 +00:00
Geoff Thorpe
2395368e7f
ENGINE support has not been put into dsaparam, so these declarations seem
...
to be pointless.
2001-11-15 01:58:32 +00:00
Bodo Möller
95c0f198a7
fix warning (due to an error during manual conflict resolution)
2001-11-13 10:19:54 +00:00
Bodo Möller
947a85d022
Merge from OpenSSL_0_9_6-stable
2001-11-13 10:12:25 +00:00
Bodo Möller
da904c9cef
synchronise with main 0.9.6 stable branch
2001-11-12 22:42:40 +00:00
Mark J. Cox
c3970428ac
Back-port of Broadcom engine code from 0.9.7 to 0.9.6, but with a few
...
patches taken from Red Hat Linux 7.2. Original code from Broadcom with
patches and backport by Nalin, more backport to fix warnings and const
changes by Mark
Submitted by: Mark Cox
Reviewed by:
PR:
2001-11-12 20:28:09 +00:00
Mark J. Cox
b1d9279a41
Add initial support for Baltimore SureWare accelerator cards; this works
...
for acceleration only at the moment, but full key management is being
worked on for the future. This code has been compiled cross-platform but
not extensively tested
Submitted by: Mark Cox, Baltimore Technologies
Reviewed by: Mark Cox
PR:
2001-11-12 15:21:55 +00:00
Mark J. Cox
c7d827fc90
Commit missing AEP files (oops)
...
Submitted by:
Reviewed by:
PR:
2001-11-12 12:11:06 +00:00
Mark J. Cox
37fe697597
Add support for AEP crypto cards to 0.9.6c. This patch is in Red Hat Linux
...
7.2 and been given extensive testing; it also compiles okay on our selection
of random machines (including 64-bit)
Submitted by: AEP, Mark Cox
Reviewed by: Mark Cox
PR:
2001-11-12 11:17:19 +00:00
cvs2svn
d8616888ee
This commit was manufactured by cvs2svn to create branch 'OpenSSL-engine-
...
0_9_6-stable'.
2001-11-10 02:12:57 +00:00
Bodo Möller
65123f8064
remove incorrect 'callback' prototype
2001-11-10 02:12:56 +00:00
Bodo Möller
1d8634b110
msg_callback documentation
2001-11-10 02:12:09 +00:00
Bodo Möller
29e0c30c2a
more output for SSL 2.0 in our msg_callback
2001-11-10 01:17:02 +00:00
Bodo Möller
cf82191d77
Implement msg_callback for SSL 2.0.
...
Important SSL 2.0 bugfixes (bugs found while implementing msg_callback).
2001-11-10 01:16:28 +00:00
Bodo Möller
3a8a0a3945
2001, not 2000
2001-11-09 13:15:05 +00:00
Bodo Möller
c5d4ab7e35
adjust to OpenSSL_0_9_6-stable version
2001-11-09 13:09:11 +00:00
Bodo Möller
b955dbd325
cast to 'unsigned long' before using ~ if we need an unsigned long result
...
Submitted by: "Stefan Marxen" <stefan.marxen@gmx.net>
2001-11-09 12:58:05 +00:00
Bodo Möller
45582d1e2b
clarify
2001-11-08 14:54:21 +00:00
Bodo Möller
60c50cbf9c
Don't define _REENTRANT here in e_os.h. On systems where we need
...
_REENTRANT if threads support is enabled, the ./Configure entry must
define it so that it ends up in CFLAG.
2001-11-08 14:32:06 +00:00
Dr. Stephen Henson
3a3619b46a
PKCS#12 code fixes: initialize and cleanup digests and ciphers
...
properly.
2001-11-06 13:54:48 +00:00
Dr. Stephen Henson
b83eddc578
Win32 fixes.
2001-11-06 13:40:27 +00:00
Richard Levitte
7f558334ad
des_old.h doesn't really need to include des.h, so don't. That will
...
avoid clashes with other code that have their own DES_ functions but
really only use OpenSSL's old des_ functions.
2001-11-06 11:37:14 +00:00
Dr. Stephen Henson
6229a5607c
Fix email address delete code.
2001-11-06 01:44:21 +00:00
Richard Levitte
6acc3b9689
Place the OpenSSL-specific headers back so they always get included,
...
or we get a dependency war in Makefile.ssl
2001-11-05 18:18:12 +00:00
Richard Levitte
66aa856698
No need to include anything on systems that do not have /dev/crypt
2001-11-05 12:44:14 +00:00
Richard Levitte
f559f31bef
DOS and Windows do not like unistd.h
2001-11-05 12:43:17 +00:00