[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  77b1f87214224689a84db21d2eb54e9497186d93 (commit)
       via  47b31827887608f910dc80228106a03556c40c4e (commit)
      from  dd12df794a6fde993cb1970d1f484793a0973988 (commit)


- Log -----------------------------------------------------------------
commit 77b1f87214224689a84db21d2eb54e9497186d93
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 24 11:59:01 2015 +0100

    Adjust include path
    
    Thanks to a -I.., the path does work, at least on unix.  However, this
    doesn't work so well on VMS.  Correcting the path to not rely on given
    -I does work on both.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 47b31827887608f910dc80228106a03556c40c4e
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 24 11:57:14 2015 +0100

    JPAKE Makefile missing 'files' target
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/jpake/Makefile   | 3 +++
 crypto/x509v3/v3_scts.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/crypto/jpake/Makefile b/crypto/jpake/Makefile
index a56d558..112dfb1 100644
--- a/crypto/jpake/Makefile
+++ b/crypto/jpake/Makefile
@@ -21,6 +21,9 @@ lib:	$(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib
 
+files:
+	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
 links:
 	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
 	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
diff --git a/crypto/x509v3/v3_scts.c b/crypto/x509v3/v3_scts.c
index 9a4c3eb..e70d5e9 100644
--- a/crypto/x509v3/v3_scts.c
+++ b/crypto/x509v3/v3_scts.c
@@ -60,7 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/asn1.h>
 #include <openssl/x509v3.h>
-#include "../ssl/ssl_locl.h"
+#include "../../ssl/ssl_locl.h"
 
 #if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
 # define SCT_TIMESTAMP unsigned __int64