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

[Matt Caswell]

The branch OpenSSL_1_0_2-stable has been updated
       via  42b291f30be846f50ad5a36dc9d7cbb3ad9c67e1 (commit)
      from  0d6710289307d277ebc3354105c965b6e8ba8eb0 (commit)


- Log -----------------------------------------------------------------
commit 42b291f30be846f50ad5a36dc9d7cbb3ad9c67e1
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 21 16:27:55 2018 +0000

    The default conv_form is uncompressed
    
    Fixes #5711
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5712)
    
    (cherry picked from commit ab0a3914a64d8f1fce22795c02269e1288df52b1)

-----------------------------------------------------------------------

Summary of changes:
 doc/apps/ecparam.pod | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/apps/ecparam.pod b/doc/apps/ecparam.pod
index ba2f3b9..9482095 100644
--- a/doc/apps/ecparam.pod
+++ b/doc/apps/ecparam.pod
@@ -86,8 +86,8 @@ currently implemented EC parameters names and exit.
 =item B<-conv_form>
 
 This specifies how the points on the elliptic curve are converted
-into octet strings. Possible values are: B<compressed> (the default
-value), B<uncompressed> and B<hybrid>. For more information regarding
+into octet strings. Possible values are: B<compressed>, B<uncompressed> (the
+default value) and B<hybrid>. For more information regarding
 the point conversion forms please read the X9.62 standard.
 B<Note> Due to patent issues the B<compressed> option is disabled
 by default for binary curves and can be enabled by defining