[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  f55fd7f2c6b70a5ee1fa959593b5a3ca64ee5914 (commit)
       via  d10ca7aed0028aeebbe8b91b3facd3dc2a5f42e7 (commit)
       via  96f1b64d8cdca10694f84fb3aabfdd35f0604555 (commit)
      from  aed3df20c105b6555ea2aeff559f2fab4ad4cefc (commit)


- Log -----------------------------------------------------------------
commit f55fd7f2c6b70a5ee1fa959593b5a3ca64ee5914
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Mar 21 11:19:58 2018 +0100

    curve448/field.h: relax alignment, as it doesn't work universally.
    
    Some platforms, cough-DJGPP, fail to compile claiming that requested
    alignment is greater than maximum possible. Supposedly original
    alignment was result of an attempt to utilize AVX2...
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5708)

commit d10ca7aed0028aeebbe8b91b3facd3dc2a5f42e7
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Mar 21 11:19:49 2018 +0100

    bio/bss_log.c: on DJGPP syslog facility is part of sockets library.
    
    In other words no-sock DJGPP build should suppress syslogging.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5708)

commit 96f1b64d8cdca10694f84fb3aabfdd35f0604555
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Mar 21 11:16:50 2018 +0100

    o_fopen.c: compensate for e_os.h omission.
    
    At earlier point e_os.h was omitted from a number of headers (in order
    to emphasize OS neutrality), but this affected o_fopen.c, which is not
    OS-neutral, and contains some DJGPP-specific code.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5708)

-----------------------------------------------------------------------

Summary of changes:
 crypto/bio/bss_log.c       | 2 ++
 crypto/ec/curve448/field.h | 2 +-
 crypto/o_fopen.c           | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c
index b04f7bb..10acba1 100644
--- a/crypto/bio/bss_log.c
+++ b/crypto/bio/bss_log.c
@@ -39,6 +39,8 @@ void *_malloc32(__size_t);
 #  endif                        /* __INITIAL_POINTER_SIZE == 64 */
 # endif                         /* __INITIAL_POINTER_SIZE && defined
                                  * _ANSI_C_SOURCE */
+#elif defined(__DJGPP__) && defined(OPENSSL_NO_SOCK)
+# define NO_SYSLOG
 #elif (!defined(MSDOS) || defined(WATT32)) && !defined(OPENSSL_SYS_VXWORKS) && !defined(NO_SYSLOG)
 # include <syslog.h>
 #endif
diff --git a/crypto/ec/curve448/field.h b/crypto/ec/curve448/field.h
index c3bad40..d96d4c0 100644
--- a/crypto/ec/curve448/field.h
+++ b/crypto/ec/curve448/field.h
@@ -25,7 +25,7 @@
 # if defined(__GNUC__) || defined(__clang__)
 #  define INLINE_UNUSED __inline__ __attribute__((__unused__,__always_inline__))
 #  define RESTRICT __restrict__
-#  define ALIGNED __attribute__((__aligned__(32)))
+#  define ALIGNED __attribute__((__aligned__(16)))
 # else
 #  define INLINE_UNUSED ossl_inline
 #  define RESTRICT
diff --git a/crypto/o_fopen.c b/crypto/o_fopen.c
index 951d034..1b4028c 100644
--- a/crypto/o_fopen.c
+++ b/crypto/o_fopen.c
@@ -15,6 +15,9 @@
 # ifdef _WIN32
 #  include <windows.h>
 # endif
+# ifdef __DJGPP__
+#  include <unistd.h>
+# endif
 
 FILE *openssl_fopen(const char *filename, const char *mode)
 {
@@ -64,7 +67,7 @@ FILE *openssl_fopen(const char *filename, const char *mode)
     {
         char *newname = NULL;
 
-        if (!HAS_LFN_SUPPORT(filename)) {
+        if (pathconf(filename, _PC_NAME_MAX) <= 12) {  /* 8.3 file system? */
             char *iterator;
             char lastchar;