[openssl-commits] [openssl] master update
Matt Caswell
matt at openssl.org
Tue May 5 08:13:03 UTC 2015
The branch master has been updated
via cab4cd3fe9bd5c07a5cd303b8695cc032efe759c (commit)
via 34fd7e68a9761260c650caca31b8d7dd7a372c33 (commit)
via aacb4f1a6ec12efff96fa7e51ca7b57254e2b2c8 (commit)
via d13bd6130bd856e9f512c43499e5fc70943bf133 (commit)
from 45ddce21fa4c2fdcfe48fb3f7e0ca78531a7b922 (commit)
- Log -----------------------------------------------------------------
commit cab4cd3fe9bd5c07a5cd303b8695cc032efe759c
Author: Matt Caswell <matt at openssl.org>
Date: Mon May 4 23:28:41 2015 +0100
make update
Reviewed-by: Dr. Stephen Henson <steve at openssl.org>
commit 34fd7e68a9761260c650caca31b8d7dd7a372c33
Author: mancha security <mancha1 at zoho.com>
Date: Mon May 4 06:36:42 2015 +0000
ssl/kssl.c: include missing header to complete SSL structure's defn.
Signed-off-by: mancha security <mancha1 at zoho.com>
Signed-off-by: Matt Caswell <matt at openssl.org>
Reviewed-by: Dr. Stephen Henson <steve at openssl.org>
commit aacb4f1a6ec12efff96fa7e51ca7b57254e2b2c8
Author: mancha security <mancha1 at zoho.com>
Date: Sun May 3 02:45:45 2015 +0000
ssl/ssl_asn1.c: Fix typo introduced via cc5b6a03a320f1
Signed-off-by: mancha security <mancha1 at zoho.com>
Signed-off-by: Matt Caswell <matt at openssl.org>
Reviewed-by: Dr. Stephen Henson <steve at openssl.org>
commit d13bd6130bd856e9f512c43499e5fc70943bf133
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>
-----------------------------------------------------------------------
Summary of changes:
crypto/x509v3/Makefile | 32 ++++++++++++--------------------
crypto/x509v3/v3_scts.c | 11 ++++++++++-
ssl/Makefile | 15 +++++++++------
ssl/kssl.c | 1 +
ssl/ssl_asn1.c | 2 +-
5 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/crypto/x509v3/Makefile b/crypto/x509v3/Makefile
index 24bb60b..4affc2d 100644
--- a/crypto/x509v3/Makefile
+++ b/crypto/x509v3/Makefile
@@ -506,26 +506,18 @@ v3_purp.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
v3_purp.o: ../cryptlib.h v3_purp.c
v3_scts.o: ../../e_os.h ../../include/openssl/asn1.h
v3_scts.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
-v3_scts.o: ../../include/openssl/comp.h ../../include/openssl/conf.h
-v3_scts.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
-v3_scts.o: ../../include/openssl/dtls1.h ../../include/openssl/e_os2.h
-v3_scts.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-v3_scts.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
-v3_scts.o: ../../include/openssl/evp.h ../../include/openssl/hmac.h
-v3_scts.o: ../../include/openssl/kssl.h ../../include/openssl/lhash.h
-v3_scts.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-v3_scts.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-v3_scts.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
-v3_scts.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
-v3_scts.o: ../../include/openssl/pqueue.h ../../include/openssl/rsa.h
-v3_scts.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_scts.o: ../../include/openssl/srtp.h ../../include/openssl/ssl.h
-v3_scts.o: ../../include/openssl/ssl2.h ../../include/openssl/ssl23.h
-v3_scts.o: ../../include/openssl/ssl3.h ../../include/openssl/stack.h
-v3_scts.o: ../../include/openssl/symhacks.h ../../include/openssl/tls1.h
-v3_scts.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-v3_scts.o: ../../include/openssl/x509v3.h ../../ssl/record/record.h
-v3_scts.o: ../../ssl/ssl_locl.h ../cryptlib.h v3_scts.c
+v3_scts.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+v3_scts.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+v3_scts.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+v3_scts.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+v3_scts.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+v3_scts.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+v3_scts.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+v3_scts.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+v3_scts.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_scts.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+v3_scts.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+v3_scts.o: ../cryptlib.h v3_scts.c
v3_skey.o: ../../e_os.h ../../include/openssl/asn1.h
v3_skey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
v3_skey.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
diff --git a/crypto/x509v3/v3_scts.c b/crypto/x509v3/v3_scts.c
index 31e610d..a9e1a97 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
diff --git a/ssl/Makefile b/ssl/Makefile
index bff2b9a..86f5077 100644
--- a/ssl/Makefile
+++ b/ssl/Makefile
@@ -278,24 +278,27 @@ dtls1_bitmap.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
dtls1_bitmap.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
dtls1_bitmap.o: dtls1_bitmap.c record/../record/record.h record/../ssl_locl.h
dtls1_bitmap.o: record/dtls1_bitmap.c record/record_locl.h
-kssl.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+kssl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
kssl.o: ../include/openssl/buffer.h ../include/openssl/comp.h
-kssl.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
-kssl.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
-kssl.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+kssl.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
+kssl.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h
+kssl.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
+kssl.o: ../include/openssl/ecdsa.h ../include/openssl/err.h
kssl.o: ../include/openssl/evp.h ../include/openssl/hmac.h
kssl.o: ../include/openssl/krb5_asn.h ../include/openssl/kssl.h
kssl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
kssl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
kssl.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
kssl.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-kssl.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
+kssl.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
+kssl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
kssl.o: ../include/openssl/sha.h ../include/openssl/srtp.h
kssl.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
kssl.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
kssl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
kssl.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-kssl.o: ../include/openssl/x509_vfy.h kssl.c kssl_lcl.h
+kssl.o: ../include/openssl/x509_vfy.h kssl.c kssl_lcl.h record/record.h
+kssl.o: ssl_locl.h
rec_layer_d1.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
rec_layer_d1.o: ../include/openssl/buffer.h ../include/openssl/comp.h
rec_layer_d1.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
diff --git a/ssl/kssl.c b/ssl/kssl.c
index 6ec3742..ce43529 100644
--- a/ssl/kssl.c
+++ b/ssl/kssl.c
@@ -79,6 +79,7 @@
#include <openssl/objects.h>
#include <openssl/krb5_asn.h>
#include "kssl_lcl.h"
+#include "ssl_locl.h"
#ifndef OPENSSL_NO_KRB5
diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index 905c8cf..3e84917 100644
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -370,7 +370,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
#ifndef OPENSSL_NO_KRB5
if (!ssl_session_memcpy(ret->krb5_client_princ, &ret->krb5_client_princ_len,
- as->krb5_princ, SSL_MAX_PRINCIPAL_LENGTH))
+ as->krb5_princ, SSL_MAX_KRB5_PRINCIPAL_LENGTH))
goto err;
#endif /* OPENSSL_NO_KRB5 */
More information about the openssl-commits
mailing list