diff options
| author | James Muir <james@openssl.org> | 2023-11-10 14:02:00 -0500 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-11-15 08:43:23 +0100 |
| commit | 86db958835d1f8ba9ce49a9f93b5309c3d13b91c (patch) | |
| tree | 39e47920c615243afc3dd7df206a54ec05fa1045 /demos/encrypt | |
| parent | 56aa3e8d1a286e11e56d9a9f6373c33a87a69ff4 (diff) | |
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 #17806
Testing:
$ cd demo
$ make test
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22698)
Diffstat (limited to 'demos/encrypt')
| -rw-r--r-- | demos/encrypt/Makefile | 17 | ||||
| -rw-r--r-- | demos/encrypt/rsa_encrypt.c | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/demos/encrypt/Makefile b/demos/encrypt/Makefile index 6d4e060668..378d277d21 100644 --- 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 index e3d8981e41..d95b985511 100644 --- a/demos/encrypt/rsa_encrypt.c +++ b/demos/encrypt/rsa_encrypt.c @@ -151,7 +151,7 @@ cleanup: 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; |