Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DropbearServerPlugin] Initial version for review #121

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

[DropbearServerPlugin] Initial version for review #121

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
cf38a01
Initial commit for DropbearServer plugin
s-rapolu Jun 19, 2019
8d9d73f
[DropbearServerPlugin]Made build changes to support both Dropbear sha…
s-rapolu Jun 25, 2019
0d6215b
[DropbearServerPlugin]Session management support in native Dropbear c…
s-rapolu Jul 16, 2019
dc1264f
[DropbearServerPlugin] Fixes to the session management implementation…
s-rapolu Jul 24, 2019
cfa9912
[DropbearServerPlugin] Fixes to RPC implementation of Dropbear plugin
s-rapolu Jul 25, 2019
6152680
[DropbearServerPlugin] Fix for dropbear configuration issue
s-rapolu Jul 25, 2019
2721a4d
[DropbearServerPlugin] Fix for finding dropbear shared library at cor…
s-rapolu Jul 25, 2019
8eb3db7
[DropbearServerPlugin] Fix for closing client connections
s-rapolu Jul 26, 2019
5e91eb4
[SecureShellServerPlugin] Removed separate JSON RPC methods as per co…
s-rapolu Aug 27, 2019
1c67d20
[SecureShellServerPlugin] Changes made to native dropbear implementation
s-rapolu Sep 3, 2019
d15fa4f
[SecureShellServerPlugin] fixed issues with native dropbear
s-rapolu Sep 6, 2019
33a89b0
[SecureShellServerPlugin] enable SSH plugin through defaults
s-rapolu Sep 6, 2019
7b3883a
Merge branch 'master' into srapolu/dropbear
s-rapolu Sep 6, 2019
fd24449
[SecureShellServerPlugin] IClient interface implementation
s-rapolu Sep 23, 2019
5b8da33
[SecureShellServerPlugin] updated dropbear patches with git format-patch
s-rapolu Sep 27, 2019
0ac6564
[SecureShellServerPlugin] changed the position of SecureShellServer b…
s-rapolu Sep 27, 2019
03467b1
[SecureShellServerPlugin] updated native dropbear with mutex lock
s-rapolu Oct 1, 2019
de980e1
[SecureShellServerPlugin] fixed issues related to session management
s-rapolu Oct 9, 2019
3b8989e
[SecureShellServerPlugin] revert the changes done for wpeframework.mk…
s-rapolu Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions configs/raspberrypi3_wpe_ml_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ BR2_PACKAGE_WPEFRAMEWORK=y
BR2_PACKAGE_WPEFRAMEWORK_VIRTUALINPUT=y
BR2_PACKAGE_WPEFRAMEWORK_PROVISIONPROXY=y
BR2_PACKAGE_WPEFRAMEWORK_DHCPSERVER=y
BR2_PACKAGE_WPEFRAMEWORK_SECURESHELLSERVER=y
BR2_PACKAGE_WPEFRAMEWORK_LOCATIONSYNC=y
BR2_PACKAGE_WPEFRAMEWORK_LOCATIONSYNC_URI="http://jsonip.metrological.com/?maf=true"
BR2_PACKAGE_WPEFRAMEWORK_MONITOR=y
Expand Down
76 changes: 76 additions & 0 deletions package/dropbear/0001-Makefile.in-changes.patch.conditional
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
--- a/Makefile.in 2016-07-21 20:47:09.000000000 +0530
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Patch needs appropriate format-patch header, including commit log providing a reason for the patch. For more info see: https://git-scm.com/docs/git-format-patch

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, made the corrections and now created the patch with git format-patch header.

+++ b/Makefile.in 2019-06-07 15:08:42.613982883 +0530
@@ -10,7 +10,7 @@
# Hopefully that seems intuitive.

ifndef PROGRAMS
- PROGRAMS=dropbear dbclient dropbearkey dropbearconvert
+ PROGRAMS=dropbear
endif

STATIC_LTC=libtomcrypt/libtomcrypt.a
@@ -18,6 +18,8 @@

LIBTOM_LIBS=@LIBTOM_LIBS@

+DROPBEAR_SERVER_LIB=libdropbear.so
+
ifeq (@BUNDLED_LIBTOM@, 1)
LIBTOM_DEPS=$(STATIC_LTC) $(STATIC_LTM)
CFLAGS+=-I$(srcdir)/libtomcrypt/src/headers/
@@ -75,6 +77,9 @@
bindir=@bindir@
sbindir=@sbindir@
mandir=@mandir@
+libdir = @libdir@
+includedir = @includedir@
+pkgconfigdir = $(libdir)/pkgconfig

CC=@CC@
AR=@AR@
@@ -82,9 +87,10 @@
STRIP=@STRIP@
INSTALL=@INSTALL@
CPPFLAGS=@CPPFLAGS@
-CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
+CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ -fPIC
LIBS+=@LIBS@
LDFLAGS=@LDFLAGS@
+ARFLAGS=rcT

EXEEXT=@EXEEXT@

@@ -106,12 +112,14 @@

ifeq ($(STATIC), 1)
LDFLAGS+=-static
+else
+ LDFLAGS +=-shared
endif

ifeq ($(MULTI), 1)
TARGETS=dropbearmulti
else
- TARGETS=$(PROGRAMS)
+ TARGETS=$(DROPBEAR_SERVER_LIB)
endif

# for the scp progress meter. The -D doesn't affect anything else.
@@ -175,6 +183,8 @@
scp: $(SCPOBJS) $(HEADERS) Makefile
$(CC) $(LDFLAGS) -o $@$(EXEEXT) $(SCPOBJS)

+$(DROPBEAR_SERVER_LIB):$(LIBTOM_LIBS)$(dropbearobjs)
+ $(CC) $(LDFLAGS) -o $@ $(dropbearobjs) $(LIBTOM_LIBS)

# multi-binary compilation.
MULTIOBJS=
@@ -215,7 +225,7 @@

thisclean:
-rm -f dropbear dbclient dropbearkey dropbearconvert scp scp-progress \
- dropbearmulti *.o *.da *.bb *.bbg *.prof
+ dropbearmulti *.o *.da *.bb *.bbg *.prof libdropbear.pc $(DROPBEAR_SERVER_LIB)

distclean: clean tidy
-rm -f config.h
Loading