[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  5a778ce5740b9bad7c19e2d160071773314ad099 (commit)
      from  04bc70d7373300d378aa9c075289d1ee404ec528 (commit)


- Log -----------------------------------------------------------------
commit 5a778ce5740b9bad7c19e2d160071773314ad099
Author: Davide Galassi <davxy at datawok.net>
Date:   Sun Feb 2 10:11:29 2020 +0100

    Missing "obj_mac" header file in "dh_lib"
    
    Usage of `NID_undef` symbol without including its definition was causing
    a build fail
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/10996)

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

Summary of changes:
 crypto/dh/dh_lib.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c
index f9fb1d9b71..0c1cccb5db 100644
--- a/crypto/dh/dh_lib.c
+++ b/crypto/dh/dh_lib.c
@@ -8,13 +8,13 @@
  */
 
 #include <stdio.h>
-#include "internal/cryptlib.h"
-#include "internal/refcount.h"
 #include <openssl/bn.h>
-#include "dh_local.h"
-#include "crypto/dh.h"
 #include <openssl/engine.h>
+#include <openssl/obj_mac.h>
+#include "internal/cryptlib.h"
+#include "internal/refcount.h"
 #include "crypto/dh.h"
+#include "dh_local.h"
 
 #ifndef FIPS_MODE
 int DH_set_method(DH *dh, const DH_METHOD *meth)