diff options
| author | Matt Caswell <matt@openssl.org> | 2014-12-19 10:55:54 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2014-12-19 14:08:17 +0000 |
| commit | 8c46748bcb601972faf2426fc42d80099af84df9 (patch) | |
| tree | bfe80a8d2b3513eca0dd454d490eda6f2d71a66e /crypto | |
| parent | 86edf13b1c97526c0cf63c37342aaa01f5442688 (diff) | |
Fix a problem if CFLAGS is too long cversion.c fails to compile when config
is run with --strict-warnings.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit 488f16e31b8f5ec2513410929325d0830d76762d)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Makefile | 7 | ||||
| -rw-r--r-- | crypto/cversion.c | 15 |
2 files changed, 4 insertions, 18 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index ee5bfbda82..2b6397a24b 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -55,12 +55,7 @@ top: all: shared buildinf.h: ../Makefile - ( echo "#ifndef MK1MF_BUILD"; \ - echo ' /* auto-generated by crypto/Makefile for crypto/cversion.c */'; \ - echo ' #define CFLAGS "$(CC) $(CFLAG)"'; \ - echo ' #define PLATFORM "$(PLATFORM)"'; \ - echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \ - echo '#endif' ) >buildinf.h + $(PERL) $(TOP)/util/mkbuildinf.pl "$(CFLAGS)" "$(PLATFORM)" >buildinf.h x86cpuid.s: x86cpuid.pl perlasm/x86asm.pl $(PERL) x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ diff --git a/crypto/cversion.c b/crypto/cversion.c index ea9f25fd16..0336adaa57 100644 --- a/crypto/cversion.c +++ b/crypto/cversion.c @@ -69,10 +69,7 @@ const char *SSLeay_version(int t) if (t == SSLEAY_BUILT_ON) { #ifdef DATE - static char buf[sizeof(DATE)+11]; - - BIO_snprintf(buf,sizeof buf,"built on: %s",DATE); - return(buf); + return(DATE); #else return("built on: date not available"); #endif @@ -80,10 +77,7 @@ const char *SSLeay_version(int t) if (t == SSLEAY_CFLAGS) { #ifdef CFLAGS - static char buf[sizeof(CFLAGS)+11]; - - BIO_snprintf(buf,sizeof buf,"compiler: %s",CFLAGS); - return(buf); + return(cflags); #else return("compiler: information not available"); #endif @@ -91,10 +85,7 @@ const char *SSLeay_version(int t) if (t == SSLEAY_PLATFORM) { #ifdef PLATFORM - static char buf[sizeof(PLATFORM)+11]; - - BIO_snprintf(buf,sizeof buf,"platform: %s", PLATFORM); - return(buf); + return(PLATFORM); #else return("platform: information not available"); #endif |