[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  abdb0c7b4ec73d6e94d4d8a0d6ee027e3b8db428 (commit)
       via  5a3a546678df9caf957b094382bae3d2ce3c4242 (commit)
      from  1abd2925855118843ac69fc6861aa72c5513572c (commit)


- Log -----------------------------------------------------------------
commit abdb0c7b4ec73d6e94d4d8a0d6ee027e3b8db428
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sat Jul 16 21:45:34 2016 +0200

    Skip non-existing files.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    GH: #1324

commit 5a3a546678df9caf957b094382bae3d2ce3c4242
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sun Jul 24 22:32:15 2016 +0200

    Add Hurd shared extension
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    GH: #1345

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

Summary of changes:
 Configurations/10-main.conf | 1 +
 fuzz/test-corpus.c          | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 4a9b925..d7db9a8 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1618,6 +1618,7 @@ sub vms_info {
         dso_scheme       => "dlfcn",
         shared_target    => "linux-shared",
         shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
 
 ##### VxWorks for various targets
diff --git a/fuzz/test-corpus.c b/fuzz/test-corpus.c
index ccad369..c553697 100644
--- a/fuzz/test-corpus.c
+++ b/fuzz/test-corpus.c
@@ -33,6 +33,8 @@ int main(int argc, char **argv) {
 
         stat(argv[n], &st);
         f = fopen(argv[n], "rb");
+        if (f == NULL)
+            continue;
         buf = malloc(st.st_size);
         s = fread(buf, 1, st.st_size, f);
         OPENSSL_assert(s == (size_t)st.st_size);