From: Matt Caswell <matt@openssl.org>
Date: Mon, 4 May 2015 22:15:46 +0000 (+0100)
Subject: Remove libcrypto to libssl dependency
X-Git-Tag: OpenSSL_1_1_0-pre1~1198
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d13bd6130bd856e9f512c43499e5fc70943bf133;p=oweals%2Fopenssl.git

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@openssl.org>
---

diff --git a/crypto/x509v3/v3_scts.c b/crypto/x509v3/v3_scts.c
index 31e610d434..a9e1a9782f 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