Skip to content

Update crypt.c changes for rpi0 #1

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

Draft
puppet13th wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

Update crypt.c changes for rpi0 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f265636
Update crypt.c
puppet13th Aug 1, 2019
6a0e6ac
Update cfg.mk.in
puppet13th Aug 1, 2019
f3c2b06
Update Makefile
puppet13th Aug 1, 2019
814e4a4
Update Makefile
puppet13th Aug 1, 2019
d996b1c
Update crypt.c
puppet13th Aug 1, 2019
9685888
Update crypt.c
puppet13th Aug 1, 2019
a795e87
Add files via upload
puppet13th Aug 11, 2019
da6574c
Update Makefile
puppet13th Aug 11, 2019
563f6a9
Rename install_data.c to install_data.c.static
puppet13th Aug 11, 2019
bf11d44
Rename http_data.c to http_data.c.static
puppet13th Aug 11, 2019
34fa61f
Update crypt.c
puppet13th Aug 11, 2019
b8e36d7
Update crypt.c
puppet13th Aug 11, 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
20 changes: 14 additions & 6 deletions cfg.mk.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,22 @@ PACKAGE_VERSION_SHORT = @PACKAGE_VERSION_SHORT@
BITS = @BITS@
ARCH = @ARCH@
CC = @CC@
CLIENT_CFLAGS = -DCLIENT -D@PLATFORM_CAPS@ -maes -Wall -O2 -I "@ROOT@/src/"
SERVER_CFLAGS = -DSERVER -DLINUX -Wall -maes -O2 -I "@ROOT@/src/"
CTOOL_CFLAGS = -DTOOL -DLINUX -Wall -maes -O2 -I "@ROOT@/src/"
CLIENT_DEBUG_CFLAGS = -DCLIENT -D@PLATFORM_CAPS@ -DDEBUG -maes -Wall -O0 -g \
#CLIENT_CFLAGS = -DCLIENT -D@PLATFORM_CAPS@ -maes -Wall -O2 -I "@ROOT@/src/"
CLIENT_CFLAGS = -DCLIENT -D@PLATFORM_CAPS@ -Wall -O2 -I "@ROOT@/src/"
#SERVER_CFLAGS = -DSERVER -DLINUX -Wall -maes -O2 -I "@ROOT@/src/"
SERVER_CFLAGS = -DSERVER -DLINUX -Wall -O2 -I "@ROOT@/src/"
#CTOOL_CFLAGS = -DTOOL -DLINUX -Wall -maes -O2 -I "@ROOT@/src/"
CTOOL_CFLAGS = -DTOOL -DLINUX -Wall -O2 -I "@ROOT@/src/"
#CLIENT_DEBUG_CFLAGS = -DCLIENT -D@PLATFORM_CAPS@ -DDEBUG -maes -Wall -O0 -g \
# -I "@ROOT@/src/"
CLIENT_DEBUG_CFLAGS = -DCLIENT -D@PLATFORM_CAPS@ -DDEBUG -Wall -O0 -g \
-I "@ROOT@/src/"
SERVER_DEBUG_CFLAGS = -DSERVER -DLINUX -DDEBUG -maes -Wall -O0 -g \
#SERVER_DEBUG_CFLAGS = -DSERVER -DLINUX -DDEBUG -maes -Wall -O0 -g \
# -I "@ROOT@/src/"
SERVER_DEBUG_CFLAGS = -DSERVER -DLINUX -DDEBUG -Wall -O0 -g \
-I "@ROOT@/src/"
CTOOL_DEBUG_CFLAGS = -DTOOL -DLINUX -DDEBUG -maes -Wall -O0 -g -I "@ROOT@/src/"
#CTOOL_DEBUG_CFLAGS = -DTOOL -DLINUX -DDEBUG -maes -Wall -O0 -g -I "@ROOT@/src/"
CTOOL_DEBUG_CFLAGS = -DTOOL -DLINUX -DDEBUG -Wall -O0 -g -I "@ROOT@/src/"
CLIENT_CLIBS = -lpthread
SERVER_CLIBS = -lgmp -lpthread
CTOOL_CLIBS = -lssl -lcrypto
Expand Down
10 changes: 5 additions & 5 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ CLIENT_OBJS = \
cktp_url.o \
config.o \
encodings/aes.o \
encodings/aes_hardware.o \
encodings/crypt.o \
encodings/pad.o \
encodings/natural.o \
Expand All @@ -43,6 +42,7 @@ CLIENT_OBJS = \
tunnel.o \
$(PLATFORM)/capture.o \
$(PLATFORM)/misc.o
#encodings/aes_hardware.o \#

SERVER_OBJS = \
base64.o \
Expand Down Expand Up @@ -97,10 +97,10 @@ client_debug: $(CLIENT_OBJS) http_data.c

$(CLIENT_PROG): client

http_data.c: ui/* tools/file2c
(cd ui/; ../tools/file2c * > ../http_data.c)
install_data.c: install/* tools/file2c
(cd install/; ../tools/file2c * > ../install_data.c)
http_data.c: http_data.c.static
(cp http_data.c.static http_data.c)
install_data.c: install_data.c.static
(cp install_data.c.static install_data.c)

http_server.o: http_data.c
install.o: install_data.c
Expand Down
2 changes: 1 addition & 1 deletion src/encodings/crypt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
#include "cktp_encoding.h"
#include "cookie.h"
#include "encodings/aes.h"
#include "encodings/aes_hardware.h"
/*#include "encodings/aes_hardware.h" */
#include "encodings/crypt.h"

#ifdef CLIENT
Expand Down
Loading