11 files changed, 86 insertions, 41 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index d566182..0698ab4 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -22,8 +22,9 @@ if(HOST_ASM_ELF_AARCH64)
                 ASM_AARCH64_ELF_SRC
                 sha/sha1_aarch64_ce.S
                 sha/sha256_aarch64_ce.S
-                sha/sha256_aarch64_ce.S
+                sha/sha512_aarch64_ce.S
         )
+        add_definitions(-DLIBRESSL_USE_SHA_ASSEMBLY)
         set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_AARCH64_ELF_SRC})
 endif()
 
@@ -636,10 +637,6 @@ if(NOT HAVE_FREEZERO)
         set(COMPAT_SRC ${COMPAT_SRC} compat/freezero.c)
 endif()
 
-if(NOT HAVE_FTRUNCATE)
-        set(COMPAT_SRC ${COMPAT_SRC} compat/ftruncate.c)
-endif()
-
 if(NOT HAVE_GETDELIM)
         set(COMPAT_SRC ${COMPAT_SRC} compat/getdelim.c)
 endif()
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index f703e33..a4a717d 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -148,10 +148,6 @@ if !HAVE_FREEZERO
 libcompat_la_SOURCES += compat/freezero.c
 endif
 
-if !HAVE_FTRUNCATE
-libcompat_la_SOURCES += compat/ftruncate.c
-endif
-
 if !HAVE_GETDELIM
 libcompat_la_SOURCES += compat/getdelim.c
 endif
@@ -216,6 +212,7 @@ include Makefile.am.mingw64-x86_64
 if !HOST_ASM_ELF_AARCH64
 if !HOST_ASM_ELF_MIPS
 if !HOST_ASM_ELF_MIPS64
+if !HOST_ASM_ELF_RISCV64
 if !HOST_ASM_ELF_X86_64
 if !HOST_ASM_MACOSX_X86_64
 if !HOST_ASM_MASM_X86_64
@@ -228,6 +225,7 @@ endif
 endif
 endif
 endif
+endif
 
 if HOST_AARCH64
 if HOST_DARWIN
diff --git a/crypto/Makefile.am.elf-mips b/crypto/Makefile.am.elf-mips
index 2276991..682fb5e 100644
--- a/crypto/Makefile.am.elf-mips
+++ b/crypto/Makefile.am.elf-mips
@@ -2,7 +2,6 @@ ASM_MIPS_ELF = aes/aes-mips.S
 ASM_MIPS_ELF += bn/bn-mips.S
 ASM_MIPS_ELF += bn/mont-mips.S
 ASM_MIPS_ELF += sha/sha1-mips.S
-ASM_MIPS_ELF += sha/sha512-mips.S
 ASM_MIPS_ELF += sha/sha256-mips.S
 
 EXTRA_DIST += $(ASM_MIPS_ELF)
diff --git a/crypto/Makefile.am.elf-mips64 b/crypto/Makefile.am.elf-mips64
index c6727b3..7269d6e 100644
--- a/crypto/Makefile.am.elf-mips64
+++ b/crypto/Makefile.am.elf-mips64
@@ -1,9 +1,9 @@
-ASM_MIPS64_ELF = aes/aes-mips.S
-ASM_MIPS64_ELF += bn/bn-mips.S
-ASM_MIPS64_ELF += bn/mont-mips.S
-ASM_MIPS64_ELF += sha/sha1-mips.S
-ASM_MIPS64_ELF += sha/sha512-mips.S
-ASM_MIPS64_ELF += sha/sha256-mips.S
+ASM_MIPS64_ELF = aes/aes-mips64.S
+ASM_MIPS64_ELF += bn/bn-mips64.S
+ASM_MIPS64_ELF += bn/mont-mips64.S
+ASM_MIPS64_ELF += sha/sha1-mips64.S
+ASM_MIPS64_ELF += sha/sha512-mips64.S
+ASM_MIPS64_ELF += sha/sha256-mips64.S
 
 EXTRA_DIST += $(ASM_MIPS64_ELF)
 
diff --git a/crypto/arch/mips/crypto_arch.h b/crypto/arch/mips/crypto_arch.h
index 274879c..2407503 100644
--- a/crypto/arch/mips/crypto_arch.h
+++ b/crypto/arch/mips/crypto_arch.h
@@ -18,4 +18,22 @@
 #ifndef HEADER_CRYPTO_ARCH_H
 #define HEADER_CRYPTO_ARCH_H
 
+#ifndef OPENSSL_NO_ASM
+
+#ifdef LIBRESSL_USE_AES_ASSEMBLY
+#define HAVE_AES_SET_ENCRYPT_KEY_INTERNAL
+#define HAVE_AES_SET_DECRYPT_KEY_INTERNAL
+#define HAVE_AES_ENCRYPT_INTERNAL
+#define HAVE_AES_DECRYPT_INTERNAL
+#endif
+
+#ifdef LIBRESSL_USE_SHA_ASSEMBLY
+#define HAVE_SHA1_BLOCK_DATA_ORDER
+#define HAVE_SHA1_BLOCK_GENERIC
+#define HAVE_SHA256_BLOCK_DATA_ORDER
+#define HAVE_SHA256_BLOCK_GENERIC
+#endif
+
+#endif
+
 #endif
diff --git a/crypto/bn/arch/mips/bn_arch.h b/crypto/bn/arch/mips/bn_arch.h
index 4d6571f..a14b83b 100644
--- a/crypto/bn/arch/mips/bn_arch.h
+++ b/crypto/bn/arch/mips/bn_arch.h
@@ -20,5 +20,24 @@
 
 #ifndef OPENSSL_NO_ASM
 
+#ifdef LIBRESSL_USE_BN_ASSEMBLY
+
+#define HAVE_BN_ADD_WORDS
+
+#define HAVE_BN_DIV_WORDS
+#define HAVE_BN_DIV_3_WORDS
+
+#define HAVE_BN_MUL_COMBA4
+#define HAVE_BN_MUL_COMBA8
+#define HAVE_BN_MULW_ADD_WORDS
+#define HAVE_BN_MULW_WORDS
+
+#define HAVE_BN_SQR_COMBA4
+#define HAVE_BN_SQR_COMBA8
+
+#define HAVE_BN_SUB_WORDS
+
+#endif
+
 #endif
 #endif
diff --git a/crypto/compat/ftruncate.c b/crypto/compat/ftruncate.c
deleted file mode 100644
index e825e50..0000000
--- a/crypto/compat/ftruncate.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Public domain
- *
- * Kinichiro Inoguchi <inoguchi@openbsd.org>
- */
-
-#ifdef _WIN32
-
-#include <unistd.h>
-
-int
-ftruncate(int fd, off_t length)
-{
-        return _chsize(fd, length);
-}
-
-#endif
diff --git a/crypto/compat/getdelim.c b/crypto/compat/getdelim.c
index caec3f2..bf4889f 100644
--- a/crypto/compat/getdelim.c
+++ b/crypto/compat/getdelim.c
@@ -27,6 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <errno.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -35,13 +37,16 @@
 ssize_t
 getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp)
 {
-        char *ptr, *eptr;
+        char *ptr, *eptr, *nbuf;
+        size_t nbufsiz;
 
 
-        if (*buf == NULL || *bufsiz == 0) {
-                *bufsiz = BUFSIZ;
-                if ((*buf = malloc(*bufsiz)) == NULL)
+        if (*buf == NULL || *bufsiz < 2) {
+                nbufsiz = BUFSIZ;
+                if ((nbuf = realloc(*buf, nbufsiz)) == NULL)
                         return -1;
+                *buf = nbuf;
+                *bufsiz = nbufsiz;
         }
 
         for (ptr = *buf, eptr = *buf + *bufsiz;;) {
@@ -62,9 +67,12 @@ getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp)
                         return ptr - *buf;
                 }
                 if (ptr + 2 >= eptr) {
-                        char *nbuf;
-                        size_t nbufsiz = *bufsiz * 2;
                         ssize_t d = ptr - *buf;
+                        if (*bufsiz > SIZE_MAX / 2) {
+                                errno = EOVERFLOW;
+                                return -1;
+                        }
+                        nbufsiz = *bufsiz * 2;
                         if ((nbuf = realloc(*buf, nbufsiz)) == NULL)
                                 return -1;
                         *buf = nbuf;
diff --git a/crypto/compat/getprogname_windows.c b/crypto/compat/getprogname_windows.c
index eb04ec0..9de3cab 100644
--- a/crypto/compat/getprogname_windows.c
+++ b/crypto/compat/getprogname_windows.c
@@ -7,7 +7,8 @@ getprogname(void)
 {
         static char progname[MAX_PATH + 1];
         DWORD length = GetModuleFileName(NULL, progname, sizeof (progname) - 1);
-        if (length < 0)
+        if (length == 0)
                 return "?";
+        progname[length] = '\0';
         return progname;
 }
diff --git a/crypto/compat/posix_win.c b/crypto/compat/posix_win.c
index bc0fa36..14b79f5 100644
--- a/crypto/compat/posix_win.c
+++ b/crypto/compat/posix_win.c
@@ -68,6 +68,14 @@ libressl_fstat(int fd, struct stat *statbuf)
         return fstat(get_real_fd(fd), statbuf);
 }
 
+#ifndef HAVE_FTRUNCATE
+int
+ftruncate(int fd, off_t length)
+{
+        return _chsize(get_real_fd(fd), length);
+}
+#endif
+
 int
 posix_open(const char *path, ...)
 {
@@ -178,6 +186,9 @@ wsa_errno(int err)
         case WSAETIMEDOUT:
                 errno = EPIPE;
                 break;
+        default:
+                errno = EIO;
+                break;
         }
         return -1;
 }
@@ -292,7 +303,7 @@ int gettimeofday(struct timeval *tp, void *tzp)
         time = ((uint64_t)file_time.dwLowDateTime);
         time += ((uint64_t)file_time.dwHighDateTime) << 32;
 
-        tp->tv_sec = (long long)((time - EPOCH) / 10000000L);
+        tp->tv_sec = (long)((time - EPOCH) / 10000000L);
         tp->tv_usec = (long)(system_time.wMilliseconds * 1000);
         return 0;
 }
diff --git a/crypto/compat/syslog_r.c b/crypto/compat/syslog_r.c
index d68169d..30841c1 100644
--- a/crypto/compat/syslog_r.c
+++ b/crypto/compat/syslog_r.c
@@ -1,3 +1,5 @@
+#include <stdio.h>
+#include <stdlib.h>
 #include <syslog.h>
 
 void
@@ -14,6 +16,15 @@ void
 vsyslog_r(int pri, struct syslog_data *data, const char *fmt, va_list ap)
 {
 #ifdef HAVE_SYSLOG
+#ifdef HAVE_VSYSLOG
         vsyslog(pri, fmt, ap);
+#else
+        char *msg = NULL;
+
+        if (vasprintf(&msg, fmt, ap) == -1)
+                return;
+        syslog(pri, "%s", msg);
+        free(msg);
+#endif
 #endif
 }