[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Matt Caswell]

The branch OpenSSL_1_0_2-stable has been updated
       via  cd5f206c2fb0d44ab55aec4ddab4a0109c134355 (commit)
      from  3cf40601b7d164ab48addbb0456d7aa59fa38c88 (commit)


- Log -----------------------------------------------------------------
commit cd5f206c2fb0d44ab55aec4ddab4a0109c134355
Author: Matt Caswell <matt at openssl.org>
Date:   Mon May 4 23:15:46 2015 +0100

    Remove libcrypto to libssl dependency
    
    Remove dependency on ssl_locl.h from v3_scts.c, and incidentally fix a build problem with
    kerberos (the dependency meant v3_scts.c was trying to include krb5.h, but without having been
    passed the relevanant -I flags to the compiler)
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>
    (cherry picked from commit d13bd6130bd856e9f512c43499e5fc70943bf133)
    
    Conflicts:
    	crypto/x509v3/v3_scts.c

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

Summary of changes:
 crypto/x509v3/v3_scts.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/crypto/x509v3/v3_scts.c b/crypto/x509v3/v3_scts.c
index 9a4c3eb..6e0b8d6 100644
--- a/crypto/x509v3/v3_scts.c
+++ b/crypto/x509v3/v3_scts.c
@@ -60,7 +60,16 @@
 #include "cryptlib.h"
 #include <openssl/asn1.h>
 #include <openssl/x509v3.h>
-#include "../ssl/ssl_locl.h"
+
+/* Signature and hash algorithms from RFC 5246 */
+#define TLSEXT_hash_sha256                              4
+
+#define TLSEXT_signature_rsa                            1
+#define TLSEXT_signature_ecdsa                          3
+
+
+#define n2s(c,s)        ((s=(((unsigned int)(c[0]))<< 8)| \
+                            (((unsigned int)(c[1]))    )),c+=2)
 
 #if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
 # define SCT_TIMESTAMP unsigned __int64