[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Matt Caswell]

The branch OpenSSL_1_0_1-stable has been updated
       via  6099e629f55e3c4b363d1c84e7775816b21bb38c (commit)
       via  3570086760653bcdd0c2d6916320719df2f002d7 (commit)
      from  acb341eb6e611e61c272e411ec9fb12228dbb752 (commit)


- Log -----------------------------------------------------------------
commit 6099e629f55e3c4b363d1c84e7775816b21bb38c
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Jan 13 10:20:12 2015 +0000

    Make output from openssl version -f consistent with previous versions
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit 2d2671790ee12dedd92c97f35b6feb755b8d4374)

commit 3570086760653bcdd0c2d6916320719df2f002d7
Author: Matt Caswell <matt at openssl.org>
Date:   Sat Jan 10 23:36:28 2015 +0000

    Fix warning where BIO_FLAGS_UPLINK was being redefined.
    This warning breaks the build in 1.0.0 and 0.9.8
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit b1ffc6ca1c387efad0772c16dfe426afef45dc4f)

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

Summary of changes:
 crypto/Makefile        |    2 +-
 crypto/ecdsa/ecs_vrf.c |    2 +-
 util/mk1mf.pl          |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crypto/Makefile b/crypto/Makefile
index 2b6397a..2355661 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -55,7 +55,7 @@ top:
 all: shared
 
 buildinf.h: ../Makefile
-	$(PERL) $(TOP)/util/mkbuildinf.pl "$(CFLAGS)" "$(PLATFORM)" >buildinf.h
+	$(PERL) $(TOP)/util/mkbuildinf.pl "$(CC) $(CFLAGS)" "$(PLATFORM)" >buildinf.h
 
 x86cpuid.s:	x86cpuid.pl perlasm/x86asm.pl
 	$(PERL) x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
diff --git a/crypto/ecdsa/ecs_vrf.c b/crypto/ecdsa/ecs_vrf.c
index 2836efe..188b9d5 100644
--- a/crypto/ecdsa/ecs_vrf.c
+++ b/crypto/ecdsa/ecs_vrf.c
@@ -57,7 +57,7 @@
  */
 
 #include "ecs_locl.h"
-#include "cryptlib.h"
+#include <string.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index d3f5424..550ef9f 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -625,7 +625,7 @@ open (OUT,">>crypto/buildinf.h") || die "Can't open buildinf.h";
 printf OUT <<EOF;
 #ifdef $platform_cpp_symbol
   /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */
-  #define CFLAGS "$cc $cflags"
+  #define CFLAGS "compiler: $cc $cflags"
   #define PLATFORM "$platform"
 EOF
 printf OUT "  #define DATE \"%s\"\n", scalar gmtime();