aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Möller <ulf@openssl.org>1999-08-13 19:21:53 +0000
committerUlf Möller <ulf@openssl.org>1999-08-13 19:21:53 +0000
commit1bf0b46b13f622c9e387af18cf46c3a0c772172f (patch)
tree07444c40fd4879454f30b7e77f03ff108295f5a2
parent27ad06a62735702b9702a605086b155a20557c5f (diff)
downloadopenssl-1bf0b46b13f622c9e387af18cf46c3a0c772172f.tar.gz
Add pkcs7 and des apps to "make all".
-rwxr-xr-xConfigure1
-rw-r--r--crypto/des/Makefile.ssl2
-rw-r--r--crypto/des/des.c2
-rw-r--r--crypto/pkcs12/Makefile.ssl2
-rw-r--r--crypto/pkcs7/Makefile.ssl4
5 files changed, 6 insertions, 5 deletions
diff --git a/Configure b/Configure
index 1c37668f3b..401b895944 100755
--- a/Configure
+++ b/Configure
@@ -98,6 +98,7 @@ my %table=(
"debug-ben-strict", "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown):::::",
"debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
"debug-bodo", "gcc:-DBIO_PAIR_DEBUG -DL_ENDIAN -DREF_CHECK -DCRYPTO_MDEBUG_ALL -g -m486 -Wall::-D_REENTRANT::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
+"debug-ulf", "gcc:-DL_ENDIAN -DREF_CHECK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -O2 -m486 -Wall -pedantic -Wall -Wshadow -pipe::-D_REENTRANT::$x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
"dist", "cc:-O::(unknown):::::",
# Basic configs that should work on any box
diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl
index 789063b3c1..e9c94406e2 100644
--- a/crypto/des/Makefile.ssl
+++ b/crypto/des/Makefile.ssl
@@ -53,7 +53,7 @@ ALL= $(GENERAL) $(SRC) $(HEADER)
top:
(cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
-all: lib
+all: lib des
lib: $(LIBOBJ)
$(AR) $(LIB) $(LIBOBJ)
diff --git a/crypto/des/des.c b/crypto/des/des.c
index b2d7f0da78..206e3777a7 100644
--- a/crypto/des/des.c
+++ b/crypto/des/des.c
@@ -336,7 +336,7 @@ void usage(void)
" in conjunction with -[eEdD].",
"-C[ckname] : generate a cbc_cksum as for -c but compatible with -[ED].",
"-k key : use key 'key'",
-"-h : the key that is entered will be a hexidecimal number",
+"-h : the key that is entered will be a hexadecimal number",
" that is used directly as the des key",
"-u[uuname] : input file is uudecoded if -[dD] or output uuencoded data if -[eE]",
" (uuname is the filename to put in the uuencode header).",
diff --git a/crypto/pkcs12/Makefile.ssl b/crypto/pkcs12/Makefile.ssl
index ebffab657c..7b3e9fd248 100644
--- a/crypto/pkcs12/Makefile.ssl
+++ b/crypto/pkcs12/Makefile.ssl
@@ -1,5 +1,5 @@
#
-# SSLeay/crypto/asn1/Makefile
+# SSLeay/crypto/pkcs12/Makefile
#
DIR= pkcs12
diff --git a/crypto/pkcs7/Makefile.ssl b/crypto/pkcs7/Makefile.ssl
index 436442a7a1..f6632b3b21 100644
--- a/crypto/pkcs7/Makefile.ssl
+++ b/crypto/pkcs7/Makefile.ssl
@@ -1,5 +1,5 @@
#
-# SSLeay/crypto/asn1/Makefile
+# SSLeay/crypto/pkcs7/Makefile
#
DIR= pkcs7
@@ -37,7 +37,7 @@ top:
test:
-all: lib
+all: lib testapps
testapps: enc dec sign verify