summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2004-06-28 13:05:53 +0000
committerRichard Levitte <levitte@openssl.org>2004-06-28 13:05:53 +0000
commit3001755d45a9a0906031986530aba93a0337de7e (patch)
treedf219f0cc2b984789f3eb0509bac401ad9f328db
parent46e9a491650c5cafe2dc2844fd03e5bf87a6ab55 (diff)
Recent changes from 0.9.6-stable.
-rwxr-xr-xConfigure2
-rw-r--r--apps/speed.c6
2 files changed, 6 insertions, 2 deletions
diff --git a/Configure b/Configure
index c0f79cac82..47b56aa80b 100755
--- a/Configure
+++ b/Configure
@@ -376,7 +376,7 @@ my %table=(
"qnx6", "cc:-DL_ENDIAN -DTERMIOS::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:",
# Linux on ARM
-"linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
# UnixWare 2.0x fails destest with -O
"unixware-2.0","cc:-DFILIO_H::-Kthread:-lsocket -lnsl -lx:${x86_gcc_des} ${x86_gcc_opts}:::",
diff --git a/apps/speed.c b/apps/speed.c
index 67c0300be7..27e4b69aad 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -192,7 +192,11 @@
#endif
#undef BUFSIZE
-#define BUFSIZE ((long)1024*8+1)
+/* BUFSIZE needs to be one cipherblock larger than the largest number in the
+ lengths array (see below), to make space for padding when doing EVP tests.
+ 1024 extra bytes may seem much, but hey, it doesn't hurt!
+ -- Richard Levitte */
+#define BUFSIZE ((long)1024*9+1)
int run=0;
static double Time_F(int s, int usertime);