Remove libcrypto to libssl dependency
authorMatt Caswell <matt@openssl.org>
Mon, 4 May 2015 22:15:46 +0000 (23:15 +0100)
committerMatt Caswell <matt@openssl.org>
Tue, 5 May 2015 08:05:51 +0000 (09:05 +0100)
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>
crypto/x509v3/v3_scts.c

index 31e610d43460c2f81cd18e1f28a295cb4be5448f..a9e1a9782f696ad78de3355f4315da3773729f3f 100644 (file)
 #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