diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2017-06-09 10:27:55 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2017-06-09 10:27:55 +0300 |
| commit | 4211ac05c73230dfda86af2196f55974395437df (patch) | |
| tree | 1eeb401af34010daa0f2eff3fc54d283bee3e431 /sign/rpmsignfiles.c | |
| parent | a77d2d3476919fdbcba9baf0dd44c98db1620360 (diff) | |
| download | rpm-4211ac05c73230dfda86af2196f55974395437df.tar.gz | |
Conditional compilation sanity for file signing
Give a nice and clear error message if file signing is requested
on a build that doesn't support it, and ifdef the entire
contents of includeFileSignatures() so we wont try to compile
in a call to rpmSignFiles(), which doesn't get built at all
due to makefile conditionals when imaevm is not enabled.
On a related note, drop the unnecessary conditional and error message
from rpmsignfiles.c: the whole file does not get built if imaevm
is not enabled so there's no need for these.
Diffstat (limited to 'sign/rpmsignfiles.c')
| -rw-r--r-- | sign/rpmsignfiles.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sign/rpmsignfiles.c b/sign/rpmsignfiles.c index 1666befb1..61b73bd40 100644 --- a/sign/rpmsignfiles.c +++ b/sign/rpmsignfiles.c @@ -40,11 +40,6 @@ const char *key, char *keypass) unsigned char signature[MAX_SIGNATURE_LENGTH]; int siglen; -#ifndef WITH_IMAEVM - rpmlog(RPMLOG_ERR, _("missing libimaevm\n")); - return NULL; -#endif - /* convert file digest hex to binary */ memset(digest, 0, diglen); /* some entries don't have a digest - we return an empty signature */ |