[openssl-commits] [openssl] OpenSSL source code branch master updated. 2a9338ee31b8448186b79c4a8115dc76f6a431d7
Kurt Roeckx
kurt at openssl.org
Wed Dec 31 10:16:49 UTC 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSSL source code".
The branch, master has been updated
via 2a9338ee31b8448186b79c4a8115dc76f6a431d7 (commit)
via b17dcb0d63cc41aa58bf356fda203670085fc83d (commit)
via d97ed219860b3188b833a130a61d2438f3f249cf (commit)
via 97d5809c2b70fdd240990b940c564bcbd77a19c6 (commit)
from 1d97c8435171a7af575f73c526d79e1ef0ee5960 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2a9338ee31b8448186b79c4a8115dc76f6a431d7
Author: Dominik Neubauer <DominikNeubauer+github at gmail.com>
Date: Tue Mar 4 22:22:29 2014 +0100
typo in s_client
Signed-off-by: Kurt Roeckx <kurt at roeckx.be>
Reviewed-by: Geoff Thorpe <geoff at openssl.org>
commit b17dcb0d63cc41aa58bf356fda203670085fc83d
Author: Martin Nowak <code at dawg.eu>
Date: Mon Apr 21 20:03:07 2014 +0200
remove duplicate defines
Signed-off-by: Kurt Roeckx <kurt at roeckx.be>
Reviewed-by: Geoff Thorpe <geoff at openssl.org>
commit d97ed219860b3188b833a130a61d2438f3f249cf
Author: Cristian Rodríguez <crrodriguez at opensuse.org>
Date: Sun Apr 20 18:41:15 2014 -0300
constify tls 1.2 lookup tables.
None of this should live in writable memory
Signed-off-by: Kurt Roeckx <kurt at roeckx.be>
Reviewed-by: Geoff Thorpe <geoff at openssl.org>
commit 97d5809c2b70fdd240990b940c564bcbd77a19c6
Author: Kurt Roeckx <kurt at roeckx.be>
Date: Tue Dec 30 17:14:49 2014 +0100
Add missing include of sys/time.h
gettimeofday was undefined
Reviewed-by: Geoff Thorpe <geoff at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
apps/s_client.c | 2 +-
crypto/bio/bss_dgram.c | 3 +++
ssl/t1_lib.c | 12 ++++++------
ssl/tls1.h | 2 --
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/apps/s_client.c b/apps/s_client.c
index 30ea743..fe14b36 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -329,7 +329,7 @@ static void sc_usage(void)
BIO_printf(bio_err," -srppass arg - password for 'user'\n");
BIO_printf(bio_err," -srp_lateuser - SRP username into second ClientHello message\n");
BIO_printf(bio_err," -srp_moregroups - Tolerate other than the known g N values.\n");
- BIO_printf(bio_err," -srp_strength int - minimal mength in bits for N (default %d).\n",SRP_MINIMAL_N);
+ BIO_printf(bio_err," -srp_strength int - minimal length in bits for N (default %d).\n",SRP_MINIMAL_N);
#endif
#ifndef OPENSSL_NO_SSL3_METHOD
BIO_printf(bio_err," -ssl3 - just use SSLv3\n");
diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 88ee559..d45dd95 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -66,6 +66,9 @@
#include <openssl/bio.h>
#ifndef OPENSSL_NO_DGRAM
+#if !(defined(_WIN32) || defined(OPENSSL_SYS_VMS))
+# include <sys/time.h>
+#endif
#if defined(OPENSSL_SYS_VMS)
#include <sys/timeb.h>
#endif
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 31b1c36..fec7ace 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -935,7 +935,7 @@ static int tls1_check_cert_param(SSL *s, X509 *x, int set_ee_md)
tlsext_sigalg_dsa(md) \
tlsext_sigalg_ecdsa(md)
-static unsigned char tls12_sigalgs[] = {
+static const unsigned char tls12_sigalgs[] = {
#ifndef OPENSSL_NO_SHA512
tlsext_sigalg(TLSEXT_hash_sha512)
tlsext_sigalg(TLSEXT_hash_sha384)
@@ -949,7 +949,7 @@ static unsigned char tls12_sigalgs[] = {
#endif
};
#ifndef OPENSSL_NO_ECDSA
-static unsigned char suiteb_sigalgs[] = {
+static const unsigned char suiteb_sigalgs[] = {
tlsext_sigalg_ecdsa(TLSEXT_hash_sha256)
tlsext_sigalg_ecdsa(TLSEXT_hash_sha384)
};
@@ -3508,7 +3508,7 @@ typedef struct
int id;
} tls12_lookup;
-static tls12_lookup tls12_md[] = {
+static const tls12_lookup tls12_md[] = {
{NID_md5, TLSEXT_hash_md5},
{NID_sha1, TLSEXT_hash_sha1},
{NID_sha224, TLSEXT_hash_sha224},
@@ -3517,13 +3517,13 @@ static tls12_lookup tls12_md[] = {
{NID_sha512, TLSEXT_hash_sha512}
};
-static tls12_lookup tls12_sig[] = {
+static const tls12_lookup tls12_sig[] = {
{EVP_PKEY_RSA, TLSEXT_signature_rsa},
{EVP_PKEY_DSA, TLSEXT_signature_dsa},
{EVP_PKEY_EC, TLSEXT_signature_ecdsa}
};
-static int tls12_find_id(int nid, tls12_lookup *table, size_t tlen)
+static int tls12_find_id(int nid, const tls12_lookup *table, size_t tlen)
{
size_t i;
for (i = 0; i < tlen; i++)
@@ -3534,7 +3534,7 @@ static int tls12_find_id(int nid, tls12_lookup *table, size_t tlen)
return -1;
}
-static int tls12_find_nid(int id, tls12_lookup *table, size_t tlen)
+static int tls12_find_nid(int id, const tls12_lookup *table, size_t tlen)
{
size_t i;
for (i = 0; i < tlen; i++)
diff --git a/ssl/tls1.h b/ssl/tls1.h
index e8188ec..7596429 100644
--- a/ssl/tls1.h
+++ b/ssl/tls1.h
@@ -784,8 +784,6 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
#define TLS_MD_CLIENT_FINISH_CONST_SIZE 15
#define TLS_MD_SERVER_FINISH_CONST "server finished"
#define TLS_MD_SERVER_FINISH_CONST_SIZE 15
-#define TLS_MD_SERVER_WRITE_KEY_CONST "server write key"
-#define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE 16
#define TLS_MD_KEY_EXPANSION_CONST "key expansion"
#define TLS_MD_KEY_EXPANSION_CONST_SIZE 13
#define TLS_MD_CLIENT_WRITE_KEY_CONST "client write key"
hooks/post-receive
--
OpenSSL source code
More information about the openssl-commits
mailing list