Date: Sun, 25 Aug 2013 02:04:34 GMT From: David Gessel <gessel@blackrosetech.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/181514: OpenSSL 1.0.1e Patch to fix pod2man syntax error with Perl 5.18 Message-ID: <201308250204.r7P24YBP012656@oldred.freebsd.org> Resent-Message-ID: <201308250210.r7P2A1Wh043245@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 181514 >Category: ports >Synopsis: OpenSSL 1.0.1e Patch to fix pod2man syntax error with Perl 5.18 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: doc-bug >Submitter-Id: current-users >Arrival-Date: Sun Aug 25 02:10:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: David Gessel >Release: FreeBSD 9.1-RELEASE #0 r254759 >Organization: Black Rose Technology >Environment: FreeBSD 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r254759: Sat Aug 24 12:14:07 PDT 2013 root@blackrosetech.com:/usr/obj/usr/src/sys/BARCELONA-13-08 amd64 >Description: Building openssl-1.0.1e with Perl 5.18 installed results in errors due to changes in Pod::Simple 3.24(+). Russ Allbery noted that: "if you want a numeric argument to =item to be parsed as a description list title instead, you have to do something to make it not a number. The easiest thing to do is prepend or postpend Z<>, although wrapping the number in C<> will also do it" Some pod files do not conform to this convention, including those in the current port version of openssl, 1.0.1e (and presumably, but untested, earlier versions). >How-To-Repeat: Install Perl 5.18+, make openSSL-1.0.1e >Fix: Patches to the .pod files to conform them to the current syntax result in successful make and install. Patches were posted to http://www.linuxfromscratch.org/blfs/view/svn/postlfs/openssl.html. These have been modified and attached to match the format in the patch to cms.pod by cpu82 and appear to be successful. Patch attached with submission follows: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # openssl_1.0.1e-perl5.18-patch.txt # patch-Configure # patch-RFC-5705 # patch-SSL_COMP_add_compression_method # patch-SSL_CTX_add_session # patch-SSL_CTX_load_verify_locations # patch-SSL_CTX_set_client_CA_list # patch-SSL_CTX_set_session_id_context # patch-SSL_CTX_set_ssl_version # patch-SSL_CTX_use_psk_identity_hint # patch-SSL_accept # patch-SSL_clear # patch-SSL_connect # patch-SSL_do_handshake # patch-SSL_read # patch-SSL_session_reused # patch-SSL_set_fd # patch-SSL_set_session # patch-SSL_shutdown # patch-SSL_write # patch-X509_STORE_CTX_get_error # patch-ad # patch-ak # patch-cms # patch-config # patch-openbsd_hw.c # patch-smime # patch-ssl-srtp.h # pkg-message.in # echo x - openssl_1.0.1e-perl5.18-patch.txt sed 's/^X//' >openssl_1.0.1e-perl5.18-patch.txt << '22b63ddb642ceef73d2edbeaa3164b57' X# This is a shell archive. Save it in a file, remove anything before X# this line, and then unpack it by entering "sh file". Note, it may X# create directories; files and directories will be owned by you and X# have default permissions. X# X# This archive contains: X# X# openssl_1.0.1e-perl5.18-patch.txt X# patch-Configure X# patch-RFC-5705 X# patch-SSL_COMP_add_compression_method X# patch-SSL_CTX_add_session X# patch-SSL_CTX_load_verify_locations X# patch-SSL_CTX_set_client_CA_list X# patch-SSL_CTX_set_session_id_context X# patch-SSL_CTX_set_ssl_version X# patch-SSL_CTX_use_psk_identity_hint X# patch-SSL_accept X# patch-SSL_clear X# patch-SSL_connect X# patch-SSL_do_handshake X# patch-SSL_read X# patch-SSL_session_reused X# patch-SSL_set_fd X# patch-SSL_set_session X# patch-SSL_shutdown X# patch-SSL_write X# patch-X509_STORE_CTX_get_error X# patch-ad X# patch-ak X# patch-cms X# patch-config X# patch-openbsd_hw.c X# patch-smime X# patch-ssl-srtp.h X# pkg-message.in X# Xecho x - openssl_1.0.1e-perl5.18-patch.txt Xsed 's/^X//' >openssl_1.0.1e-perl5.18-patch.txt << '22b63ddb642ceef73d2edbeaa3164b57' 22b63ddb642ceef73d2edbeaa3164b57 echo x - patch-Configure sed 's/^X//' >patch-Configure << '33b35c6ded482ced3b2dd3b8da167877' X--- Configure.orig 2012-03-03 14:18:06.000000000 +0100 X+++ Configure 2012-03-25 19:22:16.000000000 +0200 X@@ -150,7 +150,7 @@ X # which has to be accompanied by explicit -D_THREAD_SAFE and X # sometimes -D_REENTRANT. FreeBSD 5.x expands it as -lc_r, which X # seems to be sufficient? X-my $BSDthreads="-pthread -D_THREAD_SAFE -D_REENTRANT"; X+my $BSDthreads="$ENV{'PTHREAD_LIBS'} -D_REENTRANT $ENV{'PTHREAD_CFLAGS'}"; X X #config-string $cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $des_obj : $aes_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $wp_obj : $cmll_obj : $modes_obj : $engines_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags : $multilib X X@@ -407,19 +407,20 @@ X "android-armv7","gcc:-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", X X #### *BSD [do see comment about ${BSDthreads} above!] X-"BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", X-"BSD-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", X-"BSD-x86-elf", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", X-"debug-BSD-x86-elf", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", X-"BSD-sparcv8", "gcc:-DB_ENDIAN -DTERMIOS -O3 -mv8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", X+"BSD-generic32","$ENV{'FREEBSDCC'}:-DTERMIOS -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", X+"BSD-x86", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)", X+"BSD-x86-elf", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)", X+"debug-BSD-x86-elf", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -Wall -g $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)", X+"BSD-sparcv8", "$ENV{'FREEBSDCC'}:-DB_ENDIAN -DTERMIOS -O3 -mv8 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", X X-"BSD-generic64","gcc:-DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", X+"BSD-generic64","$ENV{'FREEBSDCC'}:-DTERMIOS -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", X # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it X # simply *happens* to work around a compiler bug in gcc 3.3.3, X # triggered by RIPEMD160 code. X-"BSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", X-"BSD-ia64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", X-"BSD-x86_64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", X+"BSD-sparc64", "$ENV{'FREEBSDCC'}:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", X+"BSD-ia64", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", X+"BSD-x86_64", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", X+"BSD-alpha", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", X X "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", X 33b35c6ded482ced3b2dd3b8da167877 echo x - patch-RFC-5705 sed 's/^X//' >patch-RFC-5705 << 'bb88e45eca071bd44abb54ffe7c0fa05' X--- ssl/ssl.h 6 Jan 2010 17:37:38 -0000 1.221.2.24 X+++ ssl/ssl.h 17 Jun 2010 12:25:35 -0000 X@@ -1806,6 +1806,10 @@ X /* Pre-shared secret session resumption functions */ X int SSL_set_session_secret_cb(SSL *s, tls_session_secret_cb_fn tls_session_secret_cb, void *arg); X X+void SSL_tls1_key_exporter(SSL *s, unsigned char *label, int label_len, X+ unsigned char *context, int context_len, X+ unsigned char *out, int olen); X+ X /* BEGIN ERROR CODES */ X /* The following lines are auto generated by the script mkerr.pl. Any changes X * made after this point may be overwritten when the script is next run. X X--- ssl/t1_enc.c 15 Jun 2010 17:25:15 -0000 1.57.2.3 X+++ ssl/t1_enc.c 17 Jun 2010 12:25:35 -0000 X@@ -1043,3 +1043,17 @@ X } X } X X+void SSL_tls1_key_exporter(SSL *s, unsigned char *label, int label_len, X+ unsigned char *context, int context_len, X+ unsigned char *out, int olen) X+ { X+ unsigned char tmp[olen]; X+ X+ tls1_PRF(s->s3->tmp.new_cipher->algorithm2, X+ label, label_len, X+ s->s3->client_random,SSL3_RANDOM_SIZE, X+ s->s3->server_random,SSL3_RANDOM_SIZE, X+ context, context_len, NULL, 0, X+ s->session->master_key, s->session->master_key_length, X+ out, tmp, olen); X+ } bb88e45eca071bd44abb54ffe7c0fa05 echo x - patch-SSL_COMP_add_compression_method sed 's/^X//' >patch-SSL_COMP_add_compression_method << '26d4b13b1dd35fd93e9bfbb2212d24ad' X--- doc/ssl/SSL_COMP_add_compression_method.pod.orig 2013-06-06 14:35:15.870871842 +0100 X+++ doc/ssl/SSL_COMP_add_compression_method.pod 2013-06-06 14:35:25.806746931 +0100 X@@ -53,11 +53,11 @@ X X =over 4 X X-=item 0 X+=item C<0> X X The operation succeeded. X X-=item 1 X+=item C<1> X X The operation failed. Check the error queue to find out the reason. X 26d4b13b1dd35fd93e9bfbb2212d24ad echo x - patch-SSL_CTX_add_session sed 's/^X//' >patch-SSL_CTX_add_session << '73610eb50fa21c4d0b4d852138991dd9' X--- doc/ssl/SSL_CTX_add_session.pod.orig 2013-06-06 14:35:15.871871829 +0100 X+++ doc/ssl/SSL_CTX_add_session.pod 2013-06-06 14:35:25.816746805 +0100 X@@ -52,13 +52,13 @@ X X =over 4 X X-=item 0 X+=item C<0> X X The operation failed. In case of the add operation, it was tried to add X the same (identical) session twice. In case of the remove operation, the X session was not found in the cache. X X-=item 1 X+=item C<1> X X The operation succeeded. X 73610eb50fa21c4d0b4d852138991dd9 echo x - patch-SSL_CTX_load_verify_locations sed 's/^X//' >patch-SSL_CTX_load_verify_locations << 'd07989227ac0ea74003848b98e3639b9' X--- doc/ssl/SSL_CTX_load_verify_locations.pod.orig 2013-06-06 14:35:15.870871842 +0100 X+++ doc/ssl/SSL_CTX_load_verify_locations.pod 2013-06-06 14:35:25.818746780 +0100 X@@ -100,13 +100,13 @@ X X =over 4 X X-=item 0 X+=item C<0> X X The operation failed because B<CAfile> and B<CApath> are NULL or the X processing at one of the locations specified failed. Check the error X stack to find out the reason. X X-=item 1 X+=item C<1> X X The operation succeeded. X d07989227ac0ea74003848b98e3639b9 echo x - patch-SSL_CTX_set_client_CA_list sed 's/^X//' >patch-SSL_CTX_set_client_CA_list << '93bdcadaa890113158ae5c9d9a9e0180' X--- doc/ssl/SSL_CTX_set_client_CA_list.pod.orig 2013-06-06 14:35:15.871871829 +0100 X+++ doc/ssl/SSL_CTX_set_client_CA_list.pod 2013-06-06 14:35:25.821746742 +0100 X@@ -66,11 +66,11 @@ X X =over 4 X X-=item 1 X+=item C<1> X X The operation succeeded. X X-=item 0 X+=item C<0> X X A failure while manipulating the STACK_OF(X509_NAME) object occurred or X the X509_NAME could not be extracted from B<cacert>. Check the error stack 93bdcadaa890113158ae5c9d9a9e0180 echo x - patch-SSL_CTX_set_session_id_context sed 's/^X//' >patch-SSL_CTX_set_session_id_context << '97e4b79ce8aa5bd89cd3515bfa18c7b0' X--- doc/ssl/SSL_CTX_set_session_id_context.pod.orig 2013-06-06 14:35:15.871871829 +0100 X+++ doc/ssl/SSL_CTX_set_session_id_context.pod 2013-06-06 14:35:25.828746654 +0100 X@@ -64,13 +64,13 @@ X X =over 4 X X-=item 0 X+=item C<0> X X The length B<sid_ctx_len> of the session id context B<sid_ctx> exceeded X the maximum allowed length of B<SSL_MAX_SSL_SESSION_ID_LENGTH>. The error X is logged to the error stack. X X-=item 1 X+=item C<1> X X The operation succeeded. X 97e4b79ce8aa5bd89cd3515bfa18c7b0 echo x - patch-SSL_CTX_set_ssl_version sed 's/^X//' >patch-SSL_CTX_set_ssl_version << 'd5dd7ba8649d8a217b7aa8aa34715496' X--- doc/ssl/SSL_CTX_set_ssl_version.pod.orig 2013-06-06 14:35:15.871871829 +0100 X+++ doc/ssl/SSL_CTX_set_ssl_version.pod 2013-06-06 14:35:25.831746617 +0100 X@@ -42,11 +42,11 @@ X X =over 4 X X-=item 0 X+=item C<0> X X The new choice failed, check the error stack to find out the reason. X X-=item 1 X+=item C<1> X X The operation succeeded. X d5dd7ba8649d8a217b7aa8aa34715496 echo x - patch-SSL_CTX_use_psk_identity_hint sed 's/^X//' >patch-SSL_CTX_use_psk_identity_hint << 'd1fb780423cdb6b5983832eab1f07b11' X--- doc/ssl/SSL_CTX_use_psk_identity_hint.pod.orig 2013-06-06 14:35:15.870871842 +0100 X+++ doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2013-06-06 14:36:42.456783309 +0100 X@@ -81,6 +81,8 @@ X X Return values from the server callback are interpreted as follows: X X+=over X+ X =item > 0 X X PSK identity was found and the server callback has provided the PSK X@@ -94,9 +96,11 @@ X connection will fail with decryption_error before it will be finished X completely. X X-=item 0 X+=item C<0> X X PSK identity was not found. An "unknown_psk_identity" alert message X will be sent and the connection setup fails. X X+=back X+ X =cut d1fb780423cdb6b5983832eab1f07b11 echo x - patch-SSL_accept sed 's/^X//' >patch-SSL_accept << '003094ac3d923e0f5f7b195fd2caafac' X--- doc/ssl/SSL_accept.pod.orig 2013-06-06 14:35:15.871871829 +0100 X+++ doc/ssl/SSL_accept.pod 2013-06-06 14:35:25.796747057 +0100 X@@ -44,12 +44,12 @@ X X =over 4 X X-=item 1 X+=item C<1> X X The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been X established. X X-=item 0 X+=item C<0> X X The TLS/SSL handshake was not successful but was shut down controlled and X by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the 003094ac3d923e0f5f7b195fd2caafac echo x - patch-SSL_clear sed 's/^X//' >patch-SSL_clear << '574a7d02b9518711a5f2eb19374afaef' X--- doc/ssl/SSL_clear.pod.orig 2013-06-06 14:35:15.871871829 +0100 X+++ doc/ssl/SSL_clear.pod 2013-06-06 14:35:25.803746969 +0100 X@@ -56,12 +56,12 @@ X X =over 4 X X-=item 0 X+=item C<0> X X The SSL_clear() operation could not be performed. Check the error stack to X find out the reason. X X-=item 1 X+=item C<1> X X The SSL_clear() operation was successful. X 574a7d02b9518711a5f2eb19374afaef echo x - patch-SSL_connect sed 's/^X//' >patch-SSL_connect << '40166cd0dc851ea9b4620d8e13bfd3c9' X--- doc/ssl/SSL_connect.pod.orig 2013-06-06 14:35:15.869871854 +0100 X+++ doc/ssl/SSL_connect.pod 2013-06-06 14:35:25.808746906 +0100 X@@ -41,12 +41,12 @@ X X =over 4 X X-=item 1 X+=item C<1> X X The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been X established. X X-=item 0 X+=item C<0> X X The TLS/SSL handshake was not successful but was shut down controlled and X by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the 40166cd0dc851ea9b4620d8e13bfd3c9 echo x - patch-SSL_do_handshake sed 's/^X//' >patch-SSL_do_handshake << '05dceab4f979be09e874ea5c25a483b0' X--- doc/ssl/SSL_do_handshake.pod.orig 2013-06-06 14:35:15.869871854 +0100 X+++ doc/ssl/SSL_do_handshake.pod 2013-06-06 14:35:25.839746516 +0100 X@@ -45,12 +45,12 @@ X X =over 4 X X-=item 1 X+=item C<1> X X The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been X established. X X-=item 0 X+=item C<0> X X The TLS/SSL handshake was not successful but was shut down controlled and X by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the 05dceab4f979be09e874ea5c25a483b0 echo x - patch-SSL_read sed 's/^X//' >patch-SSL_read << '2268de0adc7b6757aaf5c461059781eb' X--- doc/ssl/SSL_read.pod.orig 2013-06-06 14:35:15.871871829 +0100 X+++ doc/ssl/SSL_read.pod 2013-06-06 14:35:25.847746415 +0100 X@@ -86,7 +86,7 @@ X The read operation was successful; the return value is the number of X bytes actually read from the TLS/SSL connection. X X-=item 0 X+=item C<0> X X The read operation was not successful. The reason may either be a clean X shutdown due to a "close notify" alert sent by the peer (in which case 2268de0adc7b6757aaf5c461059781eb echo x - patch-SSL_session_reused sed 's/^X//' >patch-SSL_session_reused << '3240fdda710b00856114127ac4088205' X--- doc/ssl/SSL_session_reused.pod.orig 2013-06-06 14:35:15.871871829 +0100 X+++ doc/ssl/SSL_session_reused.pod 2013-06-06 14:35:25.849746390 +0100 X@@ -27,11 +27,11 @@ X X =over 4 X X-=item 0 X+=item C<0> X X A new session was negotiated. X X-=item 1 X+=item C<1> X X A session was reused. X 3240fdda710b00856114127ac4088205 echo x - patch-SSL_set_fd sed 's/^X//' >patch-SSL_set_fd << '173284e678c262197fe1c0a9123e59eb' X--- doc/ssl/SSL_set_fd.pod.orig 2013-06-06 14:35:15.869871854 +0100 X+++ doc/ssl/SSL_set_fd.pod 2013-06-06 14:35:25.852746353 +0100 X@@ -35,11 +35,11 @@ X X =over 4 X X-=item 0 X+=item C<0> X X The operation failed. Check the error stack to find out why. X X-=item 1 X+=item C<1> X X The operation succeeded. X 173284e678c262197fe1c0a9123e59eb echo x - patch-SSL_set_session sed 's/^X//' >patch-SSL_set_session << 'e6c9fafcb8c943c925caa2099a7393e2' X--- doc/ssl/SSL_set_session.pod.orig 2013-06-06 14:35:15.870871842 +0100 X+++ doc/ssl/SSL_set_session.pod 2013-06-06 14:35:25.855746315 +0100 X@@ -37,11 +37,11 @@ X X =over 4 X X-=item 0 X+=item C<0> X X The operation failed; check the error stack to find out the reason. X X-=item 1 X+=item C<1> X X The operation succeeded. X e6c9fafcb8c943c925caa2099a7393e2 echo x - patch-SSL_shutdown sed 's/^X//' >patch-SSL_shutdown << '228f6195e8a29aa5505ab5218e63853a' X--- doc/ssl/SSL_shutdown.pod.orig 2013-06-06 14:35:15.870871842 +0100 X+++ doc/ssl/SSL_shutdown.pod 2013-06-06 14:35:25.857746290 +0100 X@@ -92,12 +92,12 @@ X X =over 4 X X-=item 1 X+=item C<1> X X The shutdown was successfully completed. The "close notify" alert was sent X and the peer's "close notify" alert was received. X X-=item 0 X+=item C<0> X X The shutdown is not yet finished. Call SSL_shutdown() for a second time, X if a bidirectional shutdown shall be performed. 228f6195e8a29aa5505ab5218e63853a echo x - patch-SSL_write sed 's/^X//' >patch-SSL_write << 'c6b454f4969bb441685df40863810a3d' X--- doc/ssl/SSL_write.pod.orig 2013-06-06 14:35:15.870871842 +0100 X+++ doc/ssl/SSL_write.pod 2013-06-06 14:35:25.865746189 +0100 X@@ -79,7 +79,7 @@ X The write operation was successful, the return value is the number of X bytes actually written to the TLS/SSL connection. X X-=item 0 X+=item C<0> X X The write operation was not successful. Probably the underlying connection X was closed. Call SSL_get_error() with the return value B<ret> to find out, c6b454f4969bb441685df40863810a3d echo x - patch-X509_STORE_CTX_get_error sed 's/^X//' >patch-X509_STORE_CTX_get_error << '8800e9d4ddb43bb2b7fd3ed6121cb62e' X--- doc/crypto/X509_STORE_CTX_get_error.pod.orig 2013-06-06 14:35:15.874871791 +0100 X+++ doc/crypto/X509_STORE_CTX_get_error.pod 2013-06-06 14:37:13.826388940 +0100 X@@ -278,6 +278,8 @@ X an application specific error. This will never be returned unless explicitly X set by an application. X X+=back X+ X =head1 NOTES X X The above functions should be used instead of directly referencing the fields 8800e9d4ddb43bb2b7fd3ed6121cb62e echo x - patch-ad sed 's/^X//' >patch-ad << '09d7beb21206e893954616f2ea34bd58' X--- crypto/md5/md5.c.orig Thu Apr 9 07:59:29 1998 X+++ crypto/md5/md5.c Sun Dec 27 18:44:33 1998 X@@ -94,7 +94,7 @@ X err++; X continue; X } X- printf("MD5(%s)= ",argv[i]); X+ printf("MD5 (%s) = ",argv[i]); X do_fp(IN); X fclose(IN); X } 09d7beb21206e893954616f2ea34bd58 echo x - patch-ak sed 's/^X//' >patch-ak << 'f531155359380f2989b81885aaa11382' X--- apps/Makefile.orig Tue Aug 10 11:09:07 2004 X+++ apps/Makefile Tue Oct 26 07:00:51 2004 X@@ -112,7 +112,7 @@ X done X @cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \ X chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \ X- mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf X+ mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.sample X X tags: X ctags $(SRC) f531155359380f2989b81885aaa11382 echo x - patch-cms sed 's/^X//' >patch-cms << '62cd5a364b94436282be72d0ec4533c5' X--- doc/apps/cms.pod.orig 2013-08-23 14:21:12.000000000 +0200 X+++ doc/apps/cms.pod 2013-08-23 14:24:39.000000000 +0200 X@@ -450,28 +450,28 @@ X X =over 4 X X-=item 0 X+=item C<0> X X the operation was completely successfully. X X-=item 1 X+=item C<1> X X an error occurred parsing the command options. X X-=item 2 X+=item C<2> X X one of the input files could not be read. X X-=item 3 X+=item C<3> X X an error occurred creating the CMS file or when reading the MIME X message. X X-=item 4 X+=item C<4> X X an error occurred decrypting or verifying the message. X X-=item 5 X+=item C<5> X X the message was verified correctly but an error occurred writing out X the signers certificates. 62cd5a364b94436282be72d0ec4533c5 echo x - patch-config sed 's/^X//' >patch-config << '9760988d398f7a8f513374f14b554561' X--- config.orig 2013-06-16 07:01:13.038797248 -0500 X+++ config 2013-06-16 07:01:18.138794838 -0500 X@@ -734,14 +734,8 @@ X sparc64-*-*bsd*) OUT="BSD-sparc64" ;; X ia64-*-*bsd*) OUT="BSD-ia64" ;; X amd64-*-*bsd*) OUT="BSD-x86_64" ;; X- *86*-*-*bsd*) # mimic ld behaviour when it's looking for libc... X- if [ -L /usr/lib/libc.so ]; then # [Free|Net]BSD X- libc=/usr/lib/libc.so X- else # OpenBSD X- # ld searches for highest libc.so.* and so do we X- libc=`(ls /usr/lib/libc.so.* | tail -1) 2>/dev/null` X- fi X- case "`(file -L $libc) 2>/dev/null`" in X+ *86*-*-*bsd*) X+ case "`(file -L /bin/sh) 2>/dev/null`" in X *ELF*) OUT="BSD-x86-elf" ;; X *) OUT="BSD-x86"; options="$options no-sse2" ;; X esac ;; 9760988d398f7a8f513374f14b554561 echo x - patch-openbsd_hw.c sed 's/^X//' >patch-openbsd_hw.c << '892208a4f8b03ee2af8c6a35d5b7f9b7' XIndex: crypto/evp/openbsd_hw.c X=================================================================== XRCS file: /home/ncvs/src/crypto/openssl/crypto/evp/openbsd_hw.c,v Xretrieving revision 1.1.1.1 Xdiff -u -r1.1.1.1 openbsd_hw.c X--- crypto/evp/openbsd_hw.c 28 Jan 2003 21:24:39 -0000 1.1.1.1 X+++ crypto/evp/openbsd_hw.c 18 Jan 2005 12:26:45 -0000 X@@ -109,7 +109,10 @@ X dev_failed=1; X return 0; X } X- close(cryptodev_fd); X+ if (fd == -1) X+ fd = cryptodev_fd; X+ else X+ close(cryptodev_fd); X } X assert(ses); X memset(ses,'\0',sizeof *ses); 892208a4f8b03ee2af8c6a35d5b7f9b7 echo x - patch-smime sed 's/^X//' >patch-smime << '8331c718ec4f0d65697411de5057ac44' X--- doc/apps/smime.pod.orig 2013-06-06 14:35:15.867871879 +0100 X+++ doc/apps/smime.pod 2013-06-06 14:35:25.794747082 +0100 X@@ -308,28 +308,28 @@ X X =over 4 X X-=item 0 X+=item C<0> X X the operation was completely successfully. X X-=item 1 X+=item C<1> X X an error occurred parsing the command options. X X-=item 2 X+=item C<2> X X one of the input files could not be read. X X-=item 3 X+=item C<3> X X an error occurred creating the PKCS#7 file or when reading the MIME X message. X X-=item 4 X+=item C<4> X X an error occurred decrypting or verifying the message. X X-=item 5 X+=item C<5> X X the message was verified correctly but an error occurred writing out X the signers certificates. 8331c718ec4f0d65697411de5057ac44 echo x - patch-ssl-srtp.h sed 's/^X//' >patch-ssl-srtp.h << '87f13fc5dc2dc585c1062b17568d07d4' X--- ssl/srtp.h.orig 2012-04-26 22:40:38.000000000 -0500 X+++ ssl/srtp.h 2012-04-26 22:40:51.000000000 -0500 X@@ -135,7 +135,6 @@ X SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s); X X STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl); X-SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s); X X #ifdef __cplusplus X } 87f13fc5dc2dc585c1062b17568d07d4 echo x - pkg-message.in sed 's/^X//' >pkg-message.in << '7b21bafb4a117a5daf12100e850e69d7' X XCopy %%PREFIX%%/openssl/openssl.cnf.sample to %%PREFIX%%/openssl/openssl.cnf Xand edit it to fit your needs. X 7b21bafb4a117a5daf12100e850e69d7 exit >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308250204.r7P24YBP012656>