[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Sat Mar 19 11:31:11 UTC 2016
The branch master has been updated
via c1e350577fe14e3e124cc258f742cb77a14b6ce8 (commit)
via 50bf25d2230dd0220c399a763cd26c5d7034b699 (commit)
via 41850f6bdc2f2ba3054e52064cc8f6ffb8ec36ae (commit)
via 5287761bfc34d32572b1acfd6e64fd8c0fb2f799 (commit)
via 243a98d4a03a411dfe6db727dbf90adbfa2e7474 (commit)
from ac89799c3e78e9af1031226eb2fd389a70ce3c1b (commit)
- Log -----------------------------------------------------------------
commit c1e350577fe14e3e124cc258f742cb77a14b6ce8
Author: Richard Levitte <levitte at openssl.org>
Date: Sat Mar 19 11:39:47 2016 +0100
Correct faulty L<> links in .pods
Closes RT#4450
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit 50bf25d2230dd0220c399a763cd26c5d7034b699
Author: Richard Levitte <levitte at openssl.org>
Date: Sat Mar 19 11:25:10 2016 +0100
Add a few more quotes for Windows (install_ssldirs)
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit 41850f6bdc2f2ba3054e52064cc8f6ffb8ec36ae
Author: Richard Levitte <levitte at openssl.org>
Date: Sat Mar 19 11:24:00 2016 +0100
The command source are files, not directories
Therefore, they should be concatenated with the source directory using
catfile(), not catdir()
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit 5287761bfc34d32572b1acfd6e64fd8c0fb2f799
Author: Richard Levitte <levitte at openssl.org>
Date: Sat Mar 19 11:18:56 2016 +0100
Replace sed command with perl
Some implementations of sed require a newline before an ending '}'.
The easier method is to replace that sed command with the
corresponding perl command.
Closes RT#4448
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit 243a98d4a03a411dfe6db727dbf90adbfa2e7474
Author: Richard Levitte <levitte at openssl.org>
Date: Sat Mar 19 11:15:00 2016 +0100
Clear the exit code from 'find' in 'make depend'
Depending on what has been built so far, all .d files may not be
present and 'find' will exit with non-zero exit code. This isn't a
bother for us but may break make, so clear the exit code with an added
'exit 0'.
Closes RT#4444
Reviewed-by: Rich Salz <rsalz at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configurations/unix-Makefile.tmpl | 8 ++++----
Configurations/windows-makefile.tmpl | 4 ++--
apps/build.info | 4 ++--
doc/crypto/EVP_EncryptInit.pod | 6 +++---
doc/crypto/X509_LOOKUP_hash_dir.pod | 2 +-
doc/ssl/SSL_CTX_set_read_ahead.pod | 2 +-
doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod | 9 +++++----
7 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index be42743..1923acc 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -260,7 +260,7 @@ clean: libclean
# concatenate only if that is true.
depend:
@: {- output_off() if $disabled{makedepend}; "" -}
- @if [ -z "`find $(DEPS) -newer Makefile 2>/dev/null`" ]; then \
+ @if [ -z "`find $(DEPS) -newer Makefile 2>/dev/null; exit 0`" ]; then \
( sed -e '/^# DO NOT DELETE THIS LINE.*/,$$d' < Makefile; \
echo '# DO NOT DELETE THIS LINE -- make depend depends on it.'; \
echo; \
@@ -492,11 +492,11 @@ uninstall_runtime:
# A method to extract all names from a .pod file
# The first sed extracts everything between "=head1 NAME" and the next =head1
-# The second sed joins all the lines into one
-# The third sed removes the description and turns all commas into spaces
+# The perl command joins all the lines into one
+# The second sed removes the description and turns all commas into spaces
# Voilà, you have a space separated list of names!
EXTRACT_NAMES=sed -e '1,/^=head1 *NAME *$$/d;/^=head1/,$$d' | \
- sed -e ':a;{N;s/\n/ /;ba}' | \
+ $(PERL) -p -0 -e 's/\n/ /g; END {print "\n"}' | \
sed -e 's/ - .*$$//;s/,/ /g'
PROCESS_PODS=\
set -e; \
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index f40404c..aea2693 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -176,8 +176,8 @@ install_docs:
uninstall_docs:
install_ssldirs:
- @$(PERL) $(SRCDIR)\util\mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)\certs
- @$(PERL) $(SRCDIR)\util\mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)\private
+ @$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\certs"
+ @$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\private"
install_dev:
@if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 )
diff --git a/apps/build.info b/apps/build.info
index 0d4aad3..12a1a7e 100644
--- a/apps/build.info
+++ b/apps/build.info
@@ -1,4 +1,4 @@
-{- use File::Spec::Functions qw/catdir rel2abs/;
+{- use File::Spec::Functions qw/catdir catfile rel2abs/;
our @cmd_srcs = (
"asn1pars.c", "ca.c", "ciphers.c", "cms.c", "crl.c", "crl2p7.c",
"dgst.c", "dhparam.c", "dsa.c", "dsaparam.c", "ec.c", "ecparam.c",
@@ -20,7 +20,7 @@ SOURCE[openssl]=\
{- $target{apps_aux_src} -}
DEPEND[openssl.o]=progs.h
DEPEND[progs.h]={- join(" ", @cmd_srcs); -} ../configdata.pm
-GENERATE[progs.h]=progs.pl {- join(" ", map { catdir($sourcedir, $_) } @cmd_srcs); -}
+GENERATE[progs.h]=progs.pl {- join(" ", map { catfile($sourcedir, $_) } @cmd_srcs); -}
INCLUDE[openssl]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
DEPEND[openssl]=../libssl
diff --git a/doc/crypto/EVP_EncryptInit.pod b/doc/crypto/EVP_EncryptInit.pod
index 1b39e83..b42b64c 100644
--- a/doc/crypto/EVP_EncryptInit.pod
+++ b/doc/crypto/EVP_EncryptInit.pod
@@ -384,13 +384,13 @@ bits and 12 rounds.
AES Galois Counter Mode (GCM) for 128, 192 and 256 bit keys respectively.
These ciphers require additional control operations to function correctly: see
-the L<GCM and OCB modes> section below for details.
+the L</GCM and OCB modes> section below for details.
=item EVP_aes_128_ocb(void), EVP_aes_192_ocb(void), EVP_aes_256_ocb(void)
Offest Codebook Mode (OCB) for 128, 192 and 256 bit keys respectively.
These ciphers require additional control operations to function correctly: see
-the L<GCM and OCB modes> section below for details.
+the L</GCM and OCB modes> section below for details.
=item EVP_aes_128_ccm(), EVP_aes_192_ccm(), EVP_aes_256_ccm()
@@ -441,7 +441,7 @@ length can only be set before specifying an IV. If not called a default tag
length is used. For OCB AES the default is 16 (i.e. 128 bits). This is also the
maximum tag length for OCB.
-See L<EXAMPLES> below for an example of the use of GCM mode.
+See L</EXAMPLES> below for an example of the use of GCM mode.
=head1 CCM Mode
diff --git a/doc/crypto/X509_LOOKUP_hash_dir.pod b/doc/crypto/X509_LOOKUP_hash_dir.pod
index e863ab5..dfb9e21 100644
--- a/doc/crypto/X509_LOOKUP_hash_dir.pod
+++ b/doc/crypto/X509_LOOKUP_hash_dir.pod
@@ -47,7 +47,7 @@ B<X509_load_cert_file>.
Constant B<FILETYPE_DEFAULT> with NULL filename causes these functions
to load default certificate store file (see
-L<X509_STORE_set_default_paths>.
+L<X509_STORE_set_default_paths(3)>.
Functions return number of objects loaded from file or 0 in case of
diff --git a/doc/ssl/SSL_CTX_set_read_ahead.pod b/doc/ssl/SSL_CTX_set_read_ahead.pod
index f7d8c43..771d59d 100644
--- a/doc/ssl/SSL_CTX_set_read_ahead.pod
+++ b/doc/ssl/SSL_CTX_set_read_ahead.pod
@@ -39,7 +39,7 @@ ahead has been set or not.
These functions have no impact when used with DTLS. The return values for
SSL_CTX_get_read_head() and SSL_get_read_ahead() are undefined for DTLS. Setting
B<read_ahead> can impact the behaviour of the SSL_pending() function
-(see L<SSL_pending()>).
+(see L<SSL_pending(3)>).
=head1 RETURN VALUES
diff --git a/doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod b/doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod
index e8b973f..b660b21 100644
--- a/doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod
+++ b/doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod
@@ -49,11 +49,12 @@ I<iv>, and set the cipher context I<ctx> and the hash context I<hctx>.
The I<name> is 16 characters long and is used as a key identifier.
The I<iv> length is the length of the IV of the corresponding cipher. The
-maximum IV length is L<EVP_MAX_IV_LENGTH> bytes defined in B<evp.h>.
+maximum IV length is B<EVP_MAX_IV_LENGTH> bytes defined in B<evp.h>.
The initialization vector I<iv> should be a random value. The cipher context
I<ctx> should use the initialisation vector I<iv>. The cipher context can be
-set using L<EVP_EncryptInit_ex>. The hmac context can be set using L<HMAC_Init_ex>.
+set using L<EVP_EncryptInit_ex(3)>. The hmac context can be set using
+L<HMAC_Init_ex(3)>.
When the client presents a session ticket, the callback function with be called
with I<enc> set to 0 indicating that the I<cb> function should retrieve a set
@@ -61,8 +62,8 @@ of parameters. In this case I<name> and I<iv> have already been parsed out of
the session ticket. The OpenSSL library expects that the I<name> will be used
to retrieve a cryptographic parameters and that the cryptographic context
I<ctx> will be set with the retrieved parameters and the initialization vector
-I<iv>. using a function like L<EVP_DecryptInit_ex>. The I<hctx> needs to be set
-using L<HMAC_Init_ex>.
+I<iv>. using a function like L<EVP_DecryptInit_ex(3)>. The I<hctx> needs to be
+set using L<HMAC_Init_ex(3)>.
If the I<name> is still valid but a renewal of the ticket is required the
callback function should return 2. The library will call the callback again
More information about the openssl-commits
mailing list