initial top-level import of subdirectories

3 files changed, 122 insertions, 0 deletions

diff --git a/crypto/Makefile.am.tpl b/crypto/Makefile.am.tpl
new file mode 100644
index 0000000..6f94fdf
--- /dev/null
+++ b/crypto/Makefile.am.tpl
@@ -0,0 +1,69 @@
+include $(top_srcdir)/Makefile.am.common
+
+AM_CPPFLAGS += -I$(top_srcdir)/crypto/asn1
+AM_CPPFLAGS += -I$(top_srcdir)/crypto/evp
+AM_CPPFLAGS += -I$(top_srcdir)/crypto/modes
+
+lib_LTLIBRARIES = libcrypto.la
+
+libcrypto_la_LIBADD = libcompat.la libcompatnoopt.la
+libcrypto_la_LDFLAGS = -version-info libcrypto-version
+libcrypto_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS) -DOPENSSL_NO_HW_PADLOCK
+
+noinst_LTLIBRARIES = libcompat.la libcompatnoopt.la
+
+# compatibility functions that need to be built without optimizations
+libcompatnoopt_la_CFLAGS = -O0
+libcompatnoopt_la_SOURCES = compat/explicit_bzero.c
+
+# other compatibility functions
+libcompat_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS)
+libcompat_la_SOURCES =
+
+if NO_STRLCAT
+libcompat_la_SOURCES += compat/strlcat.c
+endif
+
+if NO_STRLCPY
+libcompat_la_SOURCES += compat/strlcpy.c
+endif
+
+if NO_REALLOCARRAY
+libcompat_la_SOURCES += compat/reallocarray.c
+endif
+
+if NO_TIMINGSAFE_MEMCMP
+libcompat_la_SOURCES += compat/timingsafe_memcmp.c
+endif
+
+if NO_TIMINGSAFE_BCMP
+libcompat_la_SOURCES += compat/timingsafe_bcmp.c
+endif
+
+if NO_ARC4RANDOM_BUF
+libcompat_la_SOURCES += compat/arc4random.c
+
+if NO_GETENTROPY
+if TARGET_LINUX
+libcompat_la_SOURCES += compat/getentropy_linux.c
+endif
+if TARGET_DARWIN
+libcompat_la_SOURCES += compat/getentropy_osx.c
+endif
+if TARGET_SOLARIS
+libcompat_la_SOURCES += compat/getentropy_solaris.c
+endif
+endif
+
+endif
+
+if NO_ISSETUGID
+libcompat_la_SOURCES += compat/issetugid_linux.c
+endif
+if NO_STRTONUM
+libcompat_la_SOURCES += compat/strtonum.c
+endif
+
+noinst_HEADERS = des/ncbc_enc.c
+libcrypto_la_SOURCES =
+EXTRA_libcrypto_la_SOURCES =
diff --git a/crypto/compat/issetugid_linux.c b/crypto/compat/issetugid_linux.c
new file mode 100644
index 0000000..669edce
--- /dev/null
+++ b/crypto/compat/issetugid_linux.c
@@ -0,0 +1,47 @@
+/*
+ * issetugid implementation for Linux
+ * Public domain
+ */
+
+#include <errno.h>
+#include <gnu/libc-version.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+/*
+ * Linux-specific glibc 2.16+ interface for determining if a process was
+ * launched setuid/setgid or with additional capabilities.
+ */
+#ifdef HAVE_GETAUXVAL
+#include <sys/auxv.h>
+#endif
+
+int issetugid(void)
+{
+#ifdef HAVE_GETAUXVAL
+        /*
+         * The API for glibc < 2.19 does not indicate if there is an error with
+         * getauxval. While it should not be the case that any 2.6 or greater
+         * kernel ever does not supply AT_SECURE, an emulated software environment
+         * might rewrite the aux vector.
+         *
+         * See https://sourceware.org/bugzilla/show_bug.cgi?id=15846
+         *
+         * Perhaps this code should just read the aux vector itself, so we have
+         * backward-compatibility and error handling in older glibc versions.
+         * info: http://lwn.net/Articles/519085/
+         *
+         */
+        const char *glcv = gnu_get_libc_version();
+        if (strverscmp(glcv, "2.19") >= 0) {
+                errno = 0;
+                if (getauxval(AT_SECURE) == 0) {
+                        if (errno != ENOENT) {
+                                return 0;
+                        }
+                }
+        }
+#endif
+        return 1;
+}
diff --git a/crypto/compat/thread_private.h b/crypto/compat/thread_private.h
new file mode 100644
index 0000000..3286a7c
--- /dev/null
+++ b/crypto/compat/thread_private.h
@@ -0,0 +1,6 @@
+#include <pthread.h>
+
+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
+
+#define _ARC4_LOCK()   pthread_mutex_lock(&arc4random_mtx)
+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)