another attempt at sk-dummy.so working x-platform

include a fatal() implementation to satisfy libopenbsd-compat

clean up .lo and .so files

.gitignore .lo and .so files

diff --git a/.gitignore b/.gitignore
index 1082413898c27011c76078651646e8ff20d180e2..6577c0df6cd375f30526f73399678588b6dbb709 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,8 @@ opensshd.init
 survey.sh
 **/*.0
 **/*.o
+**/*.lo
+**/*.so
 **/*.out
 **/*.a
 autom4te.cache/

diff --git a/Makefile.in b/Makefile.in
index d47b083457be4fa9b0637bc62a869b995a50ac17..692b007321536d04d67bf38b86a07bad09985060 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -242,7 +242,7 @@ moduli:
        echo
 
 clean: regressclean
-       rm -f *.o *.a $(TARGETS) logintest config.cache config.log
+       rm -f *.o *.lo *.a $(TARGETS) logintest config.cache config.log
        rm -f *.out core survey
        rm -f regress/check-perm$(EXEEXT)
        rm -f regress/mkdtemp$(EXEEXT)
@@ -267,6 +267,7 @@ clean:      regressclean
        rm -f regress/misc/kexfuzz/*.o
        rm -f regress/misc/kexfuzz/kexfuzz$(EXEEXT)
        rm -f regress/misc/sk-dummy/*.o
+       rm -f regress/misc/sk-dummy/*.lo
        rm -f regress/misc/sk-dummy/sk-dummy.so
        (cd openbsd-compat && $(MAKE) clean)
 
@@ -596,9 +597,10 @@ regress/misc/kexfuzz/kexfuzz$(EXEEXT): ${MISC_KEX_FUZZ_OBJS} libssh.a
 # These all need to be compiled -fPIC, so they are treated differently.
 SK_DUMMY_OBJS=\
        regress/misc/sk-dummy/sk-dummy.lo \
+       regress/misc/sk-dummy/fatal.lo \
        ed25519.lo hash.lo ge25519.lo fe25519.lo sc25519.lo verify.lo
 
-.c.lo:
+.c.lo: Makefile.in config.h
        $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c $< -o $@
 
 regress/misc/sk-dummy/sk-dummy.so: $(SK_DUMMY_OBJS)

diff --git a/regress/misc/sk-dummy/fatal.c b/regress/misc/sk-dummy/fatal.c
new file mode 100644 (file)
index 0000000..7cdc74b
--- /dev/null
+++ b/regress/misc/sk-dummy/fatal.c
@@ -0,0 +1,20 @@
+/* public domain */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <unistd.h>
+
+void fatal(char *fmt, ...);
+
+void
+fatal(char *fmt, ...)
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       vfprintf(stderr, fmt, ap);
+       va_end(ap);
+       fputc('\n', stderr);
+       _exit(1);
+}