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

2015-12-19 Thread Richard Levitte 
The branch OpenSSL_1_0_2-stable has been updated
   via  17592f323ac7dad381cc3b512573c291b1a820c0 (commit)
   via  6d97060ee00518efc99c5d89a78529dc111780fb (commit)
   via  7eb51251252ea0b269227d267512b98495f51bc4 (commit)
   via  2a60fccdd9b696e01fddaa268e92ea210beb0e8f (commit)
  from  f6cadde13239127a2b58970124f4c1f3c217 (commit)


- Log -
commit 17592f323ac7dad381cc3b512573c291b1a820c0
Author: Richard Levitte 
Date:   Mon Nov 2 16:43:28 2015 +0100

BIO_s_datagram() ctrl doesn't support SEEK/TELL, so don't pretend it does

Reviewed-by: Rich Salz 

commit 6d97060ee00518efc99c5d89a78529dc111780fb
Author: Richard Levitte 
Date:   Sun Nov 1 15:56:21 2015 +0100

Correct or add comments indicating what controls belong to what

Reviewed-by: Rich Salz 

commit 7eb51251252ea0b269227d267512b98495f51bc4
Author: Richard Levitte 
Date:   Sun Nov 1 15:45:49 2015 +0100

Document how BIO_get_conn_ip and BIO_get_conn_int_port actually work

No dummy arguments.

Reviewed-by: Rich Salz 

commit 2a60fccdd9b696e01fddaa268e92ea210beb0e8f
Author: Richard Levitte 
Date:   Sun Nov 1 15:42:04 2015 +0100

Have BIO_get_conn_int_port use BIO_ctrl instead BIO_int_ctrl

BIO_int_ctrl isn't made for the purpose BIO_get_conn_int_port used it
for.

This also changes BIO_C_GET_CONNECT to actually return the port
instead of assigning it to a pointer that was never returned back to
the caller.

Reviewed-by: Rich Salz 

---

Summary of changes:
 crypto/bio/bio.h |  8 ++--
 crypto/bio/bss_conn.c| 31 ---
 crypto/bio/bss_dgram.c   |  2 --
 doc/crypto/BIO_s_connect.pod |  4 ++--
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index f78796b..6e2293b 100644
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -479,11 +479,11 @@ struct bio_dgram_sctp_prinfo {
 # define BIO_get_conn_hostname(b)  BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0)
 # define BIO_get_conn_port(b)  BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1)
 # define BIO_get_conn_ip(b)   BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2)
-# define BIO_get_conn_int_port(b) BIO_int_ctrl(b,BIO_C_GET_CONNECT,3,0)
+# define BIO_get_conn_int_port(b) BIO_ctrl(b,BIO_C_GET_CONNECT,3,0,NULL)
 
 # define BIO_set_nbio(b,n)   BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL)
 
-/* BIO_s_accept_socket() */
+/* BIO_s_accept() */
 # define BIO_set_accept_port(b,name) BIO_ctrl(b,BIO_C_SET_ACCEPT,0,(char 
*)name)
 # define BIO_get_accept_port(b)  BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,0)
 /* #define BIO_set_nbio(b,n)BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL) */
@@ -496,6 +496,7 @@ struct bio_dgram_sctp_prinfo {
 # define BIO_set_bind_mode(b,mode) BIO_ctrl(b,BIO_C_SET_BIND_MODE,mode,NULL)
 # define BIO_get_bind_mode(b,mode) BIO_ctrl(b,BIO_C_GET_BIND_MODE,0,NULL)
 
+/* BIO_s_accept() and BIO_s_connect() */
 # define BIO_do_connect(b)   BIO_do_handshake(b)
 # define BIO_do_accept(b)BIO_do_handshake(b)
 # define BIO_do_handshake(b) BIO_ctrl(b,BIO_C_DO_STATE_MACHINE,0,NULL)
@@ -515,12 +516,15 @@ struct bio_dgram_sctp_prinfo {
 # define BIO_get_url(b,url)  BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,2,(char 
*)(url))
 # define BIO_get_no_connect_return(b)
BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,5,NULL)
 
+/* BIO_s_datagram(), BIO_s_fd(), BIO_s_socket(), BIO_s_accept() and 
BIO_s_connect() */
 # define BIO_set_fd(b,fd,c)  BIO_int_ctrl(b,BIO_C_SET_FD,c,fd)
 # define BIO_get_fd(b,c) BIO_ctrl(b,BIO_C_GET_FD,0,(char *)c)
 
+/* BIO_s_file() */
 # define BIO_set_fp(b,fp,c)  BIO_ctrl(b,BIO_C_SET_FILE_PTR,c,(char *)fp)
 # define BIO_get_fp(b,fpp)   BIO_ctrl(b,BIO_C_GET_FILE_PTR,0,(char *)fpp)
 
+/* BIO_s_fd() and BIO_s_file() */
 # define BIO_seek(b,ofs) (int)BIO_ctrl(b,BIO_C_FILE_SEEK,ofs,NULL)
 # define BIO_tell(b) (int)BIO_ctrl(b,BIO_C_FILE_TELL,0,NULL)
 
diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index 42d0aff..7d15ad2 100644
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -419,7 +419,7 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
 {
 BIO *dbio;
 int *ip;
-const char **pptr;
+const char **pptr = NULL;
 long ret = 1;
 BIO_CONNECT *data;
 
@@ -442,19 +442,28 @@ static long conn_ctrl(BIO *b, int cmd, long num, void 
*ptr)
 case BIO_C_GET_CONNECT:
 if (ptr != NULL) {
 pptr = (const char **)ptr;
-if (num == 0) {
-*pptr = data->param_hostname;
+}
 
-} else if (num == 1) {
-*pptr = data->param_port;
-} else if (num == 2) {
-*pptr = (char *)&(data->ip[0]);

[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

2015-12-19 Thread Richard Levitte 
The branch OpenSSL_1_0_1-stable has been updated
   via  f9b52eb6b1623d927aa1b556b0b23110ca2a6b28 (commit)
   via  074821106cd7358e73e18d38ef7bf68bd84ed3cd (commit)
   via  0dae9636e8e1f1b48d7af2697b5d4c6fcfbfba37 (commit)
   via  f08360a16072e8bf58fd273eba41cdbc35448cbc (commit)
  from  583f4bf7e8e83e503046b7e5a1e01b48e64bce54 (commit)


- Log -
commit f9b52eb6b1623d927aa1b556b0b23110ca2a6b28
Author: Richard Levitte 
Date:   Mon Nov 2 16:43:28 2015 +0100

BIO_s_datagram() ctrl doesn't support SEEK/TELL, so don't pretend it does

Reviewed-by: Rich Salz 
(cherry picked from commit 17592f323ac7dad381cc3b512573c291b1a820c0)

commit 074821106cd7358e73e18d38ef7bf68bd84ed3cd
Author: Richard Levitte 
Date:   Sun Nov 1 15:56:21 2015 +0100

Correct or add comments indicating what controls belong to what

Reviewed-by: Rich Salz 
(cherry picked from commit 6d97060ee00518efc99c5d89a78529dc111780fb)

commit 0dae9636e8e1f1b48d7af2697b5d4c6fcfbfba37
Author: Richard Levitte 
Date:   Sun Nov 1 15:45:49 2015 +0100

Document how BIO_get_conn_ip and BIO_get_conn_int_port actually work

No dummy arguments.

Reviewed-by: Rich Salz 
(cherry picked from commit 7eb51251252ea0b269227d267512b98495f51bc4)

commit f08360a16072e8bf58fd273eba41cdbc35448cbc
Author: Richard Levitte 
Date:   Sun Nov 1 15:42:04 2015 +0100

Have BIO_get_conn_int_port use BIO_ctrl instead BIO_int_ctrl

BIO_int_ctrl isn't made for the purpose BIO_get_conn_int_port used it
for.

This also changes BIO_C_GET_CONNECT to actually return the port
instead of assigning it to a pointer that was never returned back to
the caller.

Reviewed-by: Rich Salz 
(cherry picked from commit 2a60fccdd9b696e01fddaa268e92ea210beb0e8f)

---

Summary of changes:
 crypto/bio/bio.h |  8 ++--
 crypto/bio/bss_conn.c| 31 ---
 crypto/bio/bss_dgram.c   |  2 --
 doc/crypto/BIO_s_connect.pod |  4 ++--
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index d583cc1..c5c95de 100644
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -478,11 +478,11 @@ struct bio_dgram_sctp_prinfo {
 # define BIO_get_conn_hostname(b)  BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0)
 # define BIO_get_conn_port(b)  BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1)
 # define BIO_get_conn_ip(b)   BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2)
-# define BIO_get_conn_int_port(b) BIO_int_ctrl(b,BIO_C_GET_CONNECT,3,0)
+# define BIO_get_conn_int_port(b) BIO_ctrl(b,BIO_C_GET_CONNECT,3,0,NULL)
 
 # define BIO_set_nbio(b,n)   BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL)
 
-/* BIO_s_accept_socket() */
+/* BIO_s_accept() */
 # define BIO_set_accept_port(b,name) BIO_ctrl(b,BIO_C_SET_ACCEPT,0,(char 
*)name)
 # define BIO_get_accept_port(b)  BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,0)
 /* #define BIO_set_nbio(b,n)BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL) */
@@ -495,6 +495,7 @@ struct bio_dgram_sctp_prinfo {
 # define BIO_set_bind_mode(b,mode) BIO_ctrl(b,BIO_C_SET_BIND_MODE,mode,NULL)
 # define BIO_get_bind_mode(b,mode) BIO_ctrl(b,BIO_C_GET_BIND_MODE,0,NULL)
 
+/* BIO_s_accept() and BIO_s_connect() */
 # define BIO_do_connect(b)   BIO_do_handshake(b)
 # define BIO_do_accept(b)BIO_do_handshake(b)
 # define BIO_do_handshake(b) BIO_ctrl(b,BIO_C_DO_STATE_MACHINE,0,NULL)
@@ -514,12 +515,15 @@ struct bio_dgram_sctp_prinfo {
 # define BIO_get_url(b,url)  BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,2,(char 
*)(url))
 # define BIO_get_no_connect_return(b)
BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,5,NULL)
 
+/* BIO_s_datagram(), BIO_s_fd(), BIO_s_socket(), BIO_s_accept() and 
BIO_s_connect() */
 # define BIO_set_fd(b,fd,c)  BIO_int_ctrl(b,BIO_C_SET_FD,c,fd)
 # define BIO_get_fd(b,c) BIO_ctrl(b,BIO_C_GET_FD,0,(char *)c)
 
+/* BIO_s_file() */
 # define BIO_set_fp(b,fp,c)  BIO_ctrl(b,BIO_C_SET_FILE_PTR,c,(char *)fp)
 # define BIO_get_fp(b,fpp)   BIO_ctrl(b,BIO_C_GET_FILE_PTR,0,(char *)fpp)
 
+/* BIO_s_fd() and BIO_s_file() */
 # define BIO_seek(b,ofs) (int)BIO_ctrl(b,BIO_C_FILE_SEEK,ofs,NULL)
 # define BIO_tell(b) (int)BIO_ctrl(b,BIO_C_FILE_TELL,0,NULL)
 
diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index 6a5e8de..ed214ca 100644
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -419,7 +419,7 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
 {
 BIO *dbio;
 int *ip;
-const char **pptr;
+const char **pptr = NULL;
 long ret = 1;
 BIO_CONNECT *data;
 
@@ -442,19 +442,28 @@ static long conn_ctrl(BIO *b, int cmd, long num, void 
*ptr)
 case BIO_C_GET_CONNECT:
 if (ptr != NULL) {

[openssl-commits] [openssl] master update

2015-12-19 Thread Richard Levitte 
The branch master has been updated
   via  7a64489f9eb9bf4964de2dc2df248453ee3cc84e (commit)
  from  bc71f91064a3eec10310fa4cc14fe2a3fd9bc7bb (commit)


- Log -
commit 7a64489f9eb9bf4964de2dc2df248453ee3cc84e
Author: Richard Levitte 
Date:   Sat Dec 19 00:09:05 2015 +0100

Fix the etags action line, as etags doesn't take -R

Reviewed-by: Matt Caswell 

---

Summary of changes:
 Makefile.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.org b/Makefile.org
index 2eaffde..ab6a74e 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -468,7 +468,7 @@ lint:
 tags TAGS: FORCE
rm -f TAGS tags
-ctags -R .
-   -etags -R .
+   -etags `find . -name '*.[ch]' -o -name '*.pm'`
 
 FORCE:
 
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] [openssl] master update

2015-12-19 Thread Dr . Stephen Henson 
The branch master has been updated
   via  bc71f91064a3eec10310fa4cc14fe2a3fd9bc7bb (commit)
  from  74a62e9629b2d07360a62571ff3028c83b69b0d9 (commit)


- Log -
commit bc71f91064a3eec10310fa4cc14fe2a3fd9bc7bb
Author: Dr. Stephen Henson 
Date:   Tue Dec 15 23:57:18 2015 +

Remove fixed DH ciphersuites.

Remove all fixed DH ciphersuites and associated logic.

Reviewed-by: Matt Caswell 

---

Summary of changes:
 ssl/s3_lib.c | 400 +--
 ssl/ssl_ciph.c   |  23 +--
 ssl/ssl_lib.c|  13 +-
 ssl/ssl_locl.h   |  50 +++---
 ssl/ssl_rsa.c|  17 +-
 ssl/statem/statem_clnt.c | 102 +++-
 ssl/statem/statem_lib.c  |  11 --
 ssl/statem/statem_srvr.c |  69 ++--
 ssl/t1_lib.c |  17 +-
 ssl/t1_trce.c|  18 ---
 10 files changed, 64 insertions(+), 656 deletions(-)

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 54ba298..c02b545 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -261,38 +261,6 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = {
  168,
  },
 
-/* Cipher 0D */
-{
- 1,
- SSL3_TXT_DH_DSS_DES_192_CBC3_SHA,
- SSL3_CK_DH_DSS_DES_192_CBC3_SHA,
- SSL_kDHd,
- SSL_aDH,
- SSL_3DES,
- SSL_SHA1,
- SSL_SSLV3,
- SSL_HIGH | SSL_FIPS,
- SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
- 112,
- 168,
- },
-
-/* Cipher 10 */
-{
- 1,
- SSL3_TXT_DH_RSA_DES_192_CBC3_SHA,
- SSL3_CK_DH_RSA_DES_192_CBC3_SHA,
- SSL_kDHr,
- SSL_aDH,
- SSL_3DES,
- SSL_SHA1,
- SSL_SSLV3,
- SSL_HIGH | SSL_FIPS,
- SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
- 112,
- 168,
- },
-
 /* Cipher 13 */
 {
  1,
@@ -420,36 +388,6 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = {
  128,
  128,
  },
-/* Cipher 30 */
-{
- 1,
- TLS1_TXT_DH_DSS_WITH_AES_128_SHA,
- TLS1_CK_DH_DSS_WITH_AES_128_SHA,
- SSL_kDHd,
- SSL_aDH,
- SSL_AES128,
- SSL_SHA1,
- SSL_SSLV3,
- SSL_HIGH | SSL_FIPS,
- SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
- 128,
- 128,
- },
-/* Cipher 31 */
-{
- 1,
- TLS1_TXT_DH_RSA_WITH_AES_128_SHA,
- TLS1_CK_DH_RSA_WITH_AES_128_SHA,
- SSL_kDHr,
- SSL_aDH,
- SSL_AES128,
- SSL_SHA1,
- SSL_SSLV3,
- SSL_HIGH | SSL_FIPS,
- SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
- 128,
- 128,
- },
 /* Cipher 32 */
 {
  1,
@@ -511,37 +449,6 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = {
  256,
  256,
  },
-/* Cipher 36 */
-{
- 1,
- TLS1_TXT_DH_DSS_WITH_AES_256_SHA,
- TLS1_CK_DH_DSS_WITH_AES_256_SHA,
- SSL_kDHd,
- SSL_aDH,
- SSL_AES256,
- SSL_SHA1,
- SSL_SSLV3,
- SSL_HIGH | SSL_FIPS,
- SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
- 256,
- 256,
- },
-
-/* Cipher 37 */
-{
- 1,
- TLS1_TXT_DH_RSA_WITH_AES_256_SHA,
- TLS1_CK_DH_RSA_WITH_AES_256_SHA,
- SSL_kDHr,
- SSL_aDH,
- SSL_AES256,
- SSL_SHA1,
- SSL_SSLV3,
- SSL_HIGH | SSL_FIPS,
- SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
- 256,
- 256,
- },
 
 /* Cipher 38 */
 {
@@ -640,38 +547,6 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = {
  256,
  },
 
-/* Cipher 3E */
-{
- 1,
- TLS1_TXT_DH_DSS_WITH_AES_128_SHA256,
- TLS1_CK_DH_DSS_WITH_AES_128_SHA256,
- SSL_kDHd,
- SSL_aDH,
- SSL_AES128,
- SSL_SHA256,
- SSL_TLSV1_2,
- SSL_HIGH | SSL_FIPS,
- SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
- 128,
- 128,
- },
-
-/* Cipher 3F */
-{
- 1,
- TLS1_TXT_DH_RSA_WITH_AES_128_SHA256,
- TLS1_CK_DH_RSA_WITH_AES_128_SHA256,
- SSL_kDHr,
- SSL_aDH,
- SSL_AES128,
- SSL_SHA256,
- SSL_TLSV1_2,
- SSL_HIGH | SSL_FIPS,
- SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
- 128,
- 128,
- },
-
 /* Cipher 40 */
 {
  1,
@@ -707,38 +582,6 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = {
  128,
  },
 
-/* Cipher 42 */
-{
- 1,
- TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA,
- TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA,
- SSL_kDHd,
- SSL_aDH,
- SSL_CAMELLIA128,
- SSL_SHA1,
- SSL_SSLV3,
- SSL_HIGH,
- SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
- 128,
- 128,
- },
-
-/* Cipher 43 */
-{
- 1,
- TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA,
- TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA,
- SSL_kDHr,
- SSL_aDH,
- SSL_CAMELLIA128,
- SSL_SHA1,
- SSL_SSLV3,
- SSL_HIGH,
- SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
- 128,
- 128,
- },
-
 /* Cipher 44 */
 {
  1,
@@ -805,38 +648,6 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = {
  128,
  },
 
-/* Cipher 68 */
-

[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

2015-12-19 Thread Matt Caswell 
The branch OpenSSL_1_0_1-stable has been updated
   via  583f4bf7e8e83e503046b7e5a1e01b48e64bce54 (commit)
   via  ff2c19efdbd6108acf9bff1c53adba8c2d3aa001 (commit)
  from  e961c7a201817cefd628a023a104c4ee8a216e13 (commit)


- Log -
commit 583f4bf7e8e83e503046b7e5a1e01b48e64bce54
Author: Matt Caswell 
Date:   Sat Dec 19 14:42:06 2015 +

Fix more URLs mangled by reformat

Fix some more URLs mangled by indent in the reformat. These ones don't exist
in master so we have a separate commit. Based on a patch supplied by Arnaud
Lacombe 

Reviewed-by: Richard Levitte 

commit ff2c19efdbd6108acf9bff1c53adba8c2d3aa001
Author: Matt Caswell 
Date:   Sat Dec 19 14:38:17 2015 +

Fix URLs mangled by reformat

Some URLs in the source code ended up getting mangled by indent. This fixes
it. Based on a patch supplied by Arnaud Lacombe 

Reviewed-by: Richard Levitte 

---

Summary of changes:
 crypto/bn/bn_exp.c | 2 +-
 crypto/camellia/camellia.c | 2 +-
 crypto/ec/ectest.c | 2 +-
 demos/tunala/tunala.c  | 2 +-
 ssl/t1_enc.c   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c
index 14a3689..4839625 100644
--- a/crypto/bn/bn_exp.c
+++ b/crypto/bn/bn_exp.c
@@ -590,7 +590,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int 
top,
  * precomputation memory layout to limit data-dependency to a minimum to
  * protect secret exponents (cf. the hyper-threading timing attacks pointed
  * out by Colin Percival,
- * http://www.daemong-consideredperthreading-considered-harmful/)
+ * http://www.daemonology.net/hyperthreading-considered-harmful/)
  */
 int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
   const BIGNUM *m, BN_CTX *ctx,
diff --git a/crypto/camellia/camellia.c b/crypto/camellia/camellia.c
index 05887a9..719fa61 100644
--- a/crypto/camellia/camellia.c
+++ b/crypto/camellia/camellia.c
@@ -67,7 +67,7 @@
 
 /*
  * Algorithm Specification
- * http://info.isl.llia/specicrypt/eng/camellia/specifications.html
+ * http://info.isl.ntt.co.jp/crypt/eng/camellia/specifications.html
  */
 
 /*
diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c
index fede530..efab0b0 100644
--- a/crypto/ec/ectest.c
+++ b/crypto/ec/ectest.c
@@ -1591,7 +1591,7 @@ struct nistp_test_params {
 int degree;
 /*
  * Qx, Qy and D are taken from
- * 
http://csrcdocut.gov/groups/ST/toolkit/documents/Examples/ECDSA_Prime.pdf
+ * 
http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/ECDSA_Prime.pdf
  * Otherwise, values are standard curve parameters from FIPS 180-3
  */
 const char *p, *a, *b, *Qx, *Qy, *Gx, *Gy, *order, *d;
diff --git a/demos/tunala/tunala.c b/demos/tunala/tunala.c
index 11a7c5b..3ceea02 100644
--- a/demos/tunala/tunala.c
+++ b/demos/tunala/tunala.c
@@ -1154,7 +1154,7 @@ static int tunala_item_io(tunala_selector_t * selector, 
tunala_item_t * item)
 /*
  * This function name is attributed to the term donated by David Schwartz
  * on openssl-dev, message-ID:
- * . :-)
+ * . :-)
  */
 if (!state_machine_churn(>sm))
 /*
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 985356d..9786b26 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -1137,7 +1137,7 @@ int tls1_generate_master_secret(SSL *s, unsigned char 
*out, unsigned char *p,
 so = s->s3->server_opaque_prf_input;
 /*
  * must be same as col (see
- * draft-resc-00.txts-opaque-prf-input-00.txt, section 3.1)
+ * draft-rescorla-tls-opaque-prf-input-00.txt, section 3.1)
  */
 sol = s->s3->client_opaque_prf_input_len;
 }
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

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

2015-12-19 Thread Matt Caswell 
The branch OpenSSL_1_0_2-stable has been updated
   via  f6cadde13239127a2b58970124f4c1f3c217 (commit)
   via  dd045d17e711d5988eaac983eadf75e0ea04842d (commit)
  from  93a17f79b925e2d76bd38b3d0c3b199302c0ecfc (commit)


- Log -
commit f6cadde13239127a2b58970124f4c1f3c217
Author: Matt Caswell 
Date:   Sat Dec 19 14:42:06 2015 +

Fix more URLs mangled by reformat

Fix some more URLs mangled by indent in the reformat. These ones don't exist
in master so we have a separate commit. Based on a patch supplied by Arnaud
Lacombe 

Reviewed-by: Richard Levitte 

commit dd045d17e711d5988eaac983eadf75e0ea04842d
Author: Matt Caswell 
Date:   Sat Dec 19 14:38:17 2015 +

Fix URLs mangled by reformat

Some URLs in the source code ended up getting mangled by indent. This fixes
it. Based on a patch supplied by Arnaud Lacombe 

Reviewed-by: Richard Levitte 

---

Summary of changes:
 crypto/bn/bn_exp.c | 2 +-
 crypto/camellia/camellia.c | 2 +-
 crypto/ec/ectest.c | 2 +-
 demos/tunala/tunala.c  | 2 +-
 ssl/t1_enc.c   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c
index 98db765..6d30d1e 100644
--- a/crypto/bn/bn_exp.c
+++ b/crypto/bn/bn_exp.c
@@ -650,7 +650,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int 
top,
  * precomputation memory layout to limit data-dependency to a minimum to
  * protect secret exponents (cf. the hyper-threading timing attacks pointed
  * out by Colin Percival,
- * http://www.daemong-consideredperthreading-considered-harmful/)
+ * http://www.daemonology.net/hyperthreading-considered-harmful/)
  */
 int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
   const BIGNUM *m, BN_CTX *ctx,
diff --git a/crypto/camellia/camellia.c b/crypto/camellia/camellia.c
index 05887a9..719fa61 100644
--- a/crypto/camellia/camellia.c
+++ b/crypto/camellia/camellia.c
@@ -67,7 +67,7 @@
 
 /*
  * Algorithm Specification
- * http://info.isl.llia/specicrypt/eng/camellia/specifications.html
+ * http://info.isl.ntt.co.jp/crypt/eng/camellia/specifications.html
  */
 
 /*
diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c
index fede530..efab0b0 100644
--- a/crypto/ec/ectest.c
+++ b/crypto/ec/ectest.c
@@ -1591,7 +1591,7 @@ struct nistp_test_params {
 int degree;
 /*
  * Qx, Qy and D are taken from
- * 
http://csrcdocut.gov/groups/ST/toolkit/documents/Examples/ECDSA_Prime.pdf
+ * 
http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/ECDSA_Prime.pdf
  * Otherwise, values are standard curve parameters from FIPS 180-3
  */
 const char *p, *a, *b, *Qx, *Qy, *Gx, *Gy, *order, *d;
diff --git a/demos/tunala/tunala.c b/demos/tunala/tunala.c
index 11a7c5b..3ceea02 100644
--- a/demos/tunala/tunala.c
+++ b/demos/tunala/tunala.c
@@ -1154,7 +1154,7 @@ static int tunala_item_io(tunala_selector_t * selector, 
tunala_item_t * item)
 /*
  * This function name is attributed to the term donated by David Schwartz
  * on openssl-dev, message-ID:
- * . :-)
+ * . :-)
  */
 if (!state_machine_churn(>sm))
 /*
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index f46544b..514fcb3 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -1155,7 +1155,7 @@ int tls1_generate_master_secret(SSL *s, unsigned char 
*out, unsigned char *p,
 so = s->s3->server_opaque_prf_input;
 /*
  * must be same as col (see
- * draft-resc-00.txts-opaque-prf-input-00.txt, section 3.1)
+ * draft-rescorla-tls-opaque-prf-input-00.txt, section 3.1)
  */
 sol = s->s3->client_opaque_prf_input_len;
 }
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] [openssl] master update

2015-12-19 Thread Matt Caswell 
The branch master has been updated
   via  79caf5d32366df29f3a6f7371df27963d3943eaa (commit)
  from  7a64489f9eb9bf4964de2dc2df248453ee3cc84e (commit)


- Log -
commit 79caf5d32366df29f3a6f7371df27963d3943eaa
Author: Matt Caswell 
Date:   Sat Dec 19 14:38:17 2015 +

Fix URLs mangled by reformat

Some URLs in the source code ended up getting mangled by indent. This fixes
it. Based on a patch supplied by Arnaud Lacombe 

Reviewed-by: Richard Levitte 

---

Summary of changes:
 crypto/bn/bn_exp.c | 2 +-
 crypto/camellia/camellia.c | 2 +-
 test/ectest.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c
index e252593..e0db6c7 100644
--- a/crypto/bn/bn_exp.c
+++ b/crypto/bn/bn_exp.c
@@ -650,7 +650,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int 
top,
  * precomputation memory layout to limit data-dependency to a minimum to
  * protect secret exponents (cf. the hyper-threading timing attacks pointed
  * out by Colin Percival,
- * http://www.daemong-consideredperthreading-considered-harmful/)
+ * http://www.daemonology.net/hyperthreading-considered-harmful/)
  */
 int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
   const BIGNUM *m, BN_CTX *ctx,
diff --git a/crypto/camellia/camellia.c b/crypto/camellia/camellia.c
index cfbe9c6..5d0a3ce 100644
--- a/crypto/camellia/camellia.c
+++ b/crypto/camellia/camellia.c
@@ -67,7 +67,7 @@
 
 /*
  * Algorithm Specification
- * http://info.isl.llia/specicrypt/eng/camellia/specifications.html
+ * http://info.isl.ntt.co.jp/crypt/eng/camellia/specifications.html
  */
 
 /*
diff --git a/test/ectest.c b/test/ectest.c
index c8893f9..c6f1d7e 100644
--- a/test/ectest.c
+++ b/test/ectest.c
@@ -1412,7 +1412,7 @@ struct nistp_test_params {
 int degree;
 /*
  * Qx, Qy and D are taken from
- * 
http://csrcdocut.gov/groups/ST/toolkit/documents/Examples/ECDSA_Prime.pdf
+ * 
http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/ECDSA_Prime.pdf
  * Otherwise, values are standard curve parameters from FIPS 180-3
  */
 const char *p, *a, *b, *Qx, *Qy, *Gx, *Gy, *order, *d;
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] [openssl] master update

2015-12-19 Thread Dr . Stephen Henson 
The branch master has been updated
   via  74a62e9629b2d07360a62571ff3028c83b69b0d9 (commit)
  from  7795475f535e5368c20333903c1d2836f536115f (commit)


- Log -
commit 74a62e9629b2d07360a62571ff3028c83b69b0d9
Author: Dr. Stephen Henson 
Date:   Sat Dec 19 14:59:40 2015 +

delete unused context

Reviewed-by: Matt Caswell 

---

Summary of changes:
 ssl/statem/statem_srvr.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 0b279e7..014f211 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -2125,7 +2125,6 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL 
*s, PACKET *pkt)
 #endif
 #ifndef OPENSSL_NO_EC
 EVP_PKEY *ckey = NULL;
-EVP_PKEY_CTX *pctx = NULL;
 #endif
 PACKET enc_premaster;
 unsigned char *data, *rsa_decrypt = NULL;
@@ -2656,7 +2655,6 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL 
*s, PACKET *pkt)
 #endif
 #ifndef OPENSSL_NO_EC
 EVP_PKEY_free(ckey);
-EVP_PKEY_CTX_free(pctx);
 OPENSSL_free(rsa_decrypt);
 #endif
 #ifndef OPENSSL_NO_PSK
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits