mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "unable to find 'distinguished_name' in config" with older openssl

Browse Source 
This also fixes "make distcheck", which expects "make uninstall" to
remove all installed files.
This commit is contained in:
Pavel Roskin 2016-11-18 03:53:54 +00:00
parent f7b0b0d89c
commit 401612fd1d
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
keygen/Makefile.am
View File

@ -1,3 +1,4 @@
EXTRA_DIST = openssl.conf
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
@ -18,8 +19,18 @@ xrdpsysconfdir = $(sysconfdir)/xrdp
install-data-hook: install-data-hook:
umask 077 && \ umask 077 && \
if [ ! -f $(DESTDIR)$(xrdpsysconfdir)/rsakeys.ini ]; then ./xrdp-keygen xrdp $(DESTDIR)$(xrdpsysconfdir)/rsakeys.ini; fi && \ if [ ! -f $(DESTDIR)$(xrdpsysconfdir)/rsakeys.ini ]; then \
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 ./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: uninstall-hook:
rm -f $(DESTDIR)$(xrdpsysconfdir)/rsakeys.ini rm -f $(DESTDIR)$(xrdpsysconfdir)/rsakeys.ini
rm -f $(DESTDIR)$(xrdpsysconfdir)/cert.pem
rm -f $(DESTDIR)$(xrdpsysconfdir)/key.pem

4
keygen/openssl.conf Normal file
View File

@ -0,0 +1,4 @@
[req]
distinguished_name = req_distinguished_name
[req_distinguished_name]