[openssl-commits] [openssl] OpenSSL source code branch master updated. aa8a9266f91ce05068c5bf7eab44263c99d366f3

[Kurt Roeckx]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSSL source code".

The branch, master has been updated
       via  aa8a9266f91ce05068c5bf7eab44263c99d366f3 (commit)
       via  5075e52e6f055f0dfce5be153e6a4def9e5d8057 (commit)
       via  c18440956dd4a756e778b05d6ceadc27bd034edb (commit)
       via  8c00f4cfd2e4265f39e8fa0e3d10406a542647f0 (commit)
      from  32dfde107636ac9bc62a5b3233fe2a54dbc27008 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit aa8a9266f91ce05068c5bf7eab44263c99d366f3
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Tue Dec 16 12:35:21 2014 +0100

    Make "run" volatile
    
    RT#3629
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 5075e52e6f055f0dfce5be153e6a4def9e5d8057
Author: Thorsten Glaser <tg at mirbsd.de>
Date:   Fri May 22 16:28:05 2009 +0000

    Document openssl dgst -hmac option
    
    Signed-off-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit c18440956dd4a756e778b05d6ceadc27bd034edb
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Mon Dec 23 19:06:34 2013 +0100

    dlfcn: always define _GNU_SOURCE
    
    We need this for the freebsd kernel with glibc as used in the Debian kfreebsd
    ports.  There shouldn't be a problem defining this on systems not using glibc.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 8c00f4cfd2e4265f39e8fa0e3d10406a542647f0
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sun Dec 7 22:25:39 2014 +0100

    Fix memory leak in the apps
    
    The BIO_free() allocated ex_data again that we already freed.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 apps/dgst.c            |    2 ++
 apps/openssl.c         |    5 +++--
 apps/speed.c           |    2 +-
 crypto/dso/dso_dlfcn.c |    6 ++----
 doc/apps/dgst.pod      |   11 +++++++++++
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/apps/dgst.c b/apps/dgst.c
index 19c9424..9f6954f 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -276,6 +276,8 @@ int MAIN(int argc, char **argv)
 		BIO_printf(bio_err,"-d              to output debug info\n");
 		BIO_printf(bio_err,"-hex            output as hex dump\n");
 		BIO_printf(bio_err,"-binary         output in binary form\n");
+		BIO_printf(bio_err,"-hmac arg       set the HMAC key to arg\n");
+		BIO_printf(bio_err,"-non-fips-allow allow use of non FIPS digest\n");
 		BIO_printf(bio_err,"-sign   file    sign digest using private key in file\n");
 		BIO_printf(bio_err,"-verify file    verify a signature using public key in file\n");
 		BIO_printf(bio_err,"-prverify file  verify a signature using private key in file\n");
diff --git a/apps/openssl.c b/apps/openssl.c
index 71e1e48..5372459 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -435,9 +435,7 @@ end:
 	if (prog != NULL) lh_FUNCTION_free(prog);
 	if (arg.data != NULL) OPENSSL_free(arg.data);
 
-	apps_shutdown();
 
-	CRYPTO_mem_leaks(bio_err);
 	if (bio_err != NULL)
 		{
 		BIO_free(bio_err);
@@ -450,6 +448,9 @@ end:
 		OPENSSL_free(Argv);
 		}
 #endif
+	apps_shutdown();
+	CRYPTO_mem_leaks(bio_err);
+
 	OPENSSL_EXIT(ret);
 	}
 
diff --git a/apps/speed.c b/apps/speed.c
index e5742e6..3dcfb8d 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -209,7 +209,7 @@
 #define BUFSIZE	(1024*8+1)
 #define MAX_MISALIGNMENT 63
 
-int run=0;
+static volatile int run=0;
 
 static int mr=0;
 static int usertime=1;
diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
index 0135cc1..32386c6 100644
--- a/crypto/dso/dso_dlfcn.c
+++ b/crypto/dso/dso_dlfcn.c
@@ -60,10 +60,8 @@
    that handle _GNU_SOURCE and other similar macros.  Defining it later
    is simply too late, because those headers are protected from re-
    inclusion.  */
-#ifdef __linux
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE	/* make sure dladdr is declared */
-# endif
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE	/* make sure dladdr is declared */
 #endif
 
 #include <stdio.h>
diff --git a/doc/apps/dgst.pod b/doc/apps/dgst.pod
index d8530ab..8f974ed 100644
--- a/doc/apps/dgst.pod
+++ b/doc/apps/dgst.pod
@@ -13,6 +13,8 @@ B<openssl> B<dgst>
 [B<-hex>]
 [B<-binary>]
 [B<-r>]
+[B<-hmac arg>]
+[B<-non-fips-allow>]
 [B<-out filename>]
 [B<-sign filename>]
 [B<-keyform arg>]
@@ -62,6 +64,15 @@ output the digest or signature in binary form.
 
 output the digest in the "coreutils" format used by programs like B<sha1sum>.
 
+=item B<-hmac arg>
+
+set the HMAC key to "arg".
+
+=item B<-non-fips-allow>
+
+Allow use of non FIPS digest when in FIPS mode.  This has no effect when not in
+FIPS mode.
+
 =item B<-out filename>
 
 filename to output to, or standard output by default.


hooks/post-receive
-- 
OpenSSL source code