8 files changed, 293 insertions, 4 deletions

diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
index ab7e45b..82c2362 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
@@ -36,6 +36,8 @@ import cz.crcs.ectester.standalone.consts.KeyAgreementIdent;
 import cz.crcs.ectester.standalone.consts.KeyPairGeneratorIdent;
 import cz.crcs.ectester.standalone.consts.SignatureIdent;
 import cz.crcs.ectester.standalone.libs.*;
+import cz.crcs.ectester.standalone.libs.jni.SignalException;
+import cz.crcs.ectester.standalone.libs.jni.TimeoutException;
 import cz.crcs.ectester.standalone.output.FileTestWriter;
 import cz.crcs.ectester.standalone.test.suites.*;
 import org.apache.commons.cli.*;
@@ -103,6 +105,9 @@ public class ECTesterStandalone {
             if (!System.getProperty("os.name").startsWith("Windows")) {
                 FileUtil.writeNewer(LIB_RESOURCE_DIR + "lib_timing.so", reqs.resolve("lib_timing.so"));
                 System.load(reqs.resolve("lib_timing.so").toString());
+
+                FileUtil.writeNewer(LIB_RESOURCE_DIR + "lib_signals.so", reqs.resolve("lib_signals.so"));
+                System.load(reqs.resolve("lib_signals.so").toString());
             }
 
             List<ProviderECLibrary> libObjects = new LinkedList<>();
@@ -739,7 +744,16 @@ public class ECTesterStandalone {
         int amount = Integer.parseInt(cli.getOptionValue("generate.amount", "1"));
         for (int i = 0; i < amount || amount == 0; ++i) {
             long elapsed = -System.nanoTime();
-            KeyPair kp = kpg.genKeyPair();
+            KeyPair kp;
+            try {
+                kp = kpg.genKeyPair();
+            } catch (SignalException exc) {
+                System.err.println(exc.getSigInfo());
+                continue;
+            } catch (TimeoutException exc) {
+                System.err.println(exc);
+                continue;
+            }
             elapsed += System.nanoTime();
             if (!lib.getNativeTimingSupport().isEmpty()) {
                 elapsed = lib.getLastNativeTiming();
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/SigInfo.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/SigInfo.java
new file mode 100644
index 0000000..3cb7bad
--- /dev/null
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/SigInfo.java
@@ -0,0 +1,80 @@
+package cz.crcs.ectester.standalone.libs.jni;
+
+/**
+ * @author Jan Jancar johny@neuromancer.sk
+ */
+public class SigInfo {
+
+    private final int signo;
+    private final int code;
+    private final int errno;
+    private final int pid;
+    private final int uid;
+    private final long addr;
+    private final int status;
+    private final long band;
+    private final long sigval;
+
+    public SigInfo(int signo, int code, int errno, int pid, int uid, long addr, int status, long band, long sigval) {
+        this.signo = signo;
+        this.code = code;
+        this.errno = errno;
+        this.pid = pid;
+        this.uid = uid;
+        this.addr = addr;
+        this.status = status;
+        this.band = band;
+        this.sigval = sigval;
+    }
+
+    public int getSigno() {
+        return signo;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public int getErrno() {
+        return errno;
+    }
+
+    public int getPid() {
+        return pid;
+    }
+
+    public int getUid() {
+        return uid;
+    }
+
+    public long getAddr() {
+        return addr;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public long getBand() {
+        return band;
+    }
+
+    public long getSigval() {
+        return sigval;
+    }
+
+    @Override
+    public String toString() {
+        return "SigInfo{" +
+                "signo=" + signo +
+                ", code=" + code +
+                ", errno=" + errno +
+                ", pid=" + pid +
+                ", uid=" + uid +
+                ", addr=" + addr +
+                ", status=" + status +
+                ", band=" + band +
+                ", sigval=" + sigval +
+                '}';
+    }
+}
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/SignalException.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/SignalException.java
new file mode 100644
index 0000000..726286e
--- /dev/null
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/SignalException.java
@@ -0,0 +1,18 @@
+package cz.crcs.ectester.standalone.libs.jni;
+
+/**
+ * @author Jan Jancar johny@neuromancer.sk
+ */
+public class SignalException extends RuntimeException {
+
+    private final SigInfo sigInfo;
+
+    public SignalException(SigInfo sigInfo) {
+        super("Signal caught.");
+        this.sigInfo = sigInfo;
+    }
+
+    public SigInfo getSigInfo() {
+        return sigInfo;
+    }
+}
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/TimeoutException.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/TimeoutException.java
new file mode 100644
index 0000000..c4084b9
--- /dev/null
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/TimeoutException.java
@@ -0,0 +1,11 @@
+package cz.crcs.ectester.standalone.libs.jni;
+
+/**
+ * @author Jan Jancar johny@neuromancer.sk
+ */
+public class TimeoutException extends RuntimeException {
+
+    public TimeoutException(String message) {
+        super(message);
+    }
+}
diff --git a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile
index 1fa16c0..aef1bd3 100644
--- a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile
+++ b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile
@@ -4,7 +4,7 @@
 CC?=gcc
 CXX?=g++
 
-LFLAGS+=-fPIC -shared
+LFLAGS+=-fPIC -shared -L "$(JNI_LIBDIR)" -L "$(JNI_LIBDIR)/server" #-ljsig -ljvm
 CFLAGS+=-fPIC -I"$(JNI_INCLUDEDIR)" -I"$(JNI_PLATFORMINCLUDEDIR)" -I. -Wno-deprecated-declarations
 CXXFLAGS+=-fPIC -I"$(JNI_INCLUDEDIR)" -I"$(JNI_PLATFORMINCLUDEDIR)" -I. -Wno-deprecated-declarations
 
@@ -36,12 +36,17 @@ endif
 
 ifneq ($(JAVA_HOME),)
   JNI_INCLUDEDIR ?= $(JAVA_HOME)/include
+  JNI_LIBDIR ?= $(JAVA_HOME)/lib
 endif
 
 ifeq ($(JNI_INCLUDEDIR),)
   $(error "Could not determine JNI include dir. Try specifying either JAVA_HOME or JNI_INCLUDEDIR.")
 endif
 
+ifeq ($(JNI_LIBDIR),)
+  $(error "Could not determine JNI lib dir. Try specifying either JAVA_HOME or JNI_LIBDIR.")
+endif
+
 TARGETTRIPLET := $(shell $(CC) -dumpmachine)
 
 ifeq ($(JNI_PLATFORM),)
@@ -68,6 +73,9 @@ c_utils.o: c_utils.c
 lib_timing.so: c_timing.c
 	$(CC) -o $@ -shared $(CFLAGS) -Wl,-soname,lib_timing.so $<
 
+lib_signals.so: c_signals.c
+	$(CC) -o $@ -shared $(CFLAGS) -Wl,-soname,lib_signals.so $<
+
 cpp_utils.o: cpp_utils.cpp
 	$(CXX) $(CXXFLAGS) -c $<
 
@@ -98,8 +106,8 @@ boringssl.o: boringssl.c
 # libgcrypt shim
 gcrypt: gcrypt_provider.so
 
-gcrypt_provider.so: gcrypt.o c_utils.o | lib_timing.so
-	$(CC) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. $(shell libgcrypt-config --libs) -l:lib_timing.so
+gcrypt_provider.so: gcrypt.o c_utils.o | lib_timing.so lib_signals.so
+	$(CC) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. $(shell libgcrypt-config --libs) -l:lib_timing.so -l:lib_signals.so
 
 gcrypt.o: gcrypt.c
 	$(CC) $(shell libgcrypt-config --cflags) $(CFLAGS) -c $<
diff --git a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.c b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.c
new file mode 100644
index 0000000..f4adaa5
--- /dev/null
+++ b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.c
@@ -0,0 +1,93 @@
+#include "c_utils.h"
+#include "c_signals.h"
+
+#if __linux || __posix
+
+#include <signal.h>
+#include <setjmp.h>
+#include <stdbool.h>
+
+// TODO: Handle alarms properly.
+//       Create a new thread, make it sleep, then send alarm to the main thread.
+
+static siginfo_t last_siginfo;
+static bool initialized = false;
+static bool caught = false;
+static bool timedout = false;
+static jmp_buf *target = NULL;
+
+void handler(int signo, siginfo_t *info, void *context) {
+	last_siginfo = *info;
+	caught = true;
+	longjmp(*target, 1);
+}
+
+void alarm_handler(int signo) {
+	timedout = true;
+}
+
+static jmp_buf buf;
+
+jmp_buf *get_jmpbuf() {
+	return &buf;
+}
+
+static struct sigaction old_segv;
+static struct sigaction old_abrt;
+static struct sigaction old_alrm;
+
+void init_signals(jmp_buf *env) {
+	struct sigaction action;
+	action.sa_sigaction = handler;
+	sigemptyset(&action.sa_mask);
+	action.sa_flags = SA_SIGINFO;
+
+	sigaction(SIGSEGV, &action, &old_segv);
+	sigaction(SIGABRT, &action, &old_abrt);
+
+	struct sigaction alarm_action;
+	alarm_action.sa_handler = alarm_handler;
+	sigemptyset(&alarm_action.sa_mask);
+	alarm_action.sa_flags = 0;
+	sigaction(SIGALRM, &alarm_action, &old_alrm);
+
+	target = env;
+	initialized = true;
+	caught = false;
+	timedout = false;
+}
+
+
+void deinit_signals() {
+	sigaction(SIGSEGV, NULL, &old_segv);
+	sigaction(SIGABRT, NULL, &old_abrt);
+	sigaction(SIGALRM, NULL, &old_alrm);
+
+	target = NULL;
+	initialized = false;
+}
+
+bool get_timedout() {
+	return timedout;
+}
+
+jobject get_siginfo(JNIEnv *env) {
+	if (!caught) {
+		return NULL;
+	}
+
+	jclass local_siginfo_class = (*env)->FindClass(env, "cz/crcs/ectester/standalone/libs/jni/SigInfo");
+	jmethodID siginfo_init = (*env)->GetMethodID(env, local_siginfo_class, "<init>", "(IIIIIJIJJ)V");
+	return (*env)->NewObject(env, local_siginfo_class, siginfo_init,
+							 (jint)  last_siginfo.si_signo,
+							 (jint)  last_siginfo.si_code,
+							 (jint)  last_siginfo.si_errno,
+							 (jint)  last_siginfo.si_pid,
+							 (jint)  last_siginfo.si_uid,
+							 (jlong) last_siginfo.si_addr,
+							 (jint)  last_siginfo.si_status,
+							 (jlong) last_siginfo.si_band,
+							 (jlong) 0);
+}
+
+#endif
\ No newline at end of file
diff --git a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.h b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.h
new file mode 100644
index 0000000..95fc693
--- /dev/null
+++ b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.h
@@ -0,0 +1,58 @@
+#pragma once
+
+#include <jni.h>
+#include <setjmp.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/**
+ *
+ */
+void init_signals(jmp_buf *env);
+
+/**
+ *
+ */
+jmp_buf *get_jmpbuf();
+
+/**
+ *
+ */
+void deinit_signals();
+
+/**
+ *
+ */
+bool get_timedout();
+
+/**
+ *
+ */
+jobject get_siginfo(JNIEnv *env);
+
+
+#define SIG_TRY() 	init_signals(get_jmpbuf()); \
+					if (!setjmp(*get_jmpbuf()))
+#define SIG_CATCH() deinit_signals();
+#define SIG_HANDLE(env) do { \
+					jobject siginfo = get_siginfo(env); \
+					if (siginfo != NULL) { \
+						jclass sigexception_class = (*env)->FindClass(env, "cz/crcs/ectester/standalone/libs/jni/SignalException"); \
+						jmethodID new_sigexception = (*env)->GetMethodID(env, sigexception_class, "<init>", "(Lcz/crcs/ectester/standalone/libs/jni/SigInfo;)V"); \
+						jobject sigexception = (*env)->NewObject(env, sigexception_class, new_sigexception, siginfo); \
+						(*env)->Throw(env, sigexception); \
+					} \
+					if (get_timedout()) { \
+						jclass timeoutexception_class = (*env)->FindClass(env, "cz/crcs/ectester/standalone/libs/jni/TimeoutException"); \
+						(*env)->ThrowNew(env, timeoutexception_class, "Operation timed out."); \
+					} \
+} while (0)
+
+
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/gcrypt.c b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/gcrypt.c
index ef62fbf..3df7656 100644
--- a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/gcrypt.c
+++ b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/gcrypt.c
@@ -1,5 +1,6 @@
 #include "c_utils.h"
 #include "c_timing.h"
+#include "c_signals.h"
 
 #include "native.h"
 #include <stdio.h>
@@ -276,6 +277,12 @@ static jobject generate_from_sexp(JNIEnv *env, gcry_sexp_t gen_sexp) {
     gcry_error_t err = gcry_pk_genkey(&key_sexp, gen_sexp);
     native_timing_stop();
 
+	SIG_TRY() {
+		//raise(SIGSEGV);
+	} SIG_CATCH();
+
+	SIG_HANDLE(env);
+
     if (gcry_err_code(err) != GPG_ERR_NO_ERROR) {
         throw_new_var(env, "java/security/GeneralSecurityException", "Error generating key. Error: %ui", gcry_err_code(err));
         goto release_sexp;