demos: tidy up makefiles, fix warnings

Update makefiles so that consistent patterns are used. Object files are compiled from source using an implicit rule (but using our CFLAGS); for linking, we give an explicit rule. Ensure that "make test" works in each subdirectory (even if it does not actually run any applications). The top-level demo makefile now works. The makefiles are not make-agnostic. e.g. they use the variable $(RM) in "clean" recipes, which is defined in gnu-make but may not be defined in others. Part of openssl#17806 Testing: $ cd demo $ make test Reviewed-by: Paul Dale <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from openssl#22698)
a-mair · Nov 15, 2023 · 86db958 · 86db958
1 parent 56aa3e8
commit 86db958
Show file tree

Hide file tree

Showing 37 changed files with 314 additions and 202 deletions.
diff --git a/demos/Makefile b/demos/Makefile
@@ -1,4 +1,18 @@
-MODULES=bio digest encode encrypt kdf keyexch mac pkey signature sslecho
+MODULES = bio \
+          cipher \
+          cms \
+          digest \
+          encode \
+          encrypt \
+          guide \
+          http3 \
+          kdf \
+          keyexch \
+          mac \
+          pkey \
+          signature \
+          smime \
+          sslecho
 
 all:
 	@set -e; for i in $(MODULES); do \

diff --git a/demos/bio/Makefile b/demos/bio/Makefile
@@ -1,24 +1,22 @@
-# Quick instruction:
-# To build against an OpenSSL built in the source tree, do this:
 #
-#    make OPENSSL_INCS_LOCATION=-I../../include OPENSSL_LIBS_LOCATION=-L../..
-#
-# To run the demos when linked with a shared library (default):
+# To run the demos when linked with a shared library (default) ensure that
+# libcrypto and libssl are on the library path. For example:
 #
 #    LD_LIBRARY_PATH=../.. ./server-arg
-#    LD_LIBRARY_PATH=../.. ./server-cmod
-#    LD_LIBRARY_PATH=../.. ./server-conf
-#    LD_LIBRARY_PATH=../.. ./client-arg
-#    LD_LIBRARY_PATH=../.. ./client-conf
-#    LD_LIBRARY_PATH=../.. ./saccept
-#    LD_LIBRARY_PATH=../.. ./sconnect
 
-CFLAGS = $(OPENSSL_INCS_LOCATION)
-LDFLAGS = $(OPENSSL_LIBS_LOCATION) -lssl -lcrypto $(EX_LIBS)
+TESTS = client-arg \
+        client-conf \
+        saccept \
+        sconnect \
+        server-arg \
+        server-cmod \
+        server-conf
 
-all: client-arg client-conf saccept sconnect server-arg server-cmod server-conf
+CFLAGS  = -I../../include -g -Wall
+LDFLAGS = -L../..
+LDLIBS  = -lssl -lcrypto
 
-test:
+all: $(TESTS)
 
 client-arg: client-arg.o
 client-conf: client-conf.o
@@ -28,8 +26,12 @@ server-arg: server-arg.o
 server-cmod: server-cmod.o
 server-conf: server-conf.o
 
-client-arg client-conf saccept sconnect server-arg server-cmod server-conf:
-	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
+$(TESTS):
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
 
 clean:
-	$(RM) *.o client-arg client-conf saccept sconnect server-arg server-cmod server-conf
+	$(RM) $(TESTS) *.o
+
+test: all
+	@echo "\nBIO tests:"
+	@echo "skipped"
diff --git a/demos/bio/sconnect.c b/demos/bio/sconnect.c
@@ -30,7 +30,6 @@ int main(int argc, char *argv[])
     const char *hostport = HOSTPORT;
     const char *CAfile = CAFILE;
     const char *hostname;
-    char *cp;
     BIO *out = NULL;
     char buf[1024 * 10], *p;
     SSL_CTX *ssl_ctx = NULL;

diff --git a/demos/cipher/Makefile b/demos/cipher/Makefile
@@ -1,19 +1,17 @@
-# Quick instruction:
-# To build against an OpenSSL built in the source tree, do this:
 #
-#    make OPENSSL_INCS_LOCATION=-I../../include OPENSSL_LIBS_LOCATION=-L../..
-#
-# To run the demos when linked with a shared library (default):
+# To run the demos when linked with a shared library (default) ensure that
+# libcrypto is on the library path.  For example:
 #
 #    LD_LIBRARY_PATH=../.. ./aesccm
-#    LD_LIBRARY_PATH=../.. ./aesgcm
-#    LD_LIBRARY_PATH=../.. ./aeskeywrap
-#    LD_LIBRARY_PATH=../.. ./ariacbc
 
-CFLAGS = $(OPENSSL_INCS_LOCATION)
-LDFLAGS = $(OPENSSL_LIBS_LOCATION) -lssl -lcrypto
+TESTS = aesccm \
+        aesgcm \
+        aeskeywrap \
+        ariacbc
 
-TESTS=aesccm aesgcm aeskeywrap ariacbc
+CFLAGS  = -I../../include -g -Wall
+LDFLAGS = -L../..
+LDLIBS  = -lcrypto
 
 all: $(TESTS)
 
@@ -22,11 +20,11 @@ aesgcm: aesgcm.o
 aeskeywrap: aeskeywrap.o
 ariacbc: ariacbc.o
 
-aesccm aesgcm aeskeywrap ariacbc:
-	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
+$(TESTS):
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
 
 clean:
-	$(RM) aesccm aesgcm aeskeywrap ariacbc *.o
+	$(RM) $(TESTS) *.o
 
 .PHONY: test
 test: all

diff --git a/demos/cipher/ariacbc.c b/demos/cipher/ariacbc.c
@@ -58,9 +58,7 @@ int aria_cbc_encrypt(void)
     EVP_CIPHER_CTX *ctx;
     EVP_CIPHER *cipher = NULL;
     int outlen, tmplen;
-    size_t cbc_ivlen = sizeof(cbc_iv);
     unsigned char outbuf[1024];
-    unsigned char outtag[16];
 
     printf("ARIA CBC Encrypt:\n");
     printf("Plaintext:\n");
@@ -115,8 +113,7 @@ int aria_cbc_decrypt(void)
     int ret = 0;
     EVP_CIPHER_CTX *ctx;
     EVP_CIPHER *cipher = NULL;
-    int outlen, tmplen, rv;
-    size_t cbc_ivlen = sizeof(cbc_iv);
+    int outlen, tmplen;
     unsigned char outbuf[1024];
 
     printf("ARIA CBC Decrypt:\n");

diff --git a/demos/cms/Makefile b/demos/cms/Makefile
@@ -15,18 +15,28 @@ TESTS = cms_comp \
         cms_uncomp \
         cms_ver
 
-CFLAGS  = -I../../include -g
+CFLAGS  = -I../../include -g -Wall
 LDFLAGS = -L../..
 LDLIBS  = -lcrypto
 
 all: $(TESTS)
 
+cms_comp: cms_comp.o
+cms_ddec: cms_ddec.o
+cms_dec: cms_dec.o
+cms_denc: cms_denc.o
+cms_enc: cms_enc.o
+cms_sign: cms_sign.o
+cms_sign2: cms_sign2.o
+cms_uncomp: cms_uncomp.o
+cms_ver: cms_ver.o
+
+$(TESTS):
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
+
 clean:
 	$(RM) $(TESTS) *.o
 
-cms_%: cms_%.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -o "$@" "$<" $(LDLIBS)
-
 test: all
 	@echo "\nCMS tests:"
 	LD_LIBRARY_PATH=../.. ./cms_enc

diff --git a/demos/cms/cms_ddec.c b/demos/cms/cms_ddec.c
@@ -34,7 +34,8 @@ int main(int argc, char **argv)
 
     rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL);
 
-    BIO_reset(tbio);
+    if (BIO_reset(tbio) < 0)
+        goto err;
 
     rkey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL);
 

diff --git a/demos/cms/cms_dec.c b/demos/cms/cms_dec.c
@@ -31,7 +31,8 @@ int main(int argc, char **argv)
 
     rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL);
 
-    BIO_reset(tbio);
+    if (BIO_reset(tbio) < 0)
+        goto err;
 
     rkey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL);
 

diff --git a/demos/cms/cms_sign.c b/demos/cms/cms_sign.c
@@ -38,7 +38,8 @@ int main(int argc, char **argv)
 
     scert = PEM_read_bio_X509(tbio, NULL, 0, NULL);
 
-    BIO_reset(tbio);
+    if (BIO_reset(tbio) < 0)
+        goto err;
 
     skey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL);
 
@@ -62,8 +63,10 @@ int main(int argc, char **argv)
     if (!out)
         goto err;
 
-    if (!(flags & CMS_STREAM))
-        BIO_reset(in);
+    if (!(flags & CMS_STREAM)) {
+        if (BIO_reset(in) < 0)
+            goto err;
+    }
 
     /* Write out S/MIME message */
     if (!SMIME_write_CMS(out, cms, in, flags))

diff --git a/demos/cms/cms_sign2.c b/demos/cms/cms_sign2.c
@@ -30,7 +30,8 @@ int main(int argc, char **argv)
 
     scert = PEM_read_bio_X509(tbio, NULL, 0, NULL);
 
-    BIO_reset(tbio);
+    if (BIO_reset(tbio) < 0)
+        goto err;
 
     skey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL);
 
@@ -43,7 +44,8 @@ int main(int argc, char **argv)
 
     scert2 = PEM_read_bio_X509(tbio, NULL, 0, NULL);
 
-    BIO_reset(tbio);
+    if (BIO_reset(tbio) < 0)
+        goto err;
 
     skey2 = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL);
 

diff --git a/demos/digest/Makefile b/demos/digest/Makefile
@@ -1,32 +1,37 @@
 #
-# To run the demos when linked with a shared library (default):
+# To run the demos when linked with a shared library (default) ensure
+# that libcrypto is on the library path. For example:
 #
 #    LD_LIBRARY_PATH=../.. ./EVP_MD_demo
 
-CFLAGS = -I../../include -g -Wall
-LDFLAGS = -L../..
-LDLIBS = -lcrypto
+TESTS = EVP_MD_demo \
+        EVP_MD_stdin \
+        EVP_MD_xof \
+        BIO_f_md
 
-TESTS=EVP_MD_demo EVP_MD_stdin EVP_MD_xof BIO_f_md
+CFLAGS  = -I../../include -g -Wall
+LDFLAGS = -L../..
+LDLIBS  = -lcrypto
 
 all: $(TESTS)
 
-%.o: %.c
-	$(CC) $(CFLAGS) -c $<
-
 EVP_MD_demo: EVP_MD_demo.o
 EVP_MD_stdin: EVP_MD_stdin.o
 EVP_MD_xof: EVP_MD_xof.o
 BIO_f_md: BIO_f_md.o
 
+$(TESTS):
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
+
+clean:
+	$(RM) *.o $(TESTS)
+
 .PHONY: test
-# Since some of these tests use stdin we use the source file as stdin when running the exes
+# Since some of these tests use stdin, we use the source file as stdin
+# when running the tests
 test: all
 	@echo "\nDigest tests:"
 	@set -e; for tst in $(TESTS); do \
 		echo "\n"$$tst; \
 		cat $$tst.c | ./$$tst; \
 	done
-
-clean:
-	$(RM) *.o $(TESTS)
diff --git a/demos/encode/Makefile b/demos/encode/Makefile
@@ -1,22 +1,28 @@
 #
-# To run the demos when linked with a shared library (default):
+# To run the demos when linked with a shared library (default) ensure
+# that libcrypto is on the library path.  For example:
 #
 #    LD_LIBRARY_PATH=../.. ./rsa_encode
 
-CFLAGS = -I../../include -g -Wall
-LDFLAGS = -L../..
-LDLIBS = -lcrypto
+TESTS = ec_encode \
+        rsa_encode
 
-TESTS=ec_encode rsa_encode
+CFLAGS  = -I../../include -g -Wall
+LDFLAGS = -L../..
+LDLIBS  = -lcrypto
 
 all: $(TESTS)
 
-%.o: %.c
-	$(CC) $(CFLAGS) -c $<
+ec_encode: ec_encode.o
+rsa_encode: rsa_encode.o
 
-%_encode: %_encode.o
-
-test:
+$(TESTS):
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
 
 clean:
 	$(RM) *.o $(TESTS)
+
+.PHONY: test
+test: all
+	@echo "\nencode tests:"
+	@echo "skipped"
diff --git a/demos/encrypt/Makefile b/demos/encrypt/Makefile
@@ -1,21 +1,22 @@
 #
-# To run the demos when linked with a shared library (default):
+# To run the demos when linked with a shared library (default) ensure
+# that libcrypto is on the library path. For example:
 #
 #    LD_LIBRARY_PATH=../.. ./rsa_encrypt
 
-CFLAGS = -I../../include -g
-LDFLAGS = -L../..
-LDLIBS = -lcrypto
+TESTS = rsa_encrypt
 
-TESTS=rsa_encrypt
+CFLAGS  = -I../../include -g -Wall
+LDFLAGS = -L../..
+LDLIBS  = -lcrypto
 
 all: $(TESTS)
 
-%.o: %.c
-	$(CC) $(CFLAGS) -c $<
-
 rsa_encrypt: rsa_encrypt.o
 
+$(TESTS):
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
+
 clean:
 	$(RM) *.o $(TESTS)
 

diff --git a/demos/encrypt/rsa_encrypt.c b/demos/encrypt/rsa_encrypt.c
@@ -151,7 +151,7 @@ static int do_encrypt(OSSL_LIB_CTX *libctx,
     return ret;
 }
 
-static int do_decrypt(OSSL_LIB_CTX *libctx, const char *in, size_t in_len,
+static int do_decrypt(OSSL_LIB_CTX *libctx, const unsigned char *in, size_t in_len,
                       unsigned char **out, size_t *out_len)
 {
     int ret = 0, public = 0;