Mercurial > mxe-octave

changeset 3771:09ad2f46e0b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
openssl: update to 1.0.1k * src/openssl.mk: update version, checksum * src/openssl-1-fixes.patch: update patch from mxe.cc (devel)
author John Donoghue
date Thu, 15 Jan 2015 09:29:55 -0500
parents 060aed5d3c5a
children 078b47125239
files src/openssl-1-fixes.patch src/openssl.mk
diffstat 2 files changed, 110 insertions(+), 110 deletions(-) [+]
line wrap: on
line diff
--- a/src/openssl-1-fixes.patch	Thu Jan 15 09:29:53 2015 -0500
+++ b/src/openssl-1-fixes.patch	Thu Jan 15 09:29:55 2015 -0500
@@ -1,7 +1,7 @@
 This file is part of MXE.
 See index.html for further information.
 
-From bcc4a04e2289162279398e83567807fb1c63d2aa Mon Sep 17 00:00:00 2001
+From 27c7c56780a801db21ba49139239ecafd0e8fb88 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Wed, 8 Jan 2014 02:19:10 +0100
 Subject: [PATCH 1/2] winsock2
@@ -52,7 +52,7 @@
 1.8.4.5
 
 
-From 9c0520aa6090f3734b34ccbfc55c3dabe0a61dc7 Mon Sep 17 00:00:00 2001
+From 8f930a5f4b18990cf24383fde0e493afbb240c8b Mon Sep 17 00:00:00 2001
 From: Tom Molesworth <tom@entitymodel.com>
 Date: Wed, 8 Jan 2014 02:20:21 +0100
 Subject: [PATCH 2/2] Patch OpenSSL POD docs for perl-5.16+
@@ -63,80 +63,80 @@
 Should be harmless for earlier versions of perl.
 
 diff --git a/doc/apps/cms.pod b/doc/apps/cms.pod
-index a09588a..104b01f 100644
+index a76b3e0..9a05fa4 100644
 --- a/doc/apps/cms.pod
 +++ b/doc/apps/cms.pod
-@@ -450,28 +450,28 @@ remains DER.
+@@ -465,28 +465,28 @@ with caution. For a fuller description see L<CMS_decrypt(3)|CMS_decrypt(3)>).
  
  =over 4
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
  the operation was completely successfully.
  
--=item 1 
-+=item * 1
+-=item Z<>1
++=item * Z<>1
  
  an error occurred parsing the command options.
  
--=item 2
-+=item * 2
+-=item Z<>2
++=item * Z<>2
  
  one of the input files could not be read.
  
--=item 3
-+=item * 3
+-=item Z<>3
++=item * Z<>3
  
  an error occurred creating the CMS file or when reading the MIME
  message.
  
--=item 4
-+=item * 4
+-=item Z<>4
++=item * Z<>4
  
  an error occurred decrypting or verifying the message.
  
--=item 5
-+=item * 5
+-=item Z<>5
++=item * Z<>5
  
  the message was verified correctly but an error occurred writing out
  the signers certificates.
 diff --git a/doc/apps/smime.pod b/doc/apps/smime.pod
-index e4e89af..0267358 100644
+index d39a59a..1a5cfa6 100644
 --- a/doc/apps/smime.pod
 +++ b/doc/apps/smime.pod
 @@ -308,28 +308,28 @@ remains DER.
  
  =over 4
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
  the operation was completely successfully.
  
--=item 1 
-+=item * 1
+-=item Z<>1
++=item * Z<>1
  
  an error occurred parsing the command options.
  
--=item 2
-+=item * 2
+-=item Z<>2
++=item * Z<>2
  
  one of the input files could not be read.
  
--=item 3
-+=item * 3
+-=item Z<>3
++=item * Z<>3
  
  an error occurred creating the PKCS#7 file or when reading the MIME
  message.
  
--=item 4
-+=item * 4
+-=item Z<>4
++=item * Z<>4
  
  an error occurred decrypting or verifying the message.
  
--=item 5
-+=item * 5
+-=item Z<>5
++=item * Z<>5
  
  the message was verified correctly but an error occurred writing out
  the signers certificates.
@@ -196,123 +196,123 @@
  Given the random number output stream, it should not be possible to determine
  the RNG state or the next random number.
 diff --git a/doc/ssl/SSL_COMP_add_compression_method.pod b/doc/ssl/SSL_COMP_add_compression_method.pod
-index 42fa66b..d531299 100644
+index f4d191c..5f2a3f1 100644
 --- a/doc/ssl/SSL_COMP_add_compression_method.pod
 +++ b/doc/ssl/SSL_COMP_add_compression_method.pod
 @@ -53,11 +53,11 @@ SSL_COMP_add_compression_method() may return the following values:
  
  =over 4
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
  The operation succeeded.
  
--=item 1
-+=item * 1
+-=item Z<>1
++=item * Z<>1
  
  The operation failed. Check the error queue to find out the reason.
  
 diff --git a/doc/ssl/SSL_CTX_add_session.pod b/doc/ssl/SSL_CTX_add_session.pod
-index 82676b2..88ee952 100644
+index 8e0abd3..f5a487c 100644
 --- a/doc/ssl/SSL_CTX_add_session.pod
 +++ b/doc/ssl/SSL_CTX_add_session.pod
 @@ -52,13 +52,13 @@ The following values are returned by all functions:
  
  =over 4
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
   The operation failed. In case of the add operation, it was tried to add
   the same (identical) session twice. In case of the remove operation, the
   session was not found in the cache.
  
--=item 1
-+=item * 1
+-=item Z<>1
++=item * Z<>1
   
   The operation succeeded.
  
 diff --git a/doc/ssl/SSL_CTX_load_verify_locations.pod b/doc/ssl/SSL_CTX_load_verify_locations.pod
-index 84a799f..66031d4 100644
+index d1d8977..449c8c9 100644
 --- a/doc/ssl/SSL_CTX_load_verify_locations.pod
 +++ b/doc/ssl/SSL_CTX_load_verify_locations.pod
 @@ -100,13 +100,13 @@ The following return values can occur:
  
  =over 4
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
  The operation failed because B<CAfile> and B<CApath> are NULL or the
  processing at one of the locations specified failed. Check the error
  stack to find out the reason.
  
--=item 1
-+=item * 1
+-=item Z<>1
++=item * Z<>1
  
  The operation succeeded.
  
 diff --git a/doc/ssl/SSL_CTX_set_client_CA_list.pod b/doc/ssl/SSL_CTX_set_client_CA_list.pod
-index 5e66133..2874fb8 100644
+index 5e97392..6b04440 100644
 --- a/doc/ssl/SSL_CTX_set_client_CA_list.pod
 +++ b/doc/ssl/SSL_CTX_set_client_CA_list.pod
 @@ -66,13 +66,13 @@ values:
  
  =over 4
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
  A failure while manipulating the STACK_OF(X509_NAME) object occurred or
  the X509_NAME could not be extracted from B<cacert>. Check the error stack
  to find out the reason.
  
--=item 1
-+=item * 1
+-=item Z<>1
++=item * Z<>1
  
  The operation succeeded.
  
 diff --git a/doc/ssl/SSL_CTX_set_session_id_context.pod b/doc/ssl/SSL_CTX_set_session_id_context.pod
-index 58fc685..a2a8932 100644
+index 7c9e515..ea36746 100644
 --- a/doc/ssl/SSL_CTX_set_session_id_context.pod
 +++ b/doc/ssl/SSL_CTX_set_session_id_context.pod
 @@ -64,13 +64,13 @@ return the following values:
  
  =over 4
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
  The length B<sid_ctx_len> of the session id context B<sid_ctx> exceeded
  the maximum allowed length of B<SSL_MAX_SSL_SESSION_ID_LENGTH>. The error
  is logged to the error stack.
  
--=item 1
-+=item * 1
+-=item Z<>1
++=item * Z<>1
  
  The operation succeeded.
  
 diff --git a/doc/ssl/SSL_CTX_set_ssl_version.pod b/doc/ssl/SSL_CTX_set_ssl_version.pod
-index 254f2b4..4714cfd 100644
+index e254f96..c15f86e 100644
 --- a/doc/ssl/SSL_CTX_set_ssl_version.pod
 +++ b/doc/ssl/SSL_CTX_set_ssl_version.pod
 @@ -42,11 +42,11 @@ and SSL_set_ssl_method():
  
  =over 4
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
  The new choice failed, check the error stack to find out the reason.
  
--=item 1
-+=item * 1
+-=item Z<>1
++=item * Z<>1
  
  The operation succeeded.
  
 diff --git a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
-index 7e60df5..77e2139 100644
+index 9da7201..a60d041 100644
 --- a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
 +++ b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
 @@ -83,7 +83,7 @@ Return values from the server callback are interpreted as follows:
@@ -328,28 +328,28 @@
  connection will fail with decryption_error before it will be finished
  completely.
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
  PSK identity was not found. An "unknown_psk_identity" alert message
  will be sent and the connection setup fails.
 diff --git a/doc/ssl/SSL_accept.pod b/doc/ssl/SSL_accept.pod
-index b1c34d1..b8a2c17 100644
+index 2239444..5e032e6 100644
 --- a/doc/ssl/SSL_accept.pod
 +++ b/doc/ssl/SSL_accept.pod
 @@ -44,18 +44,18 @@ The following return values can occur:
  
  =over 4
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
  The TLS/SSL handshake was not successful but was shut down controlled and
  by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
  return value B<ret> to find out the reason.
  
--=item 1
-+=item * 1
+-=item Z<>1
++=item * Z<>1
  
  The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
  established.
@@ -360,41 +360,41 @@
  The TLS/SSL handshake was not successful because a fatal error occurred either
  at the protocol level or a connection failure occurred. The shutdown was
 diff --git a/doc/ssl/SSL_clear.pod b/doc/ssl/SSL_clear.pod
-index d4df1bf..d2830ad 100644
+index ba192bd..479f97f 100644
 --- a/doc/ssl/SSL_clear.pod
 +++ b/doc/ssl/SSL_clear.pod
 @@ -56,12 +56,12 @@ The following return values can occur:
  
  =over 4
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
  The SSL_clear() operation could not be performed. Check the error stack to
  find out the reason.
  
--=item 1
-+=item * 1
+-=item Z<>1
++=item * Z<>1
  
  The SSL_clear() operation was successful.
  
 diff --git a/doc/ssl/SSL_connect.pod b/doc/ssl/SSL_connect.pod
-index 946ca89..792821e 100644
+index 68e2b82..52c4aa9 100644
 --- a/doc/ssl/SSL_connect.pod
 +++ b/doc/ssl/SSL_connect.pod
 @@ -41,18 +41,18 @@ The following return values can occur:
  
  =over 4
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
  The TLS/SSL handshake was not successful but was shut down controlled and
  by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
  return value B<ret> to find out the reason.
  
--=item 1
-+=item * 1
+-=item Z<>1
++=item * Z<>1
  
  The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
  established.
@@ -405,22 +405,22 @@
  The TLS/SSL handshake was not successful, because a fatal error occurred either
  at the protocol level or a connection failure occurred. The shutdown was
 diff --git a/doc/ssl/SSL_do_handshake.pod b/doc/ssl/SSL_do_handshake.pod
-index 7f8cf24..c46d18d 100644
+index b35ddf5..871f15c 100644
 --- a/doc/ssl/SSL_do_handshake.pod
 +++ b/doc/ssl/SSL_do_handshake.pod
 @@ -45,18 +45,18 @@ The following return values can occur:
  
  =over 4
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
  The TLS/SSL handshake was not successful but was shut down controlled and
  by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
  return value B<ret> to find out the reason.
  
--=item 1
-+=item * 1
+-=item Z<>1
++=item * Z<>1
  
  The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
  established.
@@ -468,7 +468,7 @@
  The file descriptor linked to B<ssl>.
  
 diff --git a/doc/ssl/SSL_read.pod b/doc/ssl/SSL_read.pod
-index 7038cd2..2f5a638 100644
+index 8ca0ce5..14c472f 100644
 --- a/doc/ssl/SSL_read.pod
 +++ b/doc/ssl/SSL_read.pod
 @@ -81,12 +81,12 @@ The following return values can occur:
@@ -481,8 +481,8 @@
  The read operation was successful; the return value is the number of
  bytes actually read from the TLS/SSL connection.
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
  The read operation was not successful. The reason may either be a clean
  shutdown due to a "close notify" alert sent by the peer (in which case
@@ -496,56 +496,56 @@
  The read operation was not successful, because either an error occurred
  or action must be taken by the calling process. Call SSL_get_error() with the
 diff --git a/doc/ssl/SSL_session_reused.pod b/doc/ssl/SSL_session_reused.pod
-index da7d062..e124630 100644
+index b09d8a7..7f49da1 100644
 --- a/doc/ssl/SSL_session_reused.pod
 +++ b/doc/ssl/SSL_session_reused.pod
 @@ -27,11 +27,11 @@ The following return values can occur:
  
  =over 4
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
  A new session was negotiated.
  
--=item 1
-+=item * 1
+-=item Z<>1
++=item * Z<>1
  
  A session was reused.
  
 diff --git a/doc/ssl/SSL_set_fd.pod b/doc/ssl/SSL_set_fd.pod
-index 7029112..0baafed 100644
+index 1480871..bfc39ed 100644
 --- a/doc/ssl/SSL_set_fd.pod
 +++ b/doc/ssl/SSL_set_fd.pod
 @@ -35,11 +35,11 @@ The following return values can occur:
  
  =over 4
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
  The operation failed. Check the error stack to find out why.
  
--=item 1
-+=item * 1
+-=item Z<>1
++=item * Z<>1
  
  The operation succeeded.
  
 diff --git a/doc/ssl/SSL_set_session.pod b/doc/ssl/SSL_set_session.pod
-index 5f54714..3b2d850 100644
+index 197b521..fbdee4c 100644
 --- a/doc/ssl/SSL_set_session.pod
 +++ b/doc/ssl/SSL_set_session.pod
 @@ -37,11 +37,11 @@ The following return values can occur:
  
  =over 4
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
  The operation failed; check the error stack to find out the reason.
  
--=item 1
-+=item * 1
+-=item Z<>1
++=item * Z<>1
  
  The operation succeeded.
  
@@ -574,23 +574,23 @@
  A shutdown alert was received form the peer, either a normal "close notify"
  or a fatal error.
 diff --git a/doc/ssl/SSL_shutdown.pod b/doc/ssl/SSL_shutdown.pod
-index 42a89b7..2853e65 100644
+index 85d4a64..9fe029b 100644
 --- a/doc/ssl/SSL_shutdown.pod
 +++ b/doc/ssl/SSL_shutdown.pod
 @@ -92,19 +92,19 @@ The following return values can occur:
  
  =over 4
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
  The shutdown is not yet finished. Call SSL_shutdown() for a second time,
  if a bidirectional shutdown shall be performed.
  The output of L<SSL_get_error(3)|SSL_get_error(3)> may be misleading, as an
  erroneous SSL_ERROR_SYSCALL may be flagged even though no error occurred.
  
--=item 1
-+=item * 1
+-=item Z<>1
++=item * Z<>1
  
  The shutdown was successfully completed. The "close notify" alert was sent
  and the peer's "close notify" alert was received.
@@ -601,7 +601,7 @@
  The shutdown was not successful because a fatal error occurred either
  at the protocol level or a connection failure occurred. It can also occur if
 diff --git a/doc/ssl/SSL_write.pod b/doc/ssl/SSL_write.pod
-index e013c12..a10e46f 100644
+index a57617f..70c1630 100644
 --- a/doc/ssl/SSL_write.pod
 +++ b/doc/ssl/SSL_write.pod
 @@ -74,12 +74,12 @@ The following return values can occur:
@@ -614,8 +614,8 @@
  The write operation was successful, the return value is the number of
  bytes actually written to the TLS/SSL connection.
  
--=item 0
-+=item * 0
+-=item Z<>0
++=item * Z<>0
  
  The write operation was not successful. Probably the underlying connection
  was closed. Call SSL_get_error() with the return value B<ret> to find out,
--- a/src/openssl.mk	Thu Jan 15 09:29:53 2015 -0500
+++ b/src/openssl.mk	Thu Jan 15 09:29:55 2015 -0500
@@ -3,8 +3,8 @@
 
 PKG             := openssl
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.1g
-$(PKG)_CHECKSUM := b28b3bcb1dc3ee7b55024c9f795be60eb3183e3c
+$(PKG)_VERSION  := 1.0.1k
+$(PKG)_CHECKSUM := 19d818e202558c212a9583fcdaf876995a633ddf
 $(PKG)_SUBDIR   := openssl-$($(PKG)_VERSION)
 $(PKG)_FILE     := openssl-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.openssl.org/source/$($(PKG)_FILE)