diff options
| author | Brent Cook <bcook@openbsd.org> | 2015-02-14 18:51:44 -0600 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2015-02-14 18:54:43 -0600 |
| commit | 28311d4355e38376dc7ebcf1d2d7957718f55359 (patch) | |
| tree | ac6dd78bba77be68c50a9070a7876bdece1443a4 /apps | |
| parent | 2286578fd4e93e024ac33a0fd8f89dc936ad95a8 (diff) | |
| download | portable-28311d4355e38376dc7ebcf1d2d7957718f55359.tar.gz portable-28311d4355e38376dc7ebcf1d2d7957718f55359.tar.bz2 portable-28311d4355e38376dc7ebcf1d2d7957718f55359.zip | |
conditionally build certhash into openssl(1)
For now, look for openat and symlink. We may switch to just needing
symlink later.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Makefile.am | 7 | ||||
| -rw-r--r-- | apps/certhash_disabled.c | 13 |
2 files changed, 19 insertions, 1 deletions
diff --git a/apps/Makefile.am b/apps/Makefile.am index f752ca6..30978c1 100644 --- a/apps/Makefile.am +++ b/apps/Makefile.am | |||
| @@ -10,7 +10,6 @@ openssl_LDADD += $(top_builddir)/crypto/libcrypto.la | |||
| 10 | openssl_SOURCES = apps.c | 10 | openssl_SOURCES = apps.c |
| 11 | openssl_SOURCES += asn1pars.c | 11 | openssl_SOURCES += asn1pars.c |
| 12 | openssl_SOURCES += ca.c | 12 | openssl_SOURCES += ca.c |
| 13 | openssl_SOURCES += certhash.c | ||
| 14 | openssl_SOURCES += ciphers.c | 13 | openssl_SOURCES += ciphers.c |
| 15 | openssl_SOURCES += cms.c | 14 | openssl_SOURCES += cms.c |
| 16 | openssl_SOURCES += crl.c | 15 | openssl_SOURCES += crl.c |
| @@ -58,6 +57,12 @@ openssl_SOURCES += verify.c | |||
| 58 | openssl_SOURCES += version.c | 57 | openssl_SOURCES += version.c |
| 59 | openssl_SOURCES += x509.c | 58 | openssl_SOURCES += x509.c |
| 60 | 59 | ||
| 60 | if BUILD_CERTHASH | ||
| 61 | openssl_SOURCES += certhash.c | ||
| 62 | else | ||
| 63 | openssl_SOURCES += certhash_disabled.c | ||
| 64 | endif | ||
| 65 | |||
| 61 | if HOST_WIN | 66 | if HOST_WIN |
| 62 | openssl_SOURCES += apps_win.c | 67 | openssl_SOURCES += apps_win.c |
| 63 | else | 68 | else |
diff --git a/apps/certhash_disabled.c b/apps/certhash_disabled.c new file mode 100644 index 0000000..8238ff7 --- /dev/null +++ b/apps/certhash_disabled.c | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | /* | ||
| 2 | * Public domain | ||
| 3 | * certhash dummy implementation for platforms without symlinks | ||
| 4 | */ | ||
| 5 | |||
| 6 | #include "apps.h" | ||
| 7 | |||
| 8 | int | ||
| 9 | certhash_main(int argc, char **argv) | ||
| 10 | { | ||
| 11 | fprintf(stderr, "certhash is not enabled on this platform\n"); | ||
| 12 | return (1); | ||
| 13 | } | ||
