Skip to content

Miscellaneous security hardening fixes #116

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

Merged
pushkarnk merged 1 commit into from
May 20, 2026
Merged

Miscellaneous security hardening fixes #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ BUILD := ${TOPDIR}/build
JAVA_SRC := src/main/java/com/canonical/openssl
JAVA_SRC_DIRS := ${JAVA_SRC} ${JAVA_SRC}/drbg ${JAVA_SRC}/keyagreement ${JAVA_SRC}/keyencapsulation ${JAVA_SRC}/mac
JAVA_SRC_DIRS += ${JAVA_SRC}/kdf ${JAVA_SRC}/md ${JAVA_SRC}/signature ${JAVA_SRC}/key ${JAVA_SRC}/cipher
JAVA_SRC_DIRS += ${JAVA_SRC}/provider ${JAVA_SRC}/util
JAVA_SRC_DIRS += ${JAVA_SRC}/provider ${JAVA_SRC}/util ${JAVA_SRC}/keypairgenerator
JAVA_FILES = $(wildcard $(addsuffix /*.java, $(JAVA_SRC_DIRS)))

# Vars for compiling the C sources
Expand All @@ -36,8 +36,18 @@ NATFILES := $(foreach dir,$(NATDIR),$(wildcard $(dir)/*.c))
OBJS := $(patsubst $(NATDIR)/%.c, $(BUILD)/bin/%.o, $(NATFILES))


CCFLAGS := ${INCLUDE_HEADERS} -c -fPIC -g
LDFLAGS := -shared -fPIC -Wl,-soname,libjssl.so
DEBUG ?= 0
ifeq ($(DEBUG),1)
DEBUG_CFLAGS := -g
else
DEBUG_CFLAGS :=
endif

HARDENING_CFLAGS := -O2 -fstack-protector-strong -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -Wall -Wformat -Wformat-security
HARDENING_LDFLAGS := -Wl,-z,relro,-z,now

CCFLAGS := ${INCLUDE_HEADERS} -c -fPIC ${HARDENING_CFLAGS} ${DEBUG_CFLAGS}
LDFLAGS := -shared -fPIC ${HARDENING_LDFLAGS} -Wl,-soname,libjssl.so
SOLIB := $(BUILD)/bin/libjssl.so

# Vars for compiling the test sources
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<groupId>com.canonical.openssl</groupId>
<artifactId>openssl-fips-java</artifactId>
<version>0.6.0</version>
<version>0.7.0</version>

<properties>
<maven.compiler.source>17</maven.compiler.source>
Expand Down
Loading
Loading