| Message ID | c356f0fac7be952421a754fc8168ecd3a30b19be.1417952276.git.yann.morin.1998@free.fr |
|---|---|
| State | Deferred |
| Headers | show |
On Sun, Dec 7, 2014 at 12:39 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote: > This is mandatory for an RDP server to have a key and a certificate, > otherwise clients will refuse to connect to that server. > > We install the key and certificate bundled in FreeRDP. The user can > install its own set using a post-build script if needed. > > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Cc: Samuel Martin <s.martin49@gmail.com> Reviewed-by: Samuel Martin <s.martin49@gmail.com> > > --- > Changes v2 -> v3: > - only install the keys when the server is enabled (Samuel) > --- > package/freerdp/freerdp.mk | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk > index 67f9960..2fa880f 100644 > --- a/package/freerdp/freerdp.mk > +++ b/package/freerdp/freerdp.mk > @@ -48,6 +48,15 @@ endif > > ifeq ($(BR2_PACKAGE_FREERDP_SERVER),y) > FREERDP_CONF_OPTS += -DWITH_SERVER=ON -DWITH_SERVER_INTERFACE=ON > +# Install the server key and certificate, so that a client can connect. > +# A user can override them with its own in a post-build script, if needed. > +define FREERDP_INSTALL_KEYS > + $(INSTALL) -D $(@D)/server/X11/server.key \ > + $(TARGET_DIR)/etc/freerdp/keys/server.key > + $(INSTALL) -D $(@D)/server/X11/server.crt \ > + $(TARGET_DIR)/etc/freerdp/keys/server.crt > +endef > +FREERDP_POST_INSTALL_TARGET_HOOKS += FREERDP_INSTALL_KEYS > else > FREERDP_CONF_OPTS += -DWITH_SERVER=OFF -DWITH_SERVER_INTERFACE=OFF > endif > -- > 1.9.1 >
diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 67f9960..2fa880f 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -48,6 +48,15 @@ endif ifeq ($(BR2_PACKAGE_FREERDP_SERVER),y) FREERDP_CONF_OPTS += -DWITH_SERVER=ON -DWITH_SERVER_INTERFACE=ON +# Install the server key and certificate, so that a client can connect. +# A user can override them with its own in a post-build script, if needed. +define FREERDP_INSTALL_KEYS + $(INSTALL) -D $(@D)/server/X11/server.key \ + $(TARGET_DIR)/etc/freerdp/keys/server.key + $(INSTALL) -D $(@D)/server/X11/server.crt \ + $(TARGET_DIR)/etc/freerdp/keys/server.crt +endef +FREERDP_POST_INSTALL_TARGET_HOOKS += FREERDP_INSTALL_KEYS else FREERDP_CONF_OPTS += -DWITH_SERVER=OFF -DWITH_SERVER_INTERFACE=OFF endif
This is mandatory for an RDP server to have a key and a certificate, otherwise clients will refuse to connect to that server. We install the key and certificate bundled in FreeRDP. The user can install its own set using a post-build script if needed. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Samuel Martin <s.martin49@gmail.com> --- Changes v2 -> v3: - only install the keys when the server is enabled (Samuel) --- package/freerdp/freerdp.mk | 9 +++++++++ 1 file changed, 9 insertions(+)