[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  81dd99902869c666932ece1e5a39d3b18f2f4b04 (commit)
       via  2f554efe20d1fe05b242f41f593362965ae89912 (commit)
       via  a3507a11070868d6c10f1b5b3408e9c2634da29f (commit)
      from  c98740f8a6e2d8341bf42e4e3c8435fe0ea35bcd (commit)


- Log -----------------------------------------------------------------
commit 81dd99902869c666932ece1e5a39d3b18f2f4b04
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Aug 4 15:02:43 2016 +0100

    Prepare for 1.1.0-pre7-dev
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 2f554efe20d1fe05b242f41f593362965ae89912
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Aug 4 15:00:44 2016 +0100

    Prepare for 1.1.0-pre6 release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit a3507a11070868d6c10f1b5b3408e9c2634da29f
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Aug 4 15:00:43 2016 +0100

    make update
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 README                     | 2 +-
 apps/progs.h               | 2 +-
 include/openssl/opensslv.h | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README b/README
index 7e623a1..a4026ef 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.0-pre6-dev
+ OpenSSL 1.1.0-pre7-dev
 
  Copyright (c) 1998-2016 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/apps/progs.h b/apps/progs.h
index 5f6f07f..ac9d208 100644
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -18,7 +18,7 @@ typedef enum FUNC_TYPE {
 typedef struct function_st {
     FUNC_TYPE type;
     const char *name;
-    int (*func)(int argc, char *argv[]);
+    int (*func)(int argc,char *argv[]);
     const OPTIONS *help;
 } FUNCTION;
 
diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index 2dd067f..1abd522 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -39,11 +39,11 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x10100006L
+# define OPENSSL_VERSION_NUMBER  0x10100007L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre6-fips-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre7-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre6-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre7-dev  xx XXX xxxx"
 # endif
 
 /*-