summaryrefslogtreecommitdiffstats
path: root/keygen
diff options
context:
space:
mode:
authorPavel Roskin <plroskin@gmail.com>2017-01-15 00:42:35 -0800
committerPavel Roskin <plroskin@gmail.com>2017-01-21 18:20:24 -0800
commit250bb610258fe762871aa2c479a1e5f485e88b89 (patch)
treec8ea94ea67d7432f09465a7ab9a7cd29da30dd0e /keygen
parente217e68acbdb4bcb49591402be5d3f0efc76846a (diff)
downloadxrdp-proprietary-250bb610258fe762871aa2c479a1e5f485e88b89.tar.gz
xrdp-proprietary-250bb610258fe762871aa2c479a1e5f485e88b89.zip
Check for openssl binary in configure, don't fail if not found
Prefer openssl binary from the same location as the openssl library. Make it possible to suppress certificate generation during install by passing OPENSSL=: to make.
Diffstat (limited to 'keygen')
-rw-r--r--keygen/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/keygen/Makefile.am b/keygen/Makefile.am
index 014e8df9..2422196a 100644
--- a/keygen/Makefile.am
+++ b/keygen/Makefile.am
@@ -23,7 +23,7 @@ install-data-hook:
./xrdp-keygen xrdp $(DESTDIR)$(xrdpsysconfdir)/rsakeys.ini; \
fi && \
if [ ! -f $(DESTDIR)$(xrdpsysconfdir)/cert.pem ]; then \
- openssl req -x509 -newkey rsa:2048 -sha256 -nodes \
+ $(OPENSSL) req -x509 -newkey rsa:2048 -sha256 -nodes \
-keyout $(DESTDIR)$(xrdpsysconfdir)/key.pem -out \
$(DESTDIR)$(xrdpsysconfdir)/cert.pem -days 365 \
-subj /C=US/ST=CA/L=Sunnyvale/O=xrdp/CN=www.xrdp.org \