From 401612fd1d0c0df450bb51cf2bcdbb1b3f08bc0a Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Fri, 18 Nov 2016 03:53:54 +0000 Subject: [PATCH] Fix "unable to find 'distinguished_name' in config" with older openssl This also fixes "make distcheck", which expects "make uninstall" to remove all installed files. --- keygen/Makefile.am | 15 +++++++++++++-- keygen/openssl.conf | 4 ++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 keygen/openssl.conf diff --git a/keygen/Makefile.am b/keygen/Makefile.am index e77fe24e..014e8df9 100644 --- a/keygen/Makefile.am +++ b/keygen/Makefile.am @@ -1,3 +1,4 @@ +EXTRA_DIST = openssl.conf AM_CPPFLAGS = \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ @@ -18,8 +19,18 @@ xrdpsysconfdir = $(sysconfdir)/xrdp install-data-hook: umask 077 && \ - if [ ! -f $(DESTDIR)$(xrdpsysconfdir)/rsakeys.ini ]; then ./xrdp-keygen xrdp $(DESTDIR)$(xrdpsysconfdir)/rsakeys.ini; fi && \ - if [ ! -f $(DESTDIR)$(xrdpsysconfdir)/cert.pem ]; then 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; fi + if [ ! -f $(DESTDIR)$(xrdpsysconfdir)/rsakeys.ini ]; then \ + ./xrdp-keygen xrdp $(DESTDIR)$(xrdpsysconfdir)/rsakeys.ini; \ + fi && \ + if [ ! -f $(DESTDIR)$(xrdpsysconfdir)/cert.pem ]; then \ + 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 \ + -config $(srcdir)/openssl.conf; \ + fi uninstall-hook: rm -f $(DESTDIR)$(xrdpsysconfdir)/rsakeys.ini + rm -f $(DESTDIR)$(xrdpsysconfdir)/cert.pem + rm -f $(DESTDIR)$(xrdpsysconfdir)/key.pem diff --git a/keygen/openssl.conf b/keygen/openssl.conf new file mode 100644 index 00000000..79b1dfb4 --- /dev/null +++ b/keygen/openssl.conf @@ -0,0 +1,4 @@ +[req] +distinguished_name = req_distinguished_name + +[req_distinguished_name]