From rsalz at openssl.org  Mon Mar  2 01:46:05 2015
From: rsalz at openssl.org (Rich Salz)
Date: Mon,  2 Mar 2015 02:46:05 +0100 (CET)
Subject: [openssl-commits] [openssl]  master update
Message-ID: <20150302014605.9B3EB1DF11A@butler.localdomain>

The branch master has been updated
       via  a258afaf7c0da143f15e1cf636279c7aaee7394f (commit)
      from  af674d4e20a82c2a98767b837072d7093c70b1cf (commit)


- Log -----------------------------------------------------------------
commit a258afaf7c0da143f15e1cf636279c7aaee7394f
Author: Rich Salz <rsalz at openssl.org>
Date:   Fri Feb 27 15:06:41 2015 -0500

    Remove experimental 56bit export ciphers
    
    These ciphers are removed:
        TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5
        TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5
        TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA
        TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA
        TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA
        TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA
        TLS1_CK_DHE_DSS_WITH_RC4_128_SHA
    They were defined in a long-expired IETF internet-draft:
    draft-ietf-tls-56-bit-ciphersuites-01.txt
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 ssl/s3_lib.c |   82 ----------------------------------------------------------
 ssl/tls1.h   |   19 --------------
 2 files changed, 101 deletions(-)

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index ab19eeb..20ce112 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -1212,88 +1212,6 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = {
      },
 #endif                          /* OPENSSL_NO_CAMELLIA */
 
-#if TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES
-    /* Cipher 62 */
-    {
-     1,
-     TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA,
-     TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_DES,
-     SSL_SHA1,
-     SSL_TLSV1,
-     SSL_EXPORT | SSL_EXP56,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     56,
-     56,
-     },
-
-    /* Cipher 63 */
-    {
-     1,
-     TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA,
-     TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA,
-     SSL_kDHE,
-     SSL_aDSS,
-     SSL_DES,
-     SSL_SHA1,
-     SSL_TLSV1,
-     SSL_EXPORT | SSL_EXP56,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     56,
-     56,
-     },
-
-    /* Cipher 64 */
-    {
-     1,
-     TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA,
-     TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_RC4,
-     SSL_SHA1,
-     SSL_TLSV1,
-     SSL_EXPORT | SSL_EXP56,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     56,
-     128,
-     },
-
-    /* Cipher 65 */
-    {
-     1,
-     TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA,
-     TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA,
-     SSL_kDHE,
-     SSL_aDSS,
-     SSL_RC4,
-     SSL_SHA1,
-     SSL_TLSV1,
-     SSL_EXPORT | SSL_EXP56,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     56,
-     128,
-     },
-
-    /* Cipher 66 */
-    {
-     1,
-     TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA,
-     TLS1_CK_DHE_DSS_WITH_RC4_128_SHA,
-     SSL_kDHE,
-     SSL_aDSS,
-     SSL_RC4,
-     SSL_SHA1,
-     SSL_TLSV1,
-     SSL_NOT_EXP | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-#endif
-
     /* TLS v1.2 ciphersuites */
     /* Cipher 67 */
     {
diff --git a/ssl/tls1.h b/ssl/tls1.h
index af03f13..cb14d8e 100644
--- a/ssl/tls1.h
+++ b/ssl/tls1.h
@@ -162,8 +162,6 @@ extern "C" {
 #  define OPENSSL_TLS_SECURITY_LEVEL 1
 # endif
 
-# define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES    0
-
 # define TLS1_VERSION                    0x0301
 # define TLS1_1_VERSION                  0x0302
 # define TLS1_2_VERSION                  0x0303
@@ -411,23 +409,6 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
 # define TLS1_CK_PSK_WITH_AES_128_CBC_SHA                0x0300008C
 # define TLS1_CK_PSK_WITH_AES_256_CBC_SHA                0x0300008D
 
-/*
- * Additional TLS ciphersuites from expired Internet Draft
- * draft-ietf-tls-56-bit-ciphersuites-01.txt (available if
- * TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES is defined, see s3_lib.c).  We
- * actually treat them like SSL 3.0 ciphers, which we probably shouldn't.
- * Note that the first two are actually not in the IDs.
- */
-# define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5          0x03000060/* not in
-                                                                    * ID */
-# define TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5      0x03000061/* not in
-                                                                    * ID */
-# define TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA         0x03000062
-# define TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA     0x03000063
-# define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA          0x03000064
-# define TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA      0x03000065
-# define TLS1_CK_DHE_DSS_WITH_RC4_128_SHA                0x03000066
-
 /* AES ciphersuites from RFC3268 */
 
 # define TLS1_CK_RSA_WITH_AES_128_SHA                    0x0300002F

From rsalz at openssl.org  Mon Mar  2 01:49:02 2015
From: rsalz at openssl.org (Rich Salz)
Date: Mon,  2 Mar 2015 02:49:02 +0100 (CET)
Subject: [openssl-commits] [openssl]  master update
Message-ID: <20150302014903.C39F01DF11A@butler.localdomain>

The branch master has been updated
       via  9f7f8eced5f0c3744203dad461b7e8373f9833e3 (commit)
      from  a258afaf7c0da143f15e1cf636279c7aaee7394f (commit)


- Log -----------------------------------------------------------------
commit 9f7f8eced5f0c3744203dad461b7e8373f9833e3
Author: Rich Salz <rsalz at openssl.org>
Date:   Sun Mar 1 20:46:38 2015 -0500

    Cleanup some doc files
    
    ACKNOWLEDGEMENTS is now spelled correctly :)
    README.ASN1 talked about 0.9.6, so it's deleted.
    I turned doc/standards.txt into a set of one-line summaries of RFCs, and
    also updated the pointers to original sources (to be web links)
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 ACKNOWLEDGMENTS => ACKNOWLEDGEMENTS |    8 +-
 README.ASN1                         |  187 -------------------------
 doc/standards.txt                   |  257 ++++++++++-------------------------
 3 files changed, 74 insertions(+), 378 deletions(-)
 rename ACKNOWLEDGMENTS => ACKNOWLEDGEMENTS (83%)
 delete mode 100644 README.ASN1

diff --git a/ACKNOWLEDGMENTS b/ACKNOWLEDGEMENTS
similarity index 83%
rename from ACKNOWLEDGMENTS
rename to ACKNOWLEDGEMENTS
index 59c6f01..cb9ece5 100644
--- a/ACKNOWLEDGMENTS
+++ b/ACKNOWLEDGEMENTS
@@ -12,16 +12,16 @@ or current significant support of the OpenSSL project:
 
 Major support:
 
-	Qualys		http://www.qualys.com/
+       Qualys          http://www.qualys.com/
 
 Very significant support:
 
-	OpenGear:	http://www.opengear.com/
+       OpenGear:       http://www.opengear.com/
 
 Significant support:
 
-	PSW Group:	http://www.psw.net/
-	Acano Ltd.	http://acano.com/
+       PSW Group:      http://www.psw.net/
+       Acano Ltd.      http://acano.com/
 
 Please note that we ask permission to identify sponsors and that some sponsors
 we consider eligible for inclusion here have requested to remain anonymous.
diff --git a/README.ASN1 b/README.ASN1
deleted file mode 100644
index 11bcfaf..0000000
--- a/README.ASN1
+++ /dev/null
@@ -1,187 +0,0 @@
-
-OpenSSL ASN1 Revision
-=====================
-
-This document describes some of the issues relating to the new ASN1 code.
-
-Previous OpenSSL ASN1 problems
-=============================
-
-OK why did the OpenSSL ASN1 code need revising in the first place? Well
-there are lots of reasons some of which are included below...
-
-1. The code is difficult to read and write. For every single ASN1 structure
-(e.g. SEQUENCE) four functions need to be written for new, free, encode and
-decode operations. This is a very painful and error prone operation. Very few
-people have ever written any OpenSSL ASN1 and those that have usually wish
-they hadn't.
-
-2. Partly because of 1. the code is bloated and takes up a disproportionate
-amount of space. The SEQUENCE encoder is particularly bad: it essentially
-contains two copies of the same operation, one to compute the SEQUENCE length
-and the other to encode it.
-
-3. The code is memory based: that is it expects to be able to read the whole
-structure from memory. This is fine for small structures but if you have a
-(say) 1Gb PKCS#7 signedData structure it isn't such a good idea...
-
-4. The code for the ASN1 IMPLICIT tag is evil. It is handled by temporarily
-changing the tag to the expected one, attempting to read it, then changing it
-back again. This means that decode buffers have to be writable even though they
-are ultimately unchanged. This gets in the way of constification.
-
-5. The handling of EXPLICIT isn't much better. It adds a chunk of code into 
-the decoder and encoder for every EXPLICIT tag.
-
-6. APPLICATION and PRIVATE tags aren't even supported at all.
-
-7. Even IMPLICIT isn't complete: there is no support for implicitly tagged
-types that are not OPTIONAL.
-
-8. Much of the code assumes that a tag will fit in a single octet. This is
-only true if the tag is 30 or less (mercifully tags over 30 are rare).
-
-9. The ASN1 CHOICE type has to be largely handled manually, there aren't any
-macros that properly support it.
-
-10. Encoders have no concept of OPTIONAL and have no error checking. If the
-passed structure contains a NULL in a mandatory field it will not be encoded,
-resulting in an invalid structure.
-
-11. It is tricky to add ASN1 encoders and decoders to external applications.
-
-Template model
-==============
-
-One of the major problems with revision is the sheer volume of the ASN1 code.
-Attempts to change (for example) the IMPLICIT behaviour would result in a
-modification of *every* single decode function. 
-
-I decided to adopt a template based approach. I'm using the term 'template'
-in a manner similar to SNACC templates: it has nothing to do with C++
-templates.
-
-A template is a description of an ASN1 module as several constant C structures.
-It describes in a machine readable way exactly how the ASN1 structure should
-behave. If this template contains enough detail then it is possible to write
-versions of new, free, encode, decode (and possibly others operations) that
-operate on templates.
-
-Instead of having to write code to handle each operation only a single
-template needs to be written. If new operations are needed (such as a 'print'
-operation) only a single new template based function needs to be written 
-which will then automatically handle all existing templates.
-
-Plans for revision
-==================
-
-The revision will consist of the following steps. Other than the first two
-these can be handled in any order.
- 
-o Design and write template new, free, encode and decode operations, initially
-memory based. *DONE*
-
-o Convert existing ASN1 code to template form. *IN PROGRESS*
-
-o Convert an existing ASN1 compiler (probably SNACC) to output templates
-in OpenSSL form.
-
-o Add support for BIO based ASN1 encoders and decoders to handle large
-structures, initially blocking I/O.
-
-o Add support for non blocking I/O: this is quite a bit harder than blocking
-I/O.
-
-o Add new ASN1 structures, such as OCSP, CRMF, S/MIME v3 (CMS), attribute
-certificates etc etc.
-
-Description of major changes
-============================
-
-The BOOLEAN type now takes three values. 0xff is TRUE, 0 is FALSE and -1 is
-absent. The meaning of absent depends on the context. If for example the
-boolean type is DEFAULT FALSE (as in the case of the critical flag for
-certificate extensions) then -1 is FALSE, if DEFAULT TRUE then -1 is TRUE.
-Usually the value will only ever be read via an API which will hide this from
-an application.
-
-There is an evil bug in the old ASN1 code that mishandles OPTIONAL with
-SEQUENCE OF or SET OF. These are both implemented as a STACK structure. The
-old code would omit the structure if the STACK was NULL (which is fine) or if
-it had zero elements (which is NOT OK). This causes problems because an empty
-SEQUENCE OF or SET OF will result in an empty STACK when it is decoded but when
-it is encoded it will be omitted resulting in different encodings. The new code
-only omits the encoding if the STACK is NULL, if it contains zero elements it
-is encoded and empty. There is an additional problem though: because an empty
-STACK was omitted, sometimes the corresponding *_new() function would
-initialize the STACK to empty so an application could immediately use it, if
-this is done with the new code (i.e. a NULL) it wont work. Therefore a new
-STACK should be allocated first. One instance of this is the X509_CRL list of
-revoked certificates: a helper function X509_CRL_add0_revoked() has been added
-for this purpose.
-
-The X509_ATTRIBUTE structure used to have an element called 'set' which took
-the value 1 if the attribute value was a SET OF or 0 if it was a single. Due
-to the behaviour of CHOICE in the new code this has been changed to a field
-called 'single' which is 0 for a SET OF and 1 for single. The old field has
-been deleted to deliberately break source compatibility. Since this structure
-is normally accessed via higher level functions this shouldn't break too much.
-
-The X509_REQ_INFO certificate request info structure no longer has a field
-called 'req_kludge'. This used to be set to 1 if the attributes field was
-(incorrectly) omitted. You can check to see if the field is omitted now by
-checking if the attributes field is NULL. Similarly if you need to omit
-the field then free attributes and set it to NULL.
-
-The top level 'detached' field in the PKCS7 structure is no longer set when
-a PKCS#7 structure is read in. PKCS7_is_detached() should be called instead.
-The behaviour of PKCS7_get_detached() is unaffected.
-
-The values of 'type' in the GENERAL_NAME structure have changed. This is
-because the old code use the ASN1 initial octet as the selector. The new
-code uses the index in the ASN1_CHOICE template.
-
-The DIST_POINT_NAME structure has changed to be a true CHOICE type.
-
-typedef struct DIST_POINT_NAME_st {
-int type;
-union {
-	STACK_OF(GENERAL_NAME) *fullname;
-	STACK_OF(X509_NAME_ENTRY) *relativename;
-} name;
-} DIST_POINT_NAME;
-
-This means that name.fullname or name.relativename should be set
-and type reflects the option. That is if name.fullname is set then
-type is 0 and if name.relativename is set type is 1.
-
-With the old code using the i2d functions would typically involve:
-
-unsigned char *buf, *p;
-int len;
-/* Find length of encoding */
-len = i2d_SOMETHING(x, NULL);
-/* Allocate buffer */
-buf = OPENSSL_malloc(len);
-if(buf == NULL) {
-	/* Malloc error */
-}
-/* Use temp variable because &p gets updated to point to end of
- * encoding.
- */
-p = buf;
-i2d_SOMETHING(x, &p);
-
-
-Using the new i2d you can also do:
-
-unsigned char *buf = NULL;
-int len;
-len = i2d_SOMETHING(x, &buf);
-if(len < 0) {
-	/* Malloc error */
-}
-
-and it will automatically allocate and populate a buffer with the
-encoding. After this call 'buf' will point to the start of the
-encoding which is len bytes long.
diff --git a/doc/standards.txt b/doc/standards.txt
index 7bada8d..146525e 100644
--- a/doc/standards.txt
+++ b/doc/standards.txt
@@ -1,285 +1,168 @@
 Standards related to OpenSSL
 ============================
 
-[Please, this is currently a draft.  I made a first try at finding
- documents that describe parts of what OpenSSL implements.  There are
- big gaps, and I've most certainly done something wrong.  Please
- correct whatever is...  Also, this note should be removed when this
- file is reaching a somewhat correct state.        -- Richard Levitte]
+This is a work in progress.  These are documents that describe things that
+are implemented (in whole or at least great parts) in OpenSSL.
 
+To search for RFCs, you can start at http://www.ietf.org/rfc.html
 
-All pointers in here will be either URL's or blobs of text borrowed
-from miscellaneous indexes, like rfc-index.txt (index of RFCs),
-1id-index.txt (index of Internet drafts) and the like.
+To search for internet-drafts, you can start at http://www.ietf.org/id-info/
 
-To find the latest possible RFCs, it's recommended to either browse
-ftp://ftp.isi.edu/in-notes/ or go to http://www.rfc-editor.org/ and
-use the search mechanism found there.
-To find the latest possible Internet drafts, it's recommended to
-browse ftp://ftp.isi.edu/internet-drafts/.
-To find the latest possible PKCS, it's recommended to browse
-http://www.rsasecurity.com/rsalabs/pkcs/.
+Many PKCS standards are now RFC's; PKCS#11 is now at Oasis and can be
+found at https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=pkcs11
 
 
-Implemented:
-------------
+Implemented
+-----------
 
-These are documents that describe things that are implemented (in
-whole or at least great parts) in OpenSSL.
+PKCS#8: Private-Key Information Syntax Standard
 
-1319 The MD2 Message-Digest Algorithm. B. Kaliski. April 1992.
-     (Format: TXT=25661 bytes) (Status: INFORMATIONAL)
+PKCS#12: Personal Information Exchange Syntax Standard, version 1.0.
 
-1320 The MD4 Message-Digest Algorithm. R. Rivest. April 1992. (Format:
-     TXT=32407 bytes) (Status: INFORMATIONAL)
+1319 The MD2 Message-Digest Algorithm
 
-1321 The MD5 Message-Digest Algorithm. R. Rivest. April 1992. (Format:
-     TXT=35222 bytes) (Status: INFORMATIONAL)
+1320 The MD4 Message-Digest Algorithm
 
-2246 The TLS Protocol Version 1.0. T. Dierks, C. Allen. January 1999.
-     (Format: TXT=170401 bytes) (Status: PROPOSED STANDARD)
+1321 The MD5 Message-Digest Algorithm
 
-2268 A Description of the RC2(r) Encryption Algorithm. R. Rivest.
-     January 1998. (Format: TXT=19048 bytes) (Status: INFORMATIONAL)
+2246 The TLS Protocol Version 1
 
-2315 PKCS 7: Cryptographic Message Syntax Version 1.5. B. Kaliski.
-     March 1998. (Format: TXT=69679 bytes) (Status: INFORMATIONAL)
+2268 A Description of the RC2(r) Encryption Algorithm
 
-PKCS#8: Private-Key Information Syntax Standard
-
-PKCS#12: Personal Information Exchange Syntax Standard, version 1.0.
+2315 PKCS 7: Cryptographic Message Syntax Version 1.5
 
 2560 X.509 Internet Public Key Infrastructure Online Certificate
-     Status Protocol - OCSP. M. Myers, R. Ankney, A. Malpani, S. Galperin,
-     C. Adams. June 1999. (Format: TXT=43243 bytes) (Status: PROPOSED
-     STANDARD)
+     Status Protocol - OCSP
 
 2712 Addition of Kerberos Cipher Suites to Transport Layer Security
-     (TLS). A. Medvinsky, M. Hur. October 1999. (Format: TXT=13763 bytes)
-     (Status: PROPOSED STANDARD)
-
-2898 PKCS #5: Password-Based Cryptography Specification Version 2.0.
-     B. Kaliski. September 2000. (Format: TXT=68692 bytes) (Status:
-     INFORMATIONAL)
+     (TLS)
 
-2986 PKCS #10: Certification Request Syntax Specification Version 1.7.
-     M. Nystrom, B. Kaliski. November 2000. (Format: TXT=27794 bytes)
-     (Obsoletes RFC2314) (Status: INFORMATIONAL)
+2898 PKCS #5: Password-Based Cryptography Specification Version 2.0
 
-3174 US Secure Hash Algorithm 1 (SHA1). D. Eastlake 3rd, P. Jones.
-     September 2001. (Format: TXT=35525 bytes) (Status: INFORMATIONAL)
+2986 PKCS #10: Certification Request Syntax Specification Version 1.7
 
 3161 Internet X.509 Public Key Infrastructure, Time-Stamp Protocol (TSP)
-     C. Adams, P. Cain, D. Pinkas, R. Zuccherato. August 2001
-     (Status: PROPOSED STANDARD)
+
+3174 US Secure Hash Algorithm 1 (SHA1)
 
 3268 Advanced Encryption Standard (AES) Ciphersuites for Transport
-     Layer Security (TLS). P. Chown. June 2002. (Format: TXT=13530 bytes)
-     (Status: PROPOSED STANDARD)
+     Layer Security (TLS)
 
 3279 Algorithms and Identifiers for the Internet X.509 Public Key
      Infrastructure Certificate and Certificate Revocation List (CRL)
-     Profile. L. Bassham, W. Polk, R. Housley. April 2002. (Format:
-     TXT=53833 bytes) (Status: PROPOSED STANDARD)
+     Profile
 
 3280 Internet X.509 Public Key Infrastructure Certificate and
-     Certificate Revocation List (CRL) Profile. R. Housley, W. Polk, W.
-     Ford, D. Solo. April 2002. (Format: TXT=295556 bytes) (Obsoletes
-     RFC2459) (Status: PROPOSED STANDARD)
+     Certificate Revocation List (CRL) Profile
 
 3447 Public-Key Cryptography Standards (PKCS) #1: RSA Cryptography
-     Specifications Version 2.1. J. Jonsson, B. Kaliski. February 2003.
-     (Format: TXT=143173 bytes) (Obsoletes RFC2437) (Status:           
-     INFORMATIONAL)                                         
+     Specifications Version 2.1
 
-3713 A Description of the Camellia Encryption Algorithm. M. Matsui,
-     J. Nakajima, S. Moriai. April 2004. (Format: TXT=25031 bytes)
-     (Status: INFORMATIONAL)
+3713 A Description of the Camellia Encryption Algorithm
 
 3820 Internet X.509 Public Key Infrastructure (PKI) Proxy Certificate
-     Profile. S. Tuecke, V. Welch, D. Engert, L. Pearlman, M. Thompson.
-     June 2004. (Format: TXT=86374 bytes) (Status: PROPOSED STANDARD)
+     Profile
 
 4132 Addition of Camellia Cipher Suites to Transport Layer Security
-     (TLS). S. Moriai, A. Kato, M. Kanda. July 2005. (Format: TXT=13590
-     bytes) (Status: PROPOSED STANDARD)
+     (TLS)
 
-4162 Addition of SEED Cipher Suites to Transport Layer Security (TLS).
-     H.J. Lee, J.H. Yoon, J.I. Lee. August 2005. (Format: TXT=10578 bytes)
-     (Status: PROPOSED STANDARD)
+4162 Addition of SEED Cipher Suites to Transport Layer Security (TLS)
 
-4269 The SEED Encryption Algorithm. H.J. Lee, S.J. Lee, J.H. Yoon,
-     D.H. Cheon, J.I. Lee. December 2005. (Format: TXT=34390 bytes)
-     (Obsoletes RFC4009) (Status: INFORMATIONAL)
+4269 The SEED Encryption Algorithm
 
 
-Related:
---------
+Related
+-------
 
 These are documents that are close to OpenSSL, for example the
 STARTTLS documents.
 
 1421 Privacy Enhancement for Internet Electronic Mail: Part I: Message
-     Encryption and Authentication Procedures. J. Linn. February 1993.
-     (Format: TXT=103894 bytes) (Obsoletes RFC1113) (Status: PROPOSED
-     STANDARD)
+     Encryption and Authentication Procedures
 
 1422 Privacy Enhancement for Internet Electronic Mail: Part II:
-     Certificate-Based Key Management. S. Kent. February 1993. (Format:
-     TXT=86085 bytes) (Obsoletes RFC1114) (Status: PROPOSED STANDARD)
+     Certificate-Based Key Management
 
 1423 Privacy Enhancement for Internet Electronic Mail: Part III:
-     Algorithms, Modes, and Identifiers. D. Balenson. February 1993.
-     (Format: TXT=33277 bytes) (Obsoletes RFC1115) (Status: PROPOSED
-     STANDARD)
+     Algorithms, Modes, and Identifiers
 
 1424 Privacy Enhancement for Internet Electronic Mail: Part IV: Key
-     Certification and Related Services. B. Kaliski. February 1993.
-     (Format: TXT=17537 bytes) (Status: PROPOSED STANDARD)
+     Certification and Related Services
 
-2025 The Simple Public-Key GSS-API Mechanism (SPKM). C. Adams. October
-     1996. (Format: TXT=101692 bytes) (Status: PROPOSED STANDARD)
+2025 The Simple Public-Key GSS-API Mechanism (SPKM)
 
 2510 Internet X.509 Public Key Infrastructure Certificate Management
-     Protocols. C. Adams, S. Farrell. March 1999. (Format: TXT=158178
-     bytes) (Status: PROPOSED STANDARD)
+     Protocols
 
-2511 Internet X.509 Certificate Request Message Format. M. Myers, C.
-     Adams, D. Solo, D. Kemp. March 1999. (Format: TXT=48278 bytes)
-     (Status: PROPOSED STANDARD)
+2511 Internet X.509 Certificate Request Message Format
 
 2527 Internet X.509 Public Key Infrastructure Certificate Policy and
-     Certification Practices Framework. S. Chokhani, W. Ford. March 1999.
-     (Format: TXT=91860 bytes) (Status: INFORMATIONAL)
+     Certification Practices Framework
 
-2538 Storing Certificates in the Domain Name System (DNS). D. Eastlake
-     3rd, O. Gudmundsson. March 1999. (Format: TXT=19857 bytes) (Status:
-     PROPOSED STANDARD)
+2538 Storing Certificates in the Domain Name System (DNS)
 
-2539 Storage of Diffie-Hellman Keys in the Domain Name System (DNS).
-     D. Eastlake 3rd. March 1999. (Format: TXT=21049 bytes) (Status:
-     PROPOSED STANDARD)
+2539 Storage of Diffie-Hellman Keys in the Domain Name System (DNS)
 
 2559 Internet X.509 Public Key Infrastructure Operational Protocols -
-     LDAPv2. S. Boeyen, T. Howes, P. Richard. April 1999. (Format:
-     TXT=22889 bytes) (Updates RFC1778) (Status: PROPOSED STANDARD)
+     LDAPv2
 
 2585 Internet X.509 Public Key Infrastructure Operational Protocols:
-     FTP and HTTP. R. Housley, P. Hoffman. May 1999. (Format: TXT=14813
-     bytes) (Status: PROPOSED STANDARD)
+     FTP and HTTP
 
-2587 Internet X.509 Public Key Infrastructure LDAPv2 Schema. S.
-     Boeyen, T. Howes, P. Richard. June 1999. (Format: TXT=15102 bytes)
-     (Status: PROPOSED STANDARD)
+2587 Internet X.509 Public Key Infrastructure LDAPv2 Schema
 
-2595 Using TLS with IMAP, POP3 and ACAP. C. Newman. June 1999.
-     (Format: TXT=32440 bytes) (Status: PROPOSED STANDARD)
+2595 Using TLS with IMAP, POP3 and ACAP
 
-2631 Diffie-Hellman Key Agreement Method. E. Rescorla. June 1999.
-     (Format: TXT=25932 bytes) (Status: PROPOSED STANDARD)
+2631 Diffie-Hellman Key Agreement Method
 
-2632 S/MIME Version 3 Certificate Handling. B. Ramsdell, Ed.. June
-     1999. (Format: TXT=27925 bytes) (Status: PROPOSED STANDARD)
+2632 S/MIME Version 3 Certificate Handling
 
-2716 PPP EAP TLS Authentication Protocol. B. Aboba, D. Simon. October
-     1999. (Format: TXT=50108 bytes) (Status: EXPERIMENTAL)
+2716 PPP EAP TLS Authentication Protocol
 
-2773 Encryption using KEA and SKIPJACK. R. Housley, P. Yee, W. Nace.
-     February 2000. (Format: TXT=20008 bytes) (Updates RFC0959) (Status:
-     EXPERIMENTAL)
+2797 Certificate Management Messages over CMS
 
-2797 Certificate Management Messages over CMS. M. Myers, X. Liu, J.
-     Schaad, J. Weinstein. April 2000. (Format: TXT=103357 bytes) (Status:
-     PROPOSED STANDARD)
+2817 Upgrading to TLS Within HTTP/1.1
 
-2817 Upgrading to TLS Within HTTP/1.1. R. Khare, S. Lawrence. May
-     2000. (Format: TXT=27598 bytes) (Updates RFC2616) (Status: PROPOSED
-     STANDARD)
+2818 HTTP Over TLS
 
-2818 HTTP Over TLS. E. Rescorla. May 2000. (Format: TXT=15170 bytes)
-     (Status: INFORMATIONAL)
+2984 Use of the CAST-128 Encryption Algorithm in CMS
 
-2876 Use of the KEA and SKIPJACK Algorithms in CMS. J. Pawling. July
-     2000. (Format: TXT=29265 bytes) (Status: INFORMATIONAL)
-
-2984 Use of the CAST-128 Encryption Algorithm in CMS. C. Adams.
-     October 2000. (Format: TXT=11591 bytes) (Status: PROPOSED STANDARD)
-
-2985 PKCS #9: Selected Object Classes and Attribute Types Version 2.0.
-     M. Nystrom, B. Kaliski. November 2000. (Format: TXT=70703 bytes)
-     (Status: INFORMATIONAL)
+2985 PKCS #9: Selected Object Classes and Attribute Types Version 2.0
 
 3029 Internet X.509 Public Key Infrastructure Data Validation and
-     Certification Server Protocols. C. Adams, P. Sylvester, M. Zolotarev,
-     R. Zuccherato. February 2001. (Format: TXT=107347 bytes) (Status:
-     EXPERIMENTAL)
+     Certification Server Protocols
 
 3039 Internet X.509 Public Key Infrastructure Qualified Certificates
-     Profile. S. Santesson, W. Polk, P. Barzin, M. Nystrom. January 2001.
-     (Format: TXT=67619 bytes) (Status: PROPOSED STANDARD)
+     Profile
 
-3058 Use of the IDEA Encryption Algorithm in CMS. S. Teiwes, P.
-     Hartmann, D. Kuenzi. February 2001. (Format: TXT=17257 bytes)
-     (Status: INFORMATIONAL)
+3058 Use of the IDEA Encryption Algorithm in CMS
 
 3161 Internet X.509 Public Key Infrastructure Time-Stamp Protocol
-     (TSP). C. Adams, P. Cain, D. Pinkas, R. Zuccherato. August 2001.
-     (Format: TXT=54585 bytes) (Status: PROPOSED STANDARD)
+     (TSP)
 
-3185 Reuse of CMS Content Encryption Keys. S. Farrell, S. Turner.
-     October 2001. (Format: TXT=20404 bytes) (Status: PROPOSED STANDARD)
+3185 Reuse of CMS Content Encryption Keys
 
 3207 SMTP Service Extension for Secure SMTP over Transport Layer
-     Security. P. Hoffman. February 2002. (Format: TXT=18679 bytes)
-     (Obsoletes RFC2487) (Status: PROPOSED STANDARD)
+     Security
 
-3217 Triple-DES and RC2 Key Wrapping. R. Housley. December 2001.
-     (Format: TXT=19855 bytes) (Status: INFORMATIONAL)
+3217 Triple-DES and RC2 Key Wrapping
 
 3274 Compressed Data Content Type for Cryptographic Message Syntax
-     (CMS). P. Gutmann. June 2002. (Format: TXT=11276 bytes) (Status:
-     PROPOSED STANDARD)
+     (CMS)
 
 3278 Use of Elliptic Curve Cryptography (ECC) Algorithms in
-     Cryptographic Message Syntax (CMS). S. Blake-Wilson, D. Brown, P.
-     Lambert. April 2002. (Format: TXT=33779 bytes) (Status:
-     INFORMATIONAL)
+     Cryptographic Message Syntax (CMS)
 
-3281 An Internet Attribute Certificate Profile for Authorization. S.
-     Farrell, R. Housley. April 2002. (Format: TXT=90580 bytes) (Status:
-     PROPOSED STANDARD)
+3281 An Internet Attribute Certificate Profile for Authorization
 
-3369 Cryptographic Message Syntax (CMS). R. Housley. August 2002.
-     (Format: TXT=113975 bytes) (Obsoletes RFC2630, RFC3211) (Status:
-     PROPOSED STANDARD)
+3369 Cryptographic Message Syntax (CMS)
 
-3370 Cryptographic Message Syntax (CMS) Algorithms. R. Housley. August
-     2002. (Format: TXT=51001 bytes) (Obsoletes RFC2630, RFC3211) (Status:
-     PROPOSED STANDARD)
+3370 Cryptographic Message Syntax (CMS) Algorithms
 
-3377 Lightweight Directory Access Protocol (v3): Technical
-     Specification. J. Hodges, R. Morgan. September 2002. (Format:
-     TXT=9981 bytes) (Updates RFC2251, RFC2252, RFC2253, RFC2254, RFC2255,
-     RFC2256, RFC2829, RFC2830) (Status: PROPOSED STANDARD)
-
-3394 Advanced Encryption Standard (AES) Key Wrap Algorithm. J. Schaad,
-     R. Housley. September 2002. (Format: TXT=73072 bytes) (Status:
-     INFORMATIONAL)
+3394 Advanced Encryption Standard (AES) Key Wrap Algorithm
 
 3436 Transport Layer Security over Stream Control Transmission
-     Protocol. A. Jungmaier, E. Rescorla, M. Tuexen. December 2002.
-     (Format: TXT=16333 bytes) (Status: PROPOSED STANDARD)
+     Protocol
 
 3657 Use of the Camellia Encryption Algorithm in Cryptographic 
-     Message Syntax (CMS). S. Moriai, A. Kato. January 2004.
-     (Format: TXT=26282 bytes) (Status: PROPOSED STANDARD)
-
-"Securing FTP with TLS", 01/27/2000, <draft-murray-auth-ftp-ssl-05.txt>  
- 
-
-To be implemented:
-------------------
-
-These are documents that describe things that are planed to be
-implemented in the hopefully short future.
-
+     Message Syntax (CMS)

From steve at openssl.org  Mon Mar  2 13:42:54 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 02 Mar 2015 13:42:54 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425303774.618625.31400.nullmailer@dev.openssl.org>

The branch master has been updated
       via  437b14b533fe7f7408e3ebca6d5569f1d3347b1a (commit)
      from  9f7f8eced5f0c3744203dad461b7e8373f9833e3 (commit)


- Log -----------------------------------------------------------------
commit 437b14b533fe7f7408e3ebca6d5569f1d3347b1a
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 2 13:26:29 2015 +0000

    Fix format script.
    
    The format script didn't correctly recognise some ASN.1 macros and
    didn't reformat some files as a result. Fix script and reformat
    affected files.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 crypto/asn1/x_bignum.c     |  69 ++++++++++++---------
 crypto/asn1/x_long.c       | 149 ++++++++++++++++++++++++---------------------
 util/openssl-format-source |   2 +-
 3 files changed, 121 insertions(+), 99 deletions(-)

diff --git a/crypto/asn1/x_bignum.c b/crypto/asn1/x_bignum.c
index 1f10364..a5a403c 100644
--- a/crypto/asn1/x_bignum.c
+++ b/crypto/asn1/x_bignum.c
@@ -98,46 +98,55 @@ ASN1_ITEM_end(CBIGNUM)
 
 static int bn_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        *pval = (ASN1_VALUE *)BN_new();
-        if(*pval) return 1;
-        else return 0;
+    *pval = (ASN1_VALUE *)BN_new();
+    if (*pval)
+        return 1;
+    else
+        return 0;
 }
 
 static void bn_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        if(!*pval) return;
-        if(it->size & BN_SENSITIVE) BN_clear_free((BIGNUM *)*pval);
-        else BN_free((BIGNUM *)*pval);
-        *pval = NULL;
+    if (!*pval)
+        return;
+    if (it->size & BN_SENSITIVE)
+        BN_clear_free((BIGNUM *)*pval);
+    else
+        BN_free((BIGNUM *)*pval);
+    *pval = NULL;
 }
 
-static int bn_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype, const ASN1_ITEM *it)
+static int bn_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
+                  const ASN1_ITEM *it)
 {
-        BIGNUM *bn;
-        int pad;
-        if(!*pval) return -1;
-        bn = (BIGNUM *)*pval;
-        /* If MSB set in an octet we need a padding byte */
-        if(BN_num_bits(bn) & 0x7) pad = 0;
-        else pad = 1;
-        if(cont) {
-                if(pad) *cont++ = 0;
-                BN_bn2bin(bn, cont);
-        }
-        return pad + BN_num_bytes(bn);
+    BIGNUM *bn;
+    int pad;
+    if (!*pval)
+        return -1;
+    bn = (BIGNUM *)*pval;
+    /* If MSB set in an octet we need a padding byte */
+    if (BN_num_bits(bn) & 0x7)
+        pad = 0;
+    else
+        pad = 1;
+    if (cont) {
+        if (pad)
+            *cont++ = 0;
+        BN_bn2bin(bn, cont);
+    }
+    return pad + BN_num_bytes(bn);
 }
 
 static int bn_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
                   int utype, char *free_cont, const ASN1_ITEM *it)
 {
-        BIGNUM *bn;
-        if(!*pval) bn_new(pval, it);
-        bn  = (BIGNUM *)*pval;
-        if(!BN_bin2bn(cont, len, bn)) {
-                bn_free(pval, it);
-                return 0;
-        }
-        return 1;
+    BIGNUM *bn;
+    if (!*pval)
+        bn_new(pval, it);
+    bn = (BIGNUM *)*pval;
+    if (!BN_bin2bn(cont, len, bn)) {
+        bn_free(pval, it);
+        return 0;
+    }
+    return 1;
 }
-
-
diff --git a/crypto/asn1/x_long.c b/crypto/asn1/x_long.c
index f393619..3aed44a 100644
--- a/crypto/asn1/x_long.c
+++ b/crypto/asn1/x_long.c
@@ -97,87 +97,100 @@ ASN1_ITEM_end(ZLONG)
 
 static int long_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        *(long *)pval = it->size;
-        return 1;
+    *(long *)pval = it->size;
+    return 1;
 }
 
 static void long_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        *(long *)pval = it->size;
+    *(long *)pval = it->size;
 }
 
-static int long_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype, const ASN1_ITEM *it)
+static int long_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
+                    const ASN1_ITEM *it)
 {
-        long ltmp;
-        unsigned long utmp;
-        int clen, pad, i;
-        /* this exists to bypass broken gcc optimization */
-        char *cp = (char *)pval;
-
-        /* use memcpy, because we may not be long aligned */
-        memcpy(&ltmp, cp, sizeof(long));
-
-        if(ltmp == it->size) return -1;
-        /* Convert the long to positive: we subtract one if negative so
-         * we can cleanly handle the padding if only the MSB of the leading
-         * octet is set.
-         */
-        if(ltmp < 0) utmp = -ltmp - 1;
-        else utmp = ltmp;
-        clen = BN_num_bits_word(utmp);
-        /* If MSB of leading octet set we need to pad */
-        if(!(clen & 0x7)) pad = 1;
-        else pad = 0;
-
-        /* Convert number of bits to number of octets */
-        clen = (clen + 7) >> 3;
-
-        if(cont) {
-                if(pad) *cont++ = (ltmp < 0) ? 0xff : 0;
-                for(i = clen - 1; i >= 0; i--) {
-                        cont[i] = (unsigned char)(utmp & 0xff);
-                        if(ltmp < 0) cont[i] ^= 0xff;
-                        utmp >>= 8;
-                }
+    long ltmp;
+    unsigned long utmp;
+    int clen, pad, i;
+    /* this exists to bypass broken gcc optimization */
+    char *cp = (char *)pval;
+
+    /* use memcpy, because we may not be long aligned */
+    memcpy(&ltmp, cp, sizeof(long));
+
+    if (ltmp == it->size)
+        return -1;
+    /*
+     * Convert the long to positive: we subtract one if negative so we can
+     * cleanly handle the padding if only the MSB of the leading octet is
+     * set.
+     */
+    if (ltmp < 0)
+        utmp = -ltmp - 1;
+    else
+        utmp = ltmp;
+    clen = BN_num_bits_word(utmp);
+    /* If MSB of leading octet set we need to pad */
+    if (!(clen & 0x7))
+        pad = 1;
+    else
+        pad = 0;
+
+    /* Convert number of bits to number of octets */
+    clen = (clen + 7) >> 3;
+
+    if (cont) {
+        if (pad)
+            *cont++ = (ltmp < 0) ? 0xff : 0;
+        for (i = clen - 1; i >= 0; i--) {
+            cont[i] = (unsigned char)(utmp & 0xff);
+            if (ltmp < 0)
+                cont[i] ^= 0xff;
+            utmp >>= 8;
         }
-        return clen + pad;
+    }
+    return clen + pad;
 }
 
 static int long_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
                     int utype, char *free_cont, const ASN1_ITEM *it)
 {
-        int neg, i;
-        long ltmp;
-        unsigned long utmp = 0;
-        char *cp = (char *)pval;
-        if(len > (int)sizeof(long)) {
-                ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
-                return 0;
-        }
-        /* Is it negative? */
-        if(len && (cont[0] & 0x80)) neg = 1;
-        else neg = 0;
-        utmp = 0;
-        for(i = 0; i < len; i++) {
-                utmp <<= 8;
-                if(neg) utmp |= cont[i] ^ 0xff;
-                else utmp |= cont[i];
-        }
-        ltmp = (long)utmp;
-        if(neg) {
-                ltmp++;
-                ltmp = -ltmp;
-        }
-        if(ltmp == it->size) {
-                ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
-                return 0;
-        }
-        memcpy(cp, &ltmp, sizeof(long));
-        return 1;
+    int neg, i;
+    long ltmp;
+    unsigned long utmp = 0;
+    char *cp = (char *)pval;
+    if (len > (int)sizeof(long)) {
+        ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
+        return 0;
+    }
+    /* Is it negative? */
+    if (len && (cont[0] & 0x80))
+        neg = 1;
+    else
+        neg = 0;
+    utmp = 0;
+    for (i = 0; i < len; i++) {
+        utmp <<= 8;
+        if (neg)
+            utmp |= cont[i] ^ 0xff;
+        else
+            utmp |= cont[i];
+    }
+    ltmp = (long)utmp;
+    if (neg) {
+        ltmp++;
+        ltmp = -ltmp;
+    }
+    if (ltmp == it->size) {
+        ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
+        return 0;
+    }
+    memcpy(cp, &ltmp, sizeof(long));
+    return 1;
 }
 
 static int long_print(BIO *out, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                        int indent, const ASN1_PCTX *pctx)
-        {
-        return BIO_printf(out, "%ld\n", *(long *)pval);
-        }
+                      int indent, const ASN1_PCTX *pctx)
+{
+    return BIO_printf(out, "%ld\n", *(long *)pval);
+}
diff --git a/util/openssl-format-source b/util/openssl-format-source
index 6380a10..4ea2f1b 100755
--- a/util/openssl-format-source
+++ b/util/openssl-format-source
@@ -116,7 +116,7 @@ do
 	      -e 's/^((DECLARE|IMPLEMENT)_(EXTERN_ASN1|ASN1|ADB|STACK_OF|PKCS12_STACK_OF).*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
 	      -e 's/^([ \t]*(make_dh|make_dh_bn|make_rfc5114_td)\(.*\)[ \t,]*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
 	      -e 's/^(ASN1_ADB_TEMPLATE\(.*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
-	      -e 's/^((ASN1|ADB)_.*_END\(.*[\){=,;]+[ \t]*)$/$1\n\/**INDENT-ON**\//;' \
+	      -e 's/^((ASN1|ADB)_.*_(end|END)\(.*[\){=,;]+[ \t]*)$/$1\n\/**INDENT-ON**\//;' \
 	      -e '/ASN1_(ITEM_ref|ITEM_ptr|ITEM_rptr|PCTX)/ || s/^((ASN1|ADB)_[^\*]*[){=,]+[ \t]*)$/\/**INDENT-OFF**\/\n$1/;' \
 	      -e 's/^(} (ASN1|ADB)_[^\*]*[\){=,;]+)$/$1\n\/**INDENT-ON**\//;' \
 	      | \

From steve at openssl.org  Mon Mar  2 13:52:08 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 02 Mar 2015 13:52:08 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_0_9_8-stable update
Message-ID: <1425304328.909271.781.nullmailer@dev.openssl.org>

The branch OpenSSL_0_9_8-stable has been updated
       via  8a8ba0716796af963947586dca063ca95460010e (commit)
      from  1b4a8df38fc9ab3c089ca5765075ee53ec5bd66a (commit)


- Log -----------------------------------------------------------------
commit 8a8ba0716796af963947586dca063ca95460010e
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 2 13:26:29 2015 +0000

    Fix format script.
    
    The format script didn't correctly recognise some ASN.1 macros and
    didn't reformat some files as a result. Fix script and reformat
    affected files.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit 437b14b533fe7f7408e3ebca6d5569f1d3347b1a)
    
    Conflicts:
    	crypto/asn1/x_long.c

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

Summary of changes:
 crypto/asn1/x_bignum.c     |  69 +++++++++++++----------
 crypto/asn1/x_long.c       | 133 +++++++++++++++++++++++++--------------------
 util/openssl-format-source |   2 +-
 3 files changed, 113 insertions(+), 91 deletions(-)

diff --git a/crypto/asn1/x_bignum.c b/crypto/asn1/x_bignum.c
index 1f10364..a5a403c 100644
--- a/crypto/asn1/x_bignum.c
+++ b/crypto/asn1/x_bignum.c
@@ -98,46 +98,55 @@ ASN1_ITEM_end(CBIGNUM)
 
 static int bn_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        *pval = (ASN1_VALUE *)BN_new();
-        if(*pval) return 1;
-        else return 0;
+    *pval = (ASN1_VALUE *)BN_new();
+    if (*pval)
+        return 1;
+    else
+        return 0;
 }
 
 static void bn_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        if(!*pval) return;
-        if(it->size & BN_SENSITIVE) BN_clear_free((BIGNUM *)*pval);
-        else BN_free((BIGNUM *)*pval);
-        *pval = NULL;
+    if (!*pval)
+        return;
+    if (it->size & BN_SENSITIVE)
+        BN_clear_free((BIGNUM *)*pval);
+    else
+        BN_free((BIGNUM *)*pval);
+    *pval = NULL;
 }
 
-static int bn_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype, const ASN1_ITEM *it)
+static int bn_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
+                  const ASN1_ITEM *it)
 {
-        BIGNUM *bn;
-        int pad;
-        if(!*pval) return -1;
-        bn = (BIGNUM *)*pval;
-        /* If MSB set in an octet we need a padding byte */
-        if(BN_num_bits(bn) & 0x7) pad = 0;
-        else pad = 1;
-        if(cont) {
-                if(pad) *cont++ = 0;
-                BN_bn2bin(bn, cont);
-        }
-        return pad + BN_num_bytes(bn);
+    BIGNUM *bn;
+    int pad;
+    if (!*pval)
+        return -1;
+    bn = (BIGNUM *)*pval;
+    /* If MSB set in an octet we need a padding byte */
+    if (BN_num_bits(bn) & 0x7)
+        pad = 0;
+    else
+        pad = 1;
+    if (cont) {
+        if (pad)
+            *cont++ = 0;
+        BN_bn2bin(bn, cont);
+    }
+    return pad + BN_num_bytes(bn);
 }
 
 static int bn_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
                   int utype, char *free_cont, const ASN1_ITEM *it)
 {
-        BIGNUM *bn;
-        if(!*pval) bn_new(pval, it);
-        bn  = (BIGNUM *)*pval;
-        if(!BN_bin2bn(cont, len, bn)) {
-                bn_free(pval, it);
-                return 0;
-        }
-        return 1;
+    BIGNUM *bn;
+    if (!*pval)
+        bn_new(pval, it);
+    bn = (BIGNUM *)*pval;
+    if (!BN_bin2bn(cont, len, bn)) {
+        bn_free(pval, it);
+        return 0;
+    }
+    return 1;
 }
-
-
diff --git a/crypto/asn1/x_long.c b/crypto/asn1/x_long.c
index 2e2fbdf..e0dab2b 100644
--- a/crypto/asn1/x_long.c
+++ b/crypto/asn1/x_long.c
@@ -94,81 +94,94 @@ ASN1_ITEM_end(ZLONG)
 
 static int long_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        *(long *)pval = it->size;
-        return 1;
+    *(long *)pval = it->size;
+    return 1;
 }
 
 static void long_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        *(long *)pval = it->size;
+    *(long *)pval = it->size;
 }
 
-static int long_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype, const ASN1_ITEM *it)
+static int long_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
+                    const ASN1_ITEM *it)
 {
-        long ltmp;
-        unsigned long utmp;
-        int clen, pad, i;
-        /* this exists to bypass broken gcc optimization */
-        char *cp = (char *)pval;
+    long ltmp;
+    unsigned long utmp;
+    int clen, pad, i;
+    /* this exists to bypass broken gcc optimization */
+    char *cp = (char *)pval;
 
-        /* use memcpy, because we may not be long aligned */
-        memcpy(&ltmp, cp, sizeof(long));
+    /* use memcpy, because we may not be long aligned */
+    memcpy(&ltmp, cp, sizeof(long));
 
-        if(ltmp == it->size) return -1;
-        /* Convert the long to positive: we subtract one if negative so
-         * we can cleanly handle the padding if only the MSB of the leading
-         * octet is set.
-         */
-        if(ltmp < 0) utmp = -ltmp - 1;
-        else utmp = ltmp;
-        clen = BN_num_bits_word(utmp);
-        /* If MSB of leading octet set we need to pad */
-        if(!(clen & 0x7)) pad = 1;
-        else pad = 0;
+    if (ltmp == it->size)
+        return -1;
+    /*
+     * Convert the long to positive: we subtract one if negative so we can
+     * cleanly handle the padding if only the MSB of the leading octet is
+     * set.
+     */
+    if (ltmp < 0)
+        utmp = -ltmp - 1;
+    else
+        utmp = ltmp;
+    clen = BN_num_bits_word(utmp);
+    /* If MSB of leading octet set we need to pad */
+    if (!(clen & 0x7))
+        pad = 1;
+    else
+        pad = 0;
 
-        /* Convert number of bits to number of octets */
-        clen = (clen + 7) >> 3;
+    /* Convert number of bits to number of octets */
+    clen = (clen + 7) >> 3;
 
-        if(cont) {
-                if(pad) *cont++ = (ltmp < 0) ? 0xff : 0;
-                for(i = clen - 1; i >= 0; i--) {
-                        cont[i] = (unsigned char)(utmp & 0xff);
-                        if(ltmp < 0) cont[i] ^= 0xff;
-                        utmp >>= 8;
-                }
+    if (cont) {
+        if (pad)
+            *cont++ = (ltmp < 0) ? 0xff : 0;
+        for (i = clen - 1; i >= 0; i--) {
+            cont[i] = (unsigned char)(utmp & 0xff);
+            if (ltmp < 0)
+                cont[i] ^= 0xff;
+            utmp >>= 8;
         }
-        return clen + pad;
+    }
+    return clen + pad;
 }
 
 static int long_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
                     int utype, char *free_cont, const ASN1_ITEM *it)
 {
-        int neg, i;
-        long ltmp;
-        unsigned long utmp = 0;
-        char *cp = (char *)pval;
-        if(len > (int)sizeof(long)) {
-                ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
-                return 0;
-        }
-        /* Is it negative? */
-        if(len && (cont[0] & 0x80)) neg = 1;
-        else neg = 0;
-        utmp = 0;
-        for(i = 0; i < len; i++) {
-                utmp <<= 8;
-                if(neg) utmp |= cont[i] ^ 0xff;
-                else utmp |= cont[i];
-        }
-        ltmp = (long)utmp;
-        if(neg) {
-                ltmp++;
-                ltmp = -ltmp;
-        }
-        if(ltmp == it->size) {
-                ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
-                return 0;
-        }
-        memcpy(cp, &ltmp, sizeof(long));
-        return 1;
+    int neg, i;
+    long ltmp;
+    unsigned long utmp = 0;
+    char *cp = (char *)pval;
+    if (len > (int)sizeof(long)) {
+        ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
+        return 0;
+    }
+    /* Is it negative? */
+    if (len && (cont[0] & 0x80))
+        neg = 1;
+    else
+        neg = 0;
+    utmp = 0;
+    for (i = 0; i < len; i++) {
+        utmp <<= 8;
+        if (neg)
+            utmp |= cont[i] ^ 0xff;
+        else
+            utmp |= cont[i];
+    }
+    ltmp = (long)utmp;
+    if (neg) {
+        ltmp++;
+        ltmp = -ltmp;
+    }
+    if (ltmp == it->size) {
+        ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
+        return 0;
+    }
+    memcpy(cp, &ltmp, sizeof(long));
+    return 1;
 }
diff --git a/util/openssl-format-source b/util/openssl-format-source
index 4e90147..8c3a7c0 100755
--- a/util/openssl-format-source
+++ b/util/openssl-format-source
@@ -119,7 +119,7 @@ do
 	      -e 's/^((DECLARE|IMPLEMENT)_(EXTERN_ASN1|ASN1|ADB|STACK_OF|PKCS12_STACK_OF).*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
 	      -e 's/^([ \t]*(make_dh|make_dh_bn|make_rfc5114_td)\(.*\)[ \t,]*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
 	      -e 's/^(ASN1_ADB_TEMPLATE\(.*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
-	      -e 's/^((ASN1|ADB)_.*_END\(.*[\){=,;]+[ \t]*)$/$1\n\/**INDENT-ON**\//;' \
+	      -e 's/^((ASN1|ADB)_.*_(end|END)\(.*[\){=,;]+[ \t]*)$/$1\n\/**INDENT-ON**\//;' \
 	      -e '/ASN1_(ITEM_ref|ITEM_ptr|ITEM_rptr|PCTX)/ || s/^((ASN1|ADB)_[^\*]*[){=,]+[ \t]*)$/\/**INDENT-OFF**\/\n$1/;' \
 	      -e 's/^(} (ASN1|ADB)_[^\*]*[\){=,;]+)$/$1\n\/**INDENT-ON**\//;' \
 	      | \

From steve at openssl.org  Mon Mar  2 13:52:08 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 02 Mar 2015 13:52:08 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_0-stable update
Message-ID: <1425304328.968220.804.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_0-stable has been updated
       via  42ad0100f12841e35f8dacef5b010de450ea5fe3 (commit)
      from  dac693c957dc40dbf839f0add91b824deba26dc3 (commit)


- Log -----------------------------------------------------------------
commit 42ad0100f12841e35f8dacef5b010de450ea5fe3
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 2 13:26:29 2015 +0000

    Fix format script.
    
    The format script didn't correctly recognise some ASN.1 macros and
    didn't reformat some files as a result. Fix script and reformat
    affected files.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit 437b14b533fe7f7408e3ebca6d5569f1d3347b1a)

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

Summary of changes:
 crypto/asn1/x_bignum.c     |  69 ++++++++++++---------
 crypto/asn1/x_long.c       | 149 ++++++++++++++++++++++++---------------------
 util/openssl-format-source |   2 +-
 3 files changed, 121 insertions(+), 99 deletions(-)

diff --git a/crypto/asn1/x_bignum.c b/crypto/asn1/x_bignum.c
index 1f10364..a5a403c 100644
--- a/crypto/asn1/x_bignum.c
+++ b/crypto/asn1/x_bignum.c
@@ -98,46 +98,55 @@ ASN1_ITEM_end(CBIGNUM)
 
 static int bn_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        *pval = (ASN1_VALUE *)BN_new();
-        if(*pval) return 1;
-        else return 0;
+    *pval = (ASN1_VALUE *)BN_new();
+    if (*pval)
+        return 1;
+    else
+        return 0;
 }
 
 static void bn_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        if(!*pval) return;
-        if(it->size & BN_SENSITIVE) BN_clear_free((BIGNUM *)*pval);
-        else BN_free((BIGNUM *)*pval);
-        *pval = NULL;
+    if (!*pval)
+        return;
+    if (it->size & BN_SENSITIVE)
+        BN_clear_free((BIGNUM *)*pval);
+    else
+        BN_free((BIGNUM *)*pval);
+    *pval = NULL;
 }
 
-static int bn_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype, const ASN1_ITEM *it)
+static int bn_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
+                  const ASN1_ITEM *it)
 {
-        BIGNUM *bn;
-        int pad;
-        if(!*pval) return -1;
-        bn = (BIGNUM *)*pval;
-        /* If MSB set in an octet we need a padding byte */
-        if(BN_num_bits(bn) & 0x7) pad = 0;
-        else pad = 1;
-        if(cont) {
-                if(pad) *cont++ = 0;
-                BN_bn2bin(bn, cont);
-        }
-        return pad + BN_num_bytes(bn);
+    BIGNUM *bn;
+    int pad;
+    if (!*pval)
+        return -1;
+    bn = (BIGNUM *)*pval;
+    /* If MSB set in an octet we need a padding byte */
+    if (BN_num_bits(bn) & 0x7)
+        pad = 0;
+    else
+        pad = 1;
+    if (cont) {
+        if (pad)
+            *cont++ = 0;
+        BN_bn2bin(bn, cont);
+    }
+    return pad + BN_num_bytes(bn);
 }
 
 static int bn_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
                   int utype, char *free_cont, const ASN1_ITEM *it)
 {
-        BIGNUM *bn;
-        if(!*pval) bn_new(pval, it);
-        bn  = (BIGNUM *)*pval;
-        if(!BN_bin2bn(cont, len, bn)) {
-                bn_free(pval, it);
-                return 0;
-        }
-        return 1;
+    BIGNUM *bn;
+    if (!*pval)
+        bn_new(pval, it);
+    bn = (BIGNUM *)*pval;
+    if (!BN_bin2bn(cont, len, bn)) {
+        bn_free(pval, it);
+        return 0;
+    }
+    return 1;
 }
-
-
diff --git a/crypto/asn1/x_long.c b/crypto/asn1/x_long.c
index f393619..3aed44a 100644
--- a/crypto/asn1/x_long.c
+++ b/crypto/asn1/x_long.c
@@ -97,87 +97,100 @@ ASN1_ITEM_end(ZLONG)
 
 static int long_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        *(long *)pval = it->size;
-        return 1;
+    *(long *)pval = it->size;
+    return 1;
 }
 
 static void long_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        *(long *)pval = it->size;
+    *(long *)pval = it->size;
 }
 
-static int long_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype, const ASN1_ITEM *it)
+static int long_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
+                    const ASN1_ITEM *it)
 {
-        long ltmp;
-        unsigned long utmp;
-        int clen, pad, i;
-        /* this exists to bypass broken gcc optimization */
-        char *cp = (char *)pval;
-
-        /* use memcpy, because we may not be long aligned */
-        memcpy(&ltmp, cp, sizeof(long));
-
-        if(ltmp == it->size) return -1;
-        /* Convert the long to positive: we subtract one if negative so
-         * we can cleanly handle the padding if only the MSB of the leading
-         * octet is set.
-         */
-        if(ltmp < 0) utmp = -ltmp - 1;
-        else utmp = ltmp;
-        clen = BN_num_bits_word(utmp);
-        /* If MSB of leading octet set we need to pad */
-        if(!(clen & 0x7)) pad = 1;
-        else pad = 0;
-
-        /* Convert number of bits to number of octets */
-        clen = (clen + 7) >> 3;
-
-        if(cont) {
-                if(pad) *cont++ = (ltmp < 0) ? 0xff : 0;
-                for(i = clen - 1; i >= 0; i--) {
-                        cont[i] = (unsigned char)(utmp & 0xff);
-                        if(ltmp < 0) cont[i] ^= 0xff;
-                        utmp >>= 8;
-                }
+    long ltmp;
+    unsigned long utmp;
+    int clen, pad, i;
+    /* this exists to bypass broken gcc optimization */
+    char *cp = (char *)pval;
+
+    /* use memcpy, because we may not be long aligned */
+    memcpy(&ltmp, cp, sizeof(long));
+
+    if (ltmp == it->size)
+        return -1;
+    /*
+     * Convert the long to positive: we subtract one if negative so we can
+     * cleanly handle the padding if only the MSB of the leading octet is
+     * set.
+     */
+    if (ltmp < 0)
+        utmp = -ltmp - 1;
+    else
+        utmp = ltmp;
+    clen = BN_num_bits_word(utmp);
+    /* If MSB of leading octet set we need to pad */
+    if (!(clen & 0x7))
+        pad = 1;
+    else
+        pad = 0;
+
+    /* Convert number of bits to number of octets */
+    clen = (clen + 7) >> 3;
+
+    if (cont) {
+        if (pad)
+            *cont++ = (ltmp < 0) ? 0xff : 0;
+        for (i = clen - 1; i >= 0; i--) {
+            cont[i] = (unsigned char)(utmp & 0xff);
+            if (ltmp < 0)
+                cont[i] ^= 0xff;
+            utmp >>= 8;
         }
-        return clen + pad;
+    }
+    return clen + pad;
 }
 
 static int long_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
                     int utype, char *free_cont, const ASN1_ITEM *it)
 {
-        int neg, i;
-        long ltmp;
-        unsigned long utmp = 0;
-        char *cp = (char *)pval;
-        if(len > (int)sizeof(long)) {
-                ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
-                return 0;
-        }
-        /* Is it negative? */
-        if(len && (cont[0] & 0x80)) neg = 1;
-        else neg = 0;
-        utmp = 0;
-        for(i = 0; i < len; i++) {
-                utmp <<= 8;
-                if(neg) utmp |= cont[i] ^ 0xff;
-                else utmp |= cont[i];
-        }
-        ltmp = (long)utmp;
-        if(neg) {
-                ltmp++;
-                ltmp = -ltmp;
-        }
-        if(ltmp == it->size) {
-                ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
-                return 0;
-        }
-        memcpy(cp, &ltmp, sizeof(long));
-        return 1;
+    int neg, i;
+    long ltmp;
+    unsigned long utmp = 0;
+    char *cp = (char *)pval;
+    if (len > (int)sizeof(long)) {
+        ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
+        return 0;
+    }
+    /* Is it negative? */
+    if (len && (cont[0] & 0x80))
+        neg = 1;
+    else
+        neg = 0;
+    utmp = 0;
+    for (i = 0; i < len; i++) {
+        utmp <<= 8;
+        if (neg)
+            utmp |= cont[i] ^ 0xff;
+        else
+            utmp |= cont[i];
+    }
+    ltmp = (long)utmp;
+    if (neg) {
+        ltmp++;
+        ltmp = -ltmp;
+    }
+    if (ltmp == it->size) {
+        ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
+        return 0;
+    }
+    memcpy(cp, &ltmp, sizeof(long));
+    return 1;
 }
 
 static int long_print(BIO *out, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                        int indent, const ASN1_PCTX *pctx)
-        {
-        return BIO_printf(out, "%ld\n", *(long *)pval);
-        }
+                      int indent, const ASN1_PCTX *pctx)
+{
+    return BIO_printf(out, "%ld\n", *(long *)pval);
+}
diff --git a/util/openssl-format-source b/util/openssl-format-source
index 4e90147..8c3a7c0 100755
--- a/util/openssl-format-source
+++ b/util/openssl-format-source
@@ -119,7 +119,7 @@ do
 	      -e 's/^((DECLARE|IMPLEMENT)_(EXTERN_ASN1|ASN1|ADB|STACK_OF|PKCS12_STACK_OF).*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
 	      -e 's/^([ \t]*(make_dh|make_dh_bn|make_rfc5114_td)\(.*\)[ \t,]*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
 	      -e 's/^(ASN1_ADB_TEMPLATE\(.*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
-	      -e 's/^((ASN1|ADB)_.*_END\(.*[\){=,;]+[ \t]*)$/$1\n\/**INDENT-ON**\//;' \
+	      -e 's/^((ASN1|ADB)_.*_(end|END)\(.*[\){=,;]+[ \t]*)$/$1\n\/**INDENT-ON**\//;' \
 	      -e '/ASN1_(ITEM_ref|ITEM_ptr|ITEM_rptr|PCTX)/ || s/^((ASN1|ADB)_[^\*]*[){=,]+[ \t]*)$/\/**INDENT-OFF**\/\n$1/;' \
 	      -e 's/^(} (ASN1|ADB)_[^\*]*[\){=,;]+)$/$1\n\/**INDENT-ON**\//;' \
 	      | \

From steve at openssl.org  Mon Mar  2 13:52:09 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 02 Mar 2015 13:52:09 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1425304329.028883.834.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  1810b0472838495129fdc4b652daba5dfb4ee90c (commit)
      from  5c921f14cb08044e40f03440c39c70d9fb321e92 (commit)


- Log -----------------------------------------------------------------
commit 1810b0472838495129fdc4b652daba5dfb4ee90c
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 2 13:26:29 2015 +0000

    Fix format script.
    
    The format script didn't correctly recognise some ASN.1 macros and
    didn't reformat some files as a result. Fix script and reformat
    affected files.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit 437b14b533fe7f7408e3ebca6d5569f1d3347b1a)

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

Summary of changes:
 crypto/asn1/x_bignum.c     |  69 ++++++++++++---------
 crypto/asn1/x_long.c       | 149 ++++++++++++++++++++++++---------------------
 util/openssl-format-source |   2 +-
 3 files changed, 121 insertions(+), 99 deletions(-)

diff --git a/crypto/asn1/x_bignum.c b/crypto/asn1/x_bignum.c
index 1f10364..a5a403c 100644
--- a/crypto/asn1/x_bignum.c
+++ b/crypto/asn1/x_bignum.c
@@ -98,46 +98,55 @@ ASN1_ITEM_end(CBIGNUM)
 
 static int bn_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        *pval = (ASN1_VALUE *)BN_new();
-        if(*pval) return 1;
-        else return 0;
+    *pval = (ASN1_VALUE *)BN_new();
+    if (*pval)
+        return 1;
+    else
+        return 0;
 }
 
 static void bn_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        if(!*pval) return;
-        if(it->size & BN_SENSITIVE) BN_clear_free((BIGNUM *)*pval);
-        else BN_free((BIGNUM *)*pval);
-        *pval = NULL;
+    if (!*pval)
+        return;
+    if (it->size & BN_SENSITIVE)
+        BN_clear_free((BIGNUM *)*pval);
+    else
+        BN_free((BIGNUM *)*pval);
+    *pval = NULL;
 }
 
-static int bn_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype, const ASN1_ITEM *it)
+static int bn_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
+                  const ASN1_ITEM *it)
 {
-        BIGNUM *bn;
-        int pad;
-        if(!*pval) return -1;
-        bn = (BIGNUM *)*pval;
-        /* If MSB set in an octet we need a padding byte */
-        if(BN_num_bits(bn) & 0x7) pad = 0;
-        else pad = 1;
-        if(cont) {
-                if(pad) *cont++ = 0;
-                BN_bn2bin(bn, cont);
-        }
-        return pad + BN_num_bytes(bn);
+    BIGNUM *bn;
+    int pad;
+    if (!*pval)
+        return -1;
+    bn = (BIGNUM *)*pval;
+    /* If MSB set in an octet we need a padding byte */
+    if (BN_num_bits(bn) & 0x7)
+        pad = 0;
+    else
+        pad = 1;
+    if (cont) {
+        if (pad)
+            *cont++ = 0;
+        BN_bn2bin(bn, cont);
+    }
+    return pad + BN_num_bytes(bn);
 }
 
 static int bn_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
                   int utype, char *free_cont, const ASN1_ITEM *it)
 {
-        BIGNUM *bn;
-        if(!*pval) bn_new(pval, it);
-        bn  = (BIGNUM *)*pval;
-        if(!BN_bin2bn(cont, len, bn)) {
-                bn_free(pval, it);
-                return 0;
-        }
-        return 1;
+    BIGNUM *bn;
+    if (!*pval)
+        bn_new(pval, it);
+    bn = (BIGNUM *)*pval;
+    if (!BN_bin2bn(cont, len, bn)) {
+        bn_free(pval, it);
+        return 0;
+    }
+    return 1;
 }
-
-
diff --git a/crypto/asn1/x_long.c b/crypto/asn1/x_long.c
index f393619..3aed44a 100644
--- a/crypto/asn1/x_long.c
+++ b/crypto/asn1/x_long.c
@@ -97,87 +97,100 @@ ASN1_ITEM_end(ZLONG)
 
 static int long_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        *(long *)pval = it->size;
-        return 1;
+    *(long *)pval = it->size;
+    return 1;
 }
 
 static void long_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        *(long *)pval = it->size;
+    *(long *)pval = it->size;
 }
 
-static int long_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype, const ASN1_ITEM *it)
+static int long_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
+                    const ASN1_ITEM *it)
 {
-        long ltmp;
-        unsigned long utmp;
-        int clen, pad, i;
-        /* this exists to bypass broken gcc optimization */
-        char *cp = (char *)pval;
-
-        /* use memcpy, because we may not be long aligned */
-        memcpy(&ltmp, cp, sizeof(long));
-
-        if(ltmp == it->size) return -1;
-        /* Convert the long to positive: we subtract one if negative so
-         * we can cleanly handle the padding if only the MSB of the leading
-         * octet is set.
-         */
-        if(ltmp < 0) utmp = -ltmp - 1;
-        else utmp = ltmp;
-        clen = BN_num_bits_word(utmp);
-        /* If MSB of leading octet set we need to pad */
-        if(!(clen & 0x7)) pad = 1;
-        else pad = 0;
-
-        /* Convert number of bits to number of octets */
-        clen = (clen + 7) >> 3;
-
-        if(cont) {
-                if(pad) *cont++ = (ltmp < 0) ? 0xff : 0;
-                for(i = clen - 1; i >= 0; i--) {
-                        cont[i] = (unsigned char)(utmp & 0xff);
-                        if(ltmp < 0) cont[i] ^= 0xff;
-                        utmp >>= 8;
-                }
+    long ltmp;
+    unsigned long utmp;
+    int clen, pad, i;
+    /* this exists to bypass broken gcc optimization */
+    char *cp = (char *)pval;
+
+    /* use memcpy, because we may not be long aligned */
+    memcpy(&ltmp, cp, sizeof(long));
+
+    if (ltmp == it->size)
+        return -1;
+    /*
+     * Convert the long to positive: we subtract one if negative so we can
+     * cleanly handle the padding if only the MSB of the leading octet is
+     * set.
+     */
+    if (ltmp < 0)
+        utmp = -ltmp - 1;
+    else
+        utmp = ltmp;
+    clen = BN_num_bits_word(utmp);
+    /* If MSB of leading octet set we need to pad */
+    if (!(clen & 0x7))
+        pad = 1;
+    else
+        pad = 0;
+
+    /* Convert number of bits to number of octets */
+    clen = (clen + 7) >> 3;
+
+    if (cont) {
+        if (pad)
+            *cont++ = (ltmp < 0) ? 0xff : 0;
+        for (i = clen - 1; i >= 0; i--) {
+            cont[i] = (unsigned char)(utmp & 0xff);
+            if (ltmp < 0)
+                cont[i] ^= 0xff;
+            utmp >>= 8;
         }
-        return clen + pad;
+    }
+    return clen + pad;
 }
 
 static int long_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
                     int utype, char *free_cont, const ASN1_ITEM *it)
 {
-        int neg, i;
-        long ltmp;
-        unsigned long utmp = 0;
-        char *cp = (char *)pval;
-        if(len > (int)sizeof(long)) {
-                ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
-                return 0;
-        }
-        /* Is it negative? */
-        if(len && (cont[0] & 0x80)) neg = 1;
-        else neg = 0;
-        utmp = 0;
-        for(i = 0; i < len; i++) {
-                utmp <<= 8;
-                if(neg) utmp |= cont[i] ^ 0xff;
-                else utmp |= cont[i];
-        }
-        ltmp = (long)utmp;
-        if(neg) {
-                ltmp++;
-                ltmp = -ltmp;
-        }
-        if(ltmp == it->size) {
-                ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
-                return 0;
-        }
-        memcpy(cp, &ltmp, sizeof(long));
-        return 1;
+    int neg, i;
+    long ltmp;
+    unsigned long utmp = 0;
+    char *cp = (char *)pval;
+    if (len > (int)sizeof(long)) {
+        ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
+        return 0;
+    }
+    /* Is it negative? */
+    if (len && (cont[0] & 0x80))
+        neg = 1;
+    else
+        neg = 0;
+    utmp = 0;
+    for (i = 0; i < len; i++) {
+        utmp <<= 8;
+        if (neg)
+            utmp |= cont[i] ^ 0xff;
+        else
+            utmp |= cont[i];
+    }
+    ltmp = (long)utmp;
+    if (neg) {
+        ltmp++;
+        ltmp = -ltmp;
+    }
+    if (ltmp == it->size) {
+        ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
+        return 0;
+    }
+    memcpy(cp, &ltmp, sizeof(long));
+    return 1;
 }
 
 static int long_print(BIO *out, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                        int indent, const ASN1_PCTX *pctx)
-        {
-        return BIO_printf(out, "%ld\n", *(long *)pval);
-        }
+                      int indent, const ASN1_PCTX *pctx)
+{
+    return BIO_printf(out, "%ld\n", *(long *)pval);
+}
diff --git a/util/openssl-format-source b/util/openssl-format-source
index 4e90147..8c3a7c0 100755
--- a/util/openssl-format-source
+++ b/util/openssl-format-source
@@ -119,7 +119,7 @@ do
 	      -e 's/^((DECLARE|IMPLEMENT)_(EXTERN_ASN1|ASN1|ADB|STACK_OF|PKCS12_STACK_OF).*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
 	      -e 's/^([ \t]*(make_dh|make_dh_bn|make_rfc5114_td)\(.*\)[ \t,]*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
 	      -e 's/^(ASN1_ADB_TEMPLATE\(.*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
-	      -e 's/^((ASN1|ADB)_.*_END\(.*[\){=,;]+[ \t]*)$/$1\n\/**INDENT-ON**\//;' \
+	      -e 's/^((ASN1|ADB)_.*_(end|END)\(.*[\){=,;]+[ \t]*)$/$1\n\/**INDENT-ON**\//;' \
 	      -e '/ASN1_(ITEM_ref|ITEM_ptr|ITEM_rptr|PCTX)/ || s/^((ASN1|ADB)_[^\*]*[){=,]+[ \t]*)$/\/**INDENT-OFF**\/\n$1/;' \
 	      -e 's/^(} (ASN1|ADB)_[^\*]*[\){=,;]+)$/$1\n\/**INDENT-ON**\//;' \
 	      | \

From steve at openssl.org  Mon Mar  2 13:52:09 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 02 Mar 2015 13:52:09 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1425304329.092489.867.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  6fff54b0ced16781ff97592f6d6e1e532f9964bf (commit)
      from  6e20f556465f082dd4fdbd096a488e37528ddebf (commit)


- Log -----------------------------------------------------------------
commit 6fff54b0ced16781ff97592f6d6e1e532f9964bf
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 2 13:26:29 2015 +0000

    Fix format script.
    
    The format script didn't correctly recognise some ASN.1 macros and
    didn't reformat some files as a result. Fix script and reformat
    affected files.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit 437b14b533fe7f7408e3ebca6d5569f1d3347b1a)

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

Summary of changes:
 crypto/asn1/x_bignum.c     |  69 ++++++++++++---------
 crypto/asn1/x_long.c       | 149 ++++++++++++++++++++++++---------------------
 util/openssl-format-source |   2 +-
 3 files changed, 121 insertions(+), 99 deletions(-)

diff --git a/crypto/asn1/x_bignum.c b/crypto/asn1/x_bignum.c
index 1f10364..a5a403c 100644
--- a/crypto/asn1/x_bignum.c
+++ b/crypto/asn1/x_bignum.c
@@ -98,46 +98,55 @@ ASN1_ITEM_end(CBIGNUM)
 
 static int bn_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        *pval = (ASN1_VALUE *)BN_new();
-        if(*pval) return 1;
-        else return 0;
+    *pval = (ASN1_VALUE *)BN_new();
+    if (*pval)
+        return 1;
+    else
+        return 0;
 }
 
 static void bn_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        if(!*pval) return;
-        if(it->size & BN_SENSITIVE) BN_clear_free((BIGNUM *)*pval);
-        else BN_free((BIGNUM *)*pval);
-        *pval = NULL;
+    if (!*pval)
+        return;
+    if (it->size & BN_SENSITIVE)
+        BN_clear_free((BIGNUM *)*pval);
+    else
+        BN_free((BIGNUM *)*pval);
+    *pval = NULL;
 }
 
-static int bn_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype, const ASN1_ITEM *it)
+static int bn_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
+                  const ASN1_ITEM *it)
 {
-        BIGNUM *bn;
-        int pad;
-        if(!*pval) return -1;
-        bn = (BIGNUM *)*pval;
-        /* If MSB set in an octet we need a padding byte */
-        if(BN_num_bits(bn) & 0x7) pad = 0;
-        else pad = 1;
-        if(cont) {
-                if(pad) *cont++ = 0;
-                BN_bn2bin(bn, cont);
-        }
-        return pad + BN_num_bytes(bn);
+    BIGNUM *bn;
+    int pad;
+    if (!*pval)
+        return -1;
+    bn = (BIGNUM *)*pval;
+    /* If MSB set in an octet we need a padding byte */
+    if (BN_num_bits(bn) & 0x7)
+        pad = 0;
+    else
+        pad = 1;
+    if (cont) {
+        if (pad)
+            *cont++ = 0;
+        BN_bn2bin(bn, cont);
+    }
+    return pad + BN_num_bytes(bn);
 }
 
 static int bn_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
                   int utype, char *free_cont, const ASN1_ITEM *it)
 {
-        BIGNUM *bn;
-        if(!*pval) bn_new(pval, it);
-        bn  = (BIGNUM *)*pval;
-        if(!BN_bin2bn(cont, len, bn)) {
-                bn_free(pval, it);
-                return 0;
-        }
-        return 1;
+    BIGNUM *bn;
+    if (!*pval)
+        bn_new(pval, it);
+    bn = (BIGNUM *)*pval;
+    if (!BN_bin2bn(cont, len, bn)) {
+        bn_free(pval, it);
+        return 0;
+    }
+    return 1;
 }
-
-
diff --git a/crypto/asn1/x_long.c b/crypto/asn1/x_long.c
index f393619..3aed44a 100644
--- a/crypto/asn1/x_long.c
+++ b/crypto/asn1/x_long.c
@@ -97,87 +97,100 @@ ASN1_ITEM_end(ZLONG)
 
 static int long_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        *(long *)pval = it->size;
-        return 1;
+    *(long *)pval = it->size;
+    return 1;
 }
 
 static void long_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-        *(long *)pval = it->size;
+    *(long *)pval = it->size;
 }
 
-static int long_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype, const ASN1_ITEM *it)
+static int long_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
+                    const ASN1_ITEM *it)
 {
-        long ltmp;
-        unsigned long utmp;
-        int clen, pad, i;
-        /* this exists to bypass broken gcc optimization */
-        char *cp = (char *)pval;
-
-        /* use memcpy, because we may not be long aligned */
-        memcpy(&ltmp, cp, sizeof(long));
-
-        if(ltmp == it->size) return -1;
-        /* Convert the long to positive: we subtract one if negative so
-         * we can cleanly handle the padding if only the MSB of the leading
-         * octet is set.
-         */
-        if(ltmp < 0) utmp = -ltmp - 1;
-        else utmp = ltmp;
-        clen = BN_num_bits_word(utmp);
-        /* If MSB of leading octet set we need to pad */
-        if(!(clen & 0x7)) pad = 1;
-        else pad = 0;
-
-        /* Convert number of bits to number of octets */
-        clen = (clen + 7) >> 3;
-
-        if(cont) {
-                if(pad) *cont++ = (ltmp < 0) ? 0xff : 0;
-                for(i = clen - 1; i >= 0; i--) {
-                        cont[i] = (unsigned char)(utmp & 0xff);
-                        if(ltmp < 0) cont[i] ^= 0xff;
-                        utmp >>= 8;
-                }
+    long ltmp;
+    unsigned long utmp;
+    int clen, pad, i;
+    /* this exists to bypass broken gcc optimization */
+    char *cp = (char *)pval;
+
+    /* use memcpy, because we may not be long aligned */
+    memcpy(&ltmp, cp, sizeof(long));
+
+    if (ltmp == it->size)
+        return -1;
+    /*
+     * Convert the long to positive: we subtract one if negative so we can
+     * cleanly handle the padding if only the MSB of the leading octet is
+     * set.
+     */
+    if (ltmp < 0)
+        utmp = -ltmp - 1;
+    else
+        utmp = ltmp;
+    clen = BN_num_bits_word(utmp);
+    /* If MSB of leading octet set we need to pad */
+    if (!(clen & 0x7))
+        pad = 1;
+    else
+        pad = 0;
+
+    /* Convert number of bits to number of octets */
+    clen = (clen + 7) >> 3;
+
+    if (cont) {
+        if (pad)
+            *cont++ = (ltmp < 0) ? 0xff : 0;
+        for (i = clen - 1; i >= 0; i--) {
+            cont[i] = (unsigned char)(utmp & 0xff);
+            if (ltmp < 0)
+                cont[i] ^= 0xff;
+            utmp >>= 8;
         }
-        return clen + pad;
+    }
+    return clen + pad;
 }
 
 static int long_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
                     int utype, char *free_cont, const ASN1_ITEM *it)
 {
-        int neg, i;
-        long ltmp;
-        unsigned long utmp = 0;
-        char *cp = (char *)pval;
-        if(len > (int)sizeof(long)) {
-                ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
-                return 0;
-        }
-        /* Is it negative? */
-        if(len && (cont[0] & 0x80)) neg = 1;
-        else neg = 0;
-        utmp = 0;
-        for(i = 0; i < len; i++) {
-                utmp <<= 8;
-                if(neg) utmp |= cont[i] ^ 0xff;
-                else utmp |= cont[i];
-        }
-        ltmp = (long)utmp;
-        if(neg) {
-                ltmp++;
-                ltmp = -ltmp;
-        }
-        if(ltmp == it->size) {
-                ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
-                return 0;
-        }
-        memcpy(cp, &ltmp, sizeof(long));
-        return 1;
+    int neg, i;
+    long ltmp;
+    unsigned long utmp = 0;
+    char *cp = (char *)pval;
+    if (len > (int)sizeof(long)) {
+        ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
+        return 0;
+    }
+    /* Is it negative? */
+    if (len && (cont[0] & 0x80))
+        neg = 1;
+    else
+        neg = 0;
+    utmp = 0;
+    for (i = 0; i < len; i++) {
+        utmp <<= 8;
+        if (neg)
+            utmp |= cont[i] ^ 0xff;
+        else
+            utmp |= cont[i];
+    }
+    ltmp = (long)utmp;
+    if (neg) {
+        ltmp++;
+        ltmp = -ltmp;
+    }
+    if (ltmp == it->size) {
+        ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG);
+        return 0;
+    }
+    memcpy(cp, &ltmp, sizeof(long));
+    return 1;
 }
 
 static int long_print(BIO *out, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                        int indent, const ASN1_PCTX *pctx)
-        {
-        return BIO_printf(out, "%ld\n", *(long *)pval);
-        }
+                      int indent, const ASN1_PCTX *pctx)
+{
+    return BIO_printf(out, "%ld\n", *(long *)pval);
+}
diff --git a/util/openssl-format-source b/util/openssl-format-source
index 4e90147..8c3a7c0 100755
--- a/util/openssl-format-source
+++ b/util/openssl-format-source
@@ -119,7 +119,7 @@ do
 	      -e 's/^((DECLARE|IMPLEMENT)_(EXTERN_ASN1|ASN1|ADB|STACK_OF|PKCS12_STACK_OF).*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
 	      -e 's/^([ \t]*(make_dh|make_dh_bn|make_rfc5114_td)\(.*\)[ \t,]*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
 	      -e 's/^(ASN1_ADB_TEMPLATE\(.*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
-	      -e 's/^((ASN1|ADB)_.*_END\(.*[\){=,;]+[ \t]*)$/$1\n\/**INDENT-ON**\//;' \
+	      -e 's/^((ASN1|ADB)_.*_(end|END)\(.*[\){=,;]+[ \t]*)$/$1\n\/**INDENT-ON**\//;' \
 	      -e '/ASN1_(ITEM_ref|ITEM_ptr|ITEM_rptr|PCTX)/ || s/^((ASN1|ADB)_[^\*]*[){=,]+[ \t]*)$/\/**INDENT-OFF**\/\n$1/;' \
 	      -e 's/^(} (ASN1|ADB)_[^\*]*[\){=,;]+)$/$1\n\/**INDENT-ON**\//;' \
 	      | \

From steve at openssl.org  Mon Mar  2 15:26:35 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 02 Mar 2015 15:26:35 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425309995.465846.14045.nullmailer@dev.openssl.org>

The branch master has been updated
       via  28a00bcd8e318da18031b2ac8778c64147cd54f9 (commit)
      from  437b14b533fe7f7408e3ebca6d5569f1d3347b1a (commit)


- Log -----------------------------------------------------------------
commit 28a00bcd8e318da18031b2ac8778c64147cd54f9
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Feb 18 00:34:59 2015 +0000

    Check public key is not NULL.
    
    CVE-2015-0288
    PR#3708
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/x509/x509_req.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c
index bc6e566..01795f4 100644
--- a/crypto/x509/x509_req.c
+++ b/crypto/x509/x509_req.c
@@ -92,6 +92,8 @@ X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
         goto err;
 
     pktmp = X509_get_pubkey(x);
+    if (pktmp == NULL)
+        goto err;
     i = X509_REQ_set_pubkey(ret, pktmp);
     EVP_PKEY_free(pktmp);
     if (!i)

From steve at openssl.org  Mon Mar  2 15:27:27 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 02 Mar 2015 15:27:27 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_0_9_8-stable update
Message-ID: <1425310047.565256.14983.nullmailer@dev.openssl.org>

The branch OpenSSL_0_9_8-stable has been updated
       via  241cff623e2b0f7c435a3a80ae783c29d994f061 (commit)
      from  8a8ba0716796af963947586dca063ca95460010e (commit)


- Log -----------------------------------------------------------------
commit 241cff623e2b0f7c435a3a80ae783c29d994f061
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Feb 18 00:34:59 2015 +0000

    Check public key is not NULL.
    
    CVE-2015-0288
    PR#3708
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 28a00bcd8e318da18031b2ac8778c64147cd54f9)

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

Summary of changes:
 crypto/x509/x509_req.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c
index c1a2608..31e59c4 100644
--- a/crypto/x509/x509_req.c
+++ b/crypto/x509/x509_req.c
@@ -91,6 +91,8 @@ X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
         goto err;
 
     pktmp = X509_get_pubkey(x);
+    if (pktmp == NULL)
+        goto err;
     i = X509_REQ_set_pubkey(ret, pktmp);
     EVP_PKEY_free(pktmp);
     if (!i)

From steve at openssl.org  Mon Mar  2 15:27:27 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 02 Mar 2015 15:27:27 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1425310047.691671.15036.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  51527f1e3564f210e984fe5b654c45d34e4f03d7 (commit)
      from  1810b0472838495129fdc4b652daba5dfb4ee90c (commit)


- Log -----------------------------------------------------------------
commit 51527f1e3564f210e984fe5b654c45d34e4f03d7
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Feb 18 00:34:59 2015 +0000

    Check public key is not NULL.
    
    CVE-2015-0288
    PR#3708
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 28a00bcd8e318da18031b2ac8778c64147cd54f9)

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

Summary of changes:
 crypto/x509/x509_req.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c
index bc6e566..01795f4 100644
--- a/crypto/x509/x509_req.c
+++ b/crypto/x509/x509_req.c
@@ -92,6 +92,8 @@ X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
         goto err;
 
     pktmp = X509_get_pubkey(x);
+    if (pktmp == NULL)
+        goto err;
     i = X509_REQ_set_pubkey(ret, pktmp);
     EVP_PKEY_free(pktmp);
     if (!i)

From steve at openssl.org  Mon Mar  2 15:27:27 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 02 Mar 2015 15:27:27 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1425310047.746362.15057.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  9fdbaf3a322689a58381c724e4f3497320a69581 (commit)
      from  6fff54b0ced16781ff97592f6d6e1e532f9964bf (commit)


- Log -----------------------------------------------------------------
commit 9fdbaf3a322689a58381c724e4f3497320a69581
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Feb 18 00:34:59 2015 +0000

    Check public key is not NULL.
    
    CVE-2015-0288
    PR#3708
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 28a00bcd8e318da18031b2ac8778c64147cd54f9)

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

Summary of changes:
 crypto/x509/x509_req.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c
index bc6e566..01795f4 100644
--- a/crypto/x509/x509_req.c
+++ b/crypto/x509/x509_req.c
@@ -92,6 +92,8 @@ X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
         goto err;
 
     pktmp = X509_get_pubkey(x);
+    if (pktmp == NULL)
+        goto err;
     i = X509_REQ_set_pubkey(ret, pktmp);
     EVP_PKEY_free(pktmp);
     if (!i)

From steve at openssl.org  Mon Mar  2 15:27:27 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 02 Mar 2015 15:27:27 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_0-stable update
Message-ID: <1425310047.627386.15006.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_0-stable has been updated
       via  4bf7b291692c59270ddca0e62de1f11611591cfc (commit)
      from  42ad0100f12841e35f8dacef5b010de450ea5fe3 (commit)


- Log -----------------------------------------------------------------
commit 4bf7b291692c59270ddca0e62de1f11611591cfc
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Feb 18 00:34:59 2015 +0000

    Check public key is not NULL.
    
    CVE-2015-0288
    PR#3708
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 28a00bcd8e318da18031b2ac8778c64147cd54f9)

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

Summary of changes:
 crypto/x509/x509_req.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c
index bc6e566..01795f4 100644
--- a/crypto/x509/x509_req.c
+++ b/crypto/x509/x509_req.c
@@ -92,6 +92,8 @@ X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
         goto err;
 
     pktmp = X509_get_pubkey(x);
+    if (pktmp == NULL)
+        goto err;
     i = X509_REQ_set_pubkey(ret, pktmp);
     EVP_PKEY_free(pktmp);
     if (!i)

From rsalz at openssl.org  Mon Mar  2 18:52:57 2015
From: rsalz at openssl.org (Rich Salz)
Date: Mon, 02 Mar 2015 18:52:57 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1425322377.334131.4454.nullmailer@dev.openssl.org>

The branch master has been updated
       via  d997f7b7f32706c45422964688cfb31793664dc8 (commit)
      from  cb80695ce90a46785e07baab0cb7b04d468cd6a4 (commit)


- Log -----------------------------------------------------------------
commit d997f7b7f32706c45422964688cfb31793664dc8
Author: Rich Salz <rsalz at akamai.com>
Date:   Mon Mar 2 13:52:45 2015 -0500

    warning about download links broken.

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

Summary of changes:
 source/index.wml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/index.wml b/source/index.wml
index 59c571a..9161fd1 100644
--- a/source/index.wml
+++ b/source/index.wml
@@ -3,6 +3,9 @@
 
 <title>Source, Tarballs</title>
 
+<B>Links are currently broken, will be fixed shortly.  Sorry for the
+inconvenience.</b>
+
 <h1>Tarballs</h1>
 
 <p>

From rsalz at openssl.org  Mon Mar  2 18:57:37 2015
From: rsalz at openssl.org (Rich Salz)
Date: Mon, 02 Mar 2015 18:57:37 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1425322657.152049.5249.nullmailer@dev.openssl.org>

The branch master has been updated
       via  a378f9a9540bd060df13eb3e6c544ce0ae22d39c (commit)
      from  d997f7b7f32706c45422964688cfb31793664dc8 (commit)


- Log -----------------------------------------------------------------
commit a378f9a9540bd060df13eb3e6c544ce0ae22d39c
Author: Rich Salz <rsalz at akamai.com>
Date:   Mon Mar 2 13:57:24 2015 -0500

    Revert "warning about download links broken."
    
    This reverts commit d997f7b7f32706c45422964688cfb31793664dc8.

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

Summary of changes:
 source/index.wml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/source/index.wml b/source/index.wml
index 9161fd1..59c571a 100644
--- a/source/index.wml
+++ b/source/index.wml
@@ -3,9 +3,6 @@
 
 <title>Source, Tarballs</title>
 
-<B>Links are currently broken, will be fixed shortly.  Sorry for the
-inconvenience.</b>
-
 <h1>Tarballs</h1>
 
 <p>

From rsalz at openssl.org  Tue Mar  3 19:34:50 2015
From: rsalz at openssl.org (Rich Salz)
Date: Tue, 03 Mar 2015 19:34:50 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1425411290.729597.30317.nullmailer@dev.openssl.org>

The branch master has been updated
       via  d48d043b3068069836cf76238ca279de59e69ed1 (commit)
      from  a378f9a9540bd060df13eb3e6c544ce0ae22d39c (commit)


- Log -----------------------------------------------------------------
commit d48d043b3068069836cf76238ca279de59e69ed1
Author: Rich Salz <rsalz at akamai.com>
Date:   Tue Mar 3 14:33:49 2015 -0500

    Update openssl-cookbook notes.

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

Summary of changes:
 docs/index.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.wml b/docs/index.wml
index 316a9dc..bda3dc9 100644
--- a/docs/index.wml
+++ b/docs/index.wml
@@ -42,7 +42,7 @@ features which are not present in other releases.
 Other standards and documentation:
 <ul>
     <item name="OpenSSL Cookbook"
-          info="A free ebook that covers configuration and command-line usage; highly recommended. First published in 2013; continuously updated)."
+          info="A free ebook that covers configuration and command-line usage; highly recommended. Updated in March, with more than 30 new pages."
           url="https://www.feistyduck.com/books/openssl-cookbook/">
     <item name="X.680 and X.690"
           info="The official ASN.1, BER and DER specifications."

From steve at openssl.org  Wed Mar  4 14:04:46 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Wed, 04 Mar 2015 14:04:46 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425477886.415969.19348.nullmailer@dev.openssl.org>

The branch master has been updated
       via  618be04e407a7800a7198ac87fa5e8cee7c6e10b (commit)
      from  28a00bcd8e318da18031b2ac8778c64147cd54f9 (commit)


- Log -----------------------------------------------------------------
commit 618be04e407a7800a7198ac87fa5e8cee7c6e10b
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Mar 1 15:38:56 2015 +0000

    add RIPEMD160 whirlpool tests
    
    Add RIPEMD160 and whirlpool test data.
    Add Count keyword to repeatedly call EVP_DigestUpate.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/evp/evp_test.c   | 17 +++++++++++++--
 crypto/evp/evptests.txt | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/crypto/evp/evp_test.c b/crypto/evp/evp_test.c
index cc7036a..1b17f64 100644
--- a/crypto/evp/evp_test.c
+++ b/crypto/evp/evp_test.c
@@ -534,6 +534,8 @@ struct digest_data {
     /* Input to digest */
     unsigned char *input;
     size_t input_len;
+    /* Repeat count for input */
+    size_t nrpt;
     /* Expected output */
     unsigned char *output;
     size_t output_len;
@@ -556,6 +558,7 @@ static int digest_test_init(struct evp_test *t, const char *alg)
     mdat->digest = digest;
     mdat->input = NULL;
     mdat->output = NULL;
+    mdat->nrpt = 1;
     t->data = mdat;
     return 1;
 }
@@ -575,12 +578,20 @@ static int digest_test_parse(struct evp_test *t,
         return test_bin(value, &mdata->input, &mdata->input_len);
     if (!strcmp(keyword, "Output"))
         return test_bin(value, &mdata->output, &mdata->output_len);
+    if (!strcmp(keyword, "Count")) {
+        long nrpt = atoi(value);
+        if (nrpt <= 0)
+            return 0;
+        mdata->nrpt = (size_t)nrpt;
+        return 1;
+    }
     return 0;
 }
 
 static int digest_test_run(struct evp_test *t)
 {
     struct digest_data *mdata = t->data;
+    size_t i;
     const char *err = "INTERNAL_ERROR";
     EVP_MD_CTX *mctx;
     unsigned char md[EVP_MAX_MD_SIZE];
@@ -592,8 +603,10 @@ static int digest_test_run(struct evp_test *t)
     if (!EVP_DigestInit_ex(mctx, mdata->digest, NULL))
         goto err;
     err = "DIGESTUPDATE_ERROR";
-    if (!EVP_DigestUpdate(mctx, mdata->input, mdata->input_len))
-        goto err;
+    for (i = 0; i < mdata->nrpt; i++) {
+        if (!EVP_DigestUpdate(mctx, mdata->input, mdata->input_len))
+            goto err;
+    }
     err = "DIGESTFINAL_ERROR";
     if (!EVP_DigestFinal(mctx, md, &md_len))
         goto err;
diff --git a/crypto/evp/evptests.txt b/crypto/evp/evptests.txt
index 91fb7dc..8bf90d0 100644
--- a/crypto/evp/evptests.txt
+++ b/crypto/evp/evptests.txt
@@ -60,6 +60,62 @@ Digest = MD4
 Input = "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
 Output = e33b4ddc9c38f2199c3e7b164fcc0536
 
+# RIPEMD160 tests from rmdtest.c
+Digest = RIPEMD160
+Input = ""
+Output = 9c1185a5c5e9fc54612808977ee8f548b2258d31
+Digest = RIPEMD160
+Input = "a"
+Output = 0bdc9d2d256b3ee9daae347be6f4dc835a467ffe
+Digest = RIPEMD160
+Input = "abc"
+Output = 8eb208f7e05d987a9b044a8e98c6b087f15a0bfc
+Digest = RIPEMD160
+Input = "message digest"
+Output = 5d0689ef49d2fae572b881b123a85ffa21595f36
+Digest = RIPEMD160
+Input = "abcdefghijklmnopqrstuvwxyz"
+Output = f71c27109c692c1b56bbdceb5b9d2865b3708dbc
+Digest = RIPEMD160
+Input = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+Output = 12a053384a9c0c88e405a06c27dcf49ada62eb2b
+Digest = RIPEMD160
+Input = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+Output = b0e20b6e3116640286ed3a87a5713079b21f5189
+Digest = RIPEMD160
+Input = "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
+Output = 9b752e45573d4b39f4dbd3323cab82bf63326bfb
+
+# whirlpool tests from wp_test.c
+Digest = whirlpool
+Input = ""
+Output = 19FA61D75522A4669B44E39C1D2E1726C530232130D407F89AFEE0964997F7A73E83BE698B288FEBCF88E3E03C4F0757EA8964E59B63D93708B138CC42A66EB3
+Digest = whirlpool
+Input = "a"
+Output = 8ACA2602792AEC6F11A67206531FB7D7F0DFF59413145E6973C45001D0087B42D11BC645413AEFF63A42391A39145A591A92200D560195E53B478584FDAE231A
+Digest = whirlpool
+Input = "abc"
+Output = 4E2448A4C6F486BB16B6562C73B4020BF3043E3A731BCE721AE1B303D97E6D4C7181EEBDB6C57E277D0E34957114CBD6C797FC9D95D8B582D225292076D4EEF5
+Digest = whirlpool
+Input = "message digest"
+Output = 378C84A4126E2DC6E56DCC7458377AAC838D00032230F53CE1F5700C0FFB4D3B8421557659EF55C106B4B52AC5A4AAA692ED920052838F3362E86DBD37A8903E
+Digest = whirlpool
+Input = "abcdefghijklmnopqrstuvwxyz"
+Output = F1D754662636FFE92C82EBB9212A484A8D38631EAD4238F5442EE13B8054E41B08BF2A9251C30B6A0B8AAE86177AB4A6F68F673E7207865D5D9819A3DBA4EB3B
+Digest = whirlpool
+Input = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+Output = DC37E008CF9EE69BF11F00ED9ABA26901DD7C28CDEC066CC6AF42E40F82F3A1E08EBA26629129D8FB7CB57211B9281A65517CC879D7B962142C65F5A7AF01467
+Digest = whirlpool
+Input = "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
+Output = 466EF18BABB0154D25B9D38A6414F5C08784372BCCB204D6549C4AFADB6014294D5BD8DF2A6C44E538CD047B2681A51A2C60481E88C5A20B2C2A80CF3A9A083B
+Digest = whirlpool
+Input = "abcdbcdecdefdefgefghfghighijhijk"
+Output = 2A987EA40F917061F5D6F0A0E4644F488A7A5A52DEEE656207C562F988E95C6916BDC8031BC5BE1B7B947639FE050B56939BAAA0ADFF9AE6745B7B181C3BE3FD
+Digest = whirlpool
+Input = "aaaaaaaaaa"
+Count = 100000
+Output = 0C99005BEB57EFF50A7CF005560DDF5D29057FD86B20BFD62DECA0F1CCEA4AF51FC15490EDDC47AF32BB2B66C34FF9AD8C6008AD677F77126953B226E4ED8B01
+
 # AES 128 ECB tests (from FIPS-197 test vectors, encrypt)
 
 Cipher = AES-128-ECB

From matt at openssl.org  Thu Mar  5 09:23:55 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 05 Mar 2015 09:23:55 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1425547435.291257.7847.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  9f114219508d64a5b9522006eab1ed2db918dd25 (commit)
      from  51527f1e3564f210e984fe5b654c45d34e4f03d7 (commit)


- Log -----------------------------------------------------------------
commit 9f114219508d64a5b9522006eab1ed2db918dd25
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 4 17:49:51 2015 +0000

    Unchecked malloc fixes
    
    Miscellaneous unchecked malloc fixes. Also fixed some mem leaks on error
    paths as I spotted them along the way.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit 918bb8652969fd53f0c390c1cd909265ed502c7e)
    
    Conflicts:
    	crypto/bio/bss_dgram.c
    
    Conflicts:
    	apps/cms.c
    	apps/s_cb.c
    	apps/s_server.c
    	apps/speed.c
    	crypto/dh/dh_pmeth.c
    	ssl/s3_pkt.c

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

Summary of changes:
 apps/apps.c              | 11 +++++++++++
 apps/ca.c                |  8 ++++++++
 apps/dgst.c              |  5 +++++
 apps/rsautl.c            |  5 +++++
 apps/s_client.c          |  5 +++++
 apps/s_server.c          |  6 +++++-
 apps/srp.c               |  8 ++++++++
 apps/x509.c              |  5 +++++
 crypto/asn1/bio_ndef.c   |  6 ++++++
 crypto/bio/b_print.c     |  8 ++++++++
 crypto/bio/bss_dgram.c   | 15 ++++++++++++++-
 crypto/cms/cms_pwri.c    |  2 ++
 crypto/dso/dso_vms.c     |  3 ++-
 crypto/objects/o_names.c | 15 +++++++++------
 crypto/rand/rand_os2.c   |  3 +++
 crypto/threads/th-lock.c | 23 ++++++++++++++++++++++-
 16 files changed, 118 insertions(+), 10 deletions(-)

diff --git a/apps/apps.c b/apps/apps.c
index 918c647..9862afd 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -572,6 +572,11 @@ int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_tmp)
         char *prompt = NULL;
 
         prompt = UI_construct_prompt(ui, "pass phrase", prompt_info);
+        if(!prompt) {
+            BIO_printf(bio_err, "Out of memory\n");
+            UI_free(ui);
+            return 0;
+        }
 
         ui_flags |= UI_INPUT_FLAG_DEFAULT_PWD;
         UI_ctrl(ui, UI_CTRL_PRINT_ERRORS, 1, 0, 0);
@@ -581,6 +586,12 @@ int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_tmp)
                                      PW_MIN_LENGTH, bufsiz - 1);
         if (ok >= 0 && verify) {
             buff = (char *)OPENSSL_malloc(bufsiz);
+            if(!buff) {
+                BIO_printf(bio_err, "Out of memory\n");
+                UI_free(ui);
+                OPENSSL_free(prompt);
+                return 0;
+            }
             ok = UI_add_verify_string(ui, prompt, ui_flags, buff,
                                       PW_MIN_LENGTH, bufsiz - 1, buf);
         }
diff --git a/apps/ca.c b/apps/ca.c
index 174ad9a..055548a 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -558,10 +558,18 @@ int MAIN(int argc, char **argv)
 #ifdef OPENSSL_SYS_VMS
         len = strlen(s) + sizeof(CONFIG_FILE);
         tofree = OPENSSL_malloc(len);
+        if(!tofree) {
+            BIO_printf(bio_err, "Out of memory\n");
+            goto err;
+        }
         strcpy(tofree, s);
 #else
         len = strlen(s) + sizeof(CONFIG_FILE) + 1;
         tofree = OPENSSL_malloc(len);
+        if(!tofree) {
+            BIO_printf(bio_err, "Out of memory\n");
+            goto err;
+        }
         BUF_strlcpy(tofree, s, len);
         BUF_strlcat(tofree, "/", len);
 #endif
diff --git a/apps/dgst.c b/apps/dgst.c
index 6bf77d2..8459c19 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -448,6 +448,11 @@ int MAIN(int argc, char **argv)
             ERR_print_errors(bio_err);
             goto end;
         }
+        if (!sigbuf) {
+            BIO_printf(bio_err, "Out of memory\n");
+            ERR_print_errors(bio_err);
+            goto end;
+        }
         siglen = BIO_read(sigbio, sigbuf, siglen);
         BIO_free(sigbio);
         if (siglen <= 0) {
diff --git a/apps/rsautl.c b/apps/rsautl.c
index 0030aca..d642f9a 100644
--- a/apps/rsautl.c
+++ b/apps/rsautl.c
@@ -268,6 +268,11 @@ int MAIN(int argc, char **argv)
 
     rsa_in = OPENSSL_malloc(keysize * 2);
     rsa_out = OPENSSL_malloc(keysize);
+    if (!rsa_in || !rsa_out) {
+        BIO_printf(bio_err, "Out of memory\n");
+        ERR_print_errors(bio_err);
+        goto end;
+    }
 
     /* Read the input data */
     rsa_inlen = BIO_read(in, rsa_in, keysize * 2);
diff --git a/apps/s_client.c b/apps/s_client.c
index 758fb25..ef41cec 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -547,6 +547,11 @@ static char *MS_CALLBACK ssl_give_srp_client_pwd_cb(SSL *s, void *arg)
     PW_CB_DATA cb_tmp;
     int l;
 
+    if(!pass) {
+        BIO_printf(bio_err, "Malloc failure\n");
+        return NULL;
+    }
+
     cb_tmp.password = (char *)srp_arg->srppassin;
     cb_tmp.prompt_info = "SRP user";
     if ((l = password_callback(pass, PWD_STRLEN, 0, &cb_tmp)) < 0) {
diff --git a/apps/s_server.c b/apps/s_server.c
index f472126..d5ac75a 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -662,6 +662,8 @@ static int ebcdic_new(BIO *bi)
     EBCDIC_OUTBUFF *wbuf;
 
     wbuf = (EBCDIC_OUTBUFF *) OPENSSL_malloc(sizeof(EBCDIC_OUTBUFF) + 1024);
+    if (!wbuf)
+        return 0;
     wbuf->alloced = 1024;
     wbuf->buff[0] = '\0';
 
@@ -716,9 +718,11 @@ static int ebcdic_write(BIO *b, const char *in, int inl)
         num = num + num;        /* double the size */
         if (num < inl)
             num = inl;
-        OPENSSL_free(wbuf);
         wbuf =
             (EBCDIC_OUTBUFF *) OPENSSL_malloc(sizeof(EBCDIC_OUTBUFF) + num);
+        if(!wbuf)
+            return 0;
+        OPENSSL_free(b->ptr);
 
         wbuf->alloced = num;
         wbuf->buff[0] = '\0';
diff --git a/apps/srp.c b/apps/srp.c
index 47b45fb..c679448 100644
--- a/apps/srp.c
+++ b/apps/srp.c
@@ -435,10 +435,18 @@ int MAIN(int argc, char **argv)
 # ifdef OPENSSL_SYS_VMS
             len = strlen(s) + sizeof(CONFIG_FILE);
             tofree = OPENSSL_malloc(len);
+            if(!tofree) {
+                BIO_printf(bio_err, "Out of memory\n");
+                goto err;
+            }
             strcpy(tofree, s);
 # else
             len = strlen(s) + sizeof(CONFIG_FILE) + 1;
             tofree = OPENSSL_malloc(len);
+            if(!tofree) {
+                BIO_printf(bio_err, "Out of memory\n");
+                goto err;
+            }
             BUF_strlcpy(tofree, s, len);
             BUF_strlcat(tofree, "/", len);
 # endif
diff --git a/apps/x509.c b/apps/x509.c
index 7c3b080..929359b 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -783,6 +783,11 @@ int MAIN(int argc, char **argv)
 
                 z = i2d_X509(x, NULL);
                 m = OPENSSL_malloc(z);
+                if (!m) {
+                    BIO_printf(bio_err, "Out of memory\n");
+                    ERR_print_errors(bio_err);
+                    goto end;
+                }
 
                 d = (unsigned char *)m;
                 z = i2d_X509_NAME(X509_get_subject_name(x), &d);
diff --git a/crypto/asn1/bio_ndef.c b/crypto/asn1/bio_ndef.c
index 5817a2b..4a73ca9 100644
--- a/crypto/asn1/bio_ndef.c
+++ b/crypto/asn1/bio_ndef.c
@@ -162,6 +162,9 @@ static int ndef_prefix(BIO *b, unsigned char **pbuf, int *plen, void *parg)
 
     derlen = ASN1_item_ndef_i2d(ndef_aux->val, NULL, ndef_aux->it);
     p = OPENSSL_malloc(derlen);
+    if(!p)
+        return 0;
+
     ndef_aux->derbuf = p;
     *pbuf = p;
     derlen = ASN1_item_ndef_i2d(ndef_aux->val, &p, ndef_aux->it);
@@ -229,6 +232,9 @@ static int ndef_suffix(BIO *b, unsigned char **pbuf, int *plen, void *parg)
 
     derlen = ASN1_item_ndef_i2d(ndef_aux->val, NULL, ndef_aux->it);
     p = OPENSSL_malloc(derlen);
+    if(!p)
+        return 0;
+
     ndef_aux->derbuf = p;
     *pbuf = p;
     derlen = ASN1_item_ndef_i2d(ndef_aux->val, &p, ndef_aux->it);
diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index 5dc7630..f7940f2 100644
--- a/crypto/bio/b_print.c
+++ b/crypto/bio/b_print.c
@@ -713,6 +713,10 @@ doapr_outch(char **sbuffer,
                 if (*maxlen == 0)
                     *maxlen = 1024;
                 *buffer = OPENSSL_malloc(*maxlen);
+                if(!*buffer) {
+                    /* Panic! Can't really do anything sensible. Just return */
+                    return;
+                }
                 if (*currlen > 0) {
                     assert(*sbuffer != NULL);
                     memcpy(*buffer, *sbuffer, *currlen);
@@ -721,6 +725,10 @@ doapr_outch(char **sbuffer,
             } else {
                 *maxlen += 1024;
                 *buffer = OPENSSL_realloc(*buffer, *maxlen);
+                if(!*buffer) {
+                    /* Panic! Can't really do anything sensible. Just return */
+                    return;
+                }
             }
         }
         /* What to do if *buffer is NULL? */
diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index dd36802..b495db2 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -953,6 +953,10 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag)
      */
     sockopt_len = (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
     authchunks = OPENSSL_malloc(sockopt_len);
+    if(!authchunks) {
+        BIO_vfree(bio);
+        return (NULL);
+    }
     memset(authchunks, 0, sizeof(sockopt_len));
     ret =
         getsockopt(fd, IPPROTO_SCTP, SCTP_LOCAL_AUTH_CHUNKS, authchunks,
@@ -1288,6 +1292,10 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
             optlen =
                 (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
             authchunks = OPENSSL_malloc(optlen);
+            if (!authchunks) {
+                BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_ERROR);
+                return -1;
+            }
             memset(authchunks, 0, sizeof(optlen));
             ii = getsockopt(b->num, IPPROTO_SCTP, SCTP_PEER_AUTH_CHUNKS,
                             authchunks, &optlen);
@@ -1354,10 +1362,15 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
      * yet, we have to save it and send it as soon as the socket gets dry.
      */
     if (data->save_shutdown && !BIO_dgram_sctp_wait_for_dry(b)) {
+        char *tmp;
         data->saved_message.bio = b;
+        if(!(tmp = OPENSSL_malloc(inl))) {
+            BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_ERROR);
+            return -1;
+        }
         if (data->saved_message.data)
             OPENSSL_free(data->saved_message.data);
-        data->saved_message.data = OPENSSL_malloc(inl);
+        data->saved_message.data = tmp;
         memcpy(data->saved_message.data, in, inl);
         data->saved_message.length = inl;
         return inl;
diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c
index d93b14f..076b545 100644
--- a/crypto/cms/cms_pwri.c
+++ b/crypto/cms/cms_pwri.c
@@ -231,6 +231,8 @@ static int kek_unwrap_key(unsigned char *out, size_t *outlen,
         return 0;
     }
     tmp = OPENSSL_malloc(inlen);
+    if(!tmp)
+        return 0;
     /* setup IV by decrypting last two blocks */
     EVP_DecryptUpdate(ctx, tmp + inlen - 2 * blocklen, &outl,
                       in + inlen - 2 * blocklen, blocklen * 2);
diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c
index 8793f7e..0eff96e 100644
--- a/crypto/dso/dso_vms.c
+++ b/crypto/dso/dso_vms.c
@@ -539,7 +539,8 @@ static char *vms_name_converter(DSO *dso, const char *filename)
 {
     int len = strlen(filename);
     char *not_translated = OPENSSL_malloc(len + 1);
-    strcpy(not_translated, filename);
+    if(not_translated)
+        strcpy(not_translated, filename);
     return (not_translated);
 }
 
diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index e1e13a6..c6774f4 100644
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c
@@ -312,15 +312,18 @@ void OBJ_NAME_do_all_sorted(int type,
     d.type = type;
     d.names =
         OPENSSL_malloc(lh_OBJ_NAME_num_items(names_lh) * sizeof *d.names);
-    d.n = 0;
-    OBJ_NAME_do_all(type, do_all_sorted_fn, &d);
+    /* Really should return an error if !d.names...but its a void function! */
+    if(d.names) {
+        d.n = 0;
+        OBJ_NAME_do_all(type, do_all_sorted_fn, &d);
 
-    qsort((void *)d.names, d.n, sizeof *d.names, do_all_sorted_cmp);
+        qsort((void *)d.names, d.n, sizeof *d.names, do_all_sorted_cmp);
 
-    for (n = 0; n < d.n; ++n)
-        fn(d.names[n], arg);
+        for (n = 0; n < d.n; ++n)
+            fn(d.names[n], arg);
 
-    OPENSSL_free((void *)d.names);
+        OPENSSL_free((void *)d.names);
+    }
 }
 
 static int free_type;
diff --git a/crypto/rand/rand_os2.c b/crypto/rand/rand_os2.c
index 9c4a137..02148d5 100644
--- a/crypto/rand/rand_os2.c
+++ b/crypto/rand/rand_os2.c
@@ -149,6 +149,9 @@ int RAND_poll(void)
     if (DosQuerySysState) {
         char *buffer = OPENSSL_malloc(256 * 1024);
 
+        if(!buffer)
+            return 0;
+
         if (DosQuerySysState(0x1F, 0, 0, 0, buffer, 256 * 1024) == 0) {
             /*
              * First 4 bytes in buffer is a pointer to the thread count there
diff --git a/crypto/threads/th-lock.c b/crypto/threads/th-lock.c
index 1b57659..28884c2 100644
--- a/crypto/threads/th-lock.c
+++ b/crypto/threads/th-lock.c
@@ -117,6 +117,10 @@ void CRYPTO_thread_setup(void)
     int i;
 
     lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(HANDLE));
+    if(!lock_cs) {
+        /* Nothing we can do about this...void function! */
+        return;
+    }
     for (i = 0; i < CRYPTO_num_locks(); i++) {
         lock_cs[i] = CreateMutex(NULL, FALSE, NULL);
     }
@@ -168,6 +172,10 @@ void CRYPTO_thread_setup(void)
 # else
     lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(rwlock_t));
 # endif
+    if(!lock_cs) {
+        /* Nothing we can do about this...void function! */
+        return;
+    }
     lock_count = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(long));
     for (i = 0; i < CRYPTO_num_locks(); i++) {
         lock_count[i] = 0;
@@ -251,6 +259,12 @@ void CRYPTO_thread_setup(void)
     int i;
     char filename[20];
 
+    lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(usema_t *));
+    if(!lock_cs) {
+        /* Nothing we can do about this...void function! */
+        return;
+    }
+
     strcpy(filename, "/tmp/mttest.XXXXXX");
     mktemp(filename);
 
@@ -261,7 +275,6 @@ void CRYPTO_thread_setup(void)
     arena = usinit(filename);
     unlink(filename);
 
-    lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(usema_t *));
     for (i = 0; i < CRYPTO_num_locks(); i++) {
         lock_cs[i] = usnewsema(arena, 1);
     }
@@ -315,6 +328,14 @@ void CRYPTO_thread_setup(void)
 
     lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(pthread_mutex_t));
     lock_count = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(long));
+    if(!lock_cs || !lock_count) {
+        /* Nothing we can do about this...void function! */
+        if(lock_cs)
+            OPENSSL_free(lock_cs);
+        if(lock_count)
+            OPENSSL_free(lock_count);
+        return;
+    }
     for (i = 0; i < CRYPTO_num_locks(); i++) {
         lock_count[i] = 0;
         pthread_mutex_init(&(lock_cs[i]), NULL);

From matt at openssl.org  Thu Mar  5 09:24:05 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 05 Mar 2015 09:24:05 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1425547445.802395.8085.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  d6b4a41d100c2d3b401baf8edc34085ff610c5ba (commit)
      from  9fdbaf3a322689a58381c724e4f3497320a69581 (commit)


- Log -----------------------------------------------------------------
commit d6b4a41d100c2d3b401baf8edc34085ff610c5ba
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 4 17:49:51 2015 +0000

    Unchecked malloc fixes
    
    Miscellaneous unchecked malloc fixes. Also fixed some mem leaks on error
    paths as I spotted them along the way.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit 918bb8652969fd53f0c390c1cd909265ed502c7e)
    
    Conflicts:
    	crypto/bio/bss_dgram.c

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

Summary of changes:
 apps/apps.c              | 11 +++++++++++
 apps/ca.c                |  8 ++++++++
 apps/cms.c               |  4 ++++
 apps/dgst.c              |  5 +++++
 apps/rsautl.c            |  5 +++++
 apps/s_cb.c              |  5 +++++
 apps/s_client.c          |  5 +++++
 apps/s_server.c          | 20 +++++++++++++++++++-
 apps/speed.c             | 12 ++++++++++--
 apps/srp.c               |  8 ++++++++
 apps/x509.c              |  5 +++++
 crypto/asn1/bio_ndef.c   |  6 ++++++
 crypto/bio/b_print.c     |  8 ++++++++
 crypto/bio/bss_dgram.c   | 15 ++++++++++++++-
 crypto/cms/cms_pwri.c    |  2 ++
 crypto/dh/dh_pmeth.c     |  3 +++
 crypto/dso/dso_vms.c     |  3 ++-
 crypto/objects/o_names.c | 15 +++++++++------
 crypto/rand/rand_os2.c   |  3 +++
 crypto/threads/th-lock.c | 23 ++++++++++++++++++++++-
 ssl/s3_pkt.c             |  4 ++++
 21 files changed, 158 insertions(+), 12 deletions(-)

diff --git a/apps/apps.c b/apps/apps.c
index ef5d087..b0acbc7 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -574,6 +574,11 @@ int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_tmp)
         char *prompt = NULL;
 
         prompt = UI_construct_prompt(ui, "pass phrase", prompt_info);
+        if(!prompt) {
+            BIO_printf(bio_err, "Out of memory\n");
+            UI_free(ui);
+            return 0;
+        }
 
         ui_flags |= UI_INPUT_FLAG_DEFAULT_PWD;
         UI_ctrl(ui, UI_CTRL_PRINT_ERRORS, 1, 0, 0);
@@ -583,6 +588,12 @@ int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_tmp)
                                      PW_MIN_LENGTH, bufsiz - 1);
         if (ok >= 0 && verify) {
             buff = (char *)OPENSSL_malloc(bufsiz);
+            if(!buff) {
+                BIO_printf(bio_err, "Out of memory\n");
+                UI_free(ui);
+                OPENSSL_free(prompt);
+                return 0;
+            }
             ok = UI_add_verify_string(ui, prompt, ui_flags, buff,
                                       PW_MIN_LENGTH, bufsiz - 1, buf);
         }
diff --git a/apps/ca.c b/apps/ca.c
index f0a19cf..3215c56 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -563,10 +563,18 @@ int MAIN(int argc, char **argv)
 #ifdef OPENSSL_SYS_VMS
         len = strlen(s) + sizeof(CONFIG_FILE);
         tofree = OPENSSL_malloc(len);
+        if(!tofree) {
+            BIO_printf(bio_err, "Out of memory\n");
+            goto err;
+        }
         strcpy(tofree, s);
 #else
         len = strlen(s) + sizeof(CONFIG_FILE) + 1;
         tofree = OPENSSL_malloc(len);
+        if(!tofree) {
+            BIO_printf(bio_err, "Out of memory\n");
+            goto err;
+        }
         BUF_strlcpy(tofree, s, len);
         BUF_strlcat(tofree, "/", len);
 #endif
diff --git a/apps/cms.c b/apps/cms.c
index 2c8ada6..2c92253 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -463,6 +463,10 @@ int MAIN(int argc, char **argv)
             if (key_param == NULL || key_param->idx != keyidx) {
                 cms_key_param *nparam;
                 nparam = OPENSSL_malloc(sizeof(cms_key_param));
+                if(!nparam) {
+                    BIO_printf(bio_err, "Out of memory\n");
+                    goto argerr;
+                }
                 nparam->idx = keyidx;
                 nparam->param = sk_OPENSSL_STRING_new_null();
                 nparam->next = NULL;
diff --git a/apps/dgst.c b/apps/dgst.c
index adb7a06..47c2f69 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -460,6 +460,11 @@ int MAIN(int argc, char **argv)
             ERR_print_errors(bio_err);
             goto end;
         }
+        if (!sigbuf) {
+            BIO_printf(bio_err, "Out of memory\n");
+            ERR_print_errors(bio_err);
+            goto end;
+        }
         siglen = BIO_read(sigbio, sigbuf, siglen);
         BIO_free(sigbio);
         if (siglen <= 0) {
diff --git a/apps/rsautl.c b/apps/rsautl.c
index 0030aca..d642f9a 100644
--- a/apps/rsautl.c
+++ b/apps/rsautl.c
@@ -268,6 +268,11 @@ int MAIN(int argc, char **argv)
 
     rsa_in = OPENSSL_malloc(keysize * 2);
     rsa_out = OPENSSL_malloc(keysize);
+    if (!rsa_in || !rsa_out) {
+        BIO_printf(bio_err, "Out of memory\n");
+        ERR_print_errors(bio_err);
+        goto end;
+    }
 
     /* Read the input data */
     rsa_inlen = BIO_read(in, rsa_in, keysize * 2);
diff --git a/apps/s_cb.c b/apps/s_cb.c
index d5756c0..f6e6bcd 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -456,8 +456,13 @@ int ssl_print_curves(BIO *out, SSL *s, int noshared)
     if (ncurves <= 0)
         return 1;
     curves = OPENSSL_malloc(ncurves * sizeof(int));
+    if(!curves) {
+        BIO_puts(out, "Malloc error getting supported curves\n");
+        return 0;
+    }
     SSL_get1_curves(s, curves);
 
+
     BIO_puts(out, "Supported Elliptic Curves: ");
     for (i = 0; i < ncurves; i++) {
         if (i)
diff --git a/apps/s_client.c b/apps/s_client.c
index 8212c9f..8fa2b73 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -560,6 +560,11 @@ static char *MS_CALLBACK ssl_give_srp_client_pwd_cb(SSL *s, void *arg)
     PW_CB_DATA cb_tmp;
     int l;
 
+    if(!pass) {
+        BIO_printf(bio_err, "Malloc failure\n");
+        return NULL;
+    }
+
     cb_tmp.password = (char *)srp_arg->srppassin;
     cb_tmp.prompt_info = "SRP user";
     if ((l = password_callback(pass, PWD_STRLEN, 0, &cb_tmp)) < 0) {
diff --git a/apps/s_server.c b/apps/s_server.c
index 5709546..655ada0 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -696,6 +696,8 @@ static int ebcdic_new(BIO *bi)
     EBCDIC_OUTBUFF *wbuf;
 
     wbuf = (EBCDIC_OUTBUFF *) OPENSSL_malloc(sizeof(EBCDIC_OUTBUFF) + 1024);
+    if (!wbuf)
+        return 0;
     wbuf->alloced = 1024;
     wbuf->buff[0] = '\0';
 
@@ -750,9 +752,11 @@ static int ebcdic_write(BIO *b, const char *in, int inl)
         num = num + num;        /* double the size */
         if (num < inl)
             num = inl;
-        OPENSSL_free(wbuf);
         wbuf =
             (EBCDIC_OUTBUFF *) OPENSSL_malloc(sizeof(EBCDIC_OUTBUFF) + num);
+        if(!wbuf)
+            return 0;
+        OPENSSL_free(b->ptr);
 
         wbuf->alloced = num;
         wbuf->buff[0] = '\0';
@@ -3319,6 +3323,10 @@ static int add_session(SSL *ssl, SSL_SESSION *session)
     unsigned char *p;
 
     sess = OPENSSL_malloc(sizeof(simple_ssl_session));
+    if(!sess) {
+        BIO_printf(bio_err, "Out of memory adding session to external cache\n");
+        return 0;
+    }
 
     SSL_SESSION_get_id(session, &sess->idlen);
     sess->derlen = i2d_SSL_SESSION(session, NULL);
@@ -3326,6 +3334,16 @@ static int add_session(SSL *ssl, SSL_SESSION *session)
     sess->id = BUF_memdup(SSL_SESSION_get_id(session, NULL), sess->idlen);
 
     sess->der = OPENSSL_malloc(sess->derlen);
+    if(!sess->id || !sess->der) {
+        BIO_printf(bio_err, "Out of memory adding session to external cache\n");
+
+        if(sess->id)
+            OPENSSL_free(sess->id);
+        if(sess->der)
+            OPENSSL_free(sess->der);
+        OPENSSL_free(sess);
+        return 0;
+    }
     p = sess->der;
     i2d_SSL_SESSION(session, &p);
 
diff --git a/apps/speed.c b/apps/speed.c
index 7dcd354..7b1acc1 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -2775,6 +2775,11 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher)
 
     inp = OPENSSL_malloc(mblengths[num - 1]);
     out = OPENSSL_malloc(mblengths[num - 1] + 1024);
+    if(!inp || !out) {
+        BIO_printf(bio_err,"Out of memory\n");
+        goto end;
+    }
+
 
     EVP_CIPHER_CTX_init(&ctx);
     EVP_EncryptInit_ex(&ctx, evp_cipher, NULL, no_key, no_iv);
@@ -2859,7 +2864,10 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher)
         fprintf(stdout, "\n");
     }
 
-    OPENSSL_free(inp);
-    OPENSSL_free(out);
+end:
+    if(inp)
+        OPENSSL_free(inp);
+    if(out)
+        OPENSSL_free(out);
 }
 #endif
diff --git a/apps/srp.c b/apps/srp.c
index 47b45fb..c679448 100644
--- a/apps/srp.c
+++ b/apps/srp.c
@@ -435,10 +435,18 @@ int MAIN(int argc, char **argv)
 # ifdef OPENSSL_SYS_VMS
             len = strlen(s) + sizeof(CONFIG_FILE);
             tofree = OPENSSL_malloc(len);
+            if(!tofree) {
+                BIO_printf(bio_err, "Out of memory\n");
+                goto err;
+            }
             strcpy(tofree, s);
 # else
             len = strlen(s) + sizeof(CONFIG_FILE) + 1;
             tofree = OPENSSL_malloc(len);
+            if(!tofree) {
+                BIO_printf(bio_err, "Out of memory\n");
+                goto err;
+            }
             BUF_strlcpy(tofree, s, len);
             BUF_strlcat(tofree, "/", len);
 # endif
diff --git a/apps/x509.c b/apps/x509.c
index d005c82..864a60d 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -829,6 +829,11 @@ int MAIN(int argc, char **argv)
 
                 z = i2d_X509(x, NULL);
                 m = OPENSSL_malloc(z);
+                if (!m) {
+                    BIO_printf(bio_err, "Out of memory\n");
+                    ERR_print_errors(bio_err);
+                    goto end;
+                }
 
                 d = (unsigned char *)m;
                 z = i2d_X509_NAME(X509_get_subject_name(x), &d);
diff --git a/crypto/asn1/bio_ndef.c b/crypto/asn1/bio_ndef.c
index 5817a2b..4a73ca9 100644
--- a/crypto/asn1/bio_ndef.c
+++ b/crypto/asn1/bio_ndef.c
@@ -162,6 +162,9 @@ static int ndef_prefix(BIO *b, unsigned char **pbuf, int *plen, void *parg)
 
     derlen = ASN1_item_ndef_i2d(ndef_aux->val, NULL, ndef_aux->it);
     p = OPENSSL_malloc(derlen);
+    if(!p)
+        return 0;
+
     ndef_aux->derbuf = p;
     *pbuf = p;
     derlen = ASN1_item_ndef_i2d(ndef_aux->val, &p, ndef_aux->it);
@@ -229,6 +232,9 @@ static int ndef_suffix(BIO *b, unsigned char **pbuf, int *plen, void *parg)
 
     derlen = ASN1_item_ndef_i2d(ndef_aux->val, NULL, ndef_aux->it);
     p = OPENSSL_malloc(derlen);
+    if(!p)
+        return 0;
+
     ndef_aux->derbuf = p;
     *pbuf = p;
     derlen = ASN1_item_ndef_i2d(ndef_aux->val, &p, ndef_aux->it);
diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index 5dc7630..f7940f2 100644
--- a/crypto/bio/b_print.c
+++ b/crypto/bio/b_print.c
@@ -713,6 +713,10 @@ doapr_outch(char **sbuffer,
                 if (*maxlen == 0)
                     *maxlen = 1024;
                 *buffer = OPENSSL_malloc(*maxlen);
+                if(!*buffer) {
+                    /* Panic! Can't really do anything sensible. Just return */
+                    return;
+                }
                 if (*currlen > 0) {
                     assert(*sbuffer != NULL);
                     memcpy(*buffer, *sbuffer, *currlen);
@@ -721,6 +725,10 @@ doapr_outch(char **sbuffer,
             } else {
                 *maxlen += 1024;
                 *buffer = OPENSSL_realloc(*buffer, *maxlen);
+                if(!*buffer) {
+                    /* Panic! Can't really do anything sensible. Just return */
+                    return;
+                }
             }
         }
         /* What to do if *buffer is NULL? */
diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index fcbae5f..388d90d 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -1012,6 +1012,10 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag)
      */
     sockopt_len = (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
     authchunks = OPENSSL_malloc(sockopt_len);
+    if(!authchunks) {
+        BIO_vfree(bio);
+        return (NULL);
+    }
     memset(authchunks, 0, sizeof(sockopt_len));
     ret =
         getsockopt(fd, IPPROTO_SCTP, SCTP_LOCAL_AUTH_CHUNKS, authchunks,
@@ -1347,6 +1351,10 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
             optlen =
                 (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
             authchunks = OPENSSL_malloc(optlen);
+            if (!authchunks) {
+                BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_ERROR);
+                return -1;
+            }
             memset(authchunks, 0, sizeof(optlen));
             ii = getsockopt(b->num, IPPROTO_SCTP, SCTP_PEER_AUTH_CHUNKS,
                             authchunks, &optlen);
@@ -1413,10 +1421,15 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
      * yet, we have to save it and send it as soon as the socket gets dry.
      */
     if (data->save_shutdown && !BIO_dgram_sctp_wait_for_dry(b)) {
+        char *tmp;
         data->saved_message.bio = b;
+        if(!(tmp = OPENSSL_malloc(inl))) {
+            BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_ERROR);
+            return -1;
+        }
         if (data->saved_message.data)
             OPENSSL_free(data->saved_message.data);
-        data->saved_message.data = OPENSSL_malloc(inl);
+        data->saved_message.data = tmp;
         memcpy(data->saved_message.data, in, inl);
         data->saved_message.length = inl;
         return inl;
diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c
index d93b14f..076b545 100644
--- a/crypto/cms/cms_pwri.c
+++ b/crypto/cms/cms_pwri.c
@@ -231,6 +231,8 @@ static int kek_unwrap_key(unsigned char *out, size_t *outlen,
         return 0;
     }
     tmp = OPENSSL_malloc(inlen);
+    if(!tmp)
+        return 0;
     /* setup IV by decrypting last two blocks */
     EVP_DecryptUpdate(ctx, tmp + inlen - 2 * blocklen, &outl,
                       in + inlen - 2 * blocklen, blocklen * 2);
diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c
index 494a887..b3a3147 100644
--- a/crypto/dh/dh_pmeth.c
+++ b/crypto/dh/dh_pmeth.c
@@ -462,6 +462,9 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
         ret = 0;
         Zlen = DH_size(dh);
         Z = OPENSSL_malloc(Zlen);
+        if(!Z) {
+            goto err;
+        }
         if (DH_compute_key_padded(Z, dhpub, dh) <= 0)
             goto err;
         if (!DH_KDF_X9_42(key, *keylen, Z, Zlen, dctx->kdf_oid,
diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c
index 8793f7e..0eff96e 100644
--- a/crypto/dso/dso_vms.c
+++ b/crypto/dso/dso_vms.c
@@ -539,7 +539,8 @@ static char *vms_name_converter(DSO *dso, const char *filename)
 {
     int len = strlen(filename);
     char *not_translated = OPENSSL_malloc(len + 1);
-    strcpy(not_translated, filename);
+    if(not_translated)
+        strcpy(not_translated, filename);
     return (not_translated);
 }
 
diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index e1e13a6..c6774f4 100644
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c
@@ -312,15 +312,18 @@ void OBJ_NAME_do_all_sorted(int type,
     d.type = type;
     d.names =
         OPENSSL_malloc(lh_OBJ_NAME_num_items(names_lh) * sizeof *d.names);
-    d.n = 0;
-    OBJ_NAME_do_all(type, do_all_sorted_fn, &d);
+    /* Really should return an error if !d.names...but its a void function! */
+    if(d.names) {
+        d.n = 0;
+        OBJ_NAME_do_all(type, do_all_sorted_fn, &d);
 
-    qsort((void *)d.names, d.n, sizeof *d.names, do_all_sorted_cmp);
+        qsort((void *)d.names, d.n, sizeof *d.names, do_all_sorted_cmp);
 
-    for (n = 0; n < d.n; ++n)
-        fn(d.names[n], arg);
+        for (n = 0; n < d.n; ++n)
+            fn(d.names[n], arg);
 
-    OPENSSL_free((void *)d.names);
+        OPENSSL_free((void *)d.names);
+    }
 }
 
 static int free_type;
diff --git a/crypto/rand/rand_os2.c b/crypto/rand/rand_os2.c
index 9c4a137..02148d5 100644
--- a/crypto/rand/rand_os2.c
+++ b/crypto/rand/rand_os2.c
@@ -149,6 +149,9 @@ int RAND_poll(void)
     if (DosQuerySysState) {
         char *buffer = OPENSSL_malloc(256 * 1024);
 
+        if(!buffer)
+            return 0;
+
         if (DosQuerySysState(0x1F, 0, 0, 0, buffer, 256 * 1024) == 0) {
             /*
              * First 4 bytes in buffer is a pointer to the thread count there
diff --git a/crypto/threads/th-lock.c b/crypto/threads/th-lock.c
index 1b57659..28884c2 100644
--- a/crypto/threads/th-lock.c
+++ b/crypto/threads/th-lock.c
@@ -117,6 +117,10 @@ void CRYPTO_thread_setup(void)
     int i;
 
     lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(HANDLE));
+    if(!lock_cs) {
+        /* Nothing we can do about this...void function! */
+        return;
+    }
     for (i = 0; i < CRYPTO_num_locks(); i++) {
         lock_cs[i] = CreateMutex(NULL, FALSE, NULL);
     }
@@ -168,6 +172,10 @@ void CRYPTO_thread_setup(void)
 # else
     lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(rwlock_t));
 # endif
+    if(!lock_cs) {
+        /* Nothing we can do about this...void function! */
+        return;
+    }
     lock_count = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(long));
     for (i = 0; i < CRYPTO_num_locks(); i++) {
         lock_count[i] = 0;
@@ -251,6 +259,12 @@ void CRYPTO_thread_setup(void)
     int i;
     char filename[20];
 
+    lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(usema_t *));
+    if(!lock_cs) {
+        /* Nothing we can do about this...void function! */
+        return;
+    }
+
     strcpy(filename, "/tmp/mttest.XXXXXX");
     mktemp(filename);
 
@@ -261,7 +275,6 @@ void CRYPTO_thread_setup(void)
     arena = usinit(filename);
     unlink(filename);
 
-    lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(usema_t *));
     for (i = 0; i < CRYPTO_num_locks(); i++) {
         lock_cs[i] = usnewsema(arena, 1);
     }
@@ -315,6 +328,14 @@ void CRYPTO_thread_setup(void)
 
     lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(pthread_mutex_t));
     lock_count = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(long));
+    if(!lock_cs || !lock_count) {
+        /* Nothing we can do about this...void function! */
+        if(lock_cs)
+            OPENSSL_free(lock_cs);
+        if(lock_count)
+            OPENSSL_free(lock_count);
+        return;
+    }
     for (i = 0; i < CRYPTO_num_locks(); i++) {
         lock_count[i] = 0;
         pthread_mutex_init(&(lock_cs[i]), NULL);
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index d5ddb60..136d273 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -708,6 +708,10 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
                 packlen *= 4;
 
             wb->buf = OPENSSL_malloc(packlen);
+            if(!wb->buf) {
+                SSLerr(SSL_F_SSL3_WRITE_BYTES, ERR_R_MALLOC_FAILURE);
+                return -1;
+            }
             wb->len = packlen;
         } else if (tot == len) { /* done? */
             OPENSSL_free(wb->buf); /* free jumbo buffer */

From matt at openssl.org  Thu Mar  5 09:24:13 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 05 Mar 2015 09:24:13 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425547453.252177.8358.nullmailer@dev.openssl.org>

The branch master has been updated
       via  918bb8652969fd53f0c390c1cd909265ed502c7e (commit)
      from  618be04e407a7800a7198ac87fa5e8cee7c6e10b (commit)


- Log -----------------------------------------------------------------
commit 918bb8652969fd53f0c390c1cd909265ed502c7e
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 4 17:49:51 2015 +0000

    Unchecked malloc fixes
    
    Miscellaneous unchecked malloc fixes. Also fixed some mem leaks on error
    paths as I spotted them along the way.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 apps/apps.c              | 11 +++++++++++
 apps/ca.c                |  8 ++++++++
 apps/cms.c               |  4 ++++
 apps/dgst.c              |  5 +++++
 apps/rsautl.c            |  5 +++++
 apps/s_cb.c              |  5 +++++
 apps/s_client.c          |  5 +++++
 apps/s_server.c          | 20 +++++++++++++++++++-
 apps/speed.c             | 12 ++++++++++--
 apps/srp.c               |  8 ++++++++
 apps/x509.c              |  5 +++++
 crypto/asn1/bio_ndef.c   |  6 ++++++
 crypto/bio/b_print.c     |  8 ++++++++
 crypto/bio/bss_dgram.c   | 15 ++++++++++++++-
 crypto/cms/cms_pwri.c    |  2 ++
 crypto/dh/dh_pmeth.c     |  3 +++
 crypto/dso/dso_vms.c     |  3 ++-
 crypto/objects/o_names.c | 15 +++++++++------
 crypto/rand/rand_os2.c   |  3 +++
 crypto/threads/th-lock.c | 23 ++++++++++++++++++++++-
 ssl/s3_pkt.c             |  4 ++++
 21 files changed, 158 insertions(+), 12 deletions(-)

diff --git a/apps/apps.c b/apps/apps.c
index 8412e24..233d382 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -576,6 +576,11 @@ int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_tmp)
         char *prompt = NULL;
 
         prompt = UI_construct_prompt(ui, "pass phrase", prompt_info);
+        if(!prompt) {
+            BIO_printf(bio_err, "Out of memory\n");
+            UI_free(ui);
+            return 0;
+        }
 
         ui_flags |= UI_INPUT_FLAG_DEFAULT_PWD;
         UI_ctrl(ui, UI_CTRL_PRINT_ERRORS, 1, 0, 0);
@@ -585,6 +590,12 @@ int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_tmp)
                                      PW_MIN_LENGTH, bufsiz - 1);
         if (ok >= 0 && verify) {
             buff = (char *)OPENSSL_malloc(bufsiz);
+            if(!buff) {
+                BIO_printf(bio_err, "Out of memory\n");
+                UI_free(ui);
+                OPENSSL_free(prompt);
+                return 0;
+            }
             ok = UI_add_verify_string(ui, prompt, ui_flags, buff,
                                       PW_MIN_LENGTH, bufsiz - 1, buf);
         }
diff --git a/apps/ca.c b/apps/ca.c
index bcb3f50..814162d 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -563,10 +563,18 @@ int MAIN(int argc, char **argv)
 #ifdef OPENSSL_SYS_VMS
         len = strlen(s) + sizeof(CONFIG_FILE);
         tofree = OPENSSL_malloc(len);
+        if(!tofree) {
+            BIO_printf(bio_err, "Out of memory\n");
+            goto err;
+        }
         strcpy(tofree, s);
 #else
         len = strlen(s) + sizeof(CONFIG_FILE) + 1;
         tofree = OPENSSL_malloc(len);
+        if(!tofree) {
+            BIO_printf(bio_err, "Out of memory\n");
+            goto err;
+        }
         BUF_strlcpy(tofree, s, len);
         BUF_strlcat(tofree, "/", len);
 #endif
diff --git a/apps/cms.c b/apps/cms.c
index 479d1dd..d983e28 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -465,6 +465,10 @@ int MAIN(int argc, char **argv)
             if (key_param == NULL || key_param->idx != keyidx) {
                 cms_key_param *nparam;
                 nparam = OPENSSL_malloc(sizeof(cms_key_param));
+                if(!nparam) {
+                    BIO_printf(bio_err, "Out of memory\n");
+                    goto argerr;
+                }
                 nparam->idx = keyidx;
                 nparam->param = sk_OPENSSL_STRING_new_null();
                 nparam->next = NULL;
diff --git a/apps/dgst.c b/apps/dgst.c
index adb7a06..47c2f69 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -460,6 +460,11 @@ int MAIN(int argc, char **argv)
             ERR_print_errors(bio_err);
             goto end;
         }
+        if (!sigbuf) {
+            BIO_printf(bio_err, "Out of memory\n");
+            ERR_print_errors(bio_err);
+            goto end;
+        }
         siglen = BIO_read(sigbio, sigbuf, siglen);
         BIO_free(sigbio);
         if (siglen <= 0) {
diff --git a/apps/rsautl.c b/apps/rsautl.c
index 0030aca..d642f9a 100644
--- a/apps/rsautl.c
+++ b/apps/rsautl.c
@@ -268,6 +268,11 @@ int MAIN(int argc, char **argv)
 
     rsa_in = OPENSSL_malloc(keysize * 2);
     rsa_out = OPENSSL_malloc(keysize);
+    if (!rsa_in || !rsa_out) {
+        BIO_printf(bio_err, "Out of memory\n");
+        ERR_print_errors(bio_err);
+        goto end;
+    }
 
     /* Read the input data */
     rsa_inlen = BIO_read(in, rsa_in, keysize * 2);
diff --git a/apps/s_cb.c b/apps/s_cb.c
index eef86cb..12f7b8c 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -460,8 +460,13 @@ int ssl_print_curves(BIO *out, SSL *s, int noshared)
     if (ncurves <= 0)
         return 1;
     curves = OPENSSL_malloc(ncurves * sizeof(int));
+    if(!curves) {
+        BIO_puts(out, "Malloc error getting supported curves\n");
+        return 0;
+    }
     SSL_get1_curves(s, curves);
 
+
     BIO_puts(out, "Supported Elliptic Curves: ");
     for (i = 0; i < ncurves; i++) {
         if (i)
diff --git a/apps/s_client.c b/apps/s_client.c
index bc82239..3ec754f 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -550,6 +550,11 @@ static char *ssl_give_srp_client_pwd_cb(SSL *s, void *arg)
     PW_CB_DATA cb_tmp;
     int l;
 
+    if(!pass) {
+        BIO_printf(bio_err, "Malloc failure\n");
+        return NULL;
+    }
+
     cb_tmp.password = (char *)srp_arg->srppassin;
     cb_tmp.prompt_info = "SRP user";
     if ((l = password_callback(pass, PWD_STRLEN, 0, &cb_tmp)) < 0) {
diff --git a/apps/s_server.c b/apps/s_server.c
index 1792a3c..cf5b500 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -649,6 +649,8 @@ static int ebcdic_new(BIO *bi)
     EBCDIC_OUTBUFF *wbuf;
 
     wbuf = (EBCDIC_OUTBUFF *) OPENSSL_malloc(sizeof(EBCDIC_OUTBUFF) + 1024);
+    if (!wbuf)
+        return 0;
     wbuf->alloced = 1024;
     wbuf->buff[0] = '\0';
 
@@ -703,9 +705,11 @@ static int ebcdic_write(BIO *b, const char *in, int inl)
         num = num + num;        /* double the size */
         if (num < inl)
             num = inl;
-        OPENSSL_free(wbuf);
         wbuf =
             (EBCDIC_OUTBUFF *) OPENSSL_malloc(sizeof(EBCDIC_OUTBUFF) + num);
+        if(!wbuf)
+            return 0;
+        OPENSSL_free(b->ptr);
 
         wbuf->alloced = num;
         wbuf->buff[0] = '\0';
@@ -3204,6 +3208,10 @@ static int add_session(SSL *ssl, SSL_SESSION *session)
     unsigned char *p;
 
     sess = OPENSSL_malloc(sizeof(simple_ssl_session));
+    if(!sess) {
+        BIO_printf(bio_err, "Out of memory adding session to external cache\n");
+        return 0;
+    }
 
     SSL_SESSION_get_id(session, &sess->idlen);
     sess->derlen = i2d_SSL_SESSION(session, NULL);
@@ -3211,6 +3219,16 @@ static int add_session(SSL *ssl, SSL_SESSION *session)
     sess->id = BUF_memdup(SSL_SESSION_get_id(session, NULL), sess->idlen);
 
     sess->der = OPENSSL_malloc(sess->derlen);
+    if(!sess->id || !sess->der) {
+        BIO_printf(bio_err, "Out of memory adding session to external cache\n");
+
+        if(sess->id)
+            OPENSSL_free(sess->id);
+        if(sess->der)
+            OPENSSL_free(sess->der);
+        OPENSSL_free(sess);
+        return 0;
+    }
     p = sess->der;
     i2d_SSL_SESSION(session, &p);
 
diff --git a/apps/speed.c b/apps/speed.c
index ee9d2de..57b53ce 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -2764,6 +2764,11 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher)
 
     inp = OPENSSL_malloc(mblengths[num - 1]);
     out = OPENSSL_malloc(mblengths[num - 1] + 1024);
+    if(!inp || !out) {
+        BIO_printf(bio_err,"Out of memory\n");
+        goto end;
+    }
+
 
     EVP_CIPHER_CTX_init(&ctx);
     EVP_EncryptInit_ex(&ctx, evp_cipher, NULL, no_key, no_iv);
@@ -2848,6 +2853,9 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher)
         fprintf(stdout, "\n");
     }
 
-    OPENSSL_free(inp);
-    OPENSSL_free(out);
+end:
+    if(inp)
+        OPENSSL_free(inp);
+    if(out)
+        OPENSSL_free(out);
 }
diff --git a/apps/srp.c b/apps/srp.c
index e832535..b9312f8 100644
--- a/apps/srp.c
+++ b/apps/srp.c
@@ -437,10 +437,18 @@ int MAIN(int argc, char **argv)
 # ifdef OPENSSL_SYS_VMS
             len = strlen(s) + sizeof(CONFIG_FILE);
             tofree = OPENSSL_malloc(len);
+            if(!tofree) {
+                BIO_printf(bio_err, "Out of memory\n");
+                goto err;
+            }
             strcpy(tofree, s);
 # else
             len = strlen(s) + sizeof(CONFIG_FILE) + 1;
             tofree = OPENSSL_malloc(len);
+            if(!tofree) {
+                BIO_printf(bio_err, "Out of memory\n");
+                goto err;
+            }
             BUF_strlcpy(tofree, s, len);
             BUF_strlcat(tofree, "/", len);
 # endif
diff --git a/apps/x509.c b/apps/x509.c
index 4b08c18..380f0f0 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -819,6 +819,11 @@ int MAIN(int argc, char **argv)
 
                 z = i2d_X509(x, NULL);
                 m = OPENSSL_malloc(z);
+                if (!m) {
+                    BIO_printf(bio_err, "Out of memory\n");
+                    ERR_print_errors(bio_err);
+                    goto end;
+                }
 
                 d = (unsigned char *)m;
                 z = i2d_X509_NAME(X509_get_subject_name(x), &d);
diff --git a/crypto/asn1/bio_ndef.c b/crypto/asn1/bio_ndef.c
index 5817a2b..4a73ca9 100644
--- a/crypto/asn1/bio_ndef.c
+++ b/crypto/asn1/bio_ndef.c
@@ -162,6 +162,9 @@ static int ndef_prefix(BIO *b, unsigned char **pbuf, int *plen, void *parg)
 
     derlen = ASN1_item_ndef_i2d(ndef_aux->val, NULL, ndef_aux->it);
     p = OPENSSL_malloc(derlen);
+    if(!p)
+        return 0;
+
     ndef_aux->derbuf = p;
     *pbuf = p;
     derlen = ASN1_item_ndef_i2d(ndef_aux->val, &p, ndef_aux->it);
@@ -229,6 +232,9 @@ static int ndef_suffix(BIO *b, unsigned char **pbuf, int *plen, void *parg)
 
     derlen = ASN1_item_ndef_i2d(ndef_aux->val, NULL, ndef_aux->it);
     p = OPENSSL_malloc(derlen);
+    if(!p)
+        return 0;
+
     ndef_aux->derbuf = p;
     *pbuf = p;
     derlen = ASN1_item_ndef_i2d(ndef_aux->val, &p, ndef_aux->it);
diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index 5dc7630..f7940f2 100644
--- a/crypto/bio/b_print.c
+++ b/crypto/bio/b_print.c
@@ -713,6 +713,10 @@ doapr_outch(char **sbuffer,
                 if (*maxlen == 0)
                     *maxlen = 1024;
                 *buffer = OPENSSL_malloc(*maxlen);
+                if(!*buffer) {
+                    /* Panic! Can't really do anything sensible. Just return */
+                    return;
+                }
                 if (*currlen > 0) {
                     assert(*sbuffer != NULL);
                     memcpy(*buffer, *sbuffer, *currlen);
@@ -721,6 +725,10 @@ doapr_outch(char **sbuffer,
             } else {
                 *maxlen += 1024;
                 *buffer = OPENSSL_realloc(*buffer, *maxlen);
+                if(!*buffer) {
+                    /* Panic! Can't really do anything sensible. Just return */
+                    return;
+                }
             }
         }
         /* What to do if *buffer is NULL? */
diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 0767809..aef8149 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -998,6 +998,10 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag)
      */
     sockopt_len = (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
     authchunks = OPENSSL_malloc(sockopt_len);
+    if(!authchunks) {
+        BIO_vfree(bio);
+        return (NULL);
+    }
     memset(authchunks, 0, sockopt_len);
     ret =
         getsockopt(fd, IPPROTO_SCTP, SCTP_LOCAL_AUTH_CHUNKS, authchunks,
@@ -1333,6 +1337,10 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
             optlen =
                 (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
             authchunks = OPENSSL_malloc(optlen);
+            if (!authchunks) {
+                BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_ERROR);
+                return -1;
+            }
             memset(authchunks, 0, optlen);
             ii = getsockopt(b->num, IPPROTO_SCTP, SCTP_PEER_AUTH_CHUNKS,
                             authchunks, &optlen);
@@ -1399,10 +1407,15 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
      * yet, we have to save it and send it as soon as the socket gets dry.
      */
     if (data->save_shutdown && !BIO_dgram_sctp_wait_for_dry(b)) {
+        char *tmp;
         data->saved_message.bio = b;
+        if(!(tmp = OPENSSL_malloc(inl))) {
+            BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_ERROR);
+            return -1;
+        }
         if (data->saved_message.data)
             OPENSSL_free(data->saved_message.data);
-        data->saved_message.data = OPENSSL_malloc(inl);
+        data->saved_message.data = tmp;
         memcpy(data->saved_message.data, in, inl);
         data->saved_message.length = inl;
         return inl;
diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c
index 5969190..6729930 100644
--- a/crypto/cms/cms_pwri.c
+++ b/crypto/cms/cms_pwri.c
@@ -231,6 +231,8 @@ static int kek_unwrap_key(unsigned char *out, size_t *outlen,
         return 0;
     }
     tmp = OPENSSL_malloc(inlen);
+    if(!tmp)
+        return 0;
     /* setup IV by decrypting last two blocks */
     if (!EVP_DecryptUpdate(ctx, tmp + inlen - 2 * blocklen, &outl,
                            in + inlen - 2 * blocklen, blocklen * 2)
diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c
index c41de92..8975f44 100644
--- a/crypto/dh/dh_pmeth.c
+++ b/crypto/dh/dh_pmeth.c
@@ -468,6 +468,9 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
         ret = 0;
         Zlen = DH_size(dh);
         Z = OPENSSL_malloc(Zlen);
+        if(!Z) {
+            goto err;
+        }
         if (DH_compute_key_padded(Z, dhpub, dh) <= 0)
             goto err;
         if (!DH_KDF_X9_42(key, *keylen, Z, Zlen, dctx->kdf_oid,
diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c
index 6498184..d3c4eab 100644
--- a/crypto/dso/dso_vms.c
+++ b/crypto/dso/dso_vms.c
@@ -527,7 +527,8 @@ static char *vms_name_converter(DSO *dso, const char *filename)
 {
     int len = strlen(filename);
     char *not_translated = OPENSSL_malloc(len + 1);
-    strcpy(not_translated, filename);
+    if(not_translated)
+        strcpy(not_translated, filename);
     return (not_translated);
 }
 
diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index d7fa0d8..48ab1a7 100644
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c
@@ -311,15 +311,18 @@ void OBJ_NAME_do_all_sorted(int type,
     d.type = type;
     d.names =
         OPENSSL_malloc(lh_OBJ_NAME_num_items(names_lh) * sizeof *d.names);
-    d.n = 0;
-    OBJ_NAME_do_all(type, do_all_sorted_fn, &d);
+    /* Really should return an error if !d.names...but its a void function! */
+    if(d.names) {
+        d.n = 0;
+        OBJ_NAME_do_all(type, do_all_sorted_fn, &d);
 
-    qsort((void *)d.names, d.n, sizeof *d.names, do_all_sorted_cmp);
+        qsort((void *)d.names, d.n, sizeof *d.names, do_all_sorted_cmp);
 
-    for (n = 0; n < d.n; ++n)
-        fn(d.names[n], arg);
+        for (n = 0; n < d.n; ++n)
+            fn(d.names[n], arg);
 
-    OPENSSL_free((void *)d.names);
+        OPENSSL_free((void *)d.names);
+    }
 }
 
 static int free_type;
diff --git a/crypto/rand/rand_os2.c b/crypto/rand/rand_os2.c
index 9c4a137..02148d5 100644
--- a/crypto/rand/rand_os2.c
+++ b/crypto/rand/rand_os2.c
@@ -149,6 +149,9 @@ int RAND_poll(void)
     if (DosQuerySysState) {
         char *buffer = OPENSSL_malloc(256 * 1024);
 
+        if(!buffer)
+            return 0;
+
         if (DosQuerySysState(0x1F, 0, 0, 0, buffer, 256 * 1024) == 0) {
             /*
              * First 4 bytes in buffer is a pointer to the thread count there
diff --git a/crypto/threads/th-lock.c b/crypto/threads/th-lock.c
index 9a8e909..7b303b2 100644
--- a/crypto/threads/th-lock.c
+++ b/crypto/threads/th-lock.c
@@ -117,6 +117,10 @@ void CRYPTO_thread_setup(void)
     int i;
 
     lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(HANDLE));
+    if(!lock_cs) {
+        /* Nothing we can do about this...void function! */
+        return;
+    }
     for (i = 0; i < CRYPTO_num_locks(); i++) {
         lock_cs[i] = CreateMutex(NULL, FALSE, NULL);
     }
@@ -168,6 +172,10 @@ void CRYPTO_thread_setup(void)
 # else
     lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(rwlock_t));
 # endif
+    if(!lock_cs) {
+        /* Nothing we can do about this...void function! */
+        return;
+    }
     lock_count = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(long));
     for (i = 0; i < CRYPTO_num_locks(); i++) {
         lock_count[i] = 0;
@@ -239,6 +247,12 @@ void CRYPTO_thread_setup(void)
     int i;
     char filename[20];
 
+    lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(usema_t *));
+    if(!lock_cs) {
+        /* Nothing we can do about this...void function! */
+        return;
+    }
+
     strcpy(filename, "/tmp/mttest.XXXXXX");
     mktemp(filename);
 
@@ -249,7 +263,6 @@ void CRYPTO_thread_setup(void)
     arena = usinit(filename);
     unlink(filename);
 
-    lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(usema_t *));
     for (i = 0; i < CRYPTO_num_locks(); i++) {
         lock_cs[i] = usnewsema(arena, 1);
     }
@@ -303,6 +316,14 @@ void CRYPTO_thread_setup(void)
 
     lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(pthread_mutex_t));
     lock_count = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(long));
+    if(!lock_cs || !lock_count) {
+        /* Nothing we can do about this...void function! */
+        if(lock_cs)
+            OPENSSL_free(lock_cs);
+        if(lock_count)
+            OPENSSL_free(lock_count);
+        return;
+    }
     for (i = 0; i < CRYPTO_num_locks(); i++) {
         lock_count[i] = 0;
         pthread_mutex_init(&(lock_cs[i]), NULL);
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 11b1c55..f54152e 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -727,6 +727,10 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
                 packlen *= 4;
 
             wb->buf = OPENSSL_malloc(packlen);
+            if(!wb->buf) {
+                SSLerr(SSL_F_SSL3_WRITE_BYTES, ERR_R_MALLOC_FAILURE);
+                return -1;
+            }
             wb->len = packlen;
         } else if (tot == len) { /* done? */
             OPENSSL_free(wb->buf); /* free jumbo buffer */

From matt at openssl.org  Thu Mar  5 09:32:03 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 05 Mar 2015 09:32:03 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1425547923.824536.10007.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  183db9af80510abfe522c97387268906fd1d31c6 (commit)
      from  9f114219508d64a5b9522006eab1ed2db918dd25 (commit)


- Log -----------------------------------------------------------------
commit 183db9af80510abfe522c97387268906fd1d31c6
Author: Kurt Cancemi <kurt at x64architecture.com>
Date:   Wed Mar 4 10:57:45 2015 +0000

    Use constants not numbers
    
    This patch uses warning/fatal constants instead of numbers with comments for
    warning/alerts in d1_pkt.c and s3_pkt.c
    
    RT#3725
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit fd865cadcb603918bdcfcf44e487721c657a1117)

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

Summary of changes:
 ssl/d1_pkt.c | 4 ++--
 ssl/s3_pkt.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index 2abb7ef..0985bb0 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -1138,7 +1138,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             cb(s, SSL_CB_READ_ALERT, j);
         }
 
-        if (alert_level == 1) { /* warning */
+        if (alert_level == SSL3_AL_WARNING) {
             s->s3->warn_alert = alert_descr;
             if (alert_descr == SSL_AD_CLOSE_NOTIFY) {
 #ifndef OPENSSL_NO_SCTP
@@ -1187,7 +1187,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
                 }
             }
 #endif
-        } else if (alert_level == 2) { /* fatal */
+        } else if (alert_level == SSL3_AL_FATAL) {
             char tmp[16];
 
             s->rwstate = SSL_NOTHING;
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index d422abf..7c9f20c 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -1258,7 +1258,7 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             cb(s, SSL_CB_READ_ALERT, j);
         }
 
-        if (alert_level == 1) { /* warning */
+        if (alert_level == SSL3_AL_WARNING) {
             s->s3->warn_alert = alert_descr;
             if (alert_descr == SSL_AD_CLOSE_NOTIFY) {
                 s->shutdown |= SSL_RECEIVED_SHUTDOWN;
@@ -1281,7 +1281,7 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             else if (alert_descr == SSL_AD_MISSING_SRP_USERNAME)
                 return (0);
 #endif
-        } else if (alert_level == 2) { /* fatal */
+        } else if (alert_level == SSL3_AL_FATAL) {
             char tmp[16];
 
             s->rwstate = SSL_NOTHING;

From matt at openssl.org  Thu Mar  5 09:32:14 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 05 Mar 2015 09:32:14 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1425547934.353740.10245.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  f9a21ed069846c4c18f9894bbef2fc77551a1028 (commit)
      from  d6b4a41d100c2d3b401baf8edc34085ff610c5ba (commit)


- Log -----------------------------------------------------------------
commit f9a21ed069846c4c18f9894bbef2fc77551a1028
Author: Kurt Cancemi <kurt at x64architecture.com>
Date:   Wed Mar 4 10:57:45 2015 +0000

    Use constants not numbers
    
    This patch uses warning/fatal constants instead of numbers with comments for
    warning/alerts in d1_pkt.c and s3_pkt.c
    
    RT#3725
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit fd865cadcb603918bdcfcf44e487721c657a1117)

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

Summary of changes:
 ssl/d1_pkt.c | 4 ++--
 ssl/s3_pkt.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index c07be8f..bf96f60 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -1142,7 +1142,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             cb(s, SSL_CB_READ_ALERT, j);
         }
 
-        if (alert_level == 1) { /* warning */
+        if (alert_level == SSL3_AL_WARNING) {
             s->s3->warn_alert = alert_descr;
             if (alert_descr == SSL_AD_CLOSE_NOTIFY) {
 #ifndef OPENSSL_NO_SCTP
@@ -1191,7 +1191,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
                 }
             }
 #endif
-        } else if (alert_level == 2) { /* fatal */
+        } else if (alert_level == SSL3_AL_FATAL) {
             char tmp[16];
 
             s->rwstate = SSL_NOTHING;
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 136d273..4e6a41b 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -1430,7 +1430,7 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             cb(s, SSL_CB_READ_ALERT, j);
         }
 
-        if (alert_level == 1) { /* warning */
+        if (alert_level == SSL3_AL_WARNING) {
             s->s3->warn_alert = alert_descr;
             if (alert_descr == SSL_AD_CLOSE_NOTIFY) {
                 s->shutdown |= SSL_RECEIVED_SHUTDOWN;
@@ -1453,7 +1453,7 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             else if (alert_descr == SSL_AD_MISSING_SRP_USERNAME)
                 return (0);
 #endif
-        } else if (alert_level == 2) { /* fatal */
+        } else if (alert_level == SSL3_AL_FATAL) {
             char tmp[16];
 
             s->rwstate = SSL_NOTHING;

From matt at openssl.org  Thu Mar  5 09:32:20 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 05 Mar 2015 09:32:20 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425547940.520539.10484.nullmailer@dev.openssl.org>

The branch master has been updated
       via  fd865cadcb603918bdcfcf44e487721c657a1117 (commit)
      from  918bb8652969fd53f0c390c1cd909265ed502c7e (commit)


- Log -----------------------------------------------------------------
commit fd865cadcb603918bdcfcf44e487721c657a1117
Author: Kurt Cancemi <kurt at x64architecture.com>
Date:   Wed Mar 4 10:57:45 2015 +0000

    Use constants not numbers
    
    This patch uses warning/fatal constants instead of numbers with comments for
    warning/alerts in d1_pkt.c and s3_pkt.c
    
    RT#3725
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 ssl/d1_pkt.c | 4 ++--
 ssl/s3_pkt.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index d66ecf5..b1d9156 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -1088,7 +1088,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             cb(s, SSL_CB_READ_ALERT, j);
         }
 
-        if (alert_level == 1) { /* warning */
+        if (alert_level == SSL3_AL_WARNING) {
             s->s3->warn_alert = alert_descr;
             if (alert_descr == SSL_AD_CLOSE_NOTIFY) {
 #ifndef OPENSSL_NO_SCTP
@@ -1137,7 +1137,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
                 }
             }
 #endif
-        } else if (alert_level == 2) { /* fatal */
+        } else if (alert_level == SSL3_AL_FATAL) {
             char tmp[16];
 
             s->rwstate = SSL_NOTHING;
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index f54152e..66fa9d1 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -1451,7 +1451,7 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             cb(s, SSL_CB_READ_ALERT, j);
         }
 
-        if (alert_level == 1) { /* warning */
+        if (alert_level == SSL3_AL_WARNING) {
             s->s3->warn_alert = alert_descr;
             if (alert_descr == SSL_AD_CLOSE_NOTIFY) {
                 s->shutdown |= SSL_RECEIVED_SHUTDOWN;
@@ -1474,7 +1474,7 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             else if (alert_descr == SSL_AD_MISSING_SRP_USERNAME)
                 return (0);
 #endif
-        } else if (alert_level == 2) { /* fatal */
+        } else if (alert_level == SSL3_AL_FATAL) {
             char tmp[16];
 
             s->rwstate = SSL_NOTHING;

From angluvschris at gmail.com  Thu Mar  5 10:07:46 2015
From: angluvschris at gmail.com (angela Austin)
Date: Thu, 5 Mar 2015 04:07:46 -0600
Subject: [openssl-commits] (no subject)
Message-ID: <CABXZ1QRa1tkLcUgtC0ejmaBfhKqParnB602paEC9FZCTzVDdeg@mail.gmail.com>


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20150305/dc95ef37/attachment.html>

From steve at openssl.org  Thu Mar  5 14:48:55 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Thu, 05 Mar 2015 14:48:55 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425566935.441131.13052.nullmailer@dev.openssl.org>

The branch master has been updated
       via  6ef869d7d0a9d2e7ea7908c0b5aab1cb451e00fa (commit)
      from  fd865cadcb603918bdcfcf44e487721c657a1117 (commit)


- Log -----------------------------------------------------------------
commit 6ef869d7d0a9d2e7ea7908c0b5aab1cb451e00fa
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu Mar 5 13:41:11 2015 +0000

    Make OCSP structures opaque.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 apps/ocsp.c                       |   8 +-
 crypto/ocsp/Makefile              |   6 +-
 crypto/ocsp/ocsp.h                | 219 +++---------------------------
 crypto/ocsp/ocsp_asn.c            |   1 +
 crypto/ocsp/ocsp_cl.c             |   6 +
 crypto/ocsp/ocsp_ext.c            |   1 +
 crypto/ocsp/ocsp_lcl.h            | 273 ++++++++++++++++++++++++++++++++++++++
 crypto/ocsp/ocsp_lib.c            |   1 +
 crypto/ocsp/ocsp_prn.c            |   1 +
 crypto/ocsp/ocsp_srv.c            |   1 +
 crypto/ocsp/ocsp_vfy.c            |   1 +
 crypto/{x509v3 => ocsp}/v3_ocsp.c |   4 +-
 crypto/x509v3/Makefile            |  18 +--
 13 files changed, 316 insertions(+), 224 deletions(-)
 create mode 100644 crypto/ocsp/ocsp_lcl.h
 rename crypto/{x509v3 => ocsp}/v3_ocsp.c (99%)

diff --git a/apps/ocsp.c b/apps/ocsp.c
index b0b3069..83a7175 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -1110,8 +1110,12 @@ static int make_ocsp_response(OCSP_RESPONSE **resp, OCSP_REQUEST *req,
 
     OCSP_basic_sign(bs, rcert, rkey, rmd, rother, flags);
 
-    if (badsig)
-        bs->signature->data[bs->signature->length - 1] ^= 0x1;
+    if (badsig) {
+        ASN1_OCTET_STRING *sig = OCSP_resp_get0_signature(bs);
+        unsigned char *sigptr;
+        sigptr = ASN1_STRING_data(sig);
+        sigptr[ASN1_STRING_length(sig) - 1] ^= 0x1;
+    }
 
     *resp = OCSP_response_create(OCSP_RESPONSE_STATUS_SUCCESSFUL, bs);
 
diff --git a/crypto/ocsp/Makefile b/crypto/ocsp/Makefile
index 60c414c..f5b8445 100644
--- a/crypto/ocsp/Makefile
+++ b/crypto/ocsp/Makefile
@@ -18,15 +18,15 @@ APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= ocsp_asn.c ocsp_ext.c ocsp_ht.c ocsp_lib.c ocsp_cl.c \
-	ocsp_srv.c ocsp_prn.c ocsp_vfy.c ocsp_err.c
+	ocsp_srv.c ocsp_prn.c ocsp_vfy.c ocsp_err.c v3_ocsp.c
 
 LIBOBJ= ocsp_asn.o ocsp_ext.o ocsp_ht.o ocsp_lib.o ocsp_cl.o \
-	ocsp_srv.o ocsp_prn.o ocsp_vfy.o ocsp_err.o
+	ocsp_srv.o ocsp_prn.o ocsp_vfy.o ocsp_err.o v3_ocsp.o
 
 SRC= $(LIBSRC)
 
 EXHEADER= ocsp.h
-HEADER=	$(EXHEADER)
+HEADER=	ocsp_lcl.h $(EXHEADER)
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
diff --git a/crypto/ocsp/ocsp.h b/crypto/ocsp/ocsp.h
index ca2ee76..6999788 100644
--- a/crypto/ocsp/ocsp.h
+++ b/crypto/ocsp/ocsp.h
@@ -93,76 +93,19 @@ extern "C" {
 # define OCSP_RESPID_KEY                 0x400
 # define OCSP_NOTIME                     0x800
 
-/*-  CertID ::= SEQUENCE {
- *       hashAlgorithm            AlgorithmIdentifier,
- *       issuerNameHash     OCTET STRING, -- Hash of Issuer's DN
- *       issuerKeyHash      OCTET STRING, -- Hash of Issuers public key (excluding the tag & length fields)
- *       serialNumber       CertificateSerialNumber }
- */
-typedef struct ocsp_cert_id_st {
-    X509_ALGOR *hashAlgorithm;
-    ASN1_OCTET_STRING *issuerNameHash;
-    ASN1_OCTET_STRING *issuerKeyHash;
-    ASN1_INTEGER *serialNumber;
-} OCSP_CERTID;
+typedef struct ocsp_cert_id_st OCSP_CERTID;
 
 DECLARE_STACK_OF(OCSP_CERTID)
 
-/*-  Request ::=     SEQUENCE {
- *       reqCert                    CertID,
- *       singleRequestExtensions    [0] EXPLICIT Extensions OPTIONAL }
- */
-typedef struct ocsp_one_request_st {
-    OCSP_CERTID *reqCert;
-    STACK_OF(X509_EXTENSION) *singleRequestExtensions;
-} OCSP_ONEREQ;
+typedef struct ocsp_one_request_st OCSP_ONEREQ;
 
 DECLARE_STACK_OF(OCSP_ONEREQ)
 DECLARE_ASN1_SET_OF(OCSP_ONEREQ)
 
-/*-  TBSRequest      ::=     SEQUENCE {
- *       version             [0] EXPLICIT Version DEFAULT v1,
- *       requestorName       [1] EXPLICIT GeneralName OPTIONAL,
- *       requestList             SEQUENCE OF Request,
- *       requestExtensions   [2] EXPLICIT Extensions OPTIONAL }
- */
-typedef struct ocsp_req_info_st {
-    ASN1_INTEGER *version;
-    GENERAL_NAME *requestorName;
-    STACK_OF(OCSP_ONEREQ) *requestList;
-    STACK_OF(X509_EXTENSION) *requestExtensions;
-} OCSP_REQINFO;
-
-/*-  Signature       ::=     SEQUENCE {
- *       signatureAlgorithm   AlgorithmIdentifier,
- *       signature            BIT STRING,
- *       certs                [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL }
- */
-typedef struct ocsp_signature_st {
-    X509_ALGOR *signatureAlgorithm;
-    ASN1_BIT_STRING *signature;
-    STACK_OF(X509) *certs;
-} OCSP_SIGNATURE;
-
-/*-  OCSPRequest     ::=     SEQUENCE {
- *       tbsRequest                  TBSRequest,
- *       optionalSignature   [0]     EXPLICIT Signature OPTIONAL }
- */
-typedef struct ocsp_request_st {
-    OCSP_REQINFO *tbsRequest;
-    OCSP_SIGNATURE *optionalSignature; /* OPTIONAL */
-} OCSP_REQUEST;
-
-/*-  OCSPResponseStatus ::= ENUMERATED {
- *       successful            (0),      --Response has valid confirmations
- *       malformedRequest      (1),      --Illegal confirmation request
- *       internalError         (2),      --Internal error in issuer
- *       tryLater              (3),      --Try again later
- *                                       --(4) is not used
- *       sigRequired           (5),      --Must sign the request
- *       unauthorized          (6)       --Request unauthorized
- *   }
- */
+typedef struct ocsp_req_info_st OCSP_REQINFO;
+typedef struct ocsp_signature_st OCSP_SIGNATURE;
+typedef struct ocsp_request_st OCSP_REQUEST;
+
 # define OCSP_RESPONSE_STATUS_SUCCESSFUL          0
 # define OCSP_RESPONSE_STATUS_MALFORMEDREQUEST     1
 # define OCSP_RESPONSE_STATUS_INTERNALERROR        2
@@ -170,136 +113,29 @@ typedef struct ocsp_request_st {
 # define OCSP_RESPONSE_STATUS_SIGREQUIRED          5
 # define OCSP_RESPONSE_STATUS_UNAUTHORIZED         6
 
-/*-  ResponseBytes ::=       SEQUENCE {
- *       responseType   OBJECT IDENTIFIER,
- *       response       OCTET STRING }
- */
-typedef struct ocsp_resp_bytes_st {
-    ASN1_OBJECT *responseType;
-    ASN1_OCTET_STRING *response;
-} OCSP_RESPBYTES;
-
-/*-  OCSPResponse ::= SEQUENCE {
- *      responseStatus         OCSPResponseStatus,
- *      responseBytes          [0] EXPLICIT ResponseBytes OPTIONAL }
- */
-struct ocsp_response_st {
-    ASN1_ENUMERATED *responseStatus;
-    OCSP_RESPBYTES *responseBytes;
-};
-
-/*-  ResponderID ::= CHOICE {
- *      byName   [1] Name,
- *      byKey    [2] KeyHash }
- */
+typedef struct ocsp_resp_bytes_st OCSP_RESPBYTES;
+
 # define V_OCSP_RESPID_NAME 0
 # define V_OCSP_RESPID_KEY  1
-struct ocsp_responder_id_st {
-    int type;
-    union {
-        X509_NAME *byName;
-        ASN1_OCTET_STRING *byKey;
-    } value;
-};
 
 DECLARE_STACK_OF(OCSP_RESPID)
 DECLARE_ASN1_FUNCTIONS(OCSP_RESPID)
 
-/*-  KeyHash ::= OCTET STRING --SHA-1 hash of responder's public key
- *                            --(excluding the tag and length fields)
- */
+typedef struct ocsp_revoked_info_st OCSP_REVOKEDINFO;
 
-/*-  RevokedInfo ::= SEQUENCE {
- *       revocationTime              GeneralizedTime,
- *       revocationReason    [0]     EXPLICIT CRLReason OPTIONAL }
- */
-typedef struct ocsp_revoked_info_st {
-    ASN1_GENERALIZEDTIME *revocationTime;
-    ASN1_ENUMERATED *revocationReason;
-} OCSP_REVOKEDINFO;
-
-/*-  CertStatus ::= CHOICE {
- *       good                [0]     IMPLICIT NULL,
- *       revoked             [1]     IMPLICIT RevokedInfo,
- *       unknown             [2]     IMPLICIT UnknownInfo }
- */
 # define V_OCSP_CERTSTATUS_GOOD    0
 # define V_OCSP_CERTSTATUS_REVOKED 1
 # define V_OCSP_CERTSTATUS_UNKNOWN 2
-typedef struct ocsp_cert_status_st {
-    int type;
-    union {
-        ASN1_NULL *good;
-        OCSP_REVOKEDINFO *revoked;
-        ASN1_NULL *unknown;
-    } value;
-} OCSP_CERTSTATUS;
-
-/*-  SingleResponse ::= SEQUENCE {
- *      certID                       CertID,
- *      certStatus                   CertStatus,
- *      thisUpdate                   GeneralizedTime,
- *      nextUpdate           [0]     EXPLICIT GeneralizedTime OPTIONAL,
- *      singleExtensions     [1]     EXPLICIT Extensions OPTIONAL }
- */
-typedef struct ocsp_single_response_st {
-    OCSP_CERTID *certId;
-    OCSP_CERTSTATUS *certStatus;
-    ASN1_GENERALIZEDTIME *thisUpdate;
-    ASN1_GENERALIZEDTIME *nextUpdate;
-    STACK_OF(X509_EXTENSION) *singleExtensions;
-} OCSP_SINGLERESP;
+
+typedef struct ocsp_cert_status_st OCSP_CERTSTATUS;
+typedef struct ocsp_single_response_st OCSP_SINGLERESP;
 
 DECLARE_STACK_OF(OCSP_SINGLERESP)
 DECLARE_ASN1_SET_OF(OCSP_SINGLERESP)
 
-/*-  ResponseData ::= SEQUENCE {
- *      version              [0] EXPLICIT Version DEFAULT v1,
- *      responderID              ResponderID,
- *      producedAt               GeneralizedTime,
- *      responses                SEQUENCE OF SingleResponse,
- *      responseExtensions   [1] EXPLICIT Extensions OPTIONAL }
- */
-typedef struct ocsp_response_data_st {
-    ASN1_INTEGER *version;
-    OCSP_RESPID *responderId;
-    ASN1_GENERALIZEDTIME *producedAt;
-    STACK_OF(OCSP_SINGLERESP) *responses;
-    STACK_OF(X509_EXTENSION) *responseExtensions;
-} OCSP_RESPDATA;
-
-/*-  BasicOCSPResponse       ::= SEQUENCE {
- *      tbsResponseData      ResponseData,
- *      signatureAlgorithm   AlgorithmIdentifier,
- *      signature            BIT STRING,
- *      certs                [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL }
- */
-  /*
-   * Note 1: The value for "signature" is specified in the OCSP rfc2560 as
-   * follows: "The value for the signature SHALL be computed on the hash of
-   * the DER encoding ResponseData." This means that you must hash the
-   * DER-encoded tbsResponseData, and then run it through a crypto-signing
-   * function, which will (at least w/RSA) do a hash-'n'-private-encrypt
-   * operation.  This seems a bit odd, but that's the spec.  Also note that
-   * the data structures do not leave anywhere to independently specify the
-   * algorithm used for the initial hash. So, we look at the
-   * signature-specification algorithm, and try to do something intelligent.
-   * -- Kathy Weinhold, CertCo
-   */
-  /*
-   * Note 2: It seems that the mentioned passage from RFC 2560 (section
-   * 4.2.1) is open for interpretation.  I've done tests against another
-   * responder, and found that it doesn't do the double hashing that the RFC
-   * seems to say one should.  Therefore, all relevant functions take a flag
-   * saying which variant should be used.  -- Richard Levitte, OpenSSL team
-   * and CeloCom
-   */
-typedef struct ocsp_basic_response_st {
-    OCSP_RESPDATA *tbsResponseData;
-    X509_ALGOR *signatureAlgorithm;
-    ASN1_BIT_STRING *signature;
-    STACK_OF(X509) *certs;
-} OCSP_BASICRESP;
+typedef struct ocsp_response_data_st OCSP_RESPDATA;
+
+typedef struct ocsp_basic_response_st OCSP_BASICRESP;
 
 /*-
  *   CRLReason ::= ENUMERATED {
@@ -322,27 +158,8 @@ typedef struct ocsp_basic_response_st {
 # define OCSP_REVOKED_STATUS_CERTIFICATEHOLD         6
 # define OCSP_REVOKED_STATUS_REMOVEFROMCRL           8
 
-/*-
- * CrlID ::= SEQUENCE {
- *     crlUrl               [0]     EXPLICIT IA5String OPTIONAL,
- *     crlNum               [1]     EXPLICIT INTEGER OPTIONAL,
- *     crlTime              [2]     EXPLICIT GeneralizedTime OPTIONAL }
- */
-typedef struct ocsp_crl_id_st {
-    ASN1_IA5STRING *crlUrl;
-    ASN1_INTEGER *crlNum;
-    ASN1_GENERALIZEDTIME *crlTime;
-} OCSP_CRLID;
-
-/*-
- * ServiceLocator ::= SEQUENCE {
- *      issuer    Name,
- *      locator   AuthorityInfoAccessSyntax OPTIONAL }
- */
-typedef struct ocsp_service_locator_st {
-    X509_NAME *issuer;
-    STACK_OF(ACCESS_DESCRIPTION) *locator;
-} OCSP_SERVICELOC;
+typedef struct ocsp_crl_id_st OCSP_CRLID;
+typedef struct ocsp_service_locator_st OCSP_SERVICELOC;
 
 # define PEM_STRING_OCSP_REQUEST "OCSP REQUEST"
 # define PEM_STRING_OCSP_RESPONSE "OCSP RESPONSE"
@@ -440,6 +257,8 @@ int OCSP_request_sign(OCSP_REQUEST *req,
 int OCSP_response_status(OCSP_RESPONSE *resp);
 OCSP_BASICRESP *OCSP_response_get1_basic(OCSP_RESPONSE *resp);
 
+ASN1_OCTET_STRING *OCSP_resp_get0_signature(OCSP_BASICRESP *bs);
+
 int OCSP_resp_count(OCSP_BASICRESP *bs);
 OCSP_SINGLERESP *OCSP_resp_get0(OCSP_BASICRESP *bs, int idx);
 int OCSP_resp_find(OCSP_BASICRESP *bs, OCSP_CERTID *id, int last);
diff --git a/crypto/ocsp/ocsp_asn.c b/crypto/ocsp/ocsp_asn.c
index e2e52e7..c3362f0 100644
--- a/crypto/ocsp/ocsp_asn.c
+++ b/crypto/ocsp/ocsp_asn.c
@@ -59,6 +59,7 @@
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/ocsp.h>
+#include "ocsp_lcl.h"
 
 ASN1_SEQUENCE(OCSP_SIGNATURE) = {
         ASN1_SIMPLE(OCSP_SIGNATURE, signatureAlgorithm, X509_ALGOR),
diff --git a/crypto/ocsp/ocsp_cl.c b/crypto/ocsp/ocsp_cl.c
index 7e6ccdd..78d817d 100644
--- a/crypto/ocsp/ocsp_cl.c
+++ b/crypto/ocsp/ocsp_cl.c
@@ -73,6 +73,7 @@
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
 #include <openssl/ocsp.h>
+#include "ocsp_lcl.h"
 
 /*
  * Utility functions related to sending OCSP requests and extracting relevant
@@ -216,6 +217,11 @@ OCSP_BASICRESP *OCSP_response_get1_basic(OCSP_RESPONSE *resp)
     return ASN1_item_unpack(rb->response, ASN1_ITEM_rptr(OCSP_BASICRESP));
 }
 
+ASN1_OCTET_STRING *OCSP_resp_get0_signature(OCSP_BASICRESP *bs)
+{
+    return bs->signature;
+}
+
 /*
  * Return number of OCSP_SINGLERESP reponses present in a basic response.
  */
diff --git a/crypto/ocsp/ocsp_ext.c b/crypto/ocsp/ocsp_ext.c
index ce31b1b..04ae17f 100644
--- a/crypto/ocsp/ocsp_ext.c
+++ b/crypto/ocsp/ocsp_ext.c
@@ -69,6 +69,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/ocsp.h>
+#include "ocsp_lcl.h"
 #include <openssl/rand.h>
 #include <openssl/x509v3.h>
 
diff --git a/crypto/ocsp/ocsp_lcl.h b/crypto/ocsp/ocsp_lcl.h
new file mode 100644
index 0000000..86fb0b9
--- /dev/null
+++ b/crypto/ocsp/ocsp_lcl.h
@@ -0,0 +1,273 @@
+/* ocsp_lcl.h */
+/*
+ * Written by Tom Titchener <Tom_Titchener at groove.net> for the OpenSSL
+ * project.
+ */
+
+/*
+ * History: This file was transfered to Richard Levitte from CertCo by Kathy
+ * Weinhold in mid-spring 2000 to be included in OpenSSL or released as a
+ * patch kit.
+ */
+
+/* ====================================================================
+ * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core at openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
+
+/*-  CertID ::= SEQUENCE {
+ *       hashAlgorithm            AlgorithmIdentifier,
+ *       issuerNameHash     OCTET STRING, -- Hash of Issuer's DN
+ *       issuerKeyHash      OCTET STRING, -- Hash of Issuers public key (excluding the tag & length fields)
+ *       serialNumber       CertificateSerialNumber }
+ */
+struct ocsp_cert_id_st {
+    X509_ALGOR *hashAlgorithm;
+    ASN1_OCTET_STRING *issuerNameHash;
+    ASN1_OCTET_STRING *issuerKeyHash;
+    ASN1_INTEGER *serialNumber;
+};
+
+/*-  Request ::=     SEQUENCE {
+ *       reqCert                    CertID,
+ *       singleRequestExtensions    [0] EXPLICIT Extensions OPTIONAL }
+ */
+struct ocsp_one_request_st {
+    OCSP_CERTID *reqCert;
+    STACK_OF(X509_EXTENSION) *singleRequestExtensions;
+};
+
+/*-  TBSRequest      ::=     SEQUENCE {
+ *       version             [0] EXPLICIT Version DEFAULT v1,
+ *       requestorName       [1] EXPLICIT GeneralName OPTIONAL,
+ *       requestList             SEQUENCE OF Request,
+ *       requestExtensions   [2] EXPLICIT Extensions OPTIONAL }
+ */
+struct ocsp_req_info_st {
+    ASN1_INTEGER *version;
+    GENERAL_NAME *requestorName;
+    STACK_OF(OCSP_ONEREQ) *requestList;
+    STACK_OF(X509_EXTENSION) *requestExtensions;
+};
+
+/*-  Signature       ::=     SEQUENCE {
+ *       signatureAlgorithm   AlgorithmIdentifier,
+ *       signature            BIT STRING,
+ *       certs                [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL }
+ */
+struct ocsp_signature_st {
+    X509_ALGOR *signatureAlgorithm;
+    ASN1_BIT_STRING *signature;
+    STACK_OF(X509) *certs;
+};
+
+/*-  OCSPRequest     ::=     SEQUENCE {
+ *       tbsRequest                  TBSRequest,
+ *       optionalSignature   [0]     EXPLICIT Signature OPTIONAL }
+ */
+struct ocsp_request_st {
+    OCSP_REQINFO *tbsRequest;
+    OCSP_SIGNATURE *optionalSignature; /* OPTIONAL */
+};
+
+/*-  OCSPResponseStatus ::= ENUMERATED {
+ *       successful            (0),      --Response has valid confirmations
+ *       malformedRequest      (1),      --Illegal confirmation request
+ *       internalError         (2),      --Internal error in issuer
+ *       tryLater              (3),      --Try again later
+ *                                       --(4) is not used
+ *       sigRequired           (5),      --Must sign the request
+ *       unauthorized          (6)       --Request unauthorized
+ *   }
+ */
+
+/*-  ResponseBytes ::=       SEQUENCE {
+ *       responseType   OBJECT IDENTIFIER,
+ *       response       OCTET STRING }
+ */
+struct ocsp_resp_bytes_st {
+    ASN1_OBJECT *responseType;
+    ASN1_OCTET_STRING *response;
+};
+
+/*-  OCSPResponse ::= SEQUENCE {
+ *      responseStatus         OCSPResponseStatus,
+ *      responseBytes          [0] EXPLICIT ResponseBytes OPTIONAL }
+ */
+struct ocsp_response_st {
+    ASN1_ENUMERATED *responseStatus;
+    OCSP_RESPBYTES *responseBytes;
+};
+
+/*-  ResponderID ::= CHOICE {
+ *      byName   [1] Name,
+ *      byKey    [2] KeyHash }
+ */
+struct ocsp_responder_id_st {
+    int type;
+    union {
+        X509_NAME *byName;
+        ASN1_OCTET_STRING *byKey;
+    } value;
+};
+
+/*-  KeyHash ::= OCTET STRING --SHA-1 hash of responder's public key
+ *                            --(excluding the tag and length fields)
+ */
+
+/*-  RevokedInfo ::= SEQUENCE {
+ *       revocationTime              GeneralizedTime,
+ *       revocationReason    [0]     EXPLICIT CRLReason OPTIONAL }
+ */
+struct ocsp_revoked_info_st {
+    ASN1_GENERALIZEDTIME *revocationTime;
+    ASN1_ENUMERATED *revocationReason;
+};
+
+/*-  CertStatus ::= CHOICE {
+ *       good                [0]     IMPLICIT NULL,
+ *       revoked             [1]     IMPLICIT RevokedInfo,
+ *       unknown             [2]     IMPLICIT UnknownInfo }
+ */
+struct ocsp_cert_status_st {
+    int type;
+    union {
+        ASN1_NULL *good;
+        OCSP_REVOKEDINFO *revoked;
+        ASN1_NULL *unknown;
+    } value;
+};
+
+/*-  SingleResponse ::= SEQUENCE {
+ *      certID                       CertID,
+ *      certStatus                   CertStatus,
+ *      thisUpdate                   GeneralizedTime,
+ *      nextUpdate           [0]     EXPLICIT GeneralizedTime OPTIONAL,
+ *      singleExtensions     [1]     EXPLICIT Extensions OPTIONAL }
+ */
+struct ocsp_single_response_st {
+    OCSP_CERTID *certId;
+    OCSP_CERTSTATUS *certStatus;
+    ASN1_GENERALIZEDTIME *thisUpdate;
+    ASN1_GENERALIZEDTIME *nextUpdate;
+    STACK_OF(X509_EXTENSION) *singleExtensions;
+};
+
+/*-  ResponseData ::= SEQUENCE {
+ *      version              [0] EXPLICIT Version DEFAULT v1,
+ *      responderID              ResponderID,
+ *      producedAt               GeneralizedTime,
+ *      responses                SEQUENCE OF SingleResponse,
+ *      responseExtensions   [1] EXPLICIT Extensions OPTIONAL }
+ */
+struct ocsp_response_data_st {
+    ASN1_INTEGER *version;
+    OCSP_RESPID *responderId;
+    ASN1_GENERALIZEDTIME *producedAt;
+    STACK_OF(OCSP_SINGLERESP) *responses;
+    STACK_OF(X509_EXTENSION) *responseExtensions;
+};
+
+/*-  BasicOCSPResponse       ::= SEQUENCE {
+ *      tbsResponseData      ResponseData,
+ *      signatureAlgorithm   AlgorithmIdentifier,
+ *      signature            BIT STRING,
+ *      certs                [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL }
+ */
+  /*
+   * Note 1: The value for "signature" is specified in the OCSP rfc2560 as
+   * follows: "The value for the signature SHALL be computed on the hash of
+   * the DER encoding ResponseData." This means that you must hash the
+   * DER-encoded tbsResponseData, and then run it through a crypto-signing
+   * function, which will (at least w/RSA) do a hash-'n'-private-encrypt
+   * operation.  This seems a bit odd, but that's the spec.  Also note that
+   * the data structures do not leave anywhere to independently specify the
+   * algorithm used for the initial hash. So, we look at the
+   * signature-specification algorithm, and try to do something intelligent.
+   * -- Kathy Weinhold, CertCo
+   */
+  /*
+   * Note 2: It seems that the mentioned passage from RFC 2560 (section
+   * 4.2.1) is open for interpretation.  I've done tests against another
+   * responder, and found that it doesn't do the double hashing that the RFC
+   * seems to say one should.  Therefore, all relevant functions take a flag
+   * saying which variant should be used.  -- Richard Levitte, OpenSSL team
+   * and CeloCom
+   */
+struct ocsp_basic_response_st {
+    OCSP_RESPDATA *tbsResponseData;
+    X509_ALGOR *signatureAlgorithm;
+    ASN1_BIT_STRING *signature;
+    STACK_OF(X509) *certs;
+};
+
+/*-
+ * CrlID ::= SEQUENCE {
+ *     crlUrl               [0]     EXPLICIT IA5String OPTIONAL,
+ *     crlNum               [1]     EXPLICIT INTEGER OPTIONAL,
+ *     crlTime              [2]     EXPLICIT GeneralizedTime OPTIONAL }
+ */
+struct ocsp_crl_id_st {
+    ASN1_IA5STRING *crlUrl;
+    ASN1_INTEGER *crlNum;
+    ASN1_GENERALIZEDTIME *crlTime;
+};
+
+/*-
+ * ServiceLocator ::= SEQUENCE {
+ *      issuer    Name,
+ *      locator   AuthorityInfoAccessSyntax OPTIONAL }
+ */
+struct ocsp_service_locator_st {
+    X509_NAME *issuer;
+    STACK_OF(ACCESS_DESCRIPTION) *locator;
+};
diff --git a/crypto/ocsp/ocsp_lib.c b/crypto/ocsp/ocsp_lib.c
index 24ca40e..8e87f49 100644
--- a/crypto/ocsp/ocsp_lib.c
+++ b/crypto/ocsp/ocsp_lib.c
@@ -72,6 +72,7 @@
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
 #include <openssl/ocsp.h>
+#include "ocsp_lcl.h"
 #include <openssl/asn1t.h>
 
 /* Convert a certificate and its issuer to an OCSP_CERTID */
diff --git a/crypto/ocsp/ocsp_prn.c b/crypto/ocsp/ocsp_prn.c
index 1834256..96c2023 100644
--- a/crypto/ocsp/ocsp_prn.c
+++ b/crypto/ocsp/ocsp_prn.c
@@ -67,6 +67,7 @@
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/ocsp.h>
+#include "ocsp_lcl.h"
 #include <openssl/pem.h>
 
 static int ocsp_certid_print(BIO *bp, OCSP_CERTID *a, int indent)
diff --git a/crypto/ocsp/ocsp_srv.c b/crypto/ocsp/ocsp_srv.c
index 2ec2c63..00cafea 100644
--- a/crypto/ocsp/ocsp_srv.c
+++ b/crypto/ocsp/ocsp_srv.c
@@ -65,6 +65,7 @@
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
 #include <openssl/ocsp.h>
+#include "ocsp_lcl.h"
 
 /*
  * Utility functions related to sending OCSP responses and extracting
diff --git a/crypto/ocsp/ocsp_vfy.c b/crypto/ocsp/ocsp_vfy.c
index 6c0ccb5..8beadf7 100644
--- a/crypto/ocsp/ocsp_vfy.c
+++ b/crypto/ocsp/ocsp_vfy.c
@@ -58,6 +58,7 @@
  */
 
 #include <openssl/ocsp.h>
+#include "ocsp_lcl.h"
 #include <openssl/err.h>
 #include <string.h>
 
diff --git a/crypto/x509v3/v3_ocsp.c b/crypto/ocsp/v3_ocsp.c
similarity index 99%
rename from crypto/x509v3/v3_ocsp.c
rename to crypto/ocsp/v3_ocsp.c
index b151eac..006db17 100644
--- a/crypto/x509v3/v3_ocsp.c
+++ b/crypto/ocsp/v3_ocsp.c
@@ -57,13 +57,12 @@
  *
  */
 
-#ifndef OPENSSL_NO_OCSP
-
 # include <stdio.h>
 # include "cryptlib.h"
 # include <openssl/conf.h>
 # include <openssl/asn1.h>
 # include <openssl/ocsp.h>
+# include "ocsp_lcl.h"
 # include <openssl/x509v3.h>
 
 /*
@@ -309,4 +308,3 @@ static int i2r_ocsp_serviceloc(const X509V3_EXT_METHOD *method, void *in,
  err:
     return 0;
 }
-#endif
diff --git a/crypto/x509v3/Makefile b/crypto/x509v3/Makefile
index cdbfd52..284dfa8 100644
--- a/crypto/x509v3/Makefile
+++ b/crypto/x509v3/Makefile
@@ -20,13 +20,13 @@ LIB=$(TOP)/libcrypto.a
 LIBSRC=	v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c v3_ia5.c v3_lib.c \
 v3_prn.c v3_utl.c v3err.c v3_genn.c v3_alt.c v3_skey.c v3_akey.c v3_pku.c \
 v3_int.c v3_enum.c v3_sxnet.c v3_cpols.c v3_crld.c v3_purp.c v3_info.c \
-v3_ocsp.c v3_akeya.c v3_pmaps.c v3_pcons.c v3_ncons.c v3_pcia.c v3_pci.c \
+v3_akeya.c v3_pmaps.c v3_pcons.c v3_ncons.c v3_pcia.c v3_pci.c \
 pcy_cache.c pcy_node.c pcy_data.c pcy_map.c pcy_tree.c pcy_lib.c \
 v3_asid.c v3_addr.c v3_scts.c
 LIBOBJ= v3_bcons.o v3_bitst.o v3_conf.o v3_extku.o v3_ia5.o v3_lib.o \
 v3_prn.o v3_utl.o v3err.o v3_genn.o v3_alt.o v3_skey.o v3_akey.o v3_pku.o \
 v3_int.o v3_enum.o v3_sxnet.o v3_cpols.o v3_crld.o v3_purp.o v3_info.o \
-v3_ocsp.o v3_akeya.o v3_pmaps.o v3_pcons.o v3_ncons.o v3_pcia.o v3_pci.o \
+v3_akeya.o v3_pmaps.o v3_pcons.o v3_ncons.o v3_pcia.o v3_pci.o \
 pcy_cache.o pcy_node.o pcy_data.o pcy_map.o pcy_tree.o pcy_lib.o \
 v3_asid.o v3_addr.o v3_scts.o
 
@@ -422,20 +422,6 @@ v3_ncons.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 v3_ncons.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 v3_ncons.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
 v3_ncons.o: ../cryptlib.h v3_ncons.c
-v3_ocsp.o: ../../e_os.h ../../include/openssl/asn1.h
-v3_ocsp.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
-v3_ocsp.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
-v3_ocsp.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-v3_ocsp.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
-v3_ocsp.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-v3_ocsp.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
-v3_ocsp.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
-v3_ocsp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-v3_ocsp.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
-v3_ocsp.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_ocsp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_ocsp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-v3_ocsp.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_ocsp.c
 v3_pci.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 v3_pci.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
 v3_pci.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

From steve at openssl.org  Thu Mar  5 15:50:41 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Thu, 05 Mar 2015 15:50:41 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425570641.035125.20652.nullmailer@dev.openssl.org>

The branch master has been updated
       via  d62bc5d30f7d9519aeff9160f98b9ad9aa592c41 (commit)
      from  6ef869d7d0a9d2e7ea7908c0b5aab1cb451e00fa (commit)


- Log -----------------------------------------------------------------
commit d62bc5d30f7d9519aeff9160f98b9ad9aa592c41
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu Mar 5 15:44:41 2015 +0000

    update ordinals
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 util/libeay.num | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/util/libeay.num b/util/libeay.num
index 32cba2e..1bb1749 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -943,7 +943,7 @@ EVP_rc2_40_cbc                          959	EXIST::FUNCTION:RC2
 EVP_rc4_40                              960	EXIST::FUNCTION:RC4
 EVP_CIPHER_CTX_init                     961	EXIST::FUNCTION:
 HMAC                                    962	EXIST::FUNCTION:
-HMAC_Init                               963	EXIST::FUNCTION:
+HMAC_Init                               963	EXIST::FUNCTION:DEPRECATED
 HMAC_Update                             964	EXIST::FUNCTION:
 HMAC_Final                              965	EXIST::FUNCTION:
 ERR_get_next_error_library              966	EXIST::FUNCTION:
@@ -3001,7 +3001,7 @@ pqueue_print                            3428	EXIST::FUNCTION:
 EC_GROUP_have_precompute_mult           3429	EXIST::FUNCTION:EC
 EC_KEY_print_fp                         3430	EXIST::FUNCTION:EC,STDIO
 BN_GF2m_mod_arr                         3431	EXIST::FUNCTION:EC2M
-PEM_write_bio_X509_CERT_PAIR            3432	EXIST::FUNCTION:
+PEM_write_bio_X509_CERT_PAIR            3432	NOEXIST::FUNCTION:
 EVP_PKEY_cmp                            3433	EXIST::FUNCTION:
 X509_policy_level_node_count            3434	EXIST::FUNCTION:
 STORE_new_engine                        3435	NOEXIST::FUNCTION:
@@ -3081,7 +3081,7 @@ BN_is_prime_ex                          3503	EXIST::FUNCTION:
 STORE_revoke_public_key                 3504	NOEXIST::FUNCTION:
 X509_STORE_CTX_get0_param               3505	EXIST::FUNCTION:
 STORE_delete_arbitrary                  3506	NOEXIST::FUNCTION:
-PEM_read_X509_CERT_PAIR                 3507	EXIST::FUNCTION:
+PEM_read_X509_CERT_PAIR                 3507	NOEXIST::FUNCTION:
 X509_STORE_set_depth                    3508	EXIST::FUNCTION:
 ECDSA_get_ex_data                       3509	EXIST::FUNCTION:ECDSA
 SHA224                                  3510	EXIST::FUNCTION:
@@ -3110,8 +3110,8 @@ STORE_method_set_modify_function        3530	NOEXIST::FUNCTION:
 STORE_parse_attrs_next                  3531	NOEXIST::FUNCTION:
 ENGINE_load_padlock                     3532	EXIST::FUNCTION:ENGINE,STATIC_ENGINE
 EC_GROUP_set_curve_name                 3533	EXIST::FUNCTION:EC
-X509_CERT_PAIR_it                       3534	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_CERT_PAIR_it                       3534	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_CERT_PAIR_it                       3534	NOEXIST::FUNCTION:
+X509_CERT_PAIR_it                       3534	NOEXIST::FUNCTION:
 STORE_meth_get_revoke_fn                3535	NOEXIST::FUNCTION:
 STORE_method_get_revoke_function        3535	NOEXIST::FUNCTION:
 STORE_method_set_get_function           3536	NOEXIST::FUNCTION:
@@ -3159,7 +3159,7 @@ BN_GF2m_add                             3574	EXIST::FUNCTION:EC2M
 EC_KEY_get0_group                       3575	EXIST::FUNCTION:EC
 STORE_generate_crl                      3576	NOEXIST::FUNCTION:
 STORE_store_public_key                  3577	NOEXIST::FUNCTION:
-X509_CERT_PAIR_free                     3578	EXIST::FUNCTION:
+X509_CERT_PAIR_free                     3578	NOEXIST::FUNCTION:
 STORE_revoke_private_key                3579	NOEXIST::FUNCTION:
 BN_nist_mod_224                         3580	EXIST::FUNCTION:
 SHA512_Final                            3581	EXIST:!VMSVAX:FUNCTION:
@@ -3230,7 +3230,7 @@ STORE_list_public_key_next              3638	NOEXIST::FUNCTION:
 i2v_ASN1_BIT_STRING                     3639	EXIST::FUNCTION:
 STORE_OBJECT_free                       3640	NOEXIST::FUNCTION:
 BN_nist_mod_384                         3641	EXIST::FUNCTION:
-i2d_X509_CERT_PAIR                      3642	EXIST::FUNCTION:
+i2d_X509_CERT_PAIR                      3642	NOEXIST::FUNCTION:
 PEM_write_ECPKParameters                3643	EXIST::FUNCTION:EC
 ECDH_compute_key                        3644	EXIST::FUNCTION:ECDH
 STORE_ATTR_INFO_get0_sha1str            3645	NOEXIST::FUNCTION:
@@ -3276,7 +3276,7 @@ STORE_method_get_unlock_store_function  3680	NOEXIST::FUNCTION:
 STORE_get_ex_data                       3681	NOEXIST::FUNCTION:
 EC_KEY_set_public_key                   3682	EXIST::FUNCTION:EC
 PEM_read_ECPKParameters                 3683	EXIST::FUNCTION:EC
-X509_CERT_PAIR_new                      3684	EXIST::FUNCTION:
+X509_CERT_PAIR_new                      3684	NOEXIST::FUNCTION:
 ENGINE_register_STORE                   3685	EXIST::FUNCTION:ENGINE
 RSA_generate_key_ex                     3686	EXIST::FUNCTION:RSA
 DSA_generate_parameters_ex              3687	EXIST::FUNCTION:DSA
@@ -3290,9 +3290,9 @@ POLICY_MAPPINGS_it                      3693	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 GENERAL_SUBTREE_it                      3694	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 GENERAL_SUBTREE_it                      3694	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 EC_GROUP_get_curve_name                 3695	EXIST::FUNCTION:EC
-PEM_write_X509_CERT_PAIR                3696	EXIST::FUNCTION:
+PEM_write_X509_CERT_PAIR                3696	NOEXIST::FUNCTION:
 BIO_dump_indent_cb                      3697	EXIST::FUNCTION:
-d2i_X509_CERT_PAIR                      3698	EXIST::FUNCTION:
+d2i_X509_CERT_PAIR                      3698	NOEXIST::FUNCTION:
 STORE_list_private_key_endp             3699	NOEXIST::FUNCTION:
 asn1_const_Finish                       3700	EXIST::FUNCTION:
 i2d_EC_PUBKEY_fp                        3701	EXIST::FUNCTION:EC,STDIO
@@ -3349,7 +3349,7 @@ EC_GROUP_set_asn1_flag                  3749	EXIST::FUNCTION:EC
 EC_KEY_check_key                        3750	EXIST::FUNCTION:EC
 d2i_EC_PUBKEY_fp                        3751	EXIST::FUNCTION:EC,STDIO
 PKCS7_set0_type_other                   3752	EXIST::FUNCTION:
-PEM_read_bio_X509_CERT_PAIR             3753	EXIST::FUNCTION:
+PEM_read_bio_X509_CERT_PAIR             3753	NOEXIST::FUNCTION:
 pqueue_next                             3754	EXIST::FUNCTION:
 STORE_meth_get_list_end_fn              3755	NOEXIST::FUNCTION:
 STORE_method_get_list_end_function      3755	NOEXIST::FUNCTION:
@@ -4545,3 +4545,7 @@ BN_GENCB_get_arg                        4904	EXIST::FUNCTION:
 BN_zero_ex                              4905	EXIST::FUNCTION:
 BN_is_odd                               4906	EXIST::FUNCTION:
 BN_set_flags                            4907	EXIST::FUNCTION:
+EVP_camellia_128_ctr                    4908	EXIST::FUNCTION:CAMELLIA
+EVP_camellia_256_ctr                    4909	EXIST::FUNCTION:CAMELLIA
+EVP_camellia_192_ctr                    4910	EXIST::FUNCTION:CAMELLIA
+OCSP_resp_get0_signature                4911	EXIST::FUNCTION:

From steve at openssl.org  Thu Mar  5 16:08:00 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Thu, 05 Mar 2015 16:08:00 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425571680.573203.23277.nullmailer@dev.openssl.org>

The branch master has been updated
       via  31c2b6ee7a5bc69b9bfc7eb96f4fa30f3a2681bd (commit)
      from  d62bc5d30f7d9519aeff9160f98b9ad9aa592c41 (commit)


- Log -----------------------------------------------------------------
commit 31c2b6ee7a5bc69b9bfc7eb96f4fa30f3a2681bd
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu Mar 5 15:17:33 2015 +0000

    Make STACK_OF opaque.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/stack/safestack.h | 12 ++----------
 crypto/stack/stack.c     |  8 ++++++++
 crypto/stack/stack.h     | 11 +----------
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h
index bd0397d..ceb0ba8 100644
--- a/crypto/stack/safestack.h
+++ b/crypto/stack/safestack.h
@@ -88,16 +88,8 @@ extern "C" {
 # define STACK_OF(type) struct stack_st_##type
 # define PREDECLARE_STACK_OF(type) STACK_OF(type);
 
-# define DECLARE_STACK_OF(type) \
-STACK_OF(type) \
-    { \
-    _STACK stack; \
-    };
-# define DECLARE_SPECIAL_STACK_OF(type, type2) \
-STACK_OF(type) \
-    { \
-    _STACK stack; \
-    };
+# define DECLARE_STACK_OF(type) STACK_OF(type);
+# define DECLARE_SPECIAL_STACK_OF(type, type2) STACK_OF(type);
 
 /*-
  * Strings are special: normally an lhash entry will point to a single
diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index 758ace9..1b89f55 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -60,6 +60,14 @@
 #include <openssl/stack.h>
 #include <openssl/objects.h>
 
+struct stack_st {
+    int num;
+    char **data;
+    int sorted;
+    int num_alloc;
+    int (*comp) (const void *, const void *);
+};
+
 #undef MIN_NODES
 #define MIN_NODES       4
 
diff --git a/crypto/stack/stack.h b/crypto/stack/stack.h
index eb07216..6b8869c 100644
--- a/crypto/stack/stack.h
+++ b/crypto/stack/stack.h
@@ -63,16 +63,7 @@
 extern "C" {
 #endif
 
-typedef struct stack_st {
-    int num;
-    char **data;
-    int sorted;
-    int num_alloc;
-    int (*comp) (const void *, const void *);
-} _STACK;                       /* Use STACK_OF(...) instead */
-
-# define M_sk_num(sk)            ((sk) ? (sk)->num:-1)
-# define M_sk_value(sk,n)        ((sk) ? (sk)->data[n] : NULL)
+typedef struct stack_st _STACK; /* Use STACK_OF(...) instead */
 
 int sk_num(const _STACK *);
 void *sk_value(const _STACK *, int);

From Steve at openssl.org  Thu Mar  5 19:56:40 2015
From: Steve at openssl.org (Steve at openssl.org)
Date: Thu, 05 Mar 2015 19:56:40 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1425585400.082688.15558.nullmailer@dev.openssl.org>

The branch master has been updated
       via  c1a690a05e888b41ed73cc24a91e471ea47d4fe8 (commit)
      from  d48d043b3068069836cf76238ca279de59e69ed1 (commit)


- Log -----------------------------------------------------------------
commit c1a690a05e888b41ed73cc24a91e471ea47d4fe8
Author: Steve Marquess <marquess at openssl.com>
Date:   Thu Mar 5 14:56:26 2015 -0500

    Add 8.odt files to index

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

Summary of changes:
 docs/fips/index.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/fips/index.wml b/docs/fips/index.wml
index 0e8ccd3..0bb9a6a 100644
--- a/docs/fips/index.wml
+++ b/docs/fips/index.wml
@@ -12,7 +12,7 @@ introduction and some general background see
 <a href="fipsnotes.html">Important Notes About OpenSSL and FIPS 140-2</a>, also note the
 <a href="fipsvalidation.html">summary and status</a> of the ongoing open source based OpenSSL FIPS Object Module validation.
 <p>
-<rfilelist "*.pdf *.tar.gz *.zip incore*">
+<rfilelist "*.pdf *.tar.gz *.zip *.odt incore*">
 <p>
 Note FIPS module and FIPS validation support is included in some of the
 OpenSSL <a href="../../support/funding/contract.html">support plans</a>.  Assistance

From levitte at openssl.org  Fri Mar  6 09:21:42 2015
From: levitte at openssl.org (Richard Levitte)
Date: Fri, 06 Mar 2015 09:21:42 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425633702.082514.12861.nullmailer@dev.openssl.org>

The branch master has been updated
       via  cdca82dcde1d233a648c18b2359f058f42dfe9ae (commit)
      from  31c2b6ee7a5bc69b9bfc7eb96f4fa30f3a2681bd (commit)


- Log -----------------------------------------------------------------
commit cdca82dcde1d233a648c18b2359f058f42dfe9ae
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 5 18:19:06 2015 +0100

    Catch up the VMS build.
    
    crypto/crypto-lib.com - catch up with the OCSP changes
    test/maketest.com and test/tests.com - catch up with the addition of test_evp_extra
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/crypto-lib.com | 4 ++--
 test/maketests.com    | 6 ++++--
 test/tests.com        | 8 ++++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index bf01471..0514821 100644
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -328,7 +328,7 @@ $ LIB_X509 = "x509_def,x509_d2,x509_r2x,x509_cmp,"+ -
 $ LIB_X509V3 = "v3_bcons,v3_bitst,v3_conf,v3_extku,v3_ia5,v3_lib,"+ -
 	"v3_prn,v3_utl,v3err,v3_genn,v3_alt,v3_skey,v3_akey,v3_pku,"+ -
 	"v3_int,v3_enum,v3_sxnet,v3_cpols,v3_crld,v3_purp,v3_info,"+ -
-	"v3_ocsp,v3_akeya,v3_pmaps,v3_pcons,v3_ncons,v3_pcia,v3_pci,"+ -
+	"v3_akeya,v3_pmaps,v3_pcons,v3_ncons,v3_pcia,v3_pci,"+ -
 	"pcy_cache,pcy_node,pcy_data,pcy_map,pcy_tree,pcy_lib,"+ -
 	"v3_asid,v3_addr,v3_scts"
 $ LIB_CONF = "conf_err,conf_lib,conf_api,conf_def,conf_mod,conf_mall,conf_sap"
@@ -341,7 +341,7 @@ $ LIB_PKCS12 = "p12_add,p12_asn,p12_attr,p12_crpt,p12_crt,p12_decr,"+ -
 $ LIB_COMP = "comp_lib,comp_err,"+ -
 	"c_rle,c_zlib"
 $ LIB_OCSP = "ocsp_asn,ocsp_ext,ocsp_ht,ocsp_lib,ocsp_cl,"+ -
-	"ocsp_srv,ocsp_prn,ocsp_vfy,ocsp_err"
+	"ocsp_srv,ocsp_prn,ocsp_vfy,ocsp_err,v3_ocsp"
 $ LIB_UI = "ui_err,ui_lib,ui_openssl,ui_util"
 $ LIB_KRB5 = "krb5_asn"
 $ LIB_CMS = "cms_lib,cms_asn1,cms_att,cms_io,cms_smime,cms_err,"+ -
diff --git a/test/maketests.com b/test/maketests.com
index 5919374..b0ff39d 100644
--- a/test/maketests.com
+++ b/test/maketests.com
@@ -148,8 +148,9 @@ $ TEST_FILES = "BNTEST,ECTEST,ECDSATEST,ECDHTEST,IDEATEST,"+ -
 	       "GOST2814789TEST,"+ -
 	       "BFTEST,CASTTEST,SSLTEST,"+ -
 	       "EXPTEST,DSATEST,RSA_TEST,"+ -
-	       "EVP_TEST,IGETEST,JPAKETEST,SRPTEST,"+ -
-	       "V3NAMETEST,HEARTBEAT_TEST,P5_CRPT2_TEST,"+ -
+	       "EVP_TEST,EVP_EXTRA_TEST,IGETEST,"+ -
+	       "JPAKETEST,SRPTEST,V3NAMETEST,"+ -
+	       "HEARTBEAT_TEST,P5_CRPT2_TEST,"+ -
 	       "CONSTANT_TIME_TEST"
 $! Should we add MTTEST,PQ_TEST,LH_TEST,DIVTEST,TABTEST as well?
 $!
@@ -185,6 +186,7 @@ $ T_D_EXPTEST            := [-.crypto.bn]
 $ T_D_DSATEST            := [-.crypto.dsa]
 $ T_D_RSA_TEST           := [-.crypto.rsa]
 $ T_D_EVP_TEST           := [-.crypto.evp]
+$ T_D_EVP_EXTRA_TEST     := [-.crypto.evp]
 $ T_D_IGETEST            := [-.test]
 $ T_D_JPAKETEST          := [-.crypto.jpake]
 $ T_D_SRPTEST            := [-.crypto.srp]
diff --git a/test/tests.com b/test/tests.com
index ba947be..f01d169 100644
--- a/test/tests.com
+++ b/test/tests.com
@@ -56,8 +56,8 @@ $	    tests := -
 	test_rand,test_bn,test_ec,test_ecdsa,test_ecdh,-
 	test_enc,test_x509,test_rsa,test_crl,test_sid,-
 	test_gen,test_req,test_pkcs7,test_verify,test_dh,test_dsa,-
-	test_ss,test_ca,test_engine,test_evp,test_ssl,test_tsa,test_ige,-
-	test_jpake,test_srp,test_cms,test_v3name,test_ocsp,-
+	test_ss,test_ca,test_engine,test_evp,test_evp_extra,test_ssl,test_tsa,-
+	test_ige,test_jpake,test_srp,test_cms,test_v3name,test_ocsp,-
 	test_gost2814789,test_heartbeat,test_p5_crpt2,-
 	test_constant_time
 $	endif
@@ -94,6 +94,7 @@ $	RSATEST :=		rsa_test
 $	ENGINETEST :=		enginetest
 $	GOST2814789TEST :=	gost2814789test
 $	EVPTEST :=		evp_test
+$	EVPEXTRATEST :=		evp_extra_test
 $	P5_CRPT2_TEST :=	p5_crpt2_test
 $	IGETEST :=		igetest
 $	JPAKETEST :=		jpaketest
@@ -114,6 +115,9 @@ $
 $ test_evp:
 $	mcr 'texe_dir''evptest' 'ROOT'.CRYPTO.EVP]evptests.txt
 $	return
+$ test_evp_extra:
+$	mcr 'texe_dir''evpextratest'
+$	return
 $ test_p5_crpt2:
 $	mcr 'texe_dir''p5_crpt2_test'
 $	return

From levitte at openssl.org  Fri Mar  6 09:24:35 2015
From: levitte at openssl.org (Richard Levitte)
Date: Fri, 06 Mar 2015 09:24:35 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425633875.789669.13916.nullmailer@dev.openssl.org>

The branch master has been updated
       via  c7223a115f0b372d54f0a50c1e6dc92cabb1429c (commit)
       via  4a577300c26d9e414ca09daa27b2c0aa0db6ab6c (commit)
      from  cdca82dcde1d233a648c18b2359f058f42dfe9ae (commit)


- Log -----------------------------------------------------------------
commit c7223a115f0b372d54f0a50c1e6dc92cabb1429c
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Mar 6 01:16:29 2015 +0100

    update TABLE
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 4a577300c26d9e414ca09daa27b2c0aa0db6ab6c
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Mar 6 01:16:19 2015 +0100

    Cleanup spaces
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 Configurations |   6 +--
 TABLE          | 148 ++++++++++++++++++++++++++++-----------------------------
 2 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/Configurations b/Configurations
index 47a5a3f..9c64956 100644
--- a/Configurations
+++ b/Configurations
@@ -181,8 +181,8 @@ my $no_asm_filler="::::::::::::::::void";
 #
 #       ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8
 #
-"linux-armv4",	"gcc: -O3 -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)",
-"linux-aarch64","gcc: -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-armv4",	"gcc:-O3 -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)",
+"linux-aarch64","gcc:-O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # Configure script adds minimally required -march for assembly support,
 # if no -march was specified at command line. mips32 and mips64 below
 # refer to contemporary MIPS Architecture specifications, MIPS32 and
@@ -201,7 +201,7 @@ my $no_asm_filler="::::::::::::::::void";
 "linux-ia64",	"gcc:-DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-ia64-icc","icc:-DL_ENDIAN -O2 -Wall::-D_REENTRANT::-ldl -no_cpprt:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-x86_64",	"gcc:-m64 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-"linux-x86_64-clang",	"clang: -m64 -DL_ENDIAN -O3 -Weverything $clang_disabled_warnings -Qunused-arguments::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+"linux-x86_64-clang",	"clang:-m64 -DL_ENDIAN -O3 -Weverything $clang_disabled_warnings -Qunused-arguments::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
 "linux-x86_64-icc", "icc:-DL_ENDIAN -O2::-D_REENTRANT::-ldl -no_cpprt:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
 "linux-x32",	"gcc:-mx32 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32:",
 "linux64-s390x",	"gcc:-m64 -DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
diff --git a/TABLE b/TABLE
index 67c6639..f214b7b 100644
--- a/TABLE
+++ b/TABLE
@@ -36,7 +36,7 @@ $multilib     =
 
 *** BS2000-OSD
 $cc           = c89
-$cflags       = -O -XLLML -XLLMK -XL -DB_ENDIAN -DTERMIOS -DCHARSET_EBCDIC
+$cflags       = -O -XLLML -XLLMK -XL -DB_ENDIAN -DCHARSET_EBCDIC
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
@@ -70,7 +70,7 @@ $multilib     =
 
 *** BSD-generic32
 $cc           = gcc
-$cflags       = -DTERMIOS -O3 -fomit-frame-pointer -Wall
+$cflags       = -O3 -fomit-frame-pointer -Wall
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
@@ -104,7 +104,7 @@ $multilib     =
 
 *** BSD-generic64
 $cc           = gcc
-$cflags       = -DTERMIOS -O3 -Wall
+$cflags       = -O3 -Wall
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
@@ -138,7 +138,7 @@ $multilib     =
 
 *** BSD-ia64
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIOS -O3 -Wall
+$cflags       = -DL_ENDIAN -O3 -Wall
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
@@ -172,7 +172,7 @@ $multilib     =
 
 *** BSD-sparc64
 $cc           = gcc
-$cflags       = -DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall
+$cflags       = -DB_ENDIAN -O3 -DMD32_REG_T=int -Wall
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
@@ -206,7 +206,7 @@ $multilib     =
 
 *** BSD-sparcv8
 $cc           = gcc
-$cflags       = -DB_ENDIAN -DTERMIOS -O3 -mv8 -Wall
+$cflags       = -DB_ENDIAN -O3 -mv8 -Wall
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
@@ -240,7 +240,7 @@ $multilib     =
 
 *** BSD-x86
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall
+$cflags       = -DL_ENDIAN -O3 -fomit-frame-pointer -Wall
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
@@ -274,7 +274,7 @@ $multilib     =
 
 *** BSD-x86-elf
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall
+$cflags       = -DL_ENDIAN -O3 -fomit-frame-pointer -Wall
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
@@ -308,7 +308,7 @@ $multilib     =
 
 *** BSD-x86_64
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIOS -O3 -Wall
+$cflags       = -DL_ENDIAN -O3 -Wall
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
@@ -410,7 +410,7 @@ $multilib     =
 
 *** DJGPP
 $cc           = gcc
-$cflags       = -I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall
+$cflags       = -I/dev/env/WATT_ROOT/inc -DTERMIO -DL_ENDIAN -fomit-frame-pointer -O2 -Wall
 $unistd       = 
 $thread_cflag = 
 $sys_id       = MSDOS
@@ -546,7 +546,7 @@ $multilib     =
 
 *** QNX6
 $cc           = gcc
-$cflags       = -DTERMIOS
+$cflags       = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
@@ -580,7 +580,7 @@ $multilib     =
 
 *** QNX6-i386
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIOS -O2 -Wall
+$cflags       = -DL_ENDIAN -O2 -Wall
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
@@ -1260,7 +1260,7 @@ $multilib     =
 
 *** darwin64-debug-test-64-clang
 $cc           = clang
-$cflags       = -arch x86_64 -DL_ENDIAN -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
+$cflags       = -arch x86_64 -DL_ENDIAN -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = MACOSX
@@ -1396,7 +1396,7 @@ $multilib     =
 
 *** debug-BSD-x86-elf
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIOS -O3 -Wall -g
+$cflags       = -DL_ENDIAN -O3 -Wall -g
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
@@ -1532,7 +1532,7 @@ $multilib     =
 
 *** debug-ben
 $cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DDEBUG_SAFESTACK -O2 -pipe
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DDEBUG_SAFESTACK -O2 -pipe
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
@@ -1566,7 +1566,7 @@ $multilib     =
 
 *** debug-ben-darwin64
 $cc           = cc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -Wno-language-extension-token -Wno-extended-offsetof -arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-language-extension-token -Wno-extended-offsetof -arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = MACOSX
@@ -1600,7 +1600,7 @@ $multilib     =
 
 *** debug-ben-debug
 $cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DOPENSSL_NO_HW_PADLOCK -g3 -O2 -pipe
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DOPENSSL_NO_HW_PADLOCK -g3 -O2 -pipe
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
@@ -1634,7 +1634,7 @@ $multilib     =
 
 *** debug-ben-debug-64
 $cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
@@ -1668,7 +1668,7 @@ $multilib     =
 
 *** debug-ben-debug-64-clang
 $cc           = clang
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
@@ -1702,7 +1702,7 @@ $multilib     =
 
 *** debug-ben-debug-64-noopt
 $cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -pipe
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -pipe
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
@@ -1736,7 +1736,7 @@ $multilib     =
 
 *** debug-ben-macos
 $cc           = cc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -DL_ENDIAN -g3 -pipe
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_ASM -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -DL_ENDIAN -g3 -pipe
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
@@ -1770,7 +1770,7 @@ $multilib     =
 
 *** debug-ben-no-opt
 $cc           = gcc
-$cflags       = -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -DTERMIOS -Wall -g3
+$cflags       = -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -Wall -g3
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
@@ -1906,7 +1906,7 @@ $multilib     =
 
 *** debug-bodo
 $cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -2042,7 +2042,7 @@ $multilib     =
 
 *** debug-erbridge
 $cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -DBN_DEBUG -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DBN_DEBUG -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -2178,7 +2178,7 @@ $multilib     =
 
 *** debug-levitte-linux-elf-extreme
 $cc           = gcc
-$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
+$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -2246,7 +2246,7 @@ $multilib     =
 
 *** debug-levitte-linux-noasm-extreme
 $cc           = gcc
-$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
+$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -2280,7 +2280,7 @@ $multilib     =
 
 *** debug-linux-elf
 $cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -march=i486 -Wall
+$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -march=i486 -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -2314,7 +2314,7 @@ $multilib     =
 
 *** debug-linux-elf-noefence
 $cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -march=i486 -Wall
+$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -march=i486 -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -2348,7 +2348,7 @@ $multilib     =
 
 *** debug-linux-generic32
 $cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall
+$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -2382,7 +2382,7 @@ $multilib     =
 
 *** debug-linux-generic64
 $cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall
+$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -2416,7 +2416,7 @@ $multilib     =
 
 *** debug-linux-ia32-aes
 $cc           = gcc
-$cflags       = -DAES_EXPERIMENTAL -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall
+$cflags       = -DAES_EXPERIMENTAL -DL_ENDIAN -O3 -fomit-frame-pointer -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -2450,7 +2450,7 @@ $multilib     =
 
 *** debug-linux-pentium
 $cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentium -Wall
+$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentium -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -2484,7 +2484,7 @@ $multilib     =
 
 *** debug-linux-ppro
 $cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentiumpro -Wall
+$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -2518,7 +2518,7 @@ $multilib     =
 
 *** debug-linux-x86_64
 $cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g -Wall
+$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -g -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -2552,7 +2552,7 @@ $multilib     = 64
 
 *** debug-rse
 $cc           = cc
-$cflags       = -DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall
+$cflags       = -DL_ENDIAN -pipe -O -g -ggdb3 -Wall
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
@@ -2722,7 +2722,7 @@ $multilib     =
 
 *** debug-steve-opt
 $cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -2756,7 +2756,7 @@ $multilib     =
 
 *** debug-steve32
 $cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g -pipe
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g -pipe
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -2790,7 +2790,7 @@ $multilib     =
 
 *** debug-steve64
 $cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -2824,7 +2824,7 @@ $multilib     =
 
 *** debug-test-64-clang
 $cc           = clang
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
@@ -3470,7 +3470,7 @@ $multilib     = /pa20_64
 
 *** hurd-x86
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall
+$cflags       = -DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -3572,7 +3572,7 @@ $multilib     =
 
 *** irix-cc
 $cc           = cc
-$cflags       = -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN
+$cflags       = -O2 -use_readonly_const -DB_ENDIAN
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
@@ -3606,7 +3606,7 @@ $multilib     =
 
 *** irix-gcc
 $cc           = gcc
-$cflags       = -O3 -DTERMIOS -DB_ENDIAN
+$cflags       = -O3 -DB_ENDIAN
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
@@ -3640,7 +3640,7 @@ $multilib     =
 
 *** irix-mips3-cc
 $cc           = cc
-$cflags       = -n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W
+$cflags       = -n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W
 $unistd       = 
 $thread_cflag = -D_SGI_MP_SOURCE
 $sys_id       = 
@@ -3674,7 +3674,7 @@ $multilib     = 32
 
 *** irix-mips3-gcc
 $cc           = gcc
-$cflags       = -mabi=n32 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W
+$cflags       = -mabi=n32 -O3 -DB_ENDIAN -DBN_DIV3W
 $unistd       = 
 $thread_cflag = -D_SGI_MP_SOURCE
 $sys_id       = 
@@ -3708,7 +3708,7 @@ $multilib     = 32
 
 *** irix64-mips4-cc
 $cc           = cc
-$cflags       = -64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W
+$cflags       = -64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W
 $unistd       = 
 $thread_cflag = -D_SGI_MP_SOURCE
 $sys_id       = 
@@ -3742,7 +3742,7 @@ $multilib     = 64
 
 *** irix64-mips4-gcc
 $cc           = gcc
-$cflags       = -mabi=64 -mips4 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W
+$cflags       = -mabi=64 -mips4 -O3 -DB_ENDIAN -DBN_DIV3W
 $unistd       = 
 $thread_cflag = -D_SGI_MP_SOURCE
 $sys_id       = 
@@ -3776,7 +3776,7 @@ $multilib     = 64
 
 *** linux-aarch64
 $cc           = gcc
-$cflags       = -DTERMIO -O3 -Wall
+$cflags       = -O3 -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -3810,7 +3810,7 @@ $multilib     =
 
 *** linux-alpha+bwx-ccc
 $cc           = ccc
-$cflags       = -fast -readonly_strings -DL_ENDIAN -DTERMIO
+$cflags       = -fast -readonly_strings -DL_ENDIAN
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -3844,7 +3844,7 @@ $multilib     =
 
 *** linux-alpha+bwx-gcc
 $cc           = gcc
-$cflags       = -O3 -DL_ENDIAN -DTERMIO
+$cflags       = -O3 -DL_ENDIAN
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -3878,7 +3878,7 @@ $multilib     =
 
 *** linux-alpha-ccc
 $cc           = ccc
-$cflags       = -fast -readonly_strings -DL_ENDIAN -DTERMIO
+$cflags       = -fast -readonly_strings -DL_ENDIAN
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -3912,7 +3912,7 @@ $multilib     =
 
 *** linux-alpha-gcc
 $cc           = gcc
-$cflags       = -O3 -DL_ENDIAN -DTERMIO
+$cflags       = -O3 -DL_ENDIAN
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -3946,7 +3946,7 @@ $multilib     =
 
 *** linux-aout
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall
+$cflags       = -DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
@@ -3980,7 +3980,7 @@ $multilib     =
 
 *** linux-armv4
 $cc           = gcc
-$cflags       = -DTERMIO -O3 -Wall
+$cflags       = -O3 -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4048,7 +4048,7 @@ $multilib     =
 
 *** linux-elf
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall
+$cflags       = -DL_ENDIAN -O3 -fomit-frame-pointer -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4082,7 +4082,7 @@ $multilib     =
 
 *** linux-generic32
 $cc           = gcc
-$cflags       = -DTERMIO -O3 -fomit-frame-pointer -Wall
+$cflags       = -O3 -fomit-frame-pointer -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4116,7 +4116,7 @@ $multilib     =
 
 *** linux-generic64
 $cc           = gcc
-$cflags       = -DTERMIO -O3 -Wall
+$cflags       = -O3 -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4150,7 +4150,7 @@ $multilib     =
 
 *** linux-ia32-icc
 $cc           = icc
-$cflags       = -DL_ENDIAN -DTERMIO -O2
+$cflags       = -DL_ENDIAN -O2
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4184,7 +4184,7 @@ $multilib     =
 
 *** linux-ia64
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIO -O3 -Wall
+$cflags       = -DL_ENDIAN -O3 -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4218,7 +4218,7 @@ $multilib     =
 
 *** linux-ia64-icc
 $cc           = icc
-$cflags       = -DL_ENDIAN -DTERMIO -O2 -Wall
+$cflags       = -DL_ENDIAN -O2 -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4252,7 +4252,7 @@ $multilib     =
 
 *** linux-mips32
 $cc           = gcc
-$cflags       = -mabi=32 -DTERMIO -O3 -Wall -DBN_DIV3W
+$cflags       = -mabi=32 -O3 -Wall -DBN_DIV3W
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4286,7 +4286,7 @@ $multilib     =
 
 *** linux-mips64
 $cc           = gcc
-$cflags       = -mabi=n32 -DTERMIO -O3 -Wall -DBN_DIV3W
+$cflags       = -mabi=n32 -O3 -Wall -DBN_DIV3W
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4320,7 +4320,7 @@ $multilib     = 32
 
 *** linux-ppc
 $cc           = gcc
-$cflags       = -DB_ENDIAN -DTERMIO -O3 -Wall
+$cflags       = -DB_ENDIAN -O3 -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4354,7 +4354,7 @@ $multilib     =
 
 *** linux-ppc64
 $cc           = gcc
-$cflags       = -m64 -DB_ENDIAN -DTERMIO -O3 -Wall
+$cflags       = -m64 -DB_ENDIAN -O3 -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4388,7 +4388,7 @@ $multilib     = 64
 
 *** linux-ppc64le
 $cc           = gcc
-$cflags       = -m64 -DL_ENDIAN -DTERMIO -O3 -Wall
+$cflags       = -m64 -DL_ENDIAN -O3 -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4422,7 +4422,7 @@ $multilib     =
 
 *** linux-sparcv8
 $cc           = gcc
-$cflags       = -mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W
+$cflags       = -mv8 -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -DBN_DIV2W
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4456,7 +4456,7 @@ $multilib     =
 
 *** linux-sparcv9
 $cc           = gcc
-$cflags       = -m32 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W
+$cflags       = -m32 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = ULTRASPARC
@@ -4490,7 +4490,7 @@ $multilib     =
 
 *** linux-x32
 $cc           = gcc
-$cflags       = -mx32 -DL_ENDIAN -DTERMIO -O3 -Wall
+$cflags       = -mx32 -DL_ENDIAN -O3 -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4524,7 +4524,7 @@ $multilib     = x32
 
 *** linux-x86_64
 $cc           = gcc
-$cflags       = -m64 -DL_ENDIAN -DTERMIO -O3 -Wall
+$cflags       = -m64 -DL_ENDIAN -O3 -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4558,7 +4558,7 @@ $multilib     = 64
 
 *** linux-x86_64-clang
 $cc           = clang
-$cflags       = -m64 -DL_ENDIAN -DTERMIO -O3 -Weverything -Wno-language-extension-token -Wno-extended-offsetof -Wno-padded -Wno-shorten-64-to-32 -Wno-format-nonliteral -Wno-missing-noreturn -Wno-unused-parameter -Wno-sign-conversion -Wno-unreachable-code -Wno-conversion -Wno-documentation -Wno-missing-variable-declarations -Wno-cast-align -Wno-incompatible-pointer-types-discards-qualifiers -Wno-missing-variable-declarations -Wno-missing-field-initializers -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-conditional-uninitialized -Wno-switch-enum -Qunused-arguments
+$cflags       = -m64 -DL_ENDIAN -O3 -Weverything -Wno-language-extension-token -Wno-extended-offsetof -Wno-padded -Wno-shorten-64-to-32 -Wno-format-nonliteral -Wno-missing-noreturn -Wno-unused-parameter -Wno-sign-conversion -Wno-unreachable-code -Wno-conversion -Wno-documentation -Wno-missing-variable-declarations -Wno-cast-align -Wno-incompatible-pointer-types-discards-qualifiers -Wno-missing-variable-declarations -Wno-missing-field-initializers -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-conditional-uninitialized -Wno-switch-enum -Qunused-arguments
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4592,7 +4592,7 @@ $multilib     = 64
 
 *** linux-x86_64-icc
 $cc           = icc
-$cflags       = -DL_ENDIAN -DTERMIO -O2
+$cflags       = -DL_ENDIAN -O2
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4626,7 +4626,7 @@ $multilib     = 64
 
 *** linux32-s390x
 $cc           = gcc
-$cflags       = -m31 -Wa,-mzarch -DB_ENDIAN -DTERMIO -O3 -Wall
+$cflags       = -m31 -Wa,-mzarch -DB_ENDIAN -O3 -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4660,7 +4660,7 @@ $multilib     = /highgprs
 
 *** linux64-mips64
 $cc           = gcc
-$cflags       = -mabi=64 -DTERMIO -O3 -Wall -DBN_DIV3W
+$cflags       = -mabi=64 -O3 -Wall -DBN_DIV3W
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4694,7 +4694,7 @@ $multilib     = 64
 
 *** linux64-s390x
 $cc           = gcc
-$cflags       = -m64 -DB_ENDIAN -DTERMIO -O3 -Wall
+$cflags       = -m64 -DB_ENDIAN -O3 -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -4728,7 +4728,7 @@ $multilib     = 64
 
 *** linux64-sparcv9
 $cc           = gcc
-$cflags       = -m64 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall
+$cflags       = -m64 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = ULTRASPARC

From matt at openssl.org  Fri Mar  6 14:11:33 2015
From: matt at openssl.org (Matt Caswell)
Date: Fri, 06 Mar 2015 14:11:33 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_0_9_8-stable update
Message-ID: <1425651093.976517.13794.nullmailer@dev.openssl.org>

The branch OpenSSL_0_9_8-stable has been updated
       via  a065737afbc924c75fa332dce3ada7f120eb866a (commit)
      from  241cff623e2b0f7c435a3a80ae783c29d994f061 (commit)


- Log -----------------------------------------------------------------
commit a065737afbc924c75fa332dce3ada7f120eb866a
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Mar 6 13:00:47 2015 +0000

    Update mkerr.pl for new format
    
    Make the output from mkerr.pl consistent with the newly reformatted code.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 util/mkerr.pl | 132 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/util/mkerr.pl b/util/mkerr.pl
index 768f0df..8109ab6 100644
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -376,7 +376,8 @@ foreach $lib (keys %csrc)
 	print OUT @out;
 	undef @out;
 	print OUT <<"EOF";
-/* The following lines are auto generated by the script mkerr.pl. Any changes
+/*
+ * The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
 EOF
@@ -390,7 +391,7 @@ EOF
 ${staticloader}void ERR_load_${lib}_strings(void);
 ${staticloader}void ERR_unload_${lib}_strings(void);
 ${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line);
-#define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__)
+# define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__)
 
 EOF
 	}
@@ -401,7 +402,7 @@ EOF
 EOF
 
 	foreach $i (@function) {
-		$z=6-int(length($i)/8);
+		$z=48 - length($i);
 		if($fcodes{$i} eq "X") {
 			$fassigned{$lib} =~ m/^:([^:]*):/;
 			$findcode = $1;
@@ -415,13 +416,13 @@ EOF
 			$fassigned{$lib} .= "$findcode:";
 			print STDERR "New Function code $i\n" if $debug;
 		}
-		printf OUT "#define $i%s $fcodes{$i}\n","\t" x $z;
+		printf OUT "# define $i%s $fcodes{$i}\n"," " x $z;
 	}
 
 	print OUT "\n/* Reason codes. */\n";
 
 	foreach $i (@reasons) {
-		$z=6-int(length($i)/8);
+		$z=48 - length($i);
 		if($rcodes{$i} eq "X") {
 			$rassigned{$lib} =~ m/^:([^:]*):/;
 			$findcode = $1;
@@ -435,7 +436,7 @@ EOF
 			$rassigned{$lib} .= "$findcode:";
 			print STDERR "New Reason code   $i\n" if $debug;
 		}
-		printf OUT "#define $i%s $rcodes{$i}\n","\t" x $z;
+		printf OUT "# define $i%s $rcodes{$i}\n"," " x $z;
 	}
 	print OUT <<"EOF";
 
@@ -494,7 +495,7 @@ EOF
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -540,7 +541,8 @@ EOF
  *
  */
 
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
+/*
+ * NOTE: this file was auto generated by the mkerr.pl script: any changes
  * made to it will be overwritten when the script next updates this file,
  * only reason strings will be preserved.
  */
@@ -552,11 +554,10 @@ EOF
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 
-#define ERR_FUNC(func) ERR_PACK($pack_errcode,func,0)
-#define ERR_REASON(reason) ERR_PACK($pack_errcode,0,reason)
+# define ERR_FUNC(func) ERR_PACK($pack_errcode,func,0)
+# define ERR_REASON(reason) ERR_PACK($pack_errcode,0,reason)
 
-static ERR_STRING_DATA ${lib}_str_functs[]=
-	{
+static ERR_STRING_DATA ${lib}_str_functs[] = {
 EOF
 	# Add each function code: if a function name is found then use it.
 	foreach $i (@function) {
@@ -567,20 +568,22 @@ EOF
 			$fn = $ftrans{$fn};
 		}
 #		print OUT "{ERR_PACK($pack_errcode,$i,0),\t\"$fn\"},\n";
-		print OUT "{ERR_FUNC($i),\t\"$fn\"},\n";
+		if(length($i) + length($fn) > 58) {
+			print OUT "    {ERR_FUNC($i),\n     \"$fn\"},\n";
+		} else {
+			print OUT "    {ERR_FUNC($i), \"$fn\"},\n";
+		}
 	}
 	print OUT <<"EOF";
-{0,NULL}
-	};
+    {0, NULL}
+};
 
-static ERR_STRING_DATA ${lib}_str_reasons[]=
-	{
+static ERR_STRING_DATA ${lib}_str_reasons[] = {
 EOF
 	# Add each reason code.
 	foreach $i (@reasons) {
 		my $rn;
 		my $rstr = "ERR_REASON($i)";
-		my $nspc = 0;
 		if (exists $err_reason_strings{$i}) {
 			$rn = $err_reason_strings{$i};
 		} else {
@@ -588,90 +591,87 @@ EOF
 			$rn = $1;
 			$rn =~ tr/_[A-Z]/ [a-z]/;
 		}
-		$nspc = 40 - length($rstr) unless length($rstr) > 40;
-		$nspc = " " x $nspc;
-		print OUT "{${rstr}${nspc},\"$rn\"},\n";
+		if(length($i) + length($rn) > 56) {
+			print OUT "    {${rstr},\n     \"$rn\"},\n";
+		} else {
+			print OUT "    {${rstr}, \"$rn\"},\n";
+		}
 	}
 if($static) {
 	print OUT <<"EOF";
-{0,NULL}
-	};
+    {0, NULL}
+};
 
 #endif
 
 ${staticloader}void ERR_load_${lib}_strings(void)
-	{
+{
 #ifndef OPENSSL_NO_ERR
 
-	if (ERR_func_error_string(${lib}_str_functs[0].error) == NULL)
-		{
-		ERR_load_strings($load_errcode,${lib}_str_functs);
-		ERR_load_strings($load_errcode,${lib}_str_reasons);
-		}
+    if (ERR_func_error_string(${lib}_str_functs[0].error) == NULL) {
+        ERR_load_strings($load_errcode, ${lib}_str_functs);
+        ERR_load_strings($load_errcode, ${lib}_str_reasons);
+    }
 #endif
-	}
+}
 EOF
 } else {
 	print OUT <<"EOF";
-{0,NULL}
-	};
+    {0, NULL}
+};
 
 #endif
 
 #ifdef ${lib}_LIB_NAME
-static ERR_STRING_DATA ${lib}_lib_name[]=
-        {
-{0	,${lib}_LIB_NAME},
-{0,NULL}
-	};
+static ERR_STRING_DATA ${lib}_lib_name[] = {
+    {0, ${lib}_LIB_NAME},
+    {0, NULL}
+};
 #endif
 
-
-static int ${lib}_lib_error_code=0;
-static int ${lib}_error_init=1;
+static int ${lib}_lib_error_code = 0;
+static int ${lib}_error_init = 1;
 
 ${staticloader}void ERR_load_${lib}_strings(void)
-	{
-	if (${lib}_lib_error_code == 0)
-		${lib}_lib_error_code=ERR_get_next_error_library();
+{
+    if (${lib}_lib_error_code == 0)
+        ${lib}_lib_error_code = ERR_get_next_error_library();
 
-	if (${lib}_error_init)
-		{
-		${lib}_error_init=0;
+    if (${lib}_error_init) {
+        ${lib}_error_init = 0;
 #ifndef OPENSSL_NO_ERR
-		ERR_load_strings(${lib}_lib_error_code,${lib}_str_functs);
-		ERR_load_strings(${lib}_lib_error_code,${lib}_str_reasons);
+        ERR_load_strings(${lib}_lib_error_code, ${lib}_str_functs);
+        ERR_load_strings(${lib}_lib_error_code, ${lib}_str_reasons);
 #endif
 
 #ifdef ${lib}_LIB_NAME
-		${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code,0,0);
-		ERR_load_strings(0,${lib}_lib_name);
+        ${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code, 0, 0);
+        ERR_load_strings(0, ${lib}_lib_name);
 #endif
-		}
-	}
+    }
+}
 
 ${staticloader}void ERR_unload_${lib}_strings(void)
-	{
-	if (${lib}_error_init == 0)
-		{
+{
+    if (${lib}_error_init == 0) {
 #ifndef OPENSSL_NO_ERR
-		ERR_unload_strings(${lib}_lib_error_code,${lib}_str_functs);
-		ERR_unload_strings(${lib}_lib_error_code,${lib}_str_reasons);
+        ERR_unload_strings(${lib}_lib_error_code, ${lib}_str_functs);
+        ERR_unload_strings(${lib}_lib_error_code, ${lib}_str_reasons);
 #endif
 
 #ifdef ${lib}_LIB_NAME
-		ERR_unload_strings(0,${lib}_lib_name);
+        ERR_unload_strings(0, ${lib}_lib_name);
 #endif
-		${lib}_error_init=1;
-		}
-	}
+        ${lib}_error_init = 1;
+    }
+}
 
 ${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line)
-	{
-	if (${lib}_lib_error_code == 0)
-		${lib}_lib_error_code=ERR_get_next_error_library();
-	ERR_PUT_error(${lib}_lib_error_code,function,reason,file,line);
-	}
+{
+    if (${lib}_lib_error_code == 0)
+        ${lib}_lib_error_code = ERR_get_next_error_library();
+    ERR_PUT_error(${lib}_lib_error_code, function, reason, file, line);
+}
 EOF
 
 }

From matt at openssl.org  Fri Mar  6 14:12:05 2015
From: matt at openssl.org (Matt Caswell)
Date: Fri, 06 Mar 2015 14:12:05 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1425651125.173791.14568.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  6ee3997134e2adfaaaa62ca685681a773d2a7d9c (commit)
      from  f9a21ed069846c4c18f9894bbef2fc77551a1028 (commit)


- Log -----------------------------------------------------------------
commit 6ee3997134e2adfaaaa62ca685681a773d2a7d9c
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Mar 6 13:00:47 2015 +0000

    Update mkerr.pl for new format
    
    Make the output from mkerr.pl consistent with the newly reformatted code.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 util/mkerr.pl | 132 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/util/mkerr.pl b/util/mkerr.pl
index 88388f5..7b6776d 100644
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -459,7 +459,8 @@ foreach $lib (keys %csrc)
 	print OUT @out;
 	undef @out;
 	print OUT <<"EOF";
-/* The following lines are auto generated by the script mkerr.pl. Any changes
+/*
+ * The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
 EOF
@@ -473,7 +474,7 @@ EOF
 ${staticloader}void ERR_load_${lib}_strings(void);
 ${staticloader}void ERR_unload_${lib}_strings(void);
 ${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line);
-#define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__)
+# define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__)
 
 EOF
 	}
@@ -484,7 +485,7 @@ EOF
 EOF
 
 	foreach $i (@function) {
-		$z=6-int(length($i)/8);
+		$z=48 - length($i);
 		if($fcodes{$i} eq "X") {
 			$fassigned{$lib} =~ m/^:([^:]*):/;
 			$findcode = $1;
@@ -498,13 +499,13 @@ EOF
 			$fassigned{$lib} .= "$findcode:";
 			print STDERR "New Function code $i\n" if $debug;
 		}
-		printf OUT "#define $i%s $fcodes{$i}\n","\t" x $z;
+		printf OUT "# define $i%s $fcodes{$i}\n"," " x $z;
 	}
 
 	print OUT "\n/* Reason codes. */\n";
 
 	foreach $i (@reasons) {
-		$z=6-int(length($i)/8);
+		$z=48 - length($i);
 		if($rcodes{$i} eq "X") {
 			$rassigned{$lib} =~ m/^:([^:]*):/;
 			$findcode = $1;
@@ -518,7 +519,7 @@ EOF
 			$rassigned{$lib} .= "$findcode:";
 			print STDERR "New Reason code   $i\n" if $debug;
 		}
-		printf OUT "#define $i%s $rcodes{$i}\n","\t" x $z;
+		printf OUT "# define $i%s $rcodes{$i}\n"," " x $z;
 	}
 	print OUT <<"EOF";
 
@@ -584,7 +585,7 @@ EOF
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -630,7 +631,8 @@ EOF
  *
  */
 
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
+/*
+ * NOTE: this file was auto generated by the mkerr.pl script: any changes
  * made to it will be overwritten when the script next updates this file,
  * only reason strings will be preserved.
  */
@@ -642,11 +644,10 @@ EOF
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 
-#define ERR_FUNC(func) ERR_PACK($pack_errcode,func,0)
-#define ERR_REASON(reason) ERR_PACK($pack_errcode,0,reason)
+# define ERR_FUNC(func) ERR_PACK($pack_errcode,func,0)
+# define ERR_REASON(reason) ERR_PACK($pack_errcode,0,reason)
 
-static ERR_STRING_DATA ${lib}_str_functs[]=
-	{
+static ERR_STRING_DATA ${lib}_str_functs[] = {
 EOF
 	# Add each function code: if a function name is found then use it.
 	foreach $i (@function) {
@@ -657,20 +658,22 @@ EOF
 			$fn = $ftrans{$fn};
 		}
 #		print OUT "{ERR_PACK($pack_errcode,$i,0),\t\"$fn\"},\n";
-		print OUT "{ERR_FUNC($i),\t\"$fn\"},\n";
+		if(length($i) + length($fn) > 58) {
+			print OUT "    {ERR_FUNC($i),\n     \"$fn\"},\n";
+		} else {
+			print OUT "    {ERR_FUNC($i), \"$fn\"},\n";
+		}
 	}
 	print OUT <<"EOF";
-{0,NULL}
-	};
+    {0, NULL}
+};
 
-static ERR_STRING_DATA ${lib}_str_reasons[]=
-	{
+static ERR_STRING_DATA ${lib}_str_reasons[] = {
 EOF
 	# Add each reason code.
 	foreach $i (@reasons) {
 		my $rn;
 		my $rstr = "ERR_REASON($i)";
-		my $nspc = 0;
 		if (exists $err_reason_strings{$i}) {
 			$rn = $err_reason_strings{$i};
 		} else {
@@ -678,90 +681,87 @@ EOF
 			$rn = $1;
 			$rn =~ tr/_[A-Z]/ [a-z]/;
 		}
-		$nspc = 40 - length($rstr) unless length($rstr) > 40;
-		$nspc = " " x $nspc;
-		print OUT "{${rstr}${nspc},\"$rn\"},\n";
+		if(length($i) + length($rn) > 56) {
+			print OUT "    {${rstr},\n     \"$rn\"},\n";
+		} else {
+			print OUT "    {${rstr}, \"$rn\"},\n";
+		}
 	}
 if($static) {
 	print OUT <<"EOF";
-{0,NULL}
-	};
+    {0, NULL}
+};
 
 #endif
 
 ${staticloader}void ERR_load_${lib}_strings(void)
-	{
+{
 #ifndef OPENSSL_NO_ERR
 
-	if (ERR_func_error_string(${lib}_str_functs[0].error) == NULL)
-		{
-		ERR_load_strings($load_errcode,${lib}_str_functs);
-		ERR_load_strings($load_errcode,${lib}_str_reasons);
-		}
+    if (ERR_func_error_string(${lib}_str_functs[0].error) == NULL) {
+        ERR_load_strings($load_errcode, ${lib}_str_functs);
+        ERR_load_strings($load_errcode, ${lib}_str_reasons);
+    }
 #endif
-	}
+}
 EOF
 } else {
 	print OUT <<"EOF";
-{0,NULL}
-	};
+    {0, NULL}
+};
 
 #endif
 
 #ifdef ${lib}_LIB_NAME
-static ERR_STRING_DATA ${lib}_lib_name[]=
-        {
-{0	,${lib}_LIB_NAME},
-{0,NULL}
-	};
+static ERR_STRING_DATA ${lib}_lib_name[] = {
+    {0, ${lib}_LIB_NAME},
+    {0, NULL}
+};
 #endif
 
-
-static int ${lib}_lib_error_code=0;
-static int ${lib}_error_init=1;
+static int ${lib}_lib_error_code = 0;
+static int ${lib}_error_init = 1;
 
 ${staticloader}void ERR_load_${lib}_strings(void)
-	{
-	if (${lib}_lib_error_code == 0)
-		${lib}_lib_error_code=ERR_get_next_error_library();
+{
+    if (${lib}_lib_error_code == 0)
+        ${lib}_lib_error_code = ERR_get_next_error_library();
 
-	if (${lib}_error_init)
-		{
-		${lib}_error_init=0;
+    if (${lib}_error_init) {
+        ${lib}_error_init = 0;
 #ifndef OPENSSL_NO_ERR
-		ERR_load_strings(${lib}_lib_error_code,${lib}_str_functs);
-		ERR_load_strings(${lib}_lib_error_code,${lib}_str_reasons);
+        ERR_load_strings(${lib}_lib_error_code, ${lib}_str_functs);
+        ERR_load_strings(${lib}_lib_error_code, ${lib}_str_reasons);
 #endif
 
 #ifdef ${lib}_LIB_NAME
-		${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code,0,0);
-		ERR_load_strings(0,${lib}_lib_name);
+        ${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code, 0, 0);
+        ERR_load_strings(0, ${lib}_lib_name);
 #endif
-		}
-	}
+    }
+}
 
 ${staticloader}void ERR_unload_${lib}_strings(void)
-	{
-	if (${lib}_error_init == 0)
-		{
+{
+    if (${lib}_error_init == 0) {
 #ifndef OPENSSL_NO_ERR
-		ERR_unload_strings(${lib}_lib_error_code,${lib}_str_functs);
-		ERR_unload_strings(${lib}_lib_error_code,${lib}_str_reasons);
+        ERR_unload_strings(${lib}_lib_error_code, ${lib}_str_functs);
+        ERR_unload_strings(${lib}_lib_error_code, ${lib}_str_reasons);
 #endif
 
 #ifdef ${lib}_LIB_NAME
-		ERR_unload_strings(0,${lib}_lib_name);
+        ERR_unload_strings(0, ${lib}_lib_name);
 #endif
-		${lib}_error_init=1;
-		}
-	}
+        ${lib}_error_init = 1;
+    }
+}
 
 ${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line)
-	{
-	if (${lib}_lib_error_code == 0)
-		${lib}_lib_error_code=ERR_get_next_error_library();
-	ERR_PUT_error(${lib}_lib_error_code,function,reason,file,line);
-	}
+{
+    if (${lib}_lib_error_code == 0)
+        ${lib}_lib_error_code = ERR_get_next_error_library();
+    ERR_PUT_error(${lib}_lib_error_code, function, reason, file, line);
+}
 EOF
 
 }

From matt at openssl.org  Fri Mar  6 14:11:48 2015
From: matt at openssl.org (Matt Caswell)
Date: Fri, 06 Mar 2015 14:11:48 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_0-stable update
Message-ID: <1425651108.299289.14060.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_0-stable has been updated
       via  09712fd0e3754172fa9f6da30a6782f36c43f195 (commit)
      from  4bf7b291692c59270ddca0e62de1f11611591cfc (commit)


- Log -----------------------------------------------------------------
commit 09712fd0e3754172fa9f6da30a6782f36c43f195
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Mar 6 13:00:47 2015 +0000

    Update mkerr.pl for new format
    
    Make the output from mkerr.pl consistent with the newly reformatted code.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 util/mkerr.pl | 132 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/util/mkerr.pl b/util/mkerr.pl
index bf95388..8d2fdbc 100644
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -458,7 +458,8 @@ foreach $lib (keys %csrc)
 	print OUT @out;
 	undef @out;
 	print OUT <<"EOF";
-/* The following lines are auto generated by the script mkerr.pl. Any changes
+/*
+ * The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
 EOF
@@ -472,7 +473,7 @@ EOF
 ${staticloader}void ERR_load_${lib}_strings(void);
 ${staticloader}void ERR_unload_${lib}_strings(void);
 ${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line);
-#define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__)
+# define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__)
 
 EOF
 	}
@@ -483,7 +484,7 @@ EOF
 EOF
 
 	foreach $i (@function) {
-		$z=6-int(length($i)/8);
+		$z=48 - length($i);
 		if($fcodes{$i} eq "X") {
 			$fassigned{$lib} =~ m/^:([^:]*):/;
 			$findcode = $1;
@@ -497,13 +498,13 @@ EOF
 			$fassigned{$lib} .= "$findcode:";
 			print STDERR "New Function code $i\n" if $debug;
 		}
-		printf OUT "#define $i%s $fcodes{$i}\n","\t" x $z;
+		printf OUT "# define $i%s $fcodes{$i}\n"," " x $z;
 	}
 
 	print OUT "\n/* Reason codes. */\n";
 
 	foreach $i (@reasons) {
-		$z=6-int(length($i)/8);
+		$z=48 - length($i);
 		if($rcodes{$i} eq "X") {
 			$rassigned{$lib} =~ m/^:([^:]*):/;
 			$findcode = $1;
@@ -517,7 +518,7 @@ EOF
 			$rassigned{$lib} .= "$findcode:";
 			print STDERR "New Reason code   $i\n" if $debug;
 		}
-		printf OUT "#define $i%s $rcodes{$i}\n","\t" x $z;
+		printf OUT "# define $i%s $rcodes{$i}\n"," " x $z;
 	}
 	print OUT <<"EOF";
 
@@ -583,7 +584,7 @@ EOF
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -629,7 +630,8 @@ EOF
  *
  */
 
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
+/*
+ * NOTE: this file was auto generated by the mkerr.pl script: any changes
  * made to it will be overwritten when the script next updates this file,
  * only reason strings will be preserved.
  */
@@ -641,11 +643,10 @@ EOF
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 
-#define ERR_FUNC(func) ERR_PACK($pack_errcode,func,0)
-#define ERR_REASON(reason) ERR_PACK($pack_errcode,0,reason)
+# define ERR_FUNC(func) ERR_PACK($pack_errcode,func,0)
+# define ERR_REASON(reason) ERR_PACK($pack_errcode,0,reason)
 
-static ERR_STRING_DATA ${lib}_str_functs[]=
-	{
+static ERR_STRING_DATA ${lib}_str_functs[] = {
 EOF
 	# Add each function code: if a function name is found then use it.
 	foreach $i (@function) {
@@ -656,20 +657,22 @@ EOF
 			$fn = $ftrans{$fn};
 		}
 #		print OUT "{ERR_PACK($pack_errcode,$i,0),\t\"$fn\"},\n";
-		print OUT "{ERR_FUNC($i),\t\"$fn\"},\n";
+		if(length($i) + length($fn) > 58) {
+			print OUT "    {ERR_FUNC($i),\n     \"$fn\"},\n";
+		} else {
+			print OUT "    {ERR_FUNC($i), \"$fn\"},\n";
+		}
 	}
 	print OUT <<"EOF";
-{0,NULL}
-	};
+    {0, NULL}
+};
 
-static ERR_STRING_DATA ${lib}_str_reasons[]=
-	{
+static ERR_STRING_DATA ${lib}_str_reasons[] = {
 EOF
 	# Add each reason code.
 	foreach $i (@reasons) {
 		my $rn;
 		my $rstr = "ERR_REASON($i)";
-		my $nspc = 0;
 		if (exists $err_reason_strings{$i}) {
 			$rn = $err_reason_strings{$i};
 		} else {
@@ -677,90 +680,87 @@ EOF
 			$rn = $1;
 			$rn =~ tr/_[A-Z]/ [a-z]/;
 		}
-		$nspc = 40 - length($rstr) unless length($rstr) > 40;
-		$nspc = " " x $nspc;
-		print OUT "{${rstr}${nspc},\"$rn\"},\n";
+		if(length($i) + length($rn) > 56) {
+			print OUT "    {${rstr},\n     \"$rn\"},\n";
+		} else {
+			print OUT "    {${rstr}, \"$rn\"},\n";
+		}
 	}
 if($static) {
 	print OUT <<"EOF";
-{0,NULL}
-	};
+    {0, NULL}
+};
 
 #endif
 
 ${staticloader}void ERR_load_${lib}_strings(void)
-	{
+{
 #ifndef OPENSSL_NO_ERR
 
-	if (ERR_func_error_string(${lib}_str_functs[0].error) == NULL)
-		{
-		ERR_load_strings($load_errcode,${lib}_str_functs);
-		ERR_load_strings($load_errcode,${lib}_str_reasons);
-		}
+    if (ERR_func_error_string(${lib}_str_functs[0].error) == NULL) {
+        ERR_load_strings($load_errcode, ${lib}_str_functs);
+        ERR_load_strings($load_errcode, ${lib}_str_reasons);
+    }
 #endif
-	}
+}
 EOF
 } else {
 	print OUT <<"EOF";
-{0,NULL}
-	};
+    {0, NULL}
+};
 
 #endif
 
 #ifdef ${lib}_LIB_NAME
-static ERR_STRING_DATA ${lib}_lib_name[]=
-        {
-{0	,${lib}_LIB_NAME},
-{0,NULL}
-	};
+static ERR_STRING_DATA ${lib}_lib_name[] = {
+    {0, ${lib}_LIB_NAME},
+    {0, NULL}
+};
 #endif
 
-
-static int ${lib}_lib_error_code=0;
-static int ${lib}_error_init=1;
+static int ${lib}_lib_error_code = 0;
+static int ${lib}_error_init = 1;
 
 ${staticloader}void ERR_load_${lib}_strings(void)
-	{
-	if (${lib}_lib_error_code == 0)
-		${lib}_lib_error_code=ERR_get_next_error_library();
+{
+    if (${lib}_lib_error_code == 0)
+        ${lib}_lib_error_code = ERR_get_next_error_library();
 
-	if (${lib}_error_init)
-		{
-		${lib}_error_init=0;
+    if (${lib}_error_init) {
+        ${lib}_error_init = 0;
 #ifndef OPENSSL_NO_ERR
-		ERR_load_strings(${lib}_lib_error_code,${lib}_str_functs);
-		ERR_load_strings(${lib}_lib_error_code,${lib}_str_reasons);
+        ERR_load_strings(${lib}_lib_error_code, ${lib}_str_functs);
+        ERR_load_strings(${lib}_lib_error_code, ${lib}_str_reasons);
 #endif
 
 #ifdef ${lib}_LIB_NAME
-		${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code,0,0);
-		ERR_load_strings(0,${lib}_lib_name);
+        ${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code, 0, 0);
+        ERR_load_strings(0, ${lib}_lib_name);
 #endif
-		}
-	}
+    }
+}
 
 ${staticloader}void ERR_unload_${lib}_strings(void)
-	{
-	if (${lib}_error_init == 0)
-		{
+{
+    if (${lib}_error_init == 0) {
 #ifndef OPENSSL_NO_ERR
-		ERR_unload_strings(${lib}_lib_error_code,${lib}_str_functs);
-		ERR_unload_strings(${lib}_lib_error_code,${lib}_str_reasons);
+        ERR_unload_strings(${lib}_lib_error_code, ${lib}_str_functs);
+        ERR_unload_strings(${lib}_lib_error_code, ${lib}_str_reasons);
 #endif
 
 #ifdef ${lib}_LIB_NAME
-		ERR_unload_strings(0,${lib}_lib_name);
+        ERR_unload_strings(0, ${lib}_lib_name);
 #endif
-		${lib}_error_init=1;
-		}
-	}
+        ${lib}_error_init = 1;
+    }
+}
 
 ${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line)
-	{
-	if (${lib}_lib_error_code == 0)
-		${lib}_lib_error_code=ERR_get_next_error_library();
-	ERR_PUT_error(${lib}_lib_error_code,function,reason,file,line);
-	}
+{
+    if (${lib}_lib_error_code == 0)
+        ${lib}_lib_error_code = ERR_get_next_error_library();
+    ERR_PUT_error(${lib}_lib_error_code, function, reason, file, line);
+}
 EOF
 
 }

From matt at openssl.org  Fri Mar  6 14:11:58 2015
From: matt at openssl.org (Matt Caswell)
Date: Fri, 06 Mar 2015 14:11:58 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1425651118.412686.14328.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  0440d4ebe41d523d57acc841c483375df0e3e75f (commit)
      from  183db9af80510abfe522c97387268906fd1d31c6 (commit)


- Log -----------------------------------------------------------------
commit 0440d4ebe41d523d57acc841c483375df0e3e75f
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Mar 6 13:00:47 2015 +0000

    Update mkerr.pl for new format
    
    Make the output from mkerr.pl consistent with the newly reformatted code.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 util/mkerr.pl | 132 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/util/mkerr.pl b/util/mkerr.pl
index bf95388..8d2fdbc 100644
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -458,7 +458,8 @@ foreach $lib (keys %csrc)
 	print OUT @out;
 	undef @out;
 	print OUT <<"EOF";
-/* The following lines are auto generated by the script mkerr.pl. Any changes
+/*
+ * The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
 EOF
@@ -472,7 +473,7 @@ EOF
 ${staticloader}void ERR_load_${lib}_strings(void);
 ${staticloader}void ERR_unload_${lib}_strings(void);
 ${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line);
-#define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__)
+# define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__)
 
 EOF
 	}
@@ -483,7 +484,7 @@ EOF
 EOF
 
 	foreach $i (@function) {
-		$z=6-int(length($i)/8);
+		$z=48 - length($i);
 		if($fcodes{$i} eq "X") {
 			$fassigned{$lib} =~ m/^:([^:]*):/;
 			$findcode = $1;
@@ -497,13 +498,13 @@ EOF
 			$fassigned{$lib} .= "$findcode:";
 			print STDERR "New Function code $i\n" if $debug;
 		}
-		printf OUT "#define $i%s $fcodes{$i}\n","\t" x $z;
+		printf OUT "# define $i%s $fcodes{$i}\n"," " x $z;
 	}
 
 	print OUT "\n/* Reason codes. */\n";
 
 	foreach $i (@reasons) {
-		$z=6-int(length($i)/8);
+		$z=48 - length($i);
 		if($rcodes{$i} eq "X") {
 			$rassigned{$lib} =~ m/^:([^:]*):/;
 			$findcode = $1;
@@ -517,7 +518,7 @@ EOF
 			$rassigned{$lib} .= "$findcode:";
 			print STDERR "New Reason code   $i\n" if $debug;
 		}
-		printf OUT "#define $i%s $rcodes{$i}\n","\t" x $z;
+		printf OUT "# define $i%s $rcodes{$i}\n"," " x $z;
 	}
 	print OUT <<"EOF";
 
@@ -583,7 +584,7 @@ EOF
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -629,7 +630,8 @@ EOF
  *
  */
 
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
+/*
+ * NOTE: this file was auto generated by the mkerr.pl script: any changes
  * made to it will be overwritten when the script next updates this file,
  * only reason strings will be preserved.
  */
@@ -641,11 +643,10 @@ EOF
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 
-#define ERR_FUNC(func) ERR_PACK($pack_errcode,func,0)
-#define ERR_REASON(reason) ERR_PACK($pack_errcode,0,reason)
+# define ERR_FUNC(func) ERR_PACK($pack_errcode,func,0)
+# define ERR_REASON(reason) ERR_PACK($pack_errcode,0,reason)
 
-static ERR_STRING_DATA ${lib}_str_functs[]=
-	{
+static ERR_STRING_DATA ${lib}_str_functs[] = {
 EOF
 	# Add each function code: if a function name is found then use it.
 	foreach $i (@function) {
@@ -656,20 +657,22 @@ EOF
 			$fn = $ftrans{$fn};
 		}
 #		print OUT "{ERR_PACK($pack_errcode,$i,0),\t\"$fn\"},\n";
-		print OUT "{ERR_FUNC($i),\t\"$fn\"},\n";
+		if(length($i) + length($fn) > 58) {
+			print OUT "    {ERR_FUNC($i),\n     \"$fn\"},\n";
+		} else {
+			print OUT "    {ERR_FUNC($i), \"$fn\"},\n";
+		}
 	}
 	print OUT <<"EOF";
-{0,NULL}
-	};
+    {0, NULL}
+};
 
-static ERR_STRING_DATA ${lib}_str_reasons[]=
-	{
+static ERR_STRING_DATA ${lib}_str_reasons[] = {
 EOF
 	# Add each reason code.
 	foreach $i (@reasons) {
 		my $rn;
 		my $rstr = "ERR_REASON($i)";
-		my $nspc = 0;
 		if (exists $err_reason_strings{$i}) {
 			$rn = $err_reason_strings{$i};
 		} else {
@@ -677,90 +680,87 @@ EOF
 			$rn = $1;
 			$rn =~ tr/_[A-Z]/ [a-z]/;
 		}
-		$nspc = 40 - length($rstr) unless length($rstr) > 40;
-		$nspc = " " x $nspc;
-		print OUT "{${rstr}${nspc},\"$rn\"},\n";
+		if(length($i) + length($rn) > 56) {
+			print OUT "    {${rstr},\n     \"$rn\"},\n";
+		} else {
+			print OUT "    {${rstr}, \"$rn\"},\n";
+		}
 	}
 if($static) {
 	print OUT <<"EOF";
-{0,NULL}
-	};
+    {0, NULL}
+};
 
 #endif
 
 ${staticloader}void ERR_load_${lib}_strings(void)
-	{
+{
 #ifndef OPENSSL_NO_ERR
 
-	if (ERR_func_error_string(${lib}_str_functs[0].error) == NULL)
-		{
-		ERR_load_strings($load_errcode,${lib}_str_functs);
-		ERR_load_strings($load_errcode,${lib}_str_reasons);
-		}
+    if (ERR_func_error_string(${lib}_str_functs[0].error) == NULL) {
+        ERR_load_strings($load_errcode, ${lib}_str_functs);
+        ERR_load_strings($load_errcode, ${lib}_str_reasons);
+    }
 #endif
-	}
+}
 EOF
 } else {
 	print OUT <<"EOF";
-{0,NULL}
-	};
+    {0, NULL}
+};
 
 #endif
 
 #ifdef ${lib}_LIB_NAME
-static ERR_STRING_DATA ${lib}_lib_name[]=
-        {
-{0	,${lib}_LIB_NAME},
-{0,NULL}
-	};
+static ERR_STRING_DATA ${lib}_lib_name[] = {
+    {0, ${lib}_LIB_NAME},
+    {0, NULL}
+};
 #endif
 
-
-static int ${lib}_lib_error_code=0;
-static int ${lib}_error_init=1;
+static int ${lib}_lib_error_code = 0;
+static int ${lib}_error_init = 1;
 
 ${staticloader}void ERR_load_${lib}_strings(void)
-	{
-	if (${lib}_lib_error_code == 0)
-		${lib}_lib_error_code=ERR_get_next_error_library();
+{
+    if (${lib}_lib_error_code == 0)
+        ${lib}_lib_error_code = ERR_get_next_error_library();
 
-	if (${lib}_error_init)
-		{
-		${lib}_error_init=0;
+    if (${lib}_error_init) {
+        ${lib}_error_init = 0;
 #ifndef OPENSSL_NO_ERR
-		ERR_load_strings(${lib}_lib_error_code,${lib}_str_functs);
-		ERR_load_strings(${lib}_lib_error_code,${lib}_str_reasons);
+        ERR_load_strings(${lib}_lib_error_code, ${lib}_str_functs);
+        ERR_load_strings(${lib}_lib_error_code, ${lib}_str_reasons);
 #endif
 
 #ifdef ${lib}_LIB_NAME
-		${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code,0,0);
-		ERR_load_strings(0,${lib}_lib_name);
+        ${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code, 0, 0);
+        ERR_load_strings(0, ${lib}_lib_name);
 #endif
-		}
-	}
+    }
+}
 
 ${staticloader}void ERR_unload_${lib}_strings(void)
-	{
-	if (${lib}_error_init == 0)
-		{
+{
+    if (${lib}_error_init == 0) {
 #ifndef OPENSSL_NO_ERR
-		ERR_unload_strings(${lib}_lib_error_code,${lib}_str_functs);
-		ERR_unload_strings(${lib}_lib_error_code,${lib}_str_reasons);
+        ERR_unload_strings(${lib}_lib_error_code, ${lib}_str_functs);
+        ERR_unload_strings(${lib}_lib_error_code, ${lib}_str_reasons);
 #endif
 
 #ifdef ${lib}_LIB_NAME
-		ERR_unload_strings(0,${lib}_lib_name);
+        ERR_unload_strings(0, ${lib}_lib_name);
 #endif
-		${lib}_error_init=1;
-		}
-	}
+        ${lib}_error_init = 1;
+    }
+}
 
 ${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line)
-	{
-	if (${lib}_lib_error_code == 0)
-		${lib}_lib_error_code=ERR_get_next_error_library();
-	ERR_PUT_error(${lib}_lib_error_code,function,reason,file,line);
-	}
+{
+    if (${lib}_lib_error_code == 0)
+        ${lib}_lib_error_code = ERR_get_next_error_library();
+    ERR_PUT_error(${lib}_lib_error_code, function, reason, file, line);
+}
 EOF
 
 }

From matt at openssl.org  Fri Mar  6 14:12:12 2015
From: matt at openssl.org (Matt Caswell)
Date: Fri, 06 Mar 2015 14:12:12 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425651132.089735.14838.nullmailer@dev.openssl.org>

The branch master has been updated
       via  f3b9ce90bbd4f9dd10dc30ce354d95ec2d6b892a (commit)
       via  65aaab2fa6c00a7a987ac756e57243a70f729c42 (commit)
      from  c7223a115f0b372d54f0a50c1e6dc92cabb1429c (commit)


- Log -----------------------------------------------------------------
commit f3b9ce90bbd4f9dd10dc30ce354d95ec2d6b892a
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Mar 6 13:01:31 2015 +0000

    make errors
    
    Run make errors on master
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 65aaab2fa6c00a7a987ac756e57243a70f729c42
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Mar 6 13:00:47 2015 +0000

    Update mkerr.pl for new format
    
    Make the output from mkerr.pl consistent with the newly reformatted code.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/bio/bio.h     |   1 +
 crypto/bio/bio_err.c |   3 +-
 util/mkerr.pl        | 132 +++++++++++++++++++++++++--------------------------
 3 files changed, 69 insertions(+), 67 deletions(-)

diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index 2d3e9e7..76b6662 100644
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -833,6 +833,7 @@ void ERR_load_BIO_strings(void);
 # define BIO_F_CONN_CTRL                                  127
 # define BIO_F_CONN_STATE                                 115
 # define BIO_F_DGRAM_SCTP_READ                            132
+# define BIO_F_DGRAM_SCTP_WRITE                           133
 # define BIO_F_FILE_CTRL                                  116
 # define BIO_F_FILE_READ                                  130
 # define BIO_F_LINEBUFFER_CTRL                            129
diff --git a/crypto/bio/bio_err.c b/crypto/bio/bio_err.c
index e8d3027..d9007aa 100644
--- a/crypto/bio/bio_err.c
+++ b/crypto/bio/bio_err.c
@@ -1,6 +1,6 @@
 /* crypto/bio/bio_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2015 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -96,6 +96,7 @@ static ERR_STRING_DATA BIO_str_functs[] = {
     {ERR_FUNC(BIO_F_CONN_CTRL), "CONN_CTRL"},
     {ERR_FUNC(BIO_F_CONN_STATE), "CONN_STATE"},
     {ERR_FUNC(BIO_F_DGRAM_SCTP_READ), "DGRAM_SCTP_READ"},
+    {ERR_FUNC(BIO_F_DGRAM_SCTP_WRITE), "DGRAM_SCTP_WRITE"},
     {ERR_FUNC(BIO_F_FILE_CTRL), "FILE_CTRL"},
     {ERR_FUNC(BIO_F_FILE_READ), "FILE_READ"},
     {ERR_FUNC(BIO_F_LINEBUFFER_CTRL), "LINEBUFFER_CTRL"},
diff --git a/util/mkerr.pl b/util/mkerr.pl
index 2438e8e..96c705e 100644
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -459,7 +459,8 @@ foreach $lib (keys %csrc)
 	print OUT @out;
 	undef @out;
 	print OUT <<"EOF";
-/* The following lines are auto generated by the script mkerr.pl. Any changes
+/*
+ * The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
 EOF
@@ -473,7 +474,7 @@ EOF
 ${staticloader}void ERR_load_${lib}_strings(void);
 ${staticloader}void ERR_unload_${lib}_strings(void);
 ${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line);
-#define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__)
+# define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__)
 
 EOF
 	}
@@ -484,7 +485,7 @@ EOF
 EOF
 
 	foreach $i (@function) {
-		$z=6-int(length($i)/8);
+		$z=48 - length($i);
 		if($fcodes{$i} eq "X") {
 			$fassigned{$lib} =~ m/^:([^:]*):/;
 			$findcode = $1;
@@ -498,13 +499,13 @@ EOF
 			$fassigned{$lib} .= "$findcode:";
 			print STDERR "New Function code $i\n" if $debug;
 		}
-		printf OUT "#define $i%s $fcodes{$i}\n","\t" x $z;
+		printf OUT "# define $i%s $fcodes{$i}\n"," " x $z;
 	}
 
 	print OUT "\n/* Reason codes. */\n";
 
 	foreach $i (@reasons) {
-		$z=6-int(length($i)/8);
+		$z=48 - length($i);
 		if($rcodes{$i} eq "X") {
 			$rassigned{$lib} =~ m/^:([^:]*):/;
 			$findcode = $1;
@@ -518,7 +519,7 @@ EOF
 			$rassigned{$lib} .= "$findcode:";
 			print STDERR "New Reason code   $i\n" if $debug;
 		}
-		printf OUT "#define $i%s $rcodes{$i}\n","\t" x $z;
+		printf OUT "# define $i%s $rcodes{$i}\n"," " x $z;
 	}
 	print OUT <<"EOF";
 
@@ -584,7 +585,7 @@ EOF
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -630,7 +631,8 @@ EOF
  *
  */
 
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
+/*
+ * NOTE: this file was auto generated by the mkerr.pl script: any changes
  * made to it will be overwritten when the script next updates this file,
  * only reason strings will be preserved.
  */
@@ -642,11 +644,10 @@ EOF
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 
-#define ERR_FUNC(func) ERR_PACK($pack_errcode,func,0)
-#define ERR_REASON(reason) ERR_PACK($pack_errcode,0,reason)
+# define ERR_FUNC(func) ERR_PACK($pack_errcode,func,0)
+# define ERR_REASON(reason) ERR_PACK($pack_errcode,0,reason)
 
-static ERR_STRING_DATA ${lib}_str_functs[]=
-	{
+static ERR_STRING_DATA ${lib}_str_functs[] = {
 EOF
 	# Add each function code: if a function name is found then use it.
 	foreach $i (@function) {
@@ -657,20 +658,22 @@ EOF
 			$fn = $ftrans{$fn};
 		}
 #		print OUT "{ERR_PACK($pack_errcode,$i,0),\t\"$fn\"},\n";
-		print OUT "{ERR_FUNC($i),\t\"$fn\"},\n";
+		if(length($i) + length($fn) > 58) {
+			print OUT "    {ERR_FUNC($i),\n     \"$fn\"},\n";
+		} else {
+			print OUT "    {ERR_FUNC($i), \"$fn\"},\n";
+		}
 	}
 	print OUT <<"EOF";
-{0,NULL}
-	};
+    {0, NULL}
+};
 
-static ERR_STRING_DATA ${lib}_str_reasons[]=
-	{
+static ERR_STRING_DATA ${lib}_str_reasons[] = {
 EOF
 	# Add each reason code.
 	foreach $i (@reasons) {
 		my $rn;
 		my $rstr = "ERR_REASON($i)";
-		my $nspc = 0;
 		if (exists $err_reason_strings{$i}) {
 			$rn = $err_reason_strings{$i};
 		} else {
@@ -678,90 +681,87 @@ EOF
 			$rn = $1;
 			$rn =~ tr/_[A-Z]/ [a-z]/;
 		}
-		$nspc = 40 - length($rstr) unless length($rstr) > 40;
-		$nspc = " " x $nspc;
-		print OUT "{${rstr}${nspc},\"$rn\"},\n";
+		if(length($i) + length($rn) > 56) {
+			print OUT "    {${rstr},\n     \"$rn\"},\n";
+		} else {
+			print OUT "    {${rstr}, \"$rn\"},\n";
+		}
 	}
 if($static) {
 	print OUT <<"EOF";
-{0,NULL}
-	};
+    {0, NULL}
+};
 
 #endif
 
 ${staticloader}void ERR_load_${lib}_strings(void)
-	{
+{
 #ifndef OPENSSL_NO_ERR
 
-	if (ERR_func_error_string(${lib}_str_functs[0].error) == NULL)
-		{
-		ERR_load_strings($load_errcode,${lib}_str_functs);
-		ERR_load_strings($load_errcode,${lib}_str_reasons);
-		}
+    if (ERR_func_error_string(${lib}_str_functs[0].error) == NULL) {
+        ERR_load_strings($load_errcode, ${lib}_str_functs);
+        ERR_load_strings($load_errcode, ${lib}_str_reasons);
+    }
 #endif
-	}
+}
 EOF
 } else {
 	print OUT <<"EOF";
-{0,NULL}
-	};
+    {0, NULL}
+};
 
 #endif
 
 #ifdef ${lib}_LIB_NAME
-static ERR_STRING_DATA ${lib}_lib_name[]=
-        {
-{0	,${lib}_LIB_NAME},
-{0,NULL}
-	};
+static ERR_STRING_DATA ${lib}_lib_name[] = {
+    {0, ${lib}_LIB_NAME},
+    {0, NULL}
+};
 #endif
 
-
-static int ${lib}_lib_error_code=0;
-static int ${lib}_error_init=1;
+static int ${lib}_lib_error_code = 0;
+static int ${lib}_error_init = 1;
 
 ${staticloader}void ERR_load_${lib}_strings(void)
-	{
-	if (${lib}_lib_error_code == 0)
-		${lib}_lib_error_code=ERR_get_next_error_library();
+{
+    if (${lib}_lib_error_code == 0)
+        ${lib}_lib_error_code = ERR_get_next_error_library();
 
-	if (${lib}_error_init)
-		{
-		${lib}_error_init=0;
+    if (${lib}_error_init) {
+        ${lib}_error_init = 0;
 #ifndef OPENSSL_NO_ERR
-		ERR_load_strings(${lib}_lib_error_code,${lib}_str_functs);
-		ERR_load_strings(${lib}_lib_error_code,${lib}_str_reasons);
+        ERR_load_strings(${lib}_lib_error_code, ${lib}_str_functs);
+        ERR_load_strings(${lib}_lib_error_code, ${lib}_str_reasons);
 #endif
 
 #ifdef ${lib}_LIB_NAME
-		${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code,0,0);
-		ERR_load_strings(0,${lib}_lib_name);
+        ${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code, 0, 0);
+        ERR_load_strings(0, ${lib}_lib_name);
 #endif
-		}
-	}
+    }
+}
 
 ${staticloader}void ERR_unload_${lib}_strings(void)
-	{
-	if (${lib}_error_init == 0)
-		{
+{
+    if (${lib}_error_init == 0) {
 #ifndef OPENSSL_NO_ERR
-		ERR_unload_strings(${lib}_lib_error_code,${lib}_str_functs);
-		ERR_unload_strings(${lib}_lib_error_code,${lib}_str_reasons);
+        ERR_unload_strings(${lib}_lib_error_code, ${lib}_str_functs);
+        ERR_unload_strings(${lib}_lib_error_code, ${lib}_str_reasons);
 #endif
 
 #ifdef ${lib}_LIB_NAME
-		ERR_unload_strings(0,${lib}_lib_name);
+        ERR_unload_strings(0, ${lib}_lib_name);
 #endif
-		${lib}_error_init=1;
-		}
-	}
+        ${lib}_error_init = 1;
+    }
+}
 
 ${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line)
-	{
-	if (${lib}_lib_error_code == 0)
-		${lib}_lib_error_code=ERR_get_next_error_library();
-	ERR_PUT_error(${lib}_lib_error_code,function,reason,file,line);
-	}
+{
+    if (${lib}_lib_error_code == 0)
+        ${lib}_lib_error_code = ERR_get_next_error_library();
+    ERR_PUT_error(${lib}_lib_error_code, function, reason, file, line);
+}
 EOF
 
 }

From kurt at openssl.org  Sat Mar  7 22:05:23 2015
From: kurt at openssl.org (Kurt Roeckx)
Date: Sat, 07 Mar 2015 22:05:23 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1425765923.529840.6603.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  f417997a324037025be61737288e40e171a8218c (commit)
      from  6ee3997134e2adfaaaa62ca685681a773d2a7d9c (commit)


- Log -----------------------------------------------------------------
commit f417997a324037025be61737288e40e171a8218c
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Wed Mar 4 21:57:52 2015 +0100

    Remove export ciphers from the DEFAULT cipher list
    
    They are moved to the COMPLEMENTOFDEFAULT instead.
    This also fixes SSLv2 to be part of COMPLEMENTOFDEFAULT.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 CHANGES              |  3 ++-
 doc/apps/ciphers.pod |  4 ++--
 ssl/ssl.h            |  2 +-
 ssl/ssl_ciph.c       | 10 ++++++++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index c1a07d7..11d93b6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,8 @@
 
  Changes between 1.0.2 and 1.0.2a [xx XXX xxxx]
 
-  *)
+  *) Removed the export ciphers from the DEFAULT ciphers
+     [Kurt Roeckx]
 
  Changes between 1.0.1l and 1.0.2 [22 Jan 2015]
 
diff --git a/doc/apps/ciphers.pod b/doc/apps/ciphers.pod
index 4eeb55b..e9280bc 100644
--- a/doc/apps/ciphers.pod
+++ b/doc/apps/ciphers.pod
@@ -109,8 +109,8 @@ The following is a list of all permitted cipher strings and their meanings.
 
 =item B<DEFAULT>
 
-the default cipher list. This is determined at compile time and, as of OpenSSL
-1.0.0, is normally B<ALL:!aNULL:!eNULL>. This must be the first cipher string
+the default cipher list. This is determined at compile time and
+is normally B<ALL:!EXPORT:!aNULL:!eNULL:!SSLv2>. This must be the firstcipher string
 specified.
 
 =item B<COMPLEMENTOFDEFAULT>
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 2b0f662..a6d845d 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -338,7 +338,7 @@ extern "C" {
  * The following cipher list is used by default. It also is substituted when
  * an application-defined cipher list string starts with 'DEFAULT'.
  */
-# define SSL_DEFAULT_CIPHER_LIST "ALL:!aNULL:!eNULL:!SSLv2"
+# define SSL_DEFAULT_CIPHER_LIST "ALL:!EXPORT:!aNULL:!eNULL:!SSLv2"
 /*
  * As of OpenSSL 1.0.0, ssl_create_cipher_list() in ssl/ssl_ciph.c always
  * starts with a reasonable order, and all we have to do for DEFAULT is
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index b038c55..2cc9a4a 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -235,8 +235,8 @@ static const SSL_CIPHER cipher_aliases[] = {
      * "COMPLEMENTOFDEFAULT" (does *not* include ciphersuites not found in
      * ALL!)
      */
-    {0, SSL_TXT_CMPDEF, 0, SSL_kEDH | SSL_kEECDH, SSL_aNULL, ~SSL_eNULL, 0, 0,
-     0, 0, 0, 0},
+    {0, SSL_TXT_CMPDEF, 0, 0, SSL_aNULL, ~SSL_eNULL, 0, ~SSL_SSLV2,
+     SSL_EXP_MASK, 0, 0, 0},
 
     /*
      * key exchange aliases (some of those using only a single bit here
@@ -1027,6 +1027,10 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
             if (cipher_id && cipher_id != cp->id)
                 continue;
 #endif
+            if (algo_strength == SSL_EXP_MASK && SSL_C_IS_EXPORT(cp))
+                goto ok;
+            if (alg_ssl == ~SSL_SSLV2 && cp->algorithm_ssl == SSL_SSLV2)
+                goto ok;
             if (alg_mkey && !(alg_mkey & cp->algorithm_mkey))
                 continue;
             if (alg_auth && !(alg_auth & cp->algorithm_auth))
@@ -1045,6 +1049,8 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
                 continue;
         }
 
+    ok:
+
 #ifdef CIPHER_DEBUG
         fprintf(stderr, "Action = %d\n", rule);
 #endif

From kurt at openssl.org  Sat Mar  7 22:12:00 2015
From: kurt at openssl.org (Kurt Roeckx)
Date: Sat, 07 Mar 2015 22:12:00 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1425766320.689474.7489.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  bc2e18a3c818ae7e2d8c996b6648aa4ae8e3ee28 (commit)
      from  0440d4ebe41d523d57acc841c483375df0e3e75f (commit)


- Log -----------------------------------------------------------------
commit bc2e18a3c818ae7e2d8c996b6648aa4ae8e3ee28
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Wed Mar 4 21:57:52 2015 +0100

    Remove export ciphers from the DEFAULT cipher list
    
    They are moved to the COMPLEMENTOFDEFAULT instead.
    This also fixes SSLv2 to be part of COMPLEMENTOFDEFAULT.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit f417997a324037025be61737288e40e171a8218c)
    
    Conflicts:
    	ssl/ssl_ciph.c

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

Summary of changes:
 CHANGES              |  3 ++-
 doc/apps/ciphers.pod |  4 ++--
 ssl/ssl.h            |  2 +-
 ssl/ssl_ciph.c       | 11 ++++++++---
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index d6233cb..0bb2587 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,8 @@
 
  Changes between 1.0.1l and 1.0.1m [xx XXX xxxx]
 
-  *)
+  *) Removed the export ciphers from the DEFAULT ciphers
+     [Kurt Roeckx]
 
  Changes between 1.0.1k and 1.0.1l [15 Jan 2015]
 
diff --git a/doc/apps/ciphers.pod b/doc/apps/ciphers.pod
index 6086d0a..0aa1bad 100644
--- a/doc/apps/ciphers.pod
+++ b/doc/apps/ciphers.pod
@@ -109,8 +109,8 @@ The following is a list of all permitted cipher strings and their meanings.
 
 =item B<DEFAULT>
 
-the default cipher list. This is determined at compile time and, as of OpenSSL
-1.0.0, is normally B<ALL:!aNULL:!eNULL>. This must be the first cipher string
+the default cipher list. This is determined at compile time and
+is normally B<ALL:!EXPORT:!aNULL:!eNULL:!SSLv2>. This must be the firstcipher string
 specified.
 
 =item B<COMPLEMENTOFDEFAULT>
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 551fa2d..b93b67b 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -334,7 +334,7 @@ extern "C" {
  * The following cipher list is used by default. It also is substituted when
  * an application-defined cipher list string starts with 'DEFAULT'.
  */
-# define SSL_DEFAULT_CIPHER_LIST "ALL:!aNULL:!eNULL:!SSLv2"
+# define SSL_DEFAULT_CIPHER_LIST "ALL:!EXPORT:!aNULL:!eNULL:!SSLv2"
 /*
  * As of OpenSSL 1.0.0, ssl_create_cipher_list() in ssl/ssl_ciph.c always
  * starts with a reasonable order, and all we have to do for DEFAULT is
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 51a4a04..cac525e 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -235,8 +235,8 @@ static const SSL_CIPHER cipher_aliases[] = {
      * "COMPLEMENTOFDEFAULT" (does *not* include ciphersuites not found in
      * ALL!)
      */
-    {0, SSL_TXT_CMPDEF, 0, SSL_kEDH | SSL_kEECDH, SSL_aNULL, ~SSL_eNULL, 0, 0,
-     0, 0, 0, 0},
+    {0, SSL_TXT_CMPDEF, 0, 0, SSL_aNULL, ~SSL_eNULL, 0, ~SSL_SSLV2,
+     SSL_EXP_MASK, 0, 0, 0},
 
     /*
      * key exchange aliases (some of those using only a single bit here
@@ -997,7 +997,10 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
                     cp->algorithm_enc, cp->algorithm_mac, cp->algorithm_ssl,
                     cp->algo_strength);
 #endif
-
+            if (algo_strength == SSL_EXP_MASK && SSL_C_IS_EXPORT(cp))
+                goto ok;
+            if (alg_ssl == ~SSL_SSLV2 && cp->algorithm_ssl == SSL_SSLV2)
+                goto ok;
             if (alg_mkey && !(alg_mkey & cp->algorithm_mkey))
                 continue;
             if (alg_auth && !(alg_auth & cp->algorithm_auth))
@@ -1016,6 +1019,8 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
                 continue;
         }
 
+    ok:
+
 #ifdef CIPHER_DEBUG
         fprintf(stderr, "Action = %d\n", rule);
 #endif

From kurt at openssl.org  Sat Mar  7 22:18:27 2015
From: kurt at openssl.org (Kurt Roeckx)
Date: Sat, 07 Mar 2015 22:18:27 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_0-stable update
Message-ID: <1425766707.263392.8455.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_0-stable has been updated
       via  71b0bb764c03b76214af4ee8fc35ee940f52b783 (commit)
      from  09712fd0e3754172fa9f6da30a6782f36c43f195 (commit)


- Log -----------------------------------------------------------------
commit 71b0bb764c03b76214af4ee8fc35ee940f52b783
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Wed Mar 4 21:57:52 2015 +0100

    Remove export ciphers from the DEFAULT cipher list
    
    They are moved to the COMPLEMENTOFDEFAULT instead.
    This also fixes SSLv2 to be part of COMPLEMENTOFDEFAULT.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit bc2e18a3c818ae7e2d8c996b6648aa4ae8e3ee28)

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

Summary of changes:
 CHANGES              |  3 ++-
 doc/apps/ciphers.pod |  4 ++--
 ssl/ssl.h            |  2 +-
 ssl/ssl_ciph.c       | 11 ++++++++---
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index f48a002..3e146ab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,8 @@
 
  Changes between 1.0.0q and 1.0.0r [xx XXX xxxx]
 
-  *)
+  *) Removed the export ciphers from the DEFAULT ciphers
+     [Kurt Roeckx]
 
  Changes between 1.0.0p and 1.0.0q [15 Jan 2015]
 
diff --git a/doc/apps/ciphers.pod b/doc/apps/ciphers.pod
index f44aa00..cbd9fa3 100644
--- a/doc/apps/ciphers.pod
+++ b/doc/apps/ciphers.pod
@@ -109,8 +109,8 @@ The following is a list of all permitted cipher strings and their meanings.
 
 =item B<DEFAULT>
 
-the default cipher list. This is determined at compile time and, as of OpenSSL
-1.0.0, is normally B<ALL:!aNULL:!eNULL>. This must be the first cipher string
+the default cipher list. This is determined at compile time and
+is normally B<ALL:!EXPORT:!aNULL:!eNULL:!SSLv2>. This must be the firstcipher string
 specified.
 
 =item B<COMPLEMENTOFDEFAULT>
diff --git a/ssl/ssl.h b/ssl/ssl.h
index c977da3..3f4d0ac 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -326,7 +326,7 @@ extern "C" {
  * The following cipher list is used by default. It also is substituted when
  * an application-defined cipher list string starts with 'DEFAULT'.
  */
-# define SSL_DEFAULT_CIPHER_LIST "ALL:!aNULL:!eNULL:!SSLv2"
+# define SSL_DEFAULT_CIPHER_LIST "ALL:!EXPORT:!aNULL:!eNULL:!SSLv2"
 /*
  * As of OpenSSL 1.0.0, ssl_create_cipher_list() in ssl/ssl_ciph.c always
  * starts with a reasonable order, and all we have to do for DEFAULT is
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index a61cab6..cae03b3 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -228,8 +228,8 @@ static const SSL_CIPHER cipher_aliases[] = {
      * "COMPLEMENTOFDEFAULT" (does *not* include ciphersuites not found in
      * ALL!)
      */
-    {0, SSL_TXT_CMPDEF, 0, SSL_kEDH | SSL_kEECDH, SSL_aNULL, ~SSL_eNULL, 0, 0,
-     0, 0, 0, 0},
+    {0, SSL_TXT_CMPDEF, 0, 0, SSL_aNULL, ~SSL_eNULL, 0, ~SSL_SSLV2,
+     SSL_EXP_MASK, 0, 0, 0},
 
     /*
      * key exchange aliases (some of those using only a single bit here
@@ -916,7 +916,10 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
                  cp->algorithm_enc, cp->algorithm_mac, cp->algorithm_ssl,
                  cp->algo_strength);
 #endif
-
+            if (algo_strength == SSL_EXP_MASK && SSL_C_IS_EXPORT(cp))
+                goto ok;
+            if (alg_ssl == ~SSL_SSLV2 && cp->algorithm_ssl == SSL_SSLV2)
+                goto ok;
             if (alg_mkey && !(alg_mkey & cp->algorithm_mkey))
                 continue;
             if (alg_auth && !(alg_auth & cp->algorithm_auth))
@@ -935,6 +938,8 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
                 continue;
         }
 
+    ok:
+
 #ifdef CIPHER_DEBUG
         printf("Action = %d\n", rule);
 #endif

From rsalz at openssl.org  Sun Mar  8 02:25:19 2015
From: rsalz at openssl.org (Rich Salz)
Date: Sun, 08 Mar 2015 02:25:19 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425781519.585789.31800.nullmailer@dev.openssl.org>

The branch master has been updated
       via  63a3c45582670f1f2d8e0df3835e9bd81c34d137 (commit)
      from  f3b9ce90bbd4f9dd10dc30ce354d95ec2d6b892a (commit)


- Log -----------------------------------------------------------------
commit 63a3c45582670f1f2d8e0df3835e9bd81c34d137
Author: Viktor Szakats <vszakats at github.com>
Date:   Sat Mar 7 21:24:40 2015 -0500

    GitHub 237:  Use https for IETF links
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

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

diff --git a/doc/standards.txt b/doc/standards.txt
index 146525e..691fafe 100644
--- a/doc/standards.txt
+++ b/doc/standards.txt
@@ -4,9 +4,9 @@ Standards related to OpenSSL
 This is a work in progress.  These are documents that describe things that
 are implemented (in whole or at least great parts) in OpenSSL.
 
-To search for RFCs, you can start at http://www.ietf.org/rfc.html
+To search for RFCs, you can start at https://www.ietf.org/rfc.html
 
-To search for internet-drafts, you can start at http://www.ietf.org/id-info/
+To search for internet-drafts, you can start at https://www.ietf.org/id-info/
 
 Many PKCS standards are now RFC's; PKCS#11 is now at Oasis and can be
 found at https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=pkcs11

From appro at openssl.org  Sun Mar  8 13:10:56 2015
From: appro at openssl.org (Andy Polyakov)
Date: Sun, 08 Mar 2015 13:10:56 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425820256.228786.8016.nullmailer@dev.openssl.org>

The branch master has been updated
       via  e390ae50e0bc41676994c6fa23f7b65a8afc4d7f (commit)
      from  63a3c45582670f1f2d8e0df3835e9bd81c34d137 (commit)


- Log -----------------------------------------------------------------
commit e390ae50e0bc41676994c6fa23f7b65a8afc4d7f
Author: Andy Polyakov <appro at openssl.org>
Date:   Tue Mar 3 21:44:53 2015 +0100

    ARMv4 assembly pack: add Cortex-A15 performance data.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 crypto/modes/asm/ghash-armv4.pl    |  4 ++--
 crypto/sha/asm/sha1-armv4-large.pl |  4 +++-
 crypto/sha/asm/sha512-armv4.pl     | 13 +++----------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/crypto/modes/asm/ghash-armv4.pl b/crypto/modes/asm/ghash-armv4.pl
index 77fbf34..44521f8 100644
--- a/crypto/modes/asm/ghash-armv4.pl
+++ b/crypto/modes/asm/ghash-armv4.pl
@@ -42,8 +42,8 @@
 # below and combine it with reduction algorithm from x86 module.
 # Performance improvement over previous version varies from 65% on
 # Snapdragon S4 to 110% on Cortex A9. In absolute terms Cortex A8
-# processes one byte in 8.45 cycles, A9 - in 10.2, Snapdragon S4 -
-# in 9.33.
+# processes one byte in 8.45 cycles, A9 - in 10.2, A15 - in 7.63,
+# Snapdragon S4 - in 9.33.
 #
 # C?mara, D.; Gouv?a, C. P. L.; L?pez, J. & Dahab, R.: Fast Software
 # Polynomial Multiplication on ARM Processors using the NEON Engine.
diff --git a/crypto/sha/asm/sha1-armv4-large.pl b/crypto/sha/asm/sha1-armv4-large.pl
index b2c3032..61307b7 100644
--- a/crypto/sha/asm/sha1-armv4-large.pl
+++ b/crypto/sha/asm/sha1-armv4-large.pl
@@ -60,7 +60,9 @@
 # is ~2.5x larger and there are some redundant instructions executed
 # when processing last block, improvement is not as big for smallest
 # blocks, only ~30%. Snapdragon S4 is a tad faster, 6.4 cycles per
-# byte, which is also >80% faster than integer-only code.
+# byte, which is also >80% faster than integer-only code. Cortex-A15
+# is even faster spending 5.6 cycles per byte outperforming integer-
+# only code by factor of 2.
 
 # May 2014.
 #
diff --git a/crypto/sha/asm/sha512-armv4.pl b/crypto/sha/asm/sha512-armv4.pl
index fb7dc50..daab297 100644
--- a/crypto/sha/asm/sha512-armv4.pl
+++ b/crypto/sha/asm/sha512-armv4.pl
@@ -34,16 +34,9 @@
 # terms it's 22.6 cycles per byte, which is disappointing result.
 # Technical writers asserted that 3-way S4 pipeline can sustain
 # multiple NEON instructions per cycle, but dual NEON issue could
-# not be observed, and for NEON-only sequences IPC(*) was found to
-# be limited by 1:-( 0.33 and 0.66 were measured for sequences with
-# ILPs(*) of 1 and 2 respectively. This in turn means that you can
-# even find yourself striving, as I did here, for achieving IPC
-# adequate to one delivered by Cortex A8 [for reference, it's
-# 0.5 for ILP of 1, and 1 for higher ILPs].
-#
-# (*) ILP, instruction-level parallelism, how many instructions
-#     *can* execute at the same time. IPC, instructions per cycle,
-#     indicates how many instructions actually execute.
+# not be observed, see http://www.openssl.org/~appro/Snapdragon-S4.html
+# for further details. On side note Cortex-A15 processes one byte in
+# 16 cycles.
 
 # Byte order [in]dependence. =========================================
 #

From steve at openssl.org  Sun Mar  8 16:18:50 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 08 Mar 2015 16:18:50 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425831530.881016.32339.nullmailer@dev.openssl.org>

The branch master has been updated
       via  e3013932df2d899e8600c305342bc14b682dc0d1 (commit)
      from  e390ae50e0bc41676994c6fa23f7b65a8afc4d7f (commit)


- Log -----------------------------------------------------------------
commit e3013932df2d899e8600c305342bc14b682dc0d1
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Feb 24 16:35:37 2015 +0000

    Additional CMS documentation.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 doc/crypto/CMS_get0_type.pod       | 22 ++++++++++++++++++----
 doc/crypto/d2i_CMS_ContentInfo.pod | 29 +++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 doc/crypto/d2i_CMS_ContentInfo.pod

diff --git a/doc/crypto/CMS_get0_type.pod b/doc/crypto/CMS_get0_type.pod
index 8ff1c31..3ed92bd 100644
--- a/doc/crypto/CMS_get0_type.pod
+++ b/doc/crypto/CMS_get0_type.pod
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
- CMS_get0_type, CMS_set1_eContentType, CMS_get0_eContentType - get and set CMS content types
+ CMS_get0_type, CMS_set1_eContentType, CMS_get0_eContentType, CMS_get0_content - get and set CMS content types and content
 
 =head1 SYNOPSIS
 
@@ -11,6 +11,7 @@
  const ASN1_OBJECT *CMS_get0_type(CMS_ContentInfo *cms);
  int CMS_set1_eContentType(CMS_ContentInfo *cms, const ASN1_OBJECT *oid);
  const ASN1_OBJECT *CMS_get0_eContentType(CMS_ContentInfo *cms);
+ ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms);
 
 =head1 DESCRIPTION
 
@@ -26,11 +27,15 @@ undefined.
 ASN1_OBJECT *CMS_get0_eContentType() returns a pointer to the embedded
 content type.
 
+CMS_get0_content() returns a pointer to the B<ASN1_OCTET_STRING> pointer
+containing the embedded content.
+
 =head1 NOTES
 
-As the B<0> implies CMS_get0_type() and CMS_get0_eContentType() return internal
-pointers which should B<not> be freed up. CMS_set1_eContentType() copies the
-supplied OID and it B<should> be freed up after use.
+As the B<0> implies CMS_get0_type(), CMS_get0_eContentType() and
+CMS_get0_content() return internal pointers which should B<not> be freed up.
+CMS_set1_eContentType() copies the supplied OID and it B<should> be freed up
+after use.
 
 The B<ASN1_OBJECT> values returned can be converted to an integer B<NID> value
 using OBJ_obj2nid(). For the currently supported content types the following
@@ -43,6 +48,15 @@ values are returned:
  NID_pkcs7_encrypted
  NID_pkcs7_enveloped
 
+The return value of CMS_get0_content() is a pointer to the B<ASN1_OCTET_STRING>
+content pointer. That means that for example:
+
+ ASN1_OCTET_STRING **pconf = CMS_get0_content(cms);
+
+B<*pconf> could be NULL if there is no embedded content. Applications can
+access, modify or create the embedded content in a B<CMS_ContentInfo> structure
+using this function. Applications usually will not need to modify the
+embedded content as it is normally set by higher level functions.
 
 =head1 RETURN VALUES
 
diff --git a/doc/crypto/d2i_CMS_ContentInfo.pod b/doc/crypto/d2i_CMS_ContentInfo.pod
new file mode 100644
index 0000000..6ddb2f6
--- /dev/null
+++ b/doc/crypto/d2i_CMS_ContentInfo.pod
@@ -0,0 +1,29 @@
+=pod
+
+=head1 NAME
+
+d2i_CMS_ContentInfo, i2d_CMS_ContentInfo - CMS ContentInfo functions
+
+=head1 SYNOPSIS
+
+ #include <openssl/cms.h>
+
+ CMS_ContentInfo *d2i_CMS_ContentInfo(CMS_ContentInfo **a, unsigned char **pp, long length);
+ int i2d_CMS_ContentInfo(CMS_ContentInfo *a, unsigned char **pp);
+
+=head1 DESCRIPTION
+
+These functions decode and encode an CMS ContentInfo structure.
+
+Otherwise they behave in a similar way to d2i_X509() and i2d_X509()
+described in the L<d2i_X509(3)|d2i_X509(3)> manual page.
+
+=head1 SEE ALSO
+
+L<d2i_X509(3)|d2i_X509(3)>
+
+=head1 HISTORY
+
+These functions were first added to OpenSSL 0.9.8
+
+=cut

From steve at openssl.org  Sun Mar  8 16:20:06 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 08 Mar 2015 16:20:06 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1425831606.014036.7444.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  876ed1057438cf691646848ab6b8842663944218 (commit)
      from  bc2e18a3c818ae7e2d8c996b6648aa4ae8e3ee28 (commit)


- Log -----------------------------------------------------------------
commit 876ed1057438cf691646848ab6b8842663944218
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Feb 24 16:35:37 2015 +0000

    Additional CMS documentation.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit e3013932df2d899e8600c305342bc14b682dc0d1)

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

Summary of changes:
 doc/crypto/CMS_get0_type.pod       | 22 ++++++++++++++++++----
 doc/crypto/d2i_CMS_ContentInfo.pod | 29 +++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 doc/crypto/d2i_CMS_ContentInfo.pod

diff --git a/doc/crypto/CMS_get0_type.pod b/doc/crypto/CMS_get0_type.pod
index 8ff1c31..3ed92bd 100644
--- a/doc/crypto/CMS_get0_type.pod
+++ b/doc/crypto/CMS_get0_type.pod
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
- CMS_get0_type, CMS_set1_eContentType, CMS_get0_eContentType - get and set CMS content types
+ CMS_get0_type, CMS_set1_eContentType, CMS_get0_eContentType, CMS_get0_content - get and set CMS content types and content
 
 =head1 SYNOPSIS
 
@@ -11,6 +11,7 @@
  const ASN1_OBJECT *CMS_get0_type(CMS_ContentInfo *cms);
  int CMS_set1_eContentType(CMS_ContentInfo *cms, const ASN1_OBJECT *oid);
  const ASN1_OBJECT *CMS_get0_eContentType(CMS_ContentInfo *cms);
+ ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms);
 
 =head1 DESCRIPTION
 
@@ -26,11 +27,15 @@ undefined.
 ASN1_OBJECT *CMS_get0_eContentType() returns a pointer to the embedded
 content type.
 
+CMS_get0_content() returns a pointer to the B<ASN1_OCTET_STRING> pointer
+containing the embedded content.
+
 =head1 NOTES
 
-As the B<0> implies CMS_get0_type() and CMS_get0_eContentType() return internal
-pointers which should B<not> be freed up. CMS_set1_eContentType() copies the
-supplied OID and it B<should> be freed up after use.
+As the B<0> implies CMS_get0_type(), CMS_get0_eContentType() and
+CMS_get0_content() return internal pointers which should B<not> be freed up.
+CMS_set1_eContentType() copies the supplied OID and it B<should> be freed up
+after use.
 
 The B<ASN1_OBJECT> values returned can be converted to an integer B<NID> value
 using OBJ_obj2nid(). For the currently supported content types the following
@@ -43,6 +48,15 @@ values are returned:
  NID_pkcs7_encrypted
  NID_pkcs7_enveloped
 
+The return value of CMS_get0_content() is a pointer to the B<ASN1_OCTET_STRING>
+content pointer. That means that for example:
+
+ ASN1_OCTET_STRING **pconf = CMS_get0_content(cms);
+
+B<*pconf> could be NULL if there is no embedded content. Applications can
+access, modify or create the embedded content in a B<CMS_ContentInfo> structure
+using this function. Applications usually will not need to modify the
+embedded content as it is normally set by higher level functions.
 
 =head1 RETURN VALUES
 
diff --git a/doc/crypto/d2i_CMS_ContentInfo.pod b/doc/crypto/d2i_CMS_ContentInfo.pod
new file mode 100644
index 0000000..6ddb2f6
--- /dev/null
+++ b/doc/crypto/d2i_CMS_ContentInfo.pod
@@ -0,0 +1,29 @@
+=pod
+
+=head1 NAME
+
+d2i_CMS_ContentInfo, i2d_CMS_ContentInfo - CMS ContentInfo functions
+
+=head1 SYNOPSIS
+
+ #include <openssl/cms.h>
+
+ CMS_ContentInfo *d2i_CMS_ContentInfo(CMS_ContentInfo **a, unsigned char **pp, long length);
+ int i2d_CMS_ContentInfo(CMS_ContentInfo *a, unsigned char **pp);
+
+=head1 DESCRIPTION
+
+These functions decode and encode an CMS ContentInfo structure.
+
+Otherwise they behave in a similar way to d2i_X509() and i2d_X509()
+described in the L<d2i_X509(3)|d2i_X509(3)> manual page.
+
+=head1 SEE ALSO
+
+L<d2i_X509(3)|d2i_X509(3)>
+
+=head1 HISTORY
+
+These functions were first added to OpenSSL 0.9.8
+
+=cut

From steve at openssl.org  Sun Mar  8 16:20:06 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 08 Mar 2015 16:20:06 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1425831606.100877.7467.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  f9aa27dc78c617c35c3eea6810fd5f83999ff724 (commit)
      from  f417997a324037025be61737288e40e171a8218c (commit)


- Log -----------------------------------------------------------------
commit f9aa27dc78c617c35c3eea6810fd5f83999ff724
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Feb 24 16:35:37 2015 +0000

    Additional CMS documentation.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit e3013932df2d899e8600c305342bc14b682dc0d1)

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

Summary of changes:
 doc/crypto/CMS_get0_type.pod       | 22 ++++++++++++++++++----
 doc/crypto/d2i_CMS_ContentInfo.pod | 29 +++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 doc/crypto/d2i_CMS_ContentInfo.pod

diff --git a/doc/crypto/CMS_get0_type.pod b/doc/crypto/CMS_get0_type.pod
index 8ff1c31..3ed92bd 100644
--- a/doc/crypto/CMS_get0_type.pod
+++ b/doc/crypto/CMS_get0_type.pod
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
- CMS_get0_type, CMS_set1_eContentType, CMS_get0_eContentType - get and set CMS content types
+ CMS_get0_type, CMS_set1_eContentType, CMS_get0_eContentType, CMS_get0_content - get and set CMS content types and content
 
 =head1 SYNOPSIS
 
@@ -11,6 +11,7 @@
  const ASN1_OBJECT *CMS_get0_type(CMS_ContentInfo *cms);
  int CMS_set1_eContentType(CMS_ContentInfo *cms, const ASN1_OBJECT *oid);
  const ASN1_OBJECT *CMS_get0_eContentType(CMS_ContentInfo *cms);
+ ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms);
 
 =head1 DESCRIPTION
 
@@ -26,11 +27,15 @@ undefined.
 ASN1_OBJECT *CMS_get0_eContentType() returns a pointer to the embedded
 content type.
 
+CMS_get0_content() returns a pointer to the B<ASN1_OCTET_STRING> pointer
+containing the embedded content.
+
 =head1 NOTES
 
-As the B<0> implies CMS_get0_type() and CMS_get0_eContentType() return internal
-pointers which should B<not> be freed up. CMS_set1_eContentType() copies the
-supplied OID and it B<should> be freed up after use.
+As the B<0> implies CMS_get0_type(), CMS_get0_eContentType() and
+CMS_get0_content() return internal pointers which should B<not> be freed up.
+CMS_set1_eContentType() copies the supplied OID and it B<should> be freed up
+after use.
 
 The B<ASN1_OBJECT> values returned can be converted to an integer B<NID> value
 using OBJ_obj2nid(). For the currently supported content types the following
@@ -43,6 +48,15 @@ values are returned:
  NID_pkcs7_encrypted
  NID_pkcs7_enveloped
 
+The return value of CMS_get0_content() is a pointer to the B<ASN1_OCTET_STRING>
+content pointer. That means that for example:
+
+ ASN1_OCTET_STRING **pconf = CMS_get0_content(cms);
+
+B<*pconf> could be NULL if there is no embedded content. Applications can
+access, modify or create the embedded content in a B<CMS_ContentInfo> structure
+using this function. Applications usually will not need to modify the
+embedded content as it is normally set by higher level functions.
 
 =head1 RETURN VALUES
 
diff --git a/doc/crypto/d2i_CMS_ContentInfo.pod b/doc/crypto/d2i_CMS_ContentInfo.pod
new file mode 100644
index 0000000..6ddb2f6
--- /dev/null
+++ b/doc/crypto/d2i_CMS_ContentInfo.pod
@@ -0,0 +1,29 @@
+=pod
+
+=head1 NAME
+
+d2i_CMS_ContentInfo, i2d_CMS_ContentInfo - CMS ContentInfo functions
+
+=head1 SYNOPSIS
+
+ #include <openssl/cms.h>
+
+ CMS_ContentInfo *d2i_CMS_ContentInfo(CMS_ContentInfo **a, unsigned char **pp, long length);
+ int i2d_CMS_ContentInfo(CMS_ContentInfo *a, unsigned char **pp);
+
+=head1 DESCRIPTION
+
+These functions decode and encode an CMS ContentInfo structure.
+
+Otherwise they behave in a similar way to d2i_X509() and i2d_X509()
+described in the L<d2i_X509(3)|d2i_X509(3)> manual page.
+
+=head1 SEE ALSO
+
+L<d2i_X509(3)|d2i_X509(3)>
+
+=head1 HISTORY
+
+These functions were first added to OpenSSL 0.9.8
+
+=cut

From steve at openssl.org  Sun Mar  8 16:29:22 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 08 Mar 2015 16:29:22 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425832162.357164.8860.nullmailer@dev.openssl.org>

The branch master has been updated
       via  a8ae0891d4bfd18f224777aed1fbb172504421f1 (commit)
      from  e3013932df2d899e8600c305342bc14b682dc0d1 (commit)


- Log -----------------------------------------------------------------
commit a8ae0891d4bfd18f224777aed1fbb172504421f1
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Mar 3 14:20:23 2015 +0000

    Cleanse PKCS#8 private key components.
    
    New function ASN1_STRING_clear_free which cleanses an ASN1_STRING
    structure before freeing it.
    
    Call ASN1_STRING_clear_free on PKCS#8 private key components.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/asn1/asn1.h     |  1 +
 crypto/asn1/asn1_lib.c |  7 +++++++
 crypto/dh/dh_ameth.c   |  8 ++++----
 crypto/dsa/dsa_ameth.c | 10 +++++-----
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 5254c7d..692b81a 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -799,6 +799,7 @@ DECLARE_ASN1_SET_OF(ASN1_OBJECT)
 
 ASN1_STRING *ASN1_STRING_new(void);
 void ASN1_STRING_free(ASN1_STRING *a);
+void ASN1_STRING_clear_free(ASN1_STRING *a);
 int ASN1_STRING_copy(ASN1_STRING *dst, const ASN1_STRING *str);
 ASN1_STRING *ASN1_STRING_dup(const ASN1_STRING *a);
 ASN1_STRING *ASN1_STRING_type_new(int type);
diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index bf84526..1586aaf 100644
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c
@@ -427,6 +427,13 @@ void ASN1_STRING_free(ASN1_STRING *a)
     OPENSSL_free(a);
 }
 
+void ASN1_STRING_clear_free(ASN1_STRING *a)
+{
+    if (a && a->data && !(a->flags & ASN1_STRING_FLAG_NDEF))
+        OPENSSL_cleanse(a->data, a->length);
+    ASN1_STRING_free(a);
+}
+
 int ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b)
 {
     int i;
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index 14d291f..8dac573 100644
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -240,7 +240,7 @@ static int dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
 
     EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, dh);
 
-    ASN1_INTEGER_free(privkey);
+    ASN1_STRING_clear_free(privkey);
 
     return 1;
 
@@ -248,7 +248,7 @@ static int dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
     DHerr(DH_F_DH_PRIV_DECODE, EVP_R_DECODE_ERROR);
  dherr:
     DH_free(dh);
-    ASN1_INTEGER_free(privkey);
+    ASN1_STRING_clear_free(privkey);
     return 0;
 }
 
@@ -283,7 +283,7 @@ static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
 
     dplen = i2d_ASN1_INTEGER(prkey, &dp);
 
-    ASN1_INTEGER_free(prkey);
+    ASN1_STRING_clear_free(prkey);
     prkey = NULL;
 
     if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(pkey->ameth->pkey_id), 0,
@@ -298,7 +298,7 @@ static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
     if (params != NULL)
         ASN1_STRING_free(params);
     if (prkey != NULL)
-        ASN1_INTEGER_free(prkey);
+        ASN1_STRING_clear_free(prkey);
     return 0;
 }
 
diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index 1569a33..c3a85da 100644
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -226,7 +226,7 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
             goto decerr;
         if (privkey->type == V_ASN1_NEG_INTEGER) {
             p8->broken = PKCS8_NEG_PRIVKEY;
-            ASN1_INTEGER_free(privkey);
+            ASN1_STRING_clear_free(privkey);
             if (!(privkey = d2i_ASN1_UINTEGER(NULL, &q, pklen)))
                 goto decerr;
         }
@@ -264,7 +264,7 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
     if (ndsa)
         sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
     else
-        ASN1_INTEGER_free(privkey);
+        ASN1_STRING_clear_free(privkey);
 
     return 1;
 
@@ -273,7 +273,7 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
  dsaerr:
     BN_CTX_free(ctx);
     if (privkey)
-        ASN1_INTEGER_free(privkey);
+        ASN1_STRING_clear_free(privkey);
     sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
     DSA_free(dsa);
     return 0;
@@ -315,7 +315,7 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
 
     dplen = i2d_ASN1_INTEGER(prkey, &dp);
 
-    ASN1_INTEGER_free(prkey);
+    ASN1_STRING_clear_free(prkey);
 
     if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_dsa), 0,
                          V_ASN1_SEQUENCE, params, dp, dplen))
@@ -329,7 +329,7 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
     if (params != NULL)
         ASN1_STRING_free(params);
     if (prkey != NULL)
-        ASN1_INTEGER_free(prkey);
+        ASN1_STRING_clear_free(prkey);
     return 0;
 }
 

From steve at openssl.org  Sun Mar  8 16:48:46 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 08 Mar 2015 16:48:46 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_0-stable update
Message-ID: <1425833326.734694.12236.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_0-stable has been updated
       via  36971258e3e47f04671f5f8e828293b253b4a79a (commit)
      from  71b0bb764c03b76214af4ee8fc35ee940f52b783 (commit)


- Log -----------------------------------------------------------------
commit 36971258e3e47f04671f5f8e828293b253b4a79a
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Mar 3 14:20:23 2015 +0000

    Cleanse PKCS#8 private key components.
    
    New function ASN1_STRING_clear_free which cleanses an ASN1_STRING
    structure before freeing it.
    
    Call ASN1_STRING_clear_free on PKCS#8 private key components.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit a8ae0891d4bfd18f224777aed1fbb172504421f1)
    
    Conflicts:
    	crypto/dh/dh_ameth.c

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

Summary of changes:
 crypto/asn1/asn1.h     |  1 +
 crypto/asn1/asn1_lib.c |  7 +++++++
 crypto/dh/dh_ameth.c   |  8 +++++---
 crypto/dsa/dsa_ameth.c | 10 +++++-----
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index ed2b9e6..8709849 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -796,6 +796,7 @@ DECLARE_ASN1_SET_OF(ASN1_OBJECT)
 
 ASN1_STRING *ASN1_STRING_new(void);
 void ASN1_STRING_free(ASN1_STRING *a);
+void ASN1_STRING_clear_free(ASN1_STRING *a);
 int ASN1_STRING_copy(ASN1_STRING *dst, const ASN1_STRING *str);
 ASN1_STRING *ASN1_STRING_dup(const ASN1_STRING *a);
 ASN1_STRING *ASN1_STRING_type_new(int type);
diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index 00733a6..0b61fc9 100644
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c
@@ -430,6 +430,13 @@ void ASN1_STRING_free(ASN1_STRING *a)
     OPENSSL_free(a);
 }
 
+void ASN1_STRING_clear_free(ASN1_STRING *a)
+{
+    if (a && a->data && !(a->flags & ASN1_STRING_FLAG_NDEF))
+        OPENSSL_cleanse(a->data, a->length);
+    ASN1_STRING_free(a);
+}
+
 int ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b)
 {
     int i;
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index 2323f22..8a68aea 100644
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -215,7 +215,7 @@ static int dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
 
     EVP_PKEY_assign_DH(pkey, dh);
 
-    ASN1_INTEGER_free(privkey);
+    ASN1_STRING_clear_free(privkey);
 
     return 1;
 
@@ -223,6 +223,7 @@ static int dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
     DHerr(DH_F_DH_PRIV_DECODE, EVP_R_DECODE_ERROR);
  dherr:
     DH_free(dh);
+    ASN1_STRING_clear_free(privkey);
     return 0;
 }
 
@@ -257,7 +258,8 @@ static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
 
     dplen = i2d_ASN1_INTEGER(prkey, &dp);
 
-    ASN1_INTEGER_free(prkey);
+    ASN1_STRING_clear_free(prkey);
+    prkey = NULL;
 
     if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_dhKeyAgreement), 0,
                          V_ASN1_SEQUENCE, params, dp, dplen))
@@ -271,7 +273,7 @@ static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
     if (params != NULL)
         ASN1_STRING_free(params);
     if (prkey != NULL)
-        ASN1_INTEGER_free(prkey);
+        ASN1_STRING_clear_free(prkey);
     return 0;
 }
 
diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index 150a3ed..9fdce81 100644
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -226,7 +226,7 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
             goto decerr;
         if (privkey->type == V_ASN1_NEG_INTEGER) {
             p8->broken = PKCS8_NEG_PRIVKEY;
-            ASN1_INTEGER_free(privkey);
+            ASN1_STRING_clear_free(privkey);
             if (!(privkey = d2i_ASN1_UINTEGER(NULL, &q, pklen)))
                 goto decerr;
         }
@@ -264,7 +264,7 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
     if (ndsa)
         sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
     else
-        ASN1_INTEGER_free(privkey);
+        ASN1_STRING_clear_free(privkey);
 
     return 1;
 
@@ -273,7 +273,7 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
  dsaerr:
     BN_CTX_free(ctx);
     if (privkey)
-        ASN1_INTEGER_free(privkey);
+        ASN1_STRING_clear_free(privkey);
     sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
     DSA_free(dsa);
     return 0;
@@ -315,7 +315,7 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
 
     dplen = i2d_ASN1_INTEGER(prkey, &dp);
 
-    ASN1_INTEGER_free(prkey);
+    ASN1_STRING_clear_free(prkey);
 
     if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_dsa), 0,
                          V_ASN1_SEQUENCE, params, dp, dplen))
@@ -329,7 +329,7 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
     if (params != NULL)
         ASN1_STRING_free(params);
     if (prkey != NULL)
-        ASN1_INTEGER_free(prkey);
+        ASN1_STRING_clear_free(prkey);
     return 0;
 }
 

From steve at openssl.org  Sun Mar  8 16:48:46 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 08 Mar 2015 16:48:46 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1425833326.803990.12259.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  cb9d5b7b53d3e781c2110e2c4b8f9530ce312eb8 (commit)
      from  876ed1057438cf691646848ab6b8842663944218 (commit)


- Log -----------------------------------------------------------------
commit cb9d5b7b53d3e781c2110e2c4b8f9530ce312eb8
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Mar 3 14:20:23 2015 +0000

    Cleanse PKCS#8 private key components.
    
    New function ASN1_STRING_clear_free which cleanses an ASN1_STRING
    structure before freeing it.
    
    Call ASN1_STRING_clear_free on PKCS#8 private key components.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit a8ae0891d4bfd18f224777aed1fbb172504421f1)

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

Summary of changes:
 crypto/asn1/asn1.h     |  1 +
 crypto/asn1/asn1_lib.c |  7 +++++++
 crypto/dh/dh_ameth.c   |  8 ++++----
 crypto/dsa/dsa_ameth.c | 10 +++++-----
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index b3c38fd..39b7833 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -795,6 +795,7 @@ DECLARE_ASN1_SET_OF(ASN1_OBJECT)
 
 ASN1_STRING *ASN1_STRING_new(void);
 void ASN1_STRING_free(ASN1_STRING *a);
+void ASN1_STRING_clear_free(ASN1_STRING *a);
 int ASN1_STRING_copy(ASN1_STRING *dst, const ASN1_STRING *str);
 ASN1_STRING *ASN1_STRING_dup(const ASN1_STRING *a);
 ASN1_STRING *ASN1_STRING_type_new(int type);
diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index 00733a6..0b61fc9 100644
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c
@@ -430,6 +430,13 @@ void ASN1_STRING_free(ASN1_STRING *a)
     OPENSSL_free(a);
 }
 
+void ASN1_STRING_clear_free(ASN1_STRING *a)
+{
+    if (a && a->data && !(a->flags & ASN1_STRING_FLAG_NDEF))
+        OPENSSL_cleanse(a->data, a->length);
+    ASN1_STRING_free(a);
+}
+
 int ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b)
 {
     int i;
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index 786f021..680400f 100644
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -215,7 +215,7 @@ static int dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
 
     EVP_PKEY_assign_DH(pkey, dh);
 
-    ASN1_INTEGER_free(privkey);
+    ASN1_STRING_clear_free(privkey);
 
     return 1;
 
@@ -223,7 +223,7 @@ static int dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
     DHerr(DH_F_DH_PRIV_DECODE, EVP_R_DECODE_ERROR);
  dherr:
     DH_free(dh);
-    ASN1_INTEGER_free(privkey);
+    ASN1_STRING_clear_free(privkey);
     return 0;
 }
 
@@ -258,7 +258,7 @@ static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
 
     dplen = i2d_ASN1_INTEGER(prkey, &dp);
 
-    ASN1_INTEGER_free(prkey);
+    ASN1_STRING_clear_free(prkey);
     prkey = NULL;
 
     if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_dhKeyAgreement), 0,
@@ -273,7 +273,7 @@ static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
     if (params != NULL)
         ASN1_STRING_free(params);
     if (prkey != NULL)
-        ASN1_INTEGER_free(prkey);
+        ASN1_STRING_clear_free(prkey);
     return 0;
 }
 
diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index 61a73b3..1b29d81 100644
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -226,7 +226,7 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
             goto decerr;
         if (privkey->type == V_ASN1_NEG_INTEGER) {
             p8->broken = PKCS8_NEG_PRIVKEY;
-            ASN1_INTEGER_free(privkey);
+            ASN1_STRING_clear_free(privkey);
             if (!(privkey = d2i_ASN1_UINTEGER(NULL, &q, pklen)))
                 goto decerr;
         }
@@ -264,7 +264,7 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
     if (ndsa)
         sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
     else
-        ASN1_INTEGER_free(privkey);
+        ASN1_STRING_clear_free(privkey);
 
     return 1;
 
@@ -273,7 +273,7 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
  dsaerr:
     BN_CTX_free(ctx);
     if (privkey)
-        ASN1_INTEGER_free(privkey);
+        ASN1_STRING_clear_free(privkey);
     sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
     DSA_free(dsa);
     return 0;
@@ -315,7 +315,7 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
 
     dplen = i2d_ASN1_INTEGER(prkey, &dp);
 
-    ASN1_INTEGER_free(prkey);
+    ASN1_STRING_clear_free(prkey);
 
     if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_dsa), 0,
                          V_ASN1_SEQUENCE, params, dp, dplen))
@@ -329,7 +329,7 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
     if (params != NULL)
         ASN1_STRING_free(params);
     if (prkey != NULL)
-        ASN1_INTEGER_free(prkey);
+        ASN1_STRING_clear_free(prkey);
     return 0;
 }
 

From steve at openssl.org  Sun Mar  8 16:48:46 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 08 Mar 2015 16:48:46 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1425833326.892021.12289.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  bfa34f551c2d38e826deb44a269cb0f720f9f63b (commit)
      from  f9aa27dc78c617c35c3eea6810fd5f83999ff724 (commit)


- Log -----------------------------------------------------------------
commit bfa34f551c2d38e826deb44a269cb0f720f9f63b
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Mar 3 14:20:23 2015 +0000

    Cleanse PKCS#8 private key components.
    
    New function ASN1_STRING_clear_free which cleanses an ASN1_STRING
    structure before freeing it.
    
    Call ASN1_STRING_clear_free on PKCS#8 private key components.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit a8ae0891d4bfd18f224777aed1fbb172504421f1)

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

Summary of changes:
 crypto/asn1/asn1.h     |  1 +
 crypto/asn1/asn1_lib.c |  7 +++++++
 crypto/dh/dh_ameth.c   |  8 ++++----
 crypto/dsa/dsa_ameth.c | 10 +++++-----
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index bb6ac95..68e791f 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -795,6 +795,7 @@ DECLARE_ASN1_SET_OF(ASN1_OBJECT)
 
 ASN1_STRING *ASN1_STRING_new(void);
 void ASN1_STRING_free(ASN1_STRING *a);
+void ASN1_STRING_clear_free(ASN1_STRING *a);
 int ASN1_STRING_copy(ASN1_STRING *dst, const ASN1_STRING *str);
 ASN1_STRING *ASN1_STRING_dup(const ASN1_STRING *a);
 ASN1_STRING *ASN1_STRING_type_new(int type);
diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index 00733a6..0b61fc9 100644
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c
@@ -430,6 +430,13 @@ void ASN1_STRING_free(ASN1_STRING *a)
     OPENSSL_free(a);
 }
 
+void ASN1_STRING_clear_free(ASN1_STRING *a)
+{
+    if (a && a->data && !(a->flags & ASN1_STRING_FLAG_NDEF))
+        OPENSSL_cleanse(a->data, a->length);
+    ASN1_STRING_free(a);
+}
+
 int ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b)
 {
     int i;
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index f32d376..1d573a4 100644
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -240,7 +240,7 @@ static int dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
 
     EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, dh);
 
-    ASN1_INTEGER_free(privkey);
+    ASN1_STRING_clear_free(privkey);
 
     return 1;
 
@@ -248,7 +248,7 @@ static int dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
     DHerr(DH_F_DH_PRIV_DECODE, EVP_R_DECODE_ERROR);
  dherr:
     DH_free(dh);
-    ASN1_INTEGER_free(privkey);
+    ASN1_STRING_clear_free(privkey);
     return 0;
 }
 
@@ -283,7 +283,7 @@ static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
 
     dplen = i2d_ASN1_INTEGER(prkey, &dp);
 
-    ASN1_INTEGER_free(prkey);
+    ASN1_STRING_clear_free(prkey);
     prkey = NULL;
 
     if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(pkey->ameth->pkey_id), 0,
@@ -298,7 +298,7 @@ static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
     if (params != NULL)
         ASN1_STRING_free(params);
     if (prkey != NULL)
-        ASN1_INTEGER_free(prkey);
+        ASN1_STRING_clear_free(prkey);
     return 0;
 }
 
diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index c142ce7..529efb7 100644
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -226,7 +226,7 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
             goto decerr;
         if (privkey->type == V_ASN1_NEG_INTEGER) {
             p8->broken = PKCS8_NEG_PRIVKEY;
-            ASN1_INTEGER_free(privkey);
+            ASN1_STRING_clear_free(privkey);
             if (!(privkey = d2i_ASN1_UINTEGER(NULL, &q, pklen)))
                 goto decerr;
         }
@@ -264,7 +264,7 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
     if (ndsa)
         sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
     else
-        ASN1_INTEGER_free(privkey);
+        ASN1_STRING_clear_free(privkey);
 
     return 1;
 
@@ -273,7 +273,7 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
  dsaerr:
     BN_CTX_free(ctx);
     if (privkey)
-        ASN1_INTEGER_free(privkey);
+        ASN1_STRING_clear_free(privkey);
     sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
     DSA_free(dsa);
     return 0;
@@ -315,7 +315,7 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
 
     dplen = i2d_ASN1_INTEGER(prkey, &dp);
 
-    ASN1_INTEGER_free(prkey);
+    ASN1_STRING_clear_free(prkey);
 
     if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_dsa), 0,
                          V_ASN1_SEQUENCE, params, dp, dplen))
@@ -329,7 +329,7 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
     if (params != NULL)
         ASN1_STRING_free(params);
     if (prkey != NULL)
-        ASN1_INTEGER_free(prkey);
+        ASN1_STRING_clear_free(prkey);
     return 0;
 }
 

From steve at openssl.org  Sun Mar  8 17:24:06 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 08 Mar 2015 17:24:06 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_0_9_8-stable update
Message-ID: <1425835446.895496.16734.nullmailer@dev.openssl.org>

The branch OpenSSL_0_9_8-stable has been updated
       via  01320ad3b9261fe845d30881d760ed1da3a97a14 (commit)
      from  a065737afbc924c75fa332dce3ada7f120eb866a (commit)


- Log -----------------------------------------------------------------
commit 01320ad3b9261fe845d30881d760ed1da3a97a14
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Mar 8 17:01:28 2015 +0000

    Fix warnings.
    
    Fix compiler warnings (similar to commit 25012d5e79)
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/md32_common.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/crypto/md32_common.h b/crypto/md32_common.h
index 01f57b7..8687665 100644
--- a/crypto/md32_common.h
+++ b/crypto/md32_common.h
@@ -231,8 +231,7 @@
 #  define HOST_l2c(l,c)   (*((c)++)=(unsigned char)(((l)>>24)&0xff),      \
                          *((c)++)=(unsigned char)(((l)>>16)&0xff),      \
                          *((c)++)=(unsigned char)(((l)>> 8)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)    )&0xff),      \
-                         l)
+                         *((c)++)=(unsigned char)(((l)    )&0xff)   )
 # endif
 
 #elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
@@ -252,8 +251,8 @@
 # if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
 #  ifndef B_ENDIAN
    /* See comment in DATA_ORDER_IS_BIG_ENDIAN section. */
-#   define HOST_c2l(c,l) ((l)=*((const unsigned int *)(c)), (c)+=4, l)
-#   define HOST_l2c(l,c) (*((unsigned int *)(c))=(l), (c)+=4, l)
+#   define HOST_c2l(c,l) ((l)=*((const unsigned int *)(c)), (c)+=4)
+#   define HOST_l2c(l,c) (*((unsigned int *)(c))=(l), (c)+=4)
 #  endif
 # endif
 
@@ -267,8 +266,7 @@
 #  define HOST_l2c(l,c)   (*((c)++)=(unsigned char)(((l)    )&0xff),      \
                          *((c)++)=(unsigned char)(((l)>> 8)&0xff),      \
                          *((c)++)=(unsigned char)(((l)>>16)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>>24)&0xff),      \
-                         l)
+                         *((c)++)=(unsigned char)(((l)>>24)&0xff)   )
 # endif
 
 #endif

From steve at openssl.org  Sun Mar  8 17:24:06 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 08 Mar 2015 17:24:06 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_0-stable update
Message-ID: <1425835446.967576.16764.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_0-stable has been updated
       via  394a30c2f8f68c5d657a9eef9da4941a8e66c0c0 (commit)
      from  36971258e3e47f04671f5f8e828293b253b4a79a (commit)


- Log -----------------------------------------------------------------
commit 394a30c2f8f68c5d657a9eef9da4941a8e66c0c0
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Mar 8 16:57:46 2015 +0000

    Fix warnings.
    
    Fix compiler warnings (similar to commit 25012d5e79)
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/md32_common.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/crypto/md32_common.h b/crypto/md32_common.h
index 0004268..018b99e 100644
--- a/crypto/md32_common.h
+++ b/crypto/md32_common.h
@@ -225,15 +225,13 @@
 #  define HOST_c2l(c,l)   (l =(((unsigned long)(*((c)++)))<<24),          \
                          l|=(((unsigned long)(*((c)++)))<<16),          \
                          l|=(((unsigned long)(*((c)++)))<< 8),          \
-                         l|=(((unsigned long)(*((c)++)))    ),          \
-                         l)
+                         l|=(((unsigned long)(*((c)++)))    )   )
 # endif
 # ifndef HOST_l2c
 #  define HOST_l2c(l,c)   (*((c)++)=(unsigned char)(((l)>>24)&0xff),      \
                          *((c)++)=(unsigned char)(((l)>>16)&0xff),      \
                          *((c)++)=(unsigned char)(((l)>> 8)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)    )&0xff),      \
-                         l)
+                         *((c)++)=(unsigned char)(((l)    )&0xff)   )
 # endif
 
 #elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
@@ -253,8 +251,8 @@
 # if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
 #  ifndef B_ENDIAN
    /* See comment in DATA_ORDER_IS_BIG_ENDIAN section. */
-#   define HOST_c2l(c,l) ((l)=*((const unsigned int *)(c)), (c)+=4, l)
-#   define HOST_l2c(l,c) (*((unsigned int *)(c))=(l), (c)+=4, l)
+#   define HOST_c2l(c,l) ((l)=*((const unsigned int *)(c)), (c)+=4)
+#   define HOST_l2c(l,c) (*((unsigned int *)(c))=(l), (c)+=4)
 #  endif
 # endif
 

From steve at openssl.org  Sun Mar  8 22:41:27 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 08 Mar 2015 22:41:27 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1425854487.468347.12983.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  d6ca1cee8b6efac5906ac66443d1ca67fe689ff8 (commit)
      from  bfa34f551c2d38e826deb44a269cb0f720f9f63b (commit)


- Log -----------------------------------------------------------------
commit d6ca1cee8b6efac5906ac66443d1ca67fe689ff8
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Mar 8 17:31:48 2015 +0000

    fix warning
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 ssl/ssl_locl.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 46ea18a..79b85b9 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -370,10 +370,10 @@
 # define SSL_AEAD                0x00000040L
 
 /* Bits for algorithm_ssl (protocol version) */
-# define SSL_SSLV2               0x00000001L
-# define SSL_SSLV3               0x00000002L
+# define SSL_SSLV2               0x00000001UL
+# define SSL_SSLV3               0x00000002UL
 # define SSL_TLSV1               SSL_SSLV3/* for now */
-# define SSL_TLSV1_2             0x00000004L
+# define SSL_TLSV1_2             0x00000004UL
 
 /* Bits for algorithm2 (handshake digests and other extra flags) */
 

From steve at openssl.org  Sun Mar  8 22:46:48 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 08 Mar 2015 22:46:48 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_0-stable update
Message-ID: <1425854808.259437.13787.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_0-stable has been updated
       via  f10dfa0757227b317ba11fae99ed7c4d77b4af3e (commit)
      from  394a30c2f8f68c5d657a9eef9da4941a8e66c0c0 (commit)


- Log -----------------------------------------------------------------
commit f10dfa0757227b317ba11fae99ed7c4d77b4af3e
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Mar 8 17:31:48 2015 +0000

    fix warning
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit d6ca1cee8b6efac5906ac66443d1ca67fe689ff8)
    
    Conflicts:
    	ssl/ssl_locl.h

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

Summary of changes:
 ssl/ssl_locl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 9623c65..60ad58d 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -358,8 +358,8 @@
 # define SSL_GOST89MAC   0x00000008L
 
 /* Bits for algorithm_ssl (protocol version) */
-# define SSL_SSLV2               0x00000001L
-# define SSL_SSLV3               0x00000002L
+# define SSL_SSLV2               0x00000001UL
+# define SSL_SSLV3               0x00000002UL
 # define SSL_TLSV1               SSL_SSLV3/* for now */
 
 /* Bits for algorithm2 (handshake digests and other extra flags) */

From steve at openssl.org  Sun Mar  8 22:46:48 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 08 Mar 2015 22:46:48 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1425854808.328592.13810.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  a67303954caa923e8bf2f2bdf04882e9cbc45cc1 (commit)
      from  cb9d5b7b53d3e781c2110e2c4b8f9530ce312eb8 (commit)


- Log -----------------------------------------------------------------
commit a67303954caa923e8bf2f2bdf04882e9cbc45cc1
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Mar 8 17:31:48 2015 +0000

    fix warning
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit d6ca1cee8b6efac5906ac66443d1ca67fe689ff8)

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

Summary of changes:
 ssl/ssl_locl.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 4c8df3c..aff3b65 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -369,10 +369,10 @@
 # define SSL_AEAD                0x00000040L
 
 /* Bits for algorithm_ssl (protocol version) */
-# define SSL_SSLV2               0x00000001L
-# define SSL_SSLV3               0x00000002L
+# define SSL_SSLV2               0x00000001UL
+# define SSL_SSLV3               0x00000002UL
 # define SSL_TLSV1               SSL_SSLV3/* for now */
-# define SSL_TLSV1_2             0x00000004L
+# define SSL_TLSV1_2             0x00000004UL
 
 /* Bits for algorithm2 (handshake digests and other extra flags) */
 

From matt at openssl.org  Mon Mar  9 10:55:52 2015
From: matt at openssl.org (Matt Caswell)
Date: Mon, 09 Mar 2015 10:55:52 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1425898552.449186.29377.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  ae3fcdf1e5865b709aed4e66924197bc6191fc5b (commit)
      from  d6ca1cee8b6efac5906ac66443d1ca67fe689ff8 (commit)


- Log -----------------------------------------------------------------
commit ae3fcdf1e5865b709aed4e66924197bc6191fc5b
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 2 14:34:19 2015 +0000

    Fix DTLS1_BAD_VER regression
    
    Commit 9cf0f187 in HEAD, and 68039af3 in 1.0.2, removed a version check
    from dtls1_buffer_message() which was needed to distinguish between DTLS
    1.x and Cisco's pre-standard version of DTLS (DTLS1_BAD_VER).
    
    Based on an original patch by David Woodhouse <dwmw2 at infradead.org>
    RT#3703
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit 5178a16c4375471d25e1f5ef5de46febb62a5529)

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

Summary of changes:
 ssl/d1_both.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index 2553c3d..2104800 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -1108,8 +1108,10 @@ int dtls1_buffer_message(SSL *s, int is_ccs)
     memcpy(frag->fragment, s->init_buf->data, s->init_num);
 
     if (is_ccs) {
+        /* For DTLS1_BAD_VER the header length is non-standard */
         OPENSSL_assert(s->d1->w_msg_hdr.msg_len +
-                       DTLS1_CCS_HEADER_LENGTH == (unsigned int)s->init_num);
+                       ((s->version==DTLS1_BAD_VER)?3:DTLS1_CCS_HEADER_LENGTH)
+                       == (unsigned int)s->init_num);
     } else {
         OPENSSL_assert(s->d1->w_msg_hdr.msg_len +
                        DTLS1_HM_HEADER_LENGTH == (unsigned int)s->init_num);

From matt at openssl.org  Mon Mar  9 10:56:01 2015
From: matt at openssl.org (Matt Caswell)
Date: Mon, 09 Mar 2015 10:56:01 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425898561.197998.29607.nullmailer@dev.openssl.org>

The branch master has been updated
       via  5178a16c4375471d25e1f5ef5de46febb62a5529 (commit)
      from  a8ae0891d4bfd18f224777aed1fbb172504421f1 (commit)


- Log -----------------------------------------------------------------
commit 5178a16c4375471d25e1f5ef5de46febb62a5529
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 2 14:34:19 2015 +0000

    Fix DTLS1_BAD_VER regression
    
    Commit 9cf0f187 in HEAD, and 68039af3 in 1.0.2, removed a version check
    from dtls1_buffer_message() which was needed to distinguish between DTLS
    1.x and Cisco's pre-standard version of DTLS (DTLS1_BAD_VER).
    
    Based on an original patch by David Woodhouse <dwmw2 at infradead.org>
    RT#3703
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 ssl/d1_both.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index 7d48cc4..a7d0a82 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -1086,8 +1086,10 @@ int dtls1_buffer_message(SSL *s, int is_ccs)
     memcpy(frag->fragment, s->init_buf->data, s->init_num);
 
     if (is_ccs) {
+        /* For DTLS1_BAD_VER the header length is non-standard */
         OPENSSL_assert(s->d1->w_msg_hdr.msg_len +
-                       DTLS1_CCS_HEADER_LENGTH == (unsigned int)s->init_num);
+                       ((s->version==DTLS1_BAD_VER)?3:DTLS1_CCS_HEADER_LENGTH)
+                       == (unsigned int)s->init_num);
     } else {
         OPENSSL_assert(s->d1->w_msg_hdr.msg_len +
                        DTLS1_HM_HEADER_LENGTH == (unsigned int)s->init_num);

From matt at openssl.org  Mon Mar  9 11:09:32 2015
From: matt at openssl.org (Matt Caswell)
Date: Mon, 09 Mar 2015 11:09:32 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1425899372.492357.32056.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  0d691e0e27a5eed8ece790830b8a2168348b1373 (commit)
      from  ae3fcdf1e5865b709aed4e66924197bc6191fc5b (commit)


- Log -----------------------------------------------------------------
commit 0d691e0e27a5eed8ece790830b8a2168348b1373
Author: David Woodhouse <dwmw2 at infradead.org>
Date:   Mon Mar 2 16:20:15 2015 +0000

    Wrong SSL version in DTLS1_BAD_VER ClientHello
    
    Since commit 741c9959 ("DTLS revision."), we put the wrong protocol
    version into our ClientHello for DTLS1_BAD_VER. The old DTLS
    code which used ssl->version was replaced by the more generic SSL3 code
    which uses ssl->client_version. The Cisco ASA no longer likes our
    ClientHello.
    
    RT#3711
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit f7683aaf36341dc65672ac2ccdbfd4a232e3626d)

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

Summary of changes:
 ssl/d1_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index 2845757..1f10054 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -270,7 +270,7 @@ void dtls1_clear(SSL *s)
 
     ssl3_clear(s);
     if (s->options & SSL_OP_CISCO_ANYCONNECT)
-        s->version = DTLS1_BAD_VER;
+        s->client_version = s->version = DTLS1_BAD_VER;
     else if (s->method->version == DTLS_ANY_VERSION)
         s->version = DTLS1_2_VERSION;
     else

From matt at openssl.org  Mon Mar  9 11:09:40 2015
From: matt at openssl.org (Matt Caswell)
Date: Mon, 09 Mar 2015 11:09:40 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425899380.209711.32287.nullmailer@dev.openssl.org>

The branch master has been updated
       via  f7683aaf36341dc65672ac2ccdbfd4a232e3626d (commit)
      from  5178a16c4375471d25e1f5ef5de46febb62a5529 (commit)


- Log -----------------------------------------------------------------
commit f7683aaf36341dc65672ac2ccdbfd4a232e3626d
Author: David Woodhouse <dwmw2 at infradead.org>
Date:   Mon Mar 2 16:20:15 2015 +0000

    Wrong SSL version in DTLS1_BAD_VER ClientHello
    
    Since commit 741c9959 ("DTLS revision."), we put the wrong protocol
    version into our ClientHello for DTLS1_BAD_VER. The old DTLS
    code which used ssl->version was replaced by the more generic SSL3 code
    which uses ssl->client_version. The Cisco ASA no longer likes our
    ClientHello.
    
    RT#3711
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 ssl/d1_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index 4ca6bb3..626cecb 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -273,7 +273,7 @@ void dtls1_clear(SSL *s)
 
     ssl3_clear(s);
     if (s->options & SSL_OP_CISCO_ANYCONNECT)
-        s->version = DTLS1_BAD_VER;
+        s->client_version = s->version = DTLS1_BAD_VER;
     else if (s->method->version == DTLS_ANY_VERSION)
         s->version = DTLS1_2_VERSION;
     else

From steve at openssl.org  Mon Mar  9 16:52:17 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 09 Mar 2015 16:52:17 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_0-stable update
Message-ID: <1425919937.937030.11874.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_0-stable has been updated
       via  765e2465cace18be949bd537edf153f9445eb1fc (commit)
      from  f10dfa0757227b317ba11fae99ed7c4d77b4af3e (commit)


- Log -----------------------------------------------------------------
commit 765e2465cace18be949bd537edf153f9445eb1fc
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 9 16:40:22 2015 +0000

    update ordinals
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 util/libeay.num | 1 +
 1 file changed, 1 insertion(+)

diff --git a/util/libeay.num b/util/libeay.num
index a992e0d..bd20a3b 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1806,6 +1806,7 @@ d2i_ASN1_SET_OF_PKCS12_SAFEBAG          2341	NOEXIST::FUNCTION:
 ASN1_UTCTIME_get                        2350	NOEXIST::FUNCTION:
 X509_REQ_digest                         2362	EXIST::FUNCTION:EVP
 X509_CRL_digest                         2391	EXIST::FUNCTION:EVP
+ASN1_STRING_clear_free                  2392	EXIST::FUNCTION:
 d2i_ASN1_SET_OF_PKCS7                   2397	NOEXIST::FUNCTION:
 X509_ALGOR_cmp                          2398	EXIST::FUNCTION:
 EVP_CIPHER_CTX_set_key_length           2399	EXIST::FUNCTION:

From steve at openssl.org  Mon Mar  9 16:56:00 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 09 Mar 2015 16:56:00 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425920160.052139.12522.nullmailer@dev.openssl.org>

The branch master has been updated
       via  99e1ad3c4bb1dd03f36429c1ce4eafa5ed162964 (commit)
      from  f7683aaf36341dc65672ac2ccdbfd4a232e3626d (commit)


- Log -----------------------------------------------------------------
commit 99e1ad3c4bb1dd03f36429c1ce4eafa5ed162964
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 9 16:55:18 2015 +0000

    update ordinals
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 util/libeay.num | 1 +
 1 file changed, 1 insertion(+)

diff --git a/util/libeay.num b/util/libeay.num
index 1bb1749..a991d77 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1806,6 +1806,7 @@ d2i_ASN1_SET_OF_PKCS12_SAFEBAG          2341	NOEXIST::FUNCTION:
 ASN1_UTCTIME_get                        2350	NOEXIST::FUNCTION:
 X509_REQ_digest                         2362	EXIST::FUNCTION:
 X509_CRL_digest                         2391	EXIST::FUNCTION:
+ASN1_STRING_clear_free                  2392	EXIST::FUNCTION:
 d2i_ASN1_SET_OF_PKCS7                   2397	NOEXIST::FUNCTION:
 X509_ALGOR_cmp                          2398	EXIST::FUNCTION:
 EVP_CIPHER_CTX_set_key_length           2399	EXIST::FUNCTION:

From steve at openssl.org  Mon Mar  9 16:59:03 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 09 Mar 2015 16:59:03 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1425920343.324013.13591.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  ef6d3485eca973edf1cf94a8b0156588753aaf3f (commit)
      from  a67303954caa923e8bf2f2bdf04882e9cbc45cc1 (commit)


- Log -----------------------------------------------------------------
commit ef6d3485eca973edf1cf94a8b0156588753aaf3f
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 9 16:58:16 2015 +0000

    update ordinals
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 util/libeay.num | 1 +
 1 file changed, 1 insertion(+)

diff --git a/util/libeay.num b/util/libeay.num
index 3821c9c..b594caf 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1806,6 +1806,7 @@ d2i_ASN1_SET_OF_PKCS12_SAFEBAG          2341	NOEXIST::FUNCTION:
 ASN1_UTCTIME_get                        2350	NOEXIST::FUNCTION:
 X509_REQ_digest                         2362	EXIST::FUNCTION:EVP
 X509_CRL_digest                         2391	EXIST::FUNCTION:EVP
+ASN1_STRING_clear_free                  2392	EXIST::FUNCTION:
 d2i_ASN1_SET_OF_PKCS7                   2397	NOEXIST::FUNCTION:
 X509_ALGOR_cmp                          2398	EXIST::FUNCTION:
 EVP_CIPHER_CTX_set_key_length           2399	EXIST::FUNCTION:

From steve at openssl.org  Mon Mar  9 16:59:03 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 09 Mar 2015 16:59:03 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1425920343.398644.13614.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  ef116b000314848b6aa11a2d9f5205b82c8b59b4 (commit)
      from  0d691e0e27a5eed8ece790830b8a2168348b1373 (commit)


- Log -----------------------------------------------------------------
commit ef116b000314848b6aa11a2d9f5205b82c8b59b4
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 9 16:57:24 2015 +0000

    update ordinals
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 util/libeay.num | 1 +
 1 file changed, 1 insertion(+)

diff --git a/util/libeay.num b/util/libeay.num
index 4a11d78..b977e4e 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1806,6 +1806,7 @@ d2i_ASN1_SET_OF_PKCS12_SAFEBAG          2341	NOEXIST::FUNCTION:
 ASN1_UTCTIME_get                        2350	NOEXIST::FUNCTION:
 X509_REQ_digest                         2362	EXIST::FUNCTION:EVP
 X509_CRL_digest                         2391	EXIST::FUNCTION:EVP
+ASN1_STRING_clear_free                  2392	EXIST::FUNCTION:
 d2i_ASN1_SET_OF_PKCS7                   2397	NOEXIST::FUNCTION:
 X509_ALGOR_cmp                          2398	EXIST::FUNCTION:
 EVP_CIPHER_CTX_set_key_length           2399	EXIST::FUNCTION:

From levitte at openssl.org  Mon Mar  9 20:03:25 2015
From: levitte at openssl.org (Richard Levitte)
Date: Mon, 09 Mar 2015 20:03:25 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425931405.595866.5636.nullmailer@dev.openssl.org>

The branch master has been updated
       via  0b142f022e2c5072295e00ebc11c5b707a726d74 (commit)
      from  99e1ad3c4bb1dd03f36429c1ce4eafa5ed162964 (commit)


- Log -----------------------------------------------------------------
commit 0b142f022e2c5072295e00ebc11c5b707a726d74
Author: Dmitry-Me <wipedout at yandex.ru>
Date:   Sun Jun 1 21:30:52 2014 +0400

    Fix wrong numbers being passed as string lengths
    
    Signed-off-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 apps/s_server.c        | 2 +-
 crypto/asn1/asn1_gen.c | 2 +-
 crypto/asn1/asn1_par.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/s_server.c b/apps/s_server.c
index cf5b500..42088d0 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2745,7 +2745,7 @@ static int www_body(char *hostname, int s, int stype, unsigned char *context)
 
         /* else we have data */
         if (((www == 1) && (strncmp("GET ", buf, 4) == 0)) ||
-            ((www == 2) && (strncmp("GET /stats ", buf, 10) == 0))) {
+            ((www == 2) && (strncmp("GET /stats ", buf, 11) == 0))) {
             char *p;
             X509 *peer;
             STACK_OF(SSL_CIPHER) *sk;
diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index 9735cb5..16a1b5a 100644
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -359,7 +359,7 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
             arg->format = ASN1_GEN_FORMAT_UTF8;
         else if (!strncmp(vstart, "HEX", 3))
             arg->format = ASN1_GEN_FORMAT_HEX;
-        else if (!strncmp(vstart, "BITLIST", 3))
+        else if (!strncmp(vstart, "BITLIST", 7))
             arg->format = ASN1_GEN_FORMAT_BITLIST;
         else {
             ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKNOWN_FORMAT);
diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c
index 58d65ac..b12edf9 100644
--- a/crypto/asn1/asn1_par.c
+++ b/crypto/asn1/asn1_par.c
@@ -330,7 +330,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
                             goto end;
                     }
                 } else {
-                    if (BIO_write(bp, "BAD ENUMERATED", 11) <= 0)
+                    if (BIO_write(bp, "BAD ENUMERATED", 14) <= 0)
                         goto end;
                 }
                 M_ASN1_ENUMERATED_free(bs);

From levitte at openssl.org  Mon Mar  9 20:06:59 2015
From: levitte at openssl.org (Richard Levitte)
Date: Mon, 09 Mar 2015 20:06:59 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1425931619.037881.7022.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  b65b4c3481d9fc88056cd8373fd693d888ca064f (commit)
      from  ef116b000314848b6aa11a2d9f5205b82c8b59b4 (commit)


- Log -----------------------------------------------------------------
commit b65b4c3481d9fc88056cd8373fd693d888ca064f
Author: Dmitry-Me <wipedout at yandex.ru>
Date:   Sun Jun 1 21:30:52 2014 +0400

    Fix wrong numbers being passed as string lengths
    
    Signed-off-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 0b142f022e2c5072295e00ebc11c5b707a726d74)

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

Summary of changes:
 apps/s_server.c        | 2 +-
 crypto/asn1/asn1_gen.c | 2 +-
 crypto/asn1/asn1_par.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/s_server.c b/apps/s_server.c
index 655ada0..d5d2492 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2869,7 +2869,7 @@ static int www_body(char *hostname, int s, int stype, unsigned char *context)
 
         /* else we have data */
         if (((www == 1) && (strncmp("GET ", buf, 4) == 0)) ||
-            ((www == 2) && (strncmp("GET /stats ", buf, 10) == 0))) {
+            ((www == 2) && (strncmp("GET /stats ", buf, 11) == 0))) {
             char *p;
             X509 *peer;
             STACK_OF(SSL_CIPHER) *sk;
diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index aaec009..b71ae48 100644
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -359,7 +359,7 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
             arg->format = ASN1_GEN_FORMAT_UTF8;
         else if (!strncmp(vstart, "HEX", 3))
             arg->format = ASN1_GEN_FORMAT_HEX;
-        else if (!strncmp(vstart, "BITLIST", 3))
+        else if (!strncmp(vstart, "BITLIST", 7))
             arg->format = ASN1_GEN_FORMAT_BITLIST;
         else {
             ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKOWN_FORMAT);
diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c
index f6cd4b2..a5d2da1 100644
--- a/crypto/asn1/asn1_par.c
+++ b/crypto/asn1/asn1_par.c
@@ -337,7 +337,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
                             goto end;
                     }
                 } else {
-                    if (BIO_write(bp, "BAD ENUMERATED", 11) <= 0)
+                    if (BIO_write(bp, "BAD ENUMERATED", 14) <= 0)
                         goto end;
                 }
                 M_ASN1_ENUMERATED_free(bs);

From levitte at openssl.org  Mon Mar  9 20:06:49 2015
From: levitte at openssl.org (Richard Levitte)
Date: Mon, 09 Mar 2015 20:06:49 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1425931609.817158.6769.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  521246e6085d5e1530c58ab8a50ce898d280ceed (commit)
      from  ef6d3485eca973edf1cf94a8b0156588753aaf3f (commit)


- Log -----------------------------------------------------------------
commit 521246e6085d5e1530c58ab8a50ce898d280ceed
Author: Dmitry-Me <wipedout at yandex.ru>
Date:   Sun Jun 1 21:30:52 2014 +0400

    Fix wrong numbers being passed as string lengths
    
    Signed-off-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 0b142f022e2c5072295e00ebc11c5b707a726d74)

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

Summary of changes:
 apps/s_server.c        | 2 +-
 crypto/asn1/asn1_gen.c | 2 +-
 crypto/asn1/asn1_par.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/s_server.c b/apps/s_server.c
index d5ac75a..caba5b3 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2642,7 +2642,7 @@ static int www_body(char *hostname, int s, unsigned char *context)
 
         /* else we have data */
         if (((www == 1) && (strncmp("GET ", buf, 4) == 0)) ||
-            ((www == 2) && (strncmp("GET /stats ", buf, 10) == 0))) {
+            ((www == 2) && (strncmp("GET /stats ", buf, 11) == 0))) {
             char *p;
             X509 *peer;
             STACK_OF(SSL_CIPHER) *sk;
diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index aaec009..b71ae48 100644
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -359,7 +359,7 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
             arg->format = ASN1_GEN_FORMAT_UTF8;
         else if (!strncmp(vstart, "HEX", 3))
             arg->format = ASN1_GEN_FORMAT_HEX;
-        else if (!strncmp(vstart, "BITLIST", 3))
+        else if (!strncmp(vstart, "BITLIST", 7))
             arg->format = ASN1_GEN_FORMAT_BITLIST;
         else {
             ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKOWN_FORMAT);
diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c
index f6cd4b2..a5d2da1 100644
--- a/crypto/asn1/asn1_par.c
+++ b/crypto/asn1/asn1_par.c
@@ -337,7 +337,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
                             goto end;
                     }
                 } else {
-                    if (BIO_write(bp, "BAD ENUMERATED", 11) <= 0)
+                    if (BIO_write(bp, "BAD ENUMERATED", 14) <= 0)
                         goto end;
                 }
                 M_ASN1_ENUMERATED_free(bs);

From matt at openssl.org  Tue Mar 10 10:47:37 2015
From: matt at openssl.org (Matt Caswell)
Date: Tue, 10 Mar 2015 10:47:37 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1425984457.761228.20878.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  2b31fcc0b5e7329e13806822a5709dbd51c5c8a4 (commit)
      from  b65b4c3481d9fc88056cd8373fd693d888ca064f (commit)


- Log -----------------------------------------------------------------
commit 2b31fcc0b5e7329e13806822a5709dbd51c5c8a4
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Feb 26 11:56:00 2015 +0000

    Prevent handshake with unseeded PRNG
    
    Fix security issue where under certain conditions a client can complete a
    handshake with an unseeded PRNG. The conditions are:
    - Client is on a platform where the PRNG has not been seeded, and the
    user has not seeded manually
    - A protocol specific client method version has been used (i.e. not
    SSL_client_methodv23)
    - A ciphersuite is used that does not require additional random data
    from the PRNG beyond the initial ClientHello client random
    (e.g. PSK-RC4-SHA)
    
    If the handshake succeeds then the client random that has been used will
    have been generated from a PRNG with insufficient entropy and therefore
    the output may be predictable.
    
    For example using the following command with an unseeded openssl will
    succeed on an unpatched platform:
    
    openssl s_client -psk 1a2b3c4d -tls1_2 -cipher PSK-RC4-SHA
    
    CVE-2015-0285
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit e1b568dd2462f7cacf98f3d117936c34e2849a6b)

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

Summary of changes:
 ssl/s3_clnt.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index f186c3c..91053d5 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -717,8 +717,9 @@ int ssl3_client_hello(SSL *s)
         } else
             i = 1;
 
-        if (i)
-            ssl_fill_hello_random(s, 0, p, sizeof(s->s3->client_random));
+        if (i && ssl_fill_hello_random(s, 0, p,
+                                       sizeof(s->s3->client_random)) <= 0)
+            goto err;
 
         /* Do the message type and length last */
         d = p = ssl_handshake_start(s);

From matt at openssl.org  Tue Mar 10 10:47:44 2015
From: matt at openssl.org (Matt Caswell)
Date: Tue, 10 Mar 2015 10:47:44 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425984464.427874.21148.nullmailer@dev.openssl.org>

The branch master has been updated
       via  e1b568dd2462f7cacf98f3d117936c34e2849a6b (commit)
      from  0b142f022e2c5072295e00ebc11c5b707a726d74 (commit)


- Log -----------------------------------------------------------------
commit e1b568dd2462f7cacf98f3d117936c34e2849a6b
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Feb 26 11:56:00 2015 +0000

    Prevent handshake with unseeded PRNG
    
    Fix security issue where under certain conditions a client can complete a
    handshake with an unseeded PRNG. The conditions are:
    - Client is on a platform where the PRNG has not been seeded, and the
    user has not seeded manually
    - A protocol specific client method version has been used (i.e. not
    SSL_client_methodv23)
    - A ciphersuite is used that does not require additional random data
    from the PRNG beyond the initial ClientHello client random
    (e.g. PSK-RC4-SHA)
    
    If the handshake succeeds then the client random that has been used will
    have been generated from a PRNG with insufficient entropy and therefore
    the output may be predictable.
    
    For example using the following command with an unseeded openssl will
    succeed on an unpatched platform:
    
    openssl s_client -psk 1a2b3c4d -tls1_2 -cipher PSK-RC4-SHA
    
    CVE-2015-0285
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 ssl/s3_clnt.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 1e437b2..750217f 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -719,8 +719,9 @@ int ssl3_client_hello(SSL *s)
         } else
             i = 1;
 
-        if (i)
-            ssl_fill_hello_random(s, 0, p, sizeof(s->s3->client_random));
+        if (i && ssl_fill_hello_random(s, 0, p,
+                                       sizeof(s->s3->client_random)) <= 0)
+            goto err;
 
         /* Do the message type and length last */
         d = p = ssl_handshake_start(s);

From levitte at openssl.org  Tue Mar 10 11:33:25 2015
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 10 Mar 2015 11:33:25 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1425987205.742183.27774.nullmailer@dev.openssl.org>

The branch master has been updated
       via  460e920d8a274e27aab36346eeda6685a42c3314 (commit)
      from  e1b568dd2462f7cacf98f3d117936c34e2849a6b (commit)


- Log -----------------------------------------------------------------
commit 460e920d8a274e27aab36346eeda6685a42c3314
Author: Richard Godbee <richard at godbee.net>
Date:   Sun Sep 21 02:14:11 2014 -0400

    BIO_debug_callback: Fix output on 64-bit machines
    
    BIO_debug_callback() no longer assumes the hexadecimal representation of
    a pointer fits in 8 characters.
    
    Signed-off-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/bio/bio_cb.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/crypto/bio/bio_cb.c b/crypto/bio/bio_cb.c
index 3607375..dcb428b 100644
--- a/crypto/bio/bio_cb.c
+++ b/crypto/bio/bio_cb.c
@@ -70,14 +70,17 @@ long BIO_debug_callback(BIO *bio, int cmd, const char *argp,
     char buf[256];
     char *p;
     long r = 1;
+    int len;
     size_t p_maxlen;
 
     if (BIO_CB_RETURN & cmd)
         r = ret;
 
-    BIO_snprintf(buf, sizeof buf, "BIO[%08lX]:", (unsigned long)bio);
-    p = &(buf[14]);
-    p_maxlen = sizeof buf - 14;
+    len = BIO_snprintf(buf,sizeof buf,"BIO[%p]: ",(void *)bio);
+
+    p = buf + len;
+    p_maxlen = sizeof(buf) - len;
+
     switch (cmd) {
     case BIO_CB_FREE:
         BIO_snprintf(p, p_maxlen, "Free - %s\n", bio->method->name);

From levitte at openssl.org  Tue Mar 10 11:34:42 2015
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 10 Mar 2015 11:34:42 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1425987282.439892.28739.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  93cb447df263a0ba91c09be679eef6b1523df4f4 (commit)
      from  521246e6085d5e1530c58ab8a50ce898d280ceed (commit)


- Log -----------------------------------------------------------------
commit 93cb447df263a0ba91c09be679eef6b1523df4f4
Author: Richard Godbee <richard at godbee.net>
Date:   Sun Sep 21 02:14:11 2014 -0400

    BIO_debug_callback: Fix output on 64-bit machines
    
    BIO_debug_callback() no longer assumes the hexadecimal representation of
    a pointer fits in 8 characters.
    
    Signed-off-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 460e920d8a274e27aab36346eeda6685a42c3314)

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

Summary of changes:
 crypto/bio/bio_cb.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/crypto/bio/bio_cb.c b/crypto/bio/bio_cb.c
index 8715f5c..d3e8606 100644
--- a/crypto/bio/bio_cb.c
+++ b/crypto/bio/bio_cb.c
@@ -70,14 +70,17 @@ long MS_CALLBACK BIO_debug_callback(BIO *bio, int cmd, const char *argp,
     MS_STATIC char buf[256];
     char *p;
     long r = 1;
+    int len;
     size_t p_maxlen;
 
     if (BIO_CB_RETURN & cmd)
         r = ret;
 
-    BIO_snprintf(buf, sizeof buf, "BIO[%08lX]:", (unsigned long)bio);
-    p = &(buf[14]);
-    p_maxlen = sizeof buf - 14;
+    len = BIO_snprintf(buf,sizeof buf,"BIO[%p]: ",(void *)bio);
+
+    p = buf + len;
+    p_maxlen = sizeof(buf) - len;
+
     switch (cmd) {
     case BIO_CB_FREE:
         BIO_snprintf(p, p_maxlen, "Free - %s\n", bio->method->name);

From levitte at openssl.org  Tue Mar 10 11:34:45 2015
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 10 Mar 2015 11:34:45 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1425987285.417432.28977.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  5a9e9669d8073ddc5efeea08f3daee42509b2aa7 (commit)
      from  2b31fcc0b5e7329e13806822a5709dbd51c5c8a4 (commit)


- Log -----------------------------------------------------------------
commit 5a9e9669d8073ddc5efeea08f3daee42509b2aa7
Author: Richard Godbee <richard at godbee.net>
Date:   Sun Sep 21 02:14:11 2014 -0400

    BIO_debug_callback: Fix output on 64-bit machines
    
    BIO_debug_callback() no longer assumes the hexadecimal representation of
    a pointer fits in 8 characters.
    
    Signed-off-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 460e920d8a274e27aab36346eeda6685a42c3314)

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

Summary of changes:
 crypto/bio/bio_cb.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/crypto/bio/bio_cb.c b/crypto/bio/bio_cb.c
index 8715f5c..d3e8606 100644
--- a/crypto/bio/bio_cb.c
+++ b/crypto/bio/bio_cb.c
@@ -70,14 +70,17 @@ long MS_CALLBACK BIO_debug_callback(BIO *bio, int cmd, const char *argp,
     MS_STATIC char buf[256];
     char *p;
     long r = 1;
+    int len;
     size_t p_maxlen;
 
     if (BIO_CB_RETURN & cmd)
         r = ret;
 
-    BIO_snprintf(buf, sizeof buf, "BIO[%08lX]:", (unsigned long)bio);
-    p = &(buf[14]);
-    p_maxlen = sizeof buf - 14;
+    len = BIO_snprintf(buf,sizeof buf,"BIO[%p]: ",(void *)bio);
+
+    p = buf + len;
+    p_maxlen = sizeof(buf) - len;
+
     switch (cmd) {
     case BIO_CB_FREE:
         BIO_snprintf(p, p_maxlen, "Free - %s\n", bio->method->name);

From emilia at openssl.org  Tue Mar 10 20:53:07 2015
From: emilia at openssl.org (Emilia Kasper)
Date: Tue, 10 Mar 2015 20:53:07 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1426020787.455934.1458.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  8b7e469d06d7c487342eef1dcca3dc02fe7cd267 (commit)
      from  93cb447df263a0ba91c09be679eef6b1523df4f4 (commit)


- Log -----------------------------------------------------------------
commit 8b7e469d06d7c487342eef1dcca3dc02fe7cd267
Author: Emilia Kasper <emilia at openssl.org>
Date:   Wed Mar 4 13:05:53 2015 -0800

    Harmonize return values in dtls1_buffer_record
    
    Ensure all malloc failures return -1.
    
    Reported by Adam Langley (Google).
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 06c6a2b4a3a6e64303caa256398dd2dc16f9c35a)

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

Summary of changes:
 ssl/d1_pkt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index 0985bb0..7b49a7d 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -236,7 +236,7 @@ dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority)
             pitem_free(item);
 
         SSLerr(SSL_F_DTLS1_BUFFER_RECORD, ERR_R_INTERNAL_ERROR);
-        return (0);
+        return -1;
     }
 
     rdata->packet = s->packet;

From emilia at openssl.org  Tue Mar 10 20:53:07 2015
From: emilia at openssl.org (Emilia Kasper)
Date: Tue, 10 Mar 2015 20:53:07 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426020787.685419.1522.nullmailer@dev.openssl.org>

The branch master has been updated
       via  06c6a2b4a3a6e64303caa256398dd2dc16f9c35a (commit)
      from  460e920d8a274e27aab36346eeda6685a42c3314 (commit)


- Log -----------------------------------------------------------------
commit 06c6a2b4a3a6e64303caa256398dd2dc16f9c35a
Author: Emilia Kasper <emilia at openssl.org>
Date:   Wed Mar 4 13:05:53 2015 -0800

    Harmonize return values in dtls1_buffer_record
    
    Ensure all malloc failures return -1.
    
    Reported by Adam Langley (Google).
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 ssl/d1_pkt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index b1d9156..4dbd694 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -231,7 +231,7 @@ dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority)
             pitem_free(item);
 
         SSLerr(SSL_F_DTLS1_BUFFER_RECORD, ERR_R_INTERNAL_ERROR);
-        return (0);
+        return -1;
     }
 
     rdata->packet = s->packet;

From emilia at openssl.org  Tue Mar 10 20:53:07 2015
From: emilia at openssl.org (Emilia Kasper)
Date: Tue, 10 Mar 2015 20:53:07 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1426020787.549929.1482.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  0c14565c5b7683e4bd47cf299b2f6d4bc26d61aa (commit)
      from  5a9e9669d8073ddc5efeea08f3daee42509b2aa7 (commit)


- Log -----------------------------------------------------------------
commit 0c14565c5b7683e4bd47cf299b2f6d4bc26d61aa
Author: Emilia Kasper <emilia at openssl.org>
Date:   Wed Mar 4 13:05:53 2015 -0800

    Harmonize return values in dtls1_buffer_record
    
    Ensure all malloc failures return -1.
    
    Reported by Adam Langley (Google).
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 06c6a2b4a3a6e64303caa256398dd2dc16f9c35a)

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

Summary of changes:
 ssl/d1_pkt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index bf96f60..940ca69 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -236,7 +236,7 @@ dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority)
             pitem_free(item);
 
         SSLerr(SSL_F_DTLS1_BUFFER_RECORD, ERR_R_INTERNAL_ERROR);
-        return (0);
+        return -1;
     }
 
     rdata->packet = s->packet;

From matt at openssl.org  Wed Mar 11 10:58:42 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 11 Mar 2015 10:58:42 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_0_9_8-stable update
Message-ID: <1426071522.273914.30199.nullmailer@dev.openssl.org>

The branch OpenSSL_0_9_8-stable has been updated
       via  c2f5de13cd09179169b28179ad1e1cac0e4cd1fb (commit)
      from  01320ad3b9261fe845d30881d760ed1da3a97a14 (commit)


- Log -----------------------------------------------------------------
commit c2f5de13cd09179169b28179ad1e1cac0e4cd1fb
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 9 13:59:58 2015 +0000

    Cleanse buffers
    
    Cleanse various intermediate buffers used by the PRF (backported version
    from master).
    
    Conflicts:
    	ssl/s3_enc.c
    
    Conflicts:
    	ssl/t1_enc.c
    
    Conflicts:
    	ssl/t1_enc.c
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 ssl/s3_enc.c | 1 +
 ssl/t1_enc.c | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index f330577..5eaea69 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -712,6 +712,7 @@ int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
         ret += n;
     }
     EVP_MD_CTX_cleanup(&ctx);
+    OPENSSL_cleanse(buf, sizeof buf);
     return (ret);
 }
 
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index c5e7f23..a419e44 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -707,6 +707,8 @@ int tls1_final_finish_mac(SSL *s, EVP_MD_CTX *in1_ctx, EVP_MD_CTX *in2_ctx,
              out, buf2, sizeof buf2);
     EVP_MD_CTX_cleanup(&ctx);
 
+    OPENSSL_cleanse(buf, (int)(q - buf));
+    OPENSSL_cleanse(buf2, sizeof(buf2));
     return sizeof buf2;
 }
 
@@ -850,6 +852,8 @@ int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
     tls1_PRF(s->ctx->md5, s->ctx->sha1,
              buf, TLS_MD_MASTER_SECRET_CONST_SIZE + SSL3_RANDOM_SIZE * 2, p,
              len, s->session->master_key, buff, sizeof buff);
+    OPENSSL_cleanse(buf, sizeof buf);
+    OPENSSL_cleanse(buff, sizeof buff);
 #ifdef KSSL_DEBUG
     printf("tls1_generate_master_secret() complete\n");
 #endif                          /* KSSL_DEBUG */

From matt at openssl.org  Wed Mar 11 10:58:53 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 11 Mar 2015 10:58:53 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_0-stable update
Message-ID: <1426071533.227207.30495.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_0-stable has been updated
       via  683f03e4881ffd19b8671f290387cd4e68fad457 (commit)
      from  765e2465cace18be949bd537edf153f9445eb1fc (commit)


- Log -----------------------------------------------------------------
commit 683f03e4881ffd19b8671f290387cd4e68fad457
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 9 13:59:58 2015 +0000

    Cleanse buffers
    
    Cleanse various intermediate buffers used by the PRF (backported version
    from master).
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 35fafc4dbc0b3a717ad1b208fe2867e8c64867de)
    
    Conflicts:
    	ssl/s3_enc.c
    
    Conflicts:
    	ssl/t1_enc.c

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

Summary of changes:
 ssl/s3_enc.c | 1 +
 ssl/t1_enc.c | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index 7c3a38c..247efdc 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -830,6 +830,7 @@ int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
         ret += n;
     }
     EVP_MD_CTX_cleanup(&ctx);
+    OPENSSL_cleanse(buf, sizeof buf);
     return (ret);
 }
 
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index acef20b..c233827 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -860,6 +860,8 @@ int tls1_final_finish_mac(SSL *s,
         err = 1;
     EVP_MD_CTX_cleanup(&ctx);
 
+    OPENSSL_cleanse(buf, (int)(q - buf));
+    OPENSSL_cleanse(buf2, sizeof(buf2));
     if (err)
         return 0;
     else
@@ -1017,6 +1019,7 @@ int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
              co, col,
              s->s3->server_random, SSL3_RANDOM_SIZE,
              so, sol, p, len, s->session->master_key, buff, sizeof buff);
+    OPENSSL_cleanse(buff, sizeof buff);
 
 #ifdef KSSL_DEBUG
     printf("tls1_generate_master_secret() complete\n");

From matt at openssl.org  Wed Mar 11 10:59:04 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 11 Mar 2015 10:59:04 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1426071544.421097.30781.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  58d8a271ab1eb38fc2983519fb3c37a900df41cf (commit)
      from  8b7e469d06d7c487342eef1dcca3dc02fe7cd267 (commit)


- Log -----------------------------------------------------------------
commit 58d8a271ab1eb38fc2983519fb3c37a900df41cf
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 9 13:59:58 2015 +0000

    Cleanse buffers
    
    Cleanse various intermediate buffers used by the PRF (backported version
    from master).
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 35fafc4dbc0b3a717ad1b208fe2867e8c64867de)
    
    Conflicts:
    	ssl/s3_enc.c

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

Summary of changes:
 ssl/s3_enc.c | 1 +
 ssl/t1_enc.c | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index b4a1456..152f40d 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -841,6 +841,7 @@ int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
         ret += n;
     }
     EVP_MD_CTX_cleanup(&ctx);
+    OPENSSL_cleanse(buf, sizeof buf);
     return (ret);
 }
 
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 0d70116..fa1c002 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -958,6 +958,8 @@ int tls1_final_finish_mac(SSL *s,
         err = 1;
     EVP_MD_CTX_cleanup(&ctx);
 
+    OPENSSL_cleanse(buf, (int)(q - buf));
+    OPENSSL_cleanse(buf2, sizeof(buf2));
     if (err)
         return 0;
     else
@@ -1121,6 +1123,7 @@ int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
              co, col,
              s->s3->server_random, SSL3_RANDOM_SIZE,
              so, sol, p, len, s->session->master_key, buff, sizeof buff);
+    OPENSSL_cleanse(buff, sizeof buff);
 #ifdef SSL_DEBUG
     fprintf(stderr, "Premaster Secret:\n");
     BIO_dump_fp(stderr, (char *)p, len);
@@ -1215,6 +1218,8 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
                   NULL, 0,
                   s->session->master_key, s->session->master_key_length,
                   out, buff, olen);
+    OPENSSL_cleanse(val, vallen);
+    OPENSSL_cleanse(buff, olen);
 
 #ifdef KSSL_DEBUG
     fprintf(stderr, "tls1_export_keying_material() complete\n");

From matt at openssl.org  Wed Mar 11 10:59:15 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 11 Mar 2015 10:59:15 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1426071555.570463.31032.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  35fafc4dbc0b3a717ad1b208fe2867e8c64867de (commit)
      from  0c14565c5b7683e4bd47cf299b2f6d4bc26d61aa (commit)


- Log -----------------------------------------------------------------
commit 35fafc4dbc0b3a717ad1b208fe2867e8c64867de
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 9 13:59:58 2015 +0000

    Cleanse buffers
    
    Cleanse various intermediate buffers used by the PRF (backported version
    from master).
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 ssl/s3_enc.c | 1 +
 ssl/t1_enc.c | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index cdbf0f0..cda2d8c 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -877,6 +877,7 @@ int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
                         s, s->msg_callback_arg);
     }
 #endif
+    OPENSSL_cleanse(buf, sizeof buf);
     return (ret);
 }
 
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index a563fe4..84f5896 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -976,6 +976,8 @@ int tls1_final_finish_mac(SSL *s,
         err = 1;
     EVP_MD_CTX_cleanup(&ctx);
 
+    OPENSSL_cleanse(buf, (int)(q - buf));
+    OPENSSL_cleanse(buf2, sizeof(buf2));
     if (err)
         return 0;
     else
@@ -1139,6 +1141,7 @@ int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
              co, col,
              s->s3->server_random, SSL3_RANDOM_SIZE,
              so, sol, p, len, s->session->master_key, buff, sizeof buff);
+    OPENSSL_cleanse(buff, sizeof buff);
 #ifdef SSL_DEBUG
     fprintf(stderr, "Premaster Secret:\n");
     BIO_dump_fp(stderr, (char *)p, len);
@@ -1249,6 +1252,8 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
                   NULL, 0,
                   s->session->master_key, s->session->master_key_length,
                   out, buff, olen);
+    OPENSSL_cleanse(val, vallen);
+    OPENSSL_cleanse(buff, olen);
 
 #ifdef KSSL_DEBUG
     fprintf(stderr, "tls1_export_keying_material() complete\n");

From matt at openssl.org  Wed Mar 11 10:59:23 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 11 Mar 2015 10:59:23 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426071563.656680.31254.nullmailer@dev.openssl.org>

The branch master has been updated
       via  c9dd49a751d4e73e6d891c006bb1d835ebfb8493 (commit)
      from  06c6a2b4a3a6e64303caa256398dd2dc16f9c35a (commit)


- Log -----------------------------------------------------------------
commit c9dd49a751d4e73e6d891c006bb1d835ebfb8493
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 9 13:59:58 2015 +0000

    Cleanse buffers
    
    Cleanse various intermediate buffers used by the PRF.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 ssl/s3_enc.c | 1 +
 ssl/t1_enc.c | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index 8dda5d0..83a576a 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -871,6 +871,7 @@ int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
                         s, s->msg_callback_arg);
     }
 #endif
+    OPENSSL_cleanse(buf, sizeof buf);
     return (ret);
 }
 
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 6fad8be..1833eb7 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -949,6 +949,8 @@ int tls1_final_finish_mac(SSL *s, const char *str, int slen,
                   s->session->master_key, s->session->master_key_length,
                   out, buf2, sizeof buf2))
         return 0;
+    OPENSSL_cleanse(hash, hashlen);
+    OPENSSL_cleanse(buf2, sizeof(buf2));
     return sizeof buf2;
 }
 
@@ -1112,6 +1114,7 @@ int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
                  s->s3->server_random, SSL3_RANDOM_SIZE,
                  NULL, 0, p, len, s->session->master_key, buff, sizeof buff);
     }
+    OPENSSL_cleanse(buff, sizeof buff);
 #ifdef SSL_DEBUG
     fprintf(stderr, "Premaster Secret:\n");
     BIO_dump_fp(stderr, (char *)p, len);
@@ -1225,6 +1228,8 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
                   NULL, 0,
                   s->session->master_key, s->session->master_key_length,
                   out, buff, olen);
+    OPENSSL_cleanse(val, vallen);
+    OPENSSL_cleanse(buff, olen);
 
 #ifdef KSSL_DEBUG
     fprintf(stderr, "tls1_export_keying_material() complete\n");

From levitte at openssl.org  Wed Mar 11 11:08:27 2015
From: levitte at openssl.org (Richard Levitte)
Date: Wed, 11 Mar 2015 11:08:27 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426072107.629197.2269.nullmailer@dev.openssl.org>

The branch master has been updated
       via  97a0cc52812c6cc075ec7da849dd496f0e6cf5a4 (commit)
      from  c9dd49a751d4e73e6d891c006bb1d835ebfb8493 (commit)


- Log -----------------------------------------------------------------
commit 97a0cc52812c6cc075ec7da849dd496f0e6cf5a4
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Mar 11 10:22:50 2015 +0100

    Move Configurations* out of the way and rename them.
    
    Configure would load the glob "Configurations*".  The problem with
    this is that it also loads all kinds of backups of those
    configurations that some editors do, like emacs' classic
    'Configurations~'.  The solution is to give them an extension, such as
    '.conf', and make sure to end the glob with that.
    
    Also, because 'Configurations.conf' makes for a silly name, and
    because a possibly large number of configurations will become clutter,
    move them to a subdirectory 'Configurations/', and rename them to
    something more expressive, as well as something that sets up some form
    of sorting order.  Thus:
    
        Configurations	->	Configurations/10-main.conf
        Configurations.team	->	Configurations/90-team.conf
    
    Finally, make sure that Configure sorts the list of files that 'glob'
    produces, and adapt Makefile.org.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 Configurations => Configurations/10-main.conf      | 0
 Configurations.team => Configurations/90-team.conf | 0
 Configure                                          | 4 ++--
 Makefile.org                                       | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename Configurations => Configurations/10-main.conf (100%)
 rename Configurations.team => Configurations/90-team.conf (100%)

diff --git a/Configurations b/Configurations/10-main.conf
similarity index 100%
rename from Configurations
rename to Configurations/10-main.conf
diff --git a/Configurations.team b/Configurations/90-team.conf
similarity index 100%
rename from Configurations.team
rename to Configurations/90-team.conf
diff --git a/Configure b/Configure
index 5dbfa6c..4094c08 100755
--- a/Configure
+++ b/Configure
@@ -184,8 +184,8 @@ sub read_config {
 }
 
 my ($vol, $dir, $dummy) = File::Spec->splitpath($0);
-my $pattern = File::Spec->catpath($vol, $dir, "Configurations*");
-foreach ( glob($pattern) ) {
+my $pattern = File::Spec->catpath($vol, $dir, "Configurations/*.conf");
+foreach (sort glob($pattern) ) {
     &read_config($_);
 }
 
diff --git a/Makefile.org b/Makefile.org
index 4f5bff9..0d09ad4 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -500,7 +500,7 @@ crypto/bn/bn_prime.h: crypto/bn/bn_prime.pl
 	$(PERL) crypto/bn/bn_prime.pl >crypto/bn/bn_prime.h
 
 
-TABLE: Configure Configurations Configurations.team
+TABLE: Configure Configurations/*.conf
 	(echo 'Output of `Configure TABLE'"':"; \
 	$(PERL) Configure TABLE) > TABLE
 

From matt at openssl.org  Wed Mar 11 11:33:24 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 11 Mar 2015 11:33:24 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1426073604.099616.9139.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  f5ee5213073870493a8ade98b13ea41a2b20b8d4 (commit)
      from  58d8a271ab1eb38fc2983519fb3c37a900df41cf (commit)


- Log -----------------------------------------------------------------
commit f5ee5213073870493a8ade98b13ea41a2b20b8d4
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 10 23:15:15 2015 +0000

    Fix seg fault in ASN1_generate_v3/ASN1_generate_nconf
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>
    (cherry picked from commit ac5a110621ca48f0bebd5b4d76d081de403da29e)

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

Summary of changes:
 crypto/asn1/asn1_gen.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index b71ae48..11b582d 100644
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -353,6 +353,10 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
         break;
 
     case ASN1_GEN_FLAG_FORMAT:
+        if(!vstart) {
+            ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKNOWN_FORMAT);
+            return -1;
+        }
         if (!strncmp(vstart, "ASCII", 5))
             arg->format = ASN1_GEN_FORMAT_ASCII;
         else if (!strncmp(vstart, "UTF8", 4))

From matt at openssl.org  Wed Mar 11 11:33:34 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 11 Mar 2015 11:33:34 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1426073614.542256.9394.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  9c5c18500bfb58fe0eedfbab71409b6ebc4d2d4c (commit)
      from  35fafc4dbc0b3a717ad1b208fe2867e8c64867de (commit)


- Log -----------------------------------------------------------------
commit 9c5c18500bfb58fe0eedfbab71409b6ebc4d2d4c
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 10 23:15:15 2015 +0000

    Fix seg fault in ASN1_generate_v3/ASN1_generate_nconf
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>
    (cherry picked from commit ac5a110621ca48f0bebd5b4d76d081de403da29e)

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

Summary of changes:
 crypto/asn1/asn1_gen.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index b71ae48..11b582d 100644
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -353,6 +353,10 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
         break;
 
     case ASN1_GEN_FLAG_FORMAT:
+        if(!vstart) {
+            ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKNOWN_FORMAT);
+            return -1;
+        }
         if (!strncmp(vstart, "ASCII", 5))
             arg->format = ASN1_GEN_FORMAT_ASCII;
         else if (!strncmp(vstart, "UTF8", 4))

From matt at openssl.org  Wed Mar 11 11:34:38 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 11 Mar 2015 11:34:38 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426073678.669485.9838.nullmailer@dev.openssl.org>

The branch master has been updated
       via  ac5a110621ca48f0bebd5b4d76d081de403da29e (commit)
      from  97a0cc52812c6cc075ec7da849dd496f0e6cf5a4 (commit)


- Log -----------------------------------------------------------------
commit ac5a110621ca48f0bebd5b4d76d081de403da29e
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 10 23:15:15 2015 +0000

    Fix seg fault in ASN1_generate_v3/ASN1_generate_nconf
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

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

Summary of changes:
 crypto/asn1/asn1_gen.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index 16a1b5a..0e1cc08 100644
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -353,6 +353,10 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
         break;
 
     case ASN1_GEN_FLAG_FORMAT:
+        if(!vstart) {
+            ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKNOWN_FORMAT);
+            return -1;
+        }
         if (!strncmp(vstart, "ASCII", 5))
             arg->format = ASN1_GEN_FORMAT_ASCII;
         else if (!strncmp(vstart, "UTF8", 4))

From rsalz at openssl.org  Wed Mar 11 13:29:59 2015
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 11 Mar 2015 13:29:59 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426080599.107694.6812.nullmailer@dev.openssl.org>

The branch master has been updated
       via  10bf4fc2c3da332a54247da1f3c0dcb44944f7ff (commit)
      from  ac5a110621ca48f0bebd5b4d76d081de403da29e (commit)


- Log -----------------------------------------------------------------
commit 10bf4fc2c3da332a54247da1f3c0dcb44944f7ff
Author: Rich Salz <rsalz at akamai.com>
Date:   Tue Mar 10 19:09:27 2015 -0400

    Merge OPENSSL_NO_EC{DH,DSA} into OPENSSL_NO_EC
    
    Suggested by John Foley <foleyj at cisco.com>.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 CHANGES                     | 37 +++++++++++++----------
 apps/req.c                  |  2 +-
 apps/s_cb.c                 |  2 +-
 apps/s_server.c             |  6 ++--
 apps/speed.c                | 74 ++++++++++++---------------------------------
 crypto/ec/ec_pmeth.c        |  7 ++---
 crypto/ecdh/ecdh.h          |  2 +-
 crypto/ecdh/ecdhtest.c      |  4 +--
 crypto/ecdsa/ecdsa.h        |  2 +-
 crypto/ecdsa/ecdsatest.c    |  4 +--
 crypto/engine/eng_fat.c     |  8 ++---
 crypto/engine/eng_list.c    |  4 +--
 crypto/engine/eng_openssl.c |  4 +--
 crypto/engine/engine.h      |  4 +--
 crypto/err/err_all.c        |  8 +----
 crypto/evp/c_alld.c         |  2 +-
 crypto/evp/evp.h            |  2 +-
 crypto/x509/x509.h          |  6 ----
 ssl/s3_clnt.c               | 24 +++++++--------
 ssl/s3_lib.c                | 39 +++++++++++-------------
 ssl/s3_srvr.c               | 10 +++---
 ssl/ssl.h                   |  2 +-
 ssl/ssl_algs.c              |  2 +-
 ssl/ssl_cert.c              |  8 ++---
 ssl/ssl_ciph.c              |  9 ++----
 ssl/ssl_conf.c              |  4 +--
 ssl/ssl_lib.c               | 18 +++--------
 ssl/ssl_locl.h              | 10 +++---
 ssl/ssltest.c               | 12 ++++----
 ssl/t1_lib.c                | 17 +++++------
 util/mk1mf.pl               |  6 ----
 31 files changed, 129 insertions(+), 210 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8fcfcce..8d6fcaf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -41,28 +41,33 @@
      [Rich Salz]
 
   *) Remove various unsupported platforms:
-	Sony NEWS4
-	BEOS and BEOS_R5
-	NeXT
-	SUNOS
-	MPE/iX
-	Sinix/ReliantUNIX RM400
-	DGUX
-	NCR
-	Tandem
-	Cray
-	16-bit platforms such as WIN16
+        Sony NEWS4
+        BEOS and BEOS_R5
+        NeXT
+        SUNOS
+        MPE/iX
+        Sinix/ReliantUNIX RM400
+        DGUX
+        NCR
+        Tandem
+        Cray
+        16-bit platforms such as WIN16
      [Rich Salz]
 
-  *) Start cleaning up OPENSSL_NO_xxx #define's
-	OPENSSL_NO_RIPEMD160, OPENSSL_NO_RIPEMD merged into OPENSSL_NO_RMD160
-	OPENSSL_NO_FP_API merged into OPENSSL_NO_STDIO
-	Use setbuf() and remove OPENSSL_NO_SETVBUF_IONBF
+  *) Clean up OPENSSL_NO_xxx #define's
+        Use setbuf() and remove OPENSSL_NO_SETVBUF_IONBF
         Rename OPENSSL_SYSNAME_xxx to OPENSSL_SYS_xxx
+        OPENSSL_NO_EC{DH,DSA} merged into OPENSSL_NO_EC
+        OPENSSL_NO_RIPEMD160, OPENSSL_NO_RIPEMD merged into OPENSSL_NO_RMD160
+        OPENSSL_NO_FP_API merged into OPENSSL_NO_STDIO
+        Remove OPENSSL_NO_BIO OPENSSL_NO_BUFFER OPENSSL_NO_CHAIN_VERIFY
+        OPENSSL_NO_EVP OPENSSL_NO_FIPS_ERR OPENSSL_NO_HASH_COMP
+        OPENSSL_NO_LHASH OPENSSL_NO_OBJECT OPENSSL_NO_SPEED OPENSSL_NO_STACK
+        OPENSSL_NO_X509 OPENSSL_NO_X509_VERIFY
         Remove MS_STATIC; it's a relic from platforms <32 bits.
      [Rich Salz]
 
-  *) Start cleaning up dead code
+  *) Cleaned up dead code
         Remove all but one '#ifdef undef' which is to be looked at.
      [Rich Salz]
 
diff --git a/apps/req.c b/apps/req.c
index 6d06ed7..231535b 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -398,7 +398,7 @@ int MAIN(int argc, char **argv)
                    " -newkey rsa:bits generate a new RSA key of 'bits' in size\n");
         BIO_printf(bio_err,
                    " -newkey dsa:file generate a new DSA key, parameters taken from CA in 'file'\n");
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
         BIO_printf(bio_err,
                    " -newkey ec:file generate a new EC key, parameters taken from CA in 'file'\n");
 #endif
diff --git a/apps/s_cb.c b/apps/s_cb.c
index 12f7b8c..8a66c9a 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -521,7 +521,7 @@ int ssl_print_tmp_key(BIO *out, SSL *s)
     case EVP_PKEY_DH:
         BIO_printf(out, "DH, %d bits\n", EVP_PKEY_bits(key));
         break;
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     case EVP_PKEY_EC:
         {
             EC_KEY *ec = EVP_PKEY_get1_EC_KEY(key);
diff --git a/apps/s_server.c b/apps/s_server.c
index 42088d0..874b402 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -486,7 +486,7 @@ static void sv_usage(void)
                " -dhparam arg  - DH parameter file to use, in cert file if not specified\n");
     BIO_printf(bio_err,
                "                 or a default set of parameters is used\n");
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     BIO_printf(bio_err,
                " -named_curve arg  - Elliptic curve name to use for ephemeral ECDH keys.\n"
                "                 Use \"openssl ecparam -list_curves\" for all names\n"
@@ -545,7 +545,7 @@ static void sv_usage(void)
 #ifndef OPENSSL_NO_DH
     BIO_printf(bio_err, " -no_dhe       - Disable ephemeral DH\n");
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     BIO_printf(bio_err, " -no_ecdhe     - Disable ephemeral ECDH\n");
 #endif
     BIO_printf(bio_err,
@@ -1677,7 +1677,7 @@ int MAIN(int argc, char *argv[])
                 bio_s_out = BIO_new_fp(stdout, BIO_NOCLOSE);
         }
     }
-#if !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECDSA)
+#if !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_EC)
     if (nocert)
 #endif
     {
diff --git a/apps/speed.c b/apps/speed.c
index 57b53ce..44c276a 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -172,10 +172,8 @@
 # include <openssl/dsa.h>
 # include "./testdsa.h"
 #endif
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
 # include <openssl/ecdsa.h>
-#endif
-#ifndef OPENSSL_NO_ECDH
 # include <openssl/ecdh.h>
 #endif
 #include <openssl/modes.h>
@@ -242,14 +240,12 @@ static double rsa_results[RSA_NUM][2];
 #ifndef OPENSSL_NO_DSA
 static double dsa_results[DSA_NUM][2];
 #endif
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
 static double ecdsa_results[EC_NUM][2];
-#endif
-#ifndef OPENSSL_NO_ECDH
 static double ecdh_results[EC_NUM][1];
 #endif
 
-#if defined(OPENSSL_NO_DSA) && !(defined(OPENSSL_NO_ECDSA) && defined(OPENSSL_NO_ECDH))
+#if defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_EC)
 static const char rnd_seed[] =
     "string to make the random number generator think it has entropy";
 static int rnd_fake = 0;
@@ -330,7 +326,7 @@ static double Time_F(int s)
 }
 #endif
 
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
 static const int KDF1_SHA1_len = 20;
 static void *KDF1_SHA1(const void *in, size_t inlen, void *out,
                        size_t *outlen)
@@ -340,7 +336,7 @@ static void *KDF1_SHA1(const void *in, size_t inlen, void *out,
     *outlen = SHA_DIGEST_LENGTH;
     return SHA1(in, inlen, out);
 }
-#endif                         /* OPENSSL_NO_ECDH */
+#endif                         /* OPENSSL_NO_EC */
 
 static void multiblock_speed(const EVP_CIPHER *evp_cipher);
 
@@ -595,30 +591,23 @@ int MAIN(int argc, char **argv)
 
 #endif
 
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
     unsigned char ecdsasig[256];
     unsigned int ecdsasiglen;
     EC_KEY *ecdsa[EC_NUM];
     long ecdsa_c[EC_NUM][2];
-#endif
-
-#ifndef OPENSSL_NO_ECDH
     EC_KEY *ecdh_a[EC_NUM], *ecdh_b[EC_NUM];
     unsigned char secret_a[MAX_ECDH_SIZE], secret_b[MAX_ECDH_SIZE];
     int secret_size_a, secret_size_b;
     int ecdh_checks = 0;
     int secret_idx = 0;
     long ecdh_c[EC_NUM][2];
+    int ecdsa_doit[EC_NUM];
+    int ecdh_doit[EC_NUM];
 #endif
 
     int rsa_doit[RSA_NUM];
     int dsa_doit[DSA_NUM];
-#ifndef OPENSSL_NO_ECDSA
-    int ecdsa_doit[EC_NUM];
-#endif
-#ifndef OPENSSL_NO_ECDH
-    int ecdh_doit[EC_NUM];
-#endif
     int doit[ALGOR_NUM];
     int pr_header = 0;
     const EVP_CIPHER *evp_cipher = NULL;
@@ -639,11 +628,9 @@ int MAIN(int argc, char **argv)
 #ifndef OPENSSL_NO_DSA
     memset(dsa_key, 0, sizeof(dsa_key));
 #endif
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
     for (i = 0; i < EC_NUM; i++)
         ecdsa[i] = NULL;
-#endif
-#ifndef OPENSSL_NO_ECDH
     for (i = 0; i < EC_NUM; i++) {
         ecdh_a[i] = NULL;
         ecdh_b[i] = NULL;
@@ -689,11 +676,9 @@ int MAIN(int argc, char **argv)
         rsa_doit[i] = 0;
     for (i = 0; i < DSA_NUM; i++)
         dsa_doit[i] = 0;
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
     for (i = 0; i < EC_NUM; i++)
         ecdsa_doit[i] = 0;
-#endif
-#ifndef OPENSSL_NO_ECDH
     for (i = 0; i < EC_NUM; i++)
         ecdh_doit[i] = 0;
 #endif
@@ -986,7 +971,7 @@ int MAIN(int argc, char **argv)
             dsa_doit[R_DSA_2048] = 1;
         } else
 #endif
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
         if (strcmp(*argv, "ecdsap160") == 0)
             ecdsa_doit[R_EC_P160] = 2;
         else if (strcmp(*argv, "ecdsap192") == 0)
@@ -1022,10 +1007,7 @@ int MAIN(int argc, char **argv)
         else if (strcmp(*argv, "ecdsa") == 0) {
             for (i = 0; i < EC_NUM; i++)
                 ecdsa_doit[i] = 1;
-        } else
-#endif
-#ifndef OPENSSL_NO_ECDH
-        if (strcmp(*argv, "ecdhp160") == 0)
+        } else if (strcmp(*argv, "ecdhp160") == 0)
             ecdh_doit[R_EC_P160] = 2;
         else if (strcmp(*argv, "ecdhp192") == 0)
             ecdh_doit[R_EC_P192] = 2;
@@ -1135,7 +1117,7 @@ int MAIN(int argc, char **argv)
 #ifndef OPENSSL_NO_DSA
             BIO_printf(bio_err, "dsa512   dsa1024  dsa2048\n");
 #endif
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
             BIO_printf(bio_err, "ecdsap160 ecdsap192 ecdsap224 "
                        "ecdsap256 ecdsap384 ecdsap521\n");
             BIO_printf(bio_err,
@@ -1143,8 +1125,6 @@ int MAIN(int argc, char **argv)
             BIO_printf(bio_err,
                        "ecdsab163 ecdsab233 ecdsab283 ecdsab409 ecdsab571\n");
             BIO_printf(bio_err, "ecdsa\n");
-#endif
-#ifndef OPENSSL_NO_ECDH
             BIO_printf(bio_err, "ecdhp160  ecdhp192  ecdhp224 "
                        "ecdhp256  ecdhp384  ecdhp521\n");
             BIO_printf(bio_err,
@@ -1234,11 +1214,9 @@ int MAIN(int argc, char **argv)
             rsa_doit[i] = 1;
         for (i = 0; i < DSA_NUM; i++)
             dsa_doit[i] = 1;
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
         for (i = 0; i < EC_NUM; i++)
             ecdsa_doit[i] = 1;
-#endif
-#ifndef OPENSSL_NO_ECDH
         for (i = 0; i < EC_NUM; i++)
             ecdh_doit[i] = 1;
 #endif
@@ -1428,7 +1406,7 @@ int MAIN(int argc, char **argv)
     }
 #  endif
 
-#  ifndef OPENSSL_NO_ECDSA
+#  ifndef OPENSSL_NO_EC
     ecdsa_c[R_EC_P160][0] = count / 1000;
     ecdsa_c[R_EC_P160][1] = count / 1000 / 2;
     for (i = R_EC_P192; i <= R_EC_P521; i++) {
@@ -1471,9 +1449,6 @@ int MAIN(int argc, char **argv)
             }
         }
     }
-#  endif
-
-#  ifndef OPENSSL_NO_ECDH
     ecdh_c[R_EC_P160][0] = count / 1000;
     ecdh_c[R_EC_P160][1] = count / 1000;
     for (i = R_EC_P192; i <= R_EC_P521; i++) {
@@ -2144,7 +2119,7 @@ int MAIN(int argc, char **argv)
         RAND_cleanup();
 #endif
 
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
     if (RAND_status() != 1) {
         RAND_seed(rnd_seed, sizeof rnd_seed);
         rnd_fake = 1;
@@ -2236,9 +2211,6 @@ int MAIN(int argc, char **argv)
     }
     if (rnd_fake)
         RAND_cleanup();
-#endif
-
-#ifndef OPENSSL_NO_ECDH
     if (RAND_status() != 1) {
         RAND_seed(rnd_seed, sizeof rnd_seed);
         rnd_fake = 1;
@@ -2423,7 +2395,7 @@ int MAIN(int argc, char **argv)
                     1.0 / dsa_results[k][0], 1.0 / dsa_results[k][1]);
     }
 #endif
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
     j = 1;
     for (k = 0; k < EC_NUM; k++) {
         if (!ecdsa_doit[k])
@@ -2445,9 +2417,6 @@ int MAIN(int argc, char **argv)
                     ecdsa_results[k][0], ecdsa_results[k][1],
                     1.0 / ecdsa_results[k][0], 1.0 / ecdsa_results[k][1]);
     }
-#endif
-
-#ifndef OPENSSL_NO_ECDH
     j = 1;
     for (k = 0; k < EC_NUM; k++) {
         if (!ecdh_doit[k])
@@ -2488,12 +2457,10 @@ int MAIN(int argc, char **argv)
             DSA_free(dsa_key[i]);
 #endif
 
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
     for (i = 0; i < EC_NUM; i++)
         if (ecdsa[i] != NULL)
             EC_KEY_free(ecdsa[i]);
-#endif
-#ifndef OPENSSL_NO_ECDH
     for (i = 0; i < EC_NUM; i++) {
         if (ecdh_a[i] != NULL)
             EC_KEY_free(ecdh_a[i]);
@@ -2697,7 +2664,7 @@ static int do_multi(int multi)
                     dsa_results[k][1] = d;
             }
 # endif
-# ifndef OPENSSL_NO_ECDSA
+# ifndef OPENSSL_NO_EC
             else if (!strncmp(buf, "+F4:", 4)) {
                 int k;
                 double d;
@@ -2720,9 +2687,6 @@ static int do_multi(int multi)
                 else
                     ecdsa_results[k][1] = d;
             }
-# endif
-
-# ifndef OPENSSL_NO_ECDH
             else if (!strncmp(buf, "+F5:", 4)) {
                 int k;
                 double d;
diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c
index 0437dcf..d789e7e 100644
--- a/crypto/ec/ec_pmeth.c
+++ b/crypto/ec/ec_pmeth.c
@@ -203,7 +203,7 @@ static int pkey_ec_verify(EVP_PKEY_CTX *ctx,
     return ret;
 }
 
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
 static int pkey_ec_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
                           size_t *keylen)
 {
@@ -302,7 +302,7 @@ static int pkey_ec_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
         EC_GROUP_set_asn1_flag(dctx->gen_group, p1);
         return 1;
 
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     case EVP_PKEY_CTRL_EC_ECDH_COFACTOR:
         if (p1 == -2) {
             if (dctx->cofactor_mode != -1)
@@ -519,12 +519,11 @@ const EVP_PKEY_METHOD ec_pkey_meth = {
     0, 0,
 
     0,
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     pkey_ec_kdf_derive,
 #else
     0,
 #endif
-
     pkey_ec_ctrl,
     pkey_ec_ctrl_str
 };
diff --git a/crypto/ecdh/ecdh.h b/crypto/ecdh/ecdh.h
index 0d643a3..25ccdc9 100644
--- a/crypto/ecdh/ecdh.h
+++ b/crypto/ecdh/ecdh.h
@@ -71,7 +71,7 @@
 
 # include <openssl/opensslconf.h>
 
-# ifdef OPENSSL_NO_ECDH
+# ifdef OPENSSL_NO_EC
 #  error ECDH is disabled.
 # endif
 
diff --git a/crypto/ecdh/ecdhtest.c b/crypto/ecdh/ecdhtest.c
index 41725f6..578de31 100644
--- a/crypto/ecdh/ecdhtest.c
+++ b/crypto/ecdh/ecdhtest.c
@@ -73,7 +73,7 @@
 
 #include "../e_os.h"
 
-#include <openssl/opensslconf.h> /* for OPENSSL_NO_ECDH */
+#include <openssl/opensslconf.h> /* for OPENSSL_NO_EC */
 #include <openssl/crypto.h>
 #include <openssl/bio.h>
 #include <openssl/bn.h>
@@ -82,7 +82,7 @@
 #include <openssl/sha.h>
 #include <openssl/err.h>
 
-#ifdef OPENSSL_NO_ECDH
+#ifdef OPENSSL_NO_EC
 int main(int argc, char *argv[])
 {
     printf("No ECDH support\n");
diff --git a/crypto/ecdsa/ecdsa.h b/crypto/ecdsa/ecdsa.h
index 86cafe2..3876004 100644
--- a/crypto/ecdsa/ecdsa.h
+++ b/crypto/ecdsa/ecdsa.h
@@ -61,7 +61,7 @@
 
 # include <openssl/opensslconf.h>
 
-# ifdef OPENSSL_NO_ECDSA
+# ifdef OPENSSL_NO_EC
 #  error ECDSA is disabled.
 # endif
 
diff --git a/crypto/ecdsa/ecdsatest.c b/crypto/ecdsa/ecdsatest.c
index d58490f..31d9c84 100644
--- a/crypto/ecdsa/ecdsatest.c
+++ b/crypto/ecdsa/ecdsatest.c
@@ -73,9 +73,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_ECDSA is defined */
+#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_EC is defined */
 
-#ifdef OPENSSL_NO_ECDSA
+#ifdef OPENSSL_NO_EC
 int main(int argc, char *argv[])
 {
     puts("Elliptic curves are disabled.");
diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c
index 4279dd9..af353bd 100644
--- a/crypto/engine/eng_fat.c
+++ b/crypto/engine/eng_fat.c
@@ -79,11 +79,9 @@ int ENGINE_set_default(ENGINE *e, unsigned int flags)
     if ((flags & ENGINE_METHOD_DH) && !ENGINE_set_default_DH(e))
         return 0;
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     if ((flags & ENGINE_METHOD_ECDH) && !ENGINE_set_default_ECDH(e))
         return 0;
-#endif
-#ifndef OPENSSL_NO_ECDSA
     if ((flags & ENGINE_METHOD_ECDSA) && !ENGINE_set_default_ECDSA(e))
         return 0;
 #endif
@@ -159,10 +157,8 @@ int ENGINE_register_complete(ENGINE *e)
 #ifndef OPENSSL_NO_DH
     ENGINE_register_DH(e);
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     ENGINE_register_ECDH(e);
-#endif
-#ifndef OPENSSL_NO_ECDSA
     ENGINE_register_ECDSA(e);
 #endif
     ENGINE_register_RAND(e);
diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c
index c69e8a7..9e80eaf 100644
--- a/crypto/engine/eng_list.c
+++ b/crypto/engine/eng_list.c
@@ -300,10 +300,8 @@ static void engine_cpy(ENGINE *dest, const ENGINE *src)
 #ifndef OPENSSL_NO_DH
     dest->dh_meth = src->dh_meth;
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     dest->ecdh_meth = src->ecdh_meth;
-#endif
-#ifndef OPENSSL_NO_ECDSA
     dest->ecdsa_meth = src->ecdsa_meth;
 #endif
     dest->rand_meth = src->rand_meth;
diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
index 3e12ecf..78fa3c8 100644
--- a/crypto/engine/eng_openssl.c
+++ b/crypto/engine/eng_openssl.c
@@ -149,10 +149,8 @@ static int bind_helper(ENGINE *e)
 # ifndef OPENSSL_NO_DSA
         || !ENGINE_set_DSA(e, DSA_get_default_method())
 # endif
-# ifndef OPENSSL_NO_ECDH
+# ifndef OPENSSL_NO_EC
         || !ENGINE_set_ECDH(e, ECDH_OpenSSL())
-# endif
-# ifndef OPENSSL_NO_ECDSA
         || !ENGINE_set_ECDSA(e, ECDSA_OpenSSL())
 # endif
 # ifndef OPENSSL_NO_DH
diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h
index c931907..e2f3e5c 100644
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
@@ -82,10 +82,8 @@
 #  ifndef OPENSSL_NO_DH
 #   include <openssl/dh.h>
 #  endif
-#  ifndef OPENSSL_NO_ECDH
+#  ifndef OPENSSL_NO_EC
 #   include <openssl/ecdh.h>
-#  endif
-#  ifndef OPENSSL_NO_ECDSA
 #   include <openssl/ecdsa.h>
 #  endif
 #  include <openssl/rand.h>
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index 1363fb0..b844167 100644
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -76,10 +76,8 @@
 #ifndef OPENSSL_NO_DSA
 # include <openssl/dsa.h>
 #endif
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
 # include <openssl/ecdsa.h>
-#endif
-#ifndef OPENSSL_NO_ECDH
 # include <openssl/ecdh.h>
 #endif
 #include <openssl/evp.h>
@@ -138,11 +136,7 @@ void ERR_load_crypto_strings(void)
 # endif
 # ifndef OPENSSL_NO_EC
     ERR_load_EC_strings();
-# endif
-# ifndef OPENSSL_NO_ECDSA
     ERR_load_ECDSA_strings();
-# endif
-# ifndef OPENSSL_NO_ECDH
     ERR_load_ECDH_strings();
 # endif
     /* skip ERR_load_SSL_strings() because it is not in this library */
diff --git a/crypto/evp/c_alld.c b/crypto/evp/c_alld.c
index 0d4278b..94039ef 100644
--- a/crypto/evp/c_alld.c
+++ b/crypto/evp/c_alld.c
@@ -80,7 +80,7 @@ void OpenSSL_add_all_digests(void)
     EVP_add_digest_alias(SN_dsaWithSHA1, "DSS1");
     EVP_add_digest_alias(SN_dsaWithSHA1, "dss1");
 # endif
-# ifndef OPENSSL_NO_ECDSA
+# ifndef OPENSSL_NO_EC
     EVP_add_digest(EVP_ecdsa());
 # endif
 #if !defined(OPENSSL_NO_MDC2) && !defined(OPENSSL_NO_DES)
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 2e9f83f..0d26fd3 100644
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -234,7 +234,7 @@ typedef int evp_verify_method(int type, const unsigned char *m,
 #   define EVP_PKEY_DSA_method     EVP_PKEY_NULL_method
 #  endif
 
-#  ifndef OPENSSL_NO_ECDSA
+#  ifndef OPENSSL_NO_EC
 #   define EVP_PKEY_ECDSA_method   (evp_sign_method *)ECDSA_sign, \
                                 (evp_verify_method *)ECDSA_verify, \
                                  {EVP_PKEY_EC,0,0,0}
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index 1e78e30..9835be5 100644
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -75,13 +75,7 @@
 
 # ifndef OPENSSL_NO_EC
 #  include <openssl/ec.h>
-# endif
-
-# ifndef OPENSSL_NO_ECDSA
 #  include <openssl/ecdsa.h>
-# endif
-
-# ifndef OPENSSL_NO_ECDH
 #  include <openssl/ecdh.h>
 # endif
 
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 750217f..1e611c4 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1321,7 +1321,7 @@ int ssl3_get_key_exchange(SSL *s)
 #ifndef OPENSSL_NO_DH
     DH *dh = NULL;
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     EC_KEY *ecdh = NULL;
     BN_CTX *bn_ctx = NULL;
     EC_POINT *srvr_ecpoint = NULL;
@@ -1385,7 +1385,7 @@ int ssl3_get_key_exchange(SSL *s)
             s->session->sess_cert->peer_dh_tmp = NULL;
         }
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
         if (s->session->sess_cert->peer_ecdh_tmp) {
             EC_KEY_free(s->session->sess_cert->peer_ecdh_tmp);
             s->session->sess_cert->peer_ecdh_tmp = NULL;
@@ -1724,7 +1724,7 @@ int ssl3_get_key_exchange(SSL *s)
     }
 #endif                          /* !OPENSSL_NO_DH */
 
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     else if (alg_k & SSL_kECDHE) {
         EC_GROUP *ngroup;
         const EC_GROUP *group;
@@ -1822,7 +1822,7 @@ int ssl3_get_key_exchange(SSL *s)
                 X509_get_pubkey(s->session->
                                 sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
 # endif
-# ifndef OPENSSL_NO_ECDSA
+# ifndef OPENSSL_NO_EC
         else if (alg_a & SSL_aECDSA)
             pkey =
                 X509_get_pubkey(s->session->
@@ -1841,7 +1841,7 @@ int ssl3_get_key_exchange(SSL *s)
         SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_UNEXPECTED_MESSAGE);
         goto f_err;
     }
-#endif                          /* !OPENSSL_NO_ECDH */
+#endif                          /* !OPENSSL_NO_EC */
 
     /* p points to the next byte, there are 'n' bytes left */
 
@@ -1961,7 +1961,7 @@ int ssl3_get_key_exchange(SSL *s)
     if (dh != NULL)
         DH_free(dh);
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     BN_CTX_free(bn_ctx);
     EC_POINT_free(srvr_ecpoint);
     if (ecdh != NULL)
@@ -2299,7 +2299,7 @@ int ssl3_send_client_key_exchange(SSL *s)
 #ifndef OPENSSL_NO_KRB5
     KSSL_ERR kssl_err;
 #endif                          /* OPENSSL_NO_KRB5 */
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     EC_KEY *clnt_ecdh = NULL;
     const EC_POINT *srvr_ecpoint = NULL;
     EVP_PKEY *srvr_pub_pkey = NULL;
@@ -2597,7 +2597,7 @@ int ssl3_send_client_key_exchange(SSL *s)
         }
 #endif
 
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
         else if (alg_k & (SSL_kECDHE | SSL_kECDHr | SSL_kECDHe)) {
             const EC_GROUP *srvr_group = NULL;
             EC_KEY *tkey;
@@ -2768,7 +2768,7 @@ int ssl3_send_client_key_exchange(SSL *s)
                 EC_KEY_free(clnt_ecdh);
             EVP_PKEY_free(srvr_pub_pkey);
         }
-#endif                          /* !OPENSSL_NO_ECDH */
+#endif                          /* !OPENSSL_NO_EC */
         else if (alg_k & SSL_kGOST) {
             /* GOST key exchange message creation */
             EVP_PKEY_CTX *pkey_ctx;
@@ -3054,7 +3054,7 @@ int ssl3_send_client_key_exchange(SSL *s)
         OPENSSL_free(pms);
         s->cert->pms = NULL;
     }
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     BN_CTX_free(bn_ctx);
     if (encodedPoint != NULL)
         OPENSSL_free(encodedPoint);
@@ -3156,7 +3156,7 @@ int ssl3_send_client_verify(SSL *s)
             n = j + 2;
         } else
 #endif
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
         if (pkey->type == EVP_PKEY_EC) {
             if (!ECDSA_sign(pkey->save_type,
                             &(data[MD5_DIGEST_LENGTH]),
@@ -3365,7 +3365,7 @@ int ssl3_check_cert_and_algorithm(SSL *s)
     /* This is the passed certificate */
 
     idx = sc->peer_cert_type;
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     if (idx == SSL_PKEY_ECC) {
         if (ssl_check_srvr_ecc_cert_and_alg(sc->peer_pkeys[idx].x509, s) == 0) {
             /* check failed */
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 20ce112..f4369eb 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -2051,7 +2051,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = {
      },
 #endif
 
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     /* Cipher C001 */
     {
      1,
@@ -2451,7 +2451,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = {
      256,
      256,
      },
-#endif                          /* OPENSSL_NO_ECDH */
+#endif                          /* OPENSSL_NO_EC */
 
 #ifndef OPENSSL_NO_SRP
     /* Cipher C01A */
@@ -2598,7 +2598,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = {
      256,
      },
 #endif                          /* OPENSSL_NO_SRP */
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
 
     /* HMAC based TLS v1.2 ciphersuites from RFC5289 */
 
@@ -2973,7 +2973,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = {
      256,
      256},
 # endif                         /* OPENSSL_NO_CAMELLIA */
-#endif                          /* OPENSSL_NO_ECDH */
+#endif                          /* OPENSSL_NO_EC */
 
 #ifdef TEMP_GOST_TLS
 /* Cipher FF00 */
@@ -3138,7 +3138,7 @@ void ssl3_free(SSL *s)
     if (s->s3->tmp.dh != NULL)
         DH_free(s->s3->tmp.dh);
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     if (s->s3->tmp.ecdh != NULL)
         EC_KEY_free(s->s3->tmp.ecdh);
 #endif
@@ -3183,7 +3183,7 @@ void ssl3_clear(SSL *s)
         s->s3->tmp.dh = NULL;
     }
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     if (s->s3->tmp.ecdh != NULL) {
         EC_KEY_free(s->s3->tmp.ecdh);
         s->s3->tmp.ecdh = NULL;
@@ -3357,7 +3357,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
         s->cert->dh_tmp_auto = larg;
         return 1;
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     case SSL_CTRL_SET_TMP_ECDH:
         {
             EC_KEY *ecdh = NULL;
@@ -3389,7 +3389,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
             SSLerr(SSL_F_SSL3_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
             return (ret);
         }
-#endif                          /* !OPENSSL_NO_ECDH */
+#endif                          /* !OPENSSL_NO_EC */
 #ifndef OPENSSL_NO_TLSEXT
     case SSL_CTRL_SET_TLSEXT_HOSTNAME:
         if (larg == TLSEXT_NAMETYPE_host_name) {
@@ -3558,7 +3558,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
     case SSL_CTRL_GET_SHARED_CURVE:
         return tls1_shared_curve(s, larg);
 
-# ifndef OPENSSL_NO_ECDH
+# ifndef OPENSSL_NO_EC
     case SSL_CTRL_SET_ECDH_AUTO:
         s->cert->ecdh_tmp_auto = larg;
         return 1;
@@ -3629,7 +3629,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
             EVP_PKEY *ptmp;
             int rv = 0;
             sc = s->session->sess_cert;
-#if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DH) && !defined(OPENSSL_NO_EC) && !defined(OPENSSL_NO_ECDH)
+#if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DH) && !defined(OPENSSL_NO_EC)
             if (!sc->peer_rsa_tmp && !sc->peer_dh_tmp && !sc->peer_ecdh_tmp)
                 return 0;
 #endif
@@ -3645,7 +3645,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
             else if (sc->peer_dh_tmp)
                 rv = EVP_PKEY_set1_DH(ptmp, sc->peer_dh_tmp);
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
             else if (sc->peer_ecdh_tmp)
                 rv = EVP_PKEY_set1_EC_KEY(ptmp, sc->peer_ecdh_tmp);
 #endif
@@ -3736,7 +3736,7 @@ long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp) (void))
         }
         break;
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     case SSL_CTRL_SET_TMP_ECDH_CB:
         {
             s->cert->ecdh_tmp_cb = (EC_KEY *(*)(SSL *, int, int))fp;
@@ -3847,7 +3847,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
         ctx->cert->dh_tmp_auto = larg;
         return 1;
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     case SSL_CTRL_SET_TMP_ECDH:
         {
             EC_KEY *ecdh = NULL;
@@ -3881,7 +3881,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
             SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
             return (0);
         }
-#endif                          /* !OPENSSL_NO_ECDH */
+#endif                          /* !OPENSSL_NO_EC */
 #ifndef OPENSSL_NO_TLSEXT
     case SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG:
         ctx->tlsext_servername_arg = parg;
@@ -3955,7 +3955,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
         return tls1_set_curves_list(&ctx->tlsext_ellipticcurvelist,
                                     &ctx->tlsext_ellipticcurvelist_length,
                                     parg);
-#  ifndef OPENSSL_NO_ECDH
+#  ifndef OPENSSL_NO_EC
     case SSL_CTRL_SET_ECDH_AUTO:
         ctx->cert->ecdh_tmp_auto = larg;
         return 1;
@@ -4059,7 +4059,7 @@ long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp) (void))
         }
         break;
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     case SSL_CTRL_SET_TMP_ECDH_CB:
         {
             cert->ecdh_tmp_cb = (EC_KEY *(*)(SSL *, int, int))fp;
@@ -4251,14 +4251,12 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
 
 #ifndef OPENSSL_NO_TLSEXT
 # ifndef OPENSSL_NO_EC
-#  ifndef OPENSSL_NO_ECDH
         /*
          * if we are considering an ECC cipher suite that uses an ephemeral
          * EC key check it
          */
         if (alg_k & SSL_kECDHE)
             ok = ok && tls1_check_ec_tmp_key(s, c->id);
-#  endif                        /* OPENSSL_NO_ECDH */
 # endif                         /* OPENSSL_NO_EC */
 #endif                          /* OPENSSL_NO_TLSEXT */
 
@@ -4346,16 +4344,13 @@ int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
     if (!(alg_a & SSL_aDSS))
         p[ret++] = SSL3_CT_DSS_SIGN;
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     if ((alg_k & (SSL_kECDHr | SSL_kECDHe)) && (s->version >= TLS1_VERSION)) {
         if (nostrict || !(alg_a & SSL_aRSA))
             p[ret++] = TLS_CT_RSA_FIXED_ECDH;
         if (nostrict || !(alg_a & SSL_aECDSA))
             p[ret++] = TLS_CT_ECDSA_FIXED_ECDH;
     }
-#endif
-
-#ifndef OPENSSL_NO_ECDSA
     /*
      * ECDSA certs can be used with RSA cipher suites as well so we don't
      * need to check for SSL_kECDH or SSL_kECDHE
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 39c1574..ee66a5a 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -1532,7 +1532,7 @@ int ssl3_send_server_key_exchange(SSL *s)
 #ifndef OPENSSL_NO_DH
     DH *dh = NULL, *dhp;
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     EC_KEY *ecdh = NULL, *ecdhp;
     unsigned char *encodedPoint = NULL;
     int encodedlen = 0;
@@ -1654,7 +1654,7 @@ int ssl3_send_server_key_exchange(SSL *s)
             r[2] = dh->pub_key;
         } else
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
         if (type & SSL_kECDHE) {
             const EC_GROUP *group;
 
@@ -1782,7 +1782,7 @@ int ssl3_send_server_key_exchange(SSL *s)
             r[2] = NULL;
             r[3] = NULL;
         } else
-#endif                          /* !OPENSSL_NO_ECDH */
+#endif                          /* !OPENSSL_NO_EC */
 #ifndef OPENSSL_NO_PSK
         if (type & SSL_kPSK) {
             /*
@@ -1853,7 +1853,7 @@ int ssl3_send_server_key_exchange(SSL *s)
             p += nr[i];
         }
 
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
         if (type & SSL_kECDHE) {
             /*
              * XXX: For now, we only support named (not generic) curves. In
@@ -3001,7 +3001,7 @@ int ssl3_get_cert_verify(SSL *s)
         }
     } else
 #endif
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
     if (pkey->type == EVP_PKEY_EC) {
         j = ECDSA_verify(pkey->save_type,
                          &(s->s3->tmp.cert_verify_md[MD5_DIGEST_LENGTH]),
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 160d37c..56eb7ba 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1760,7 +1760,7 @@ void SSL_set_tmp_dh_callback(SSL *ssl,
                              DH *(*dh) (SSL *ssl, int is_export,
                                         int keylength));
 # endif
-# ifndef OPENSSL_NO_ECDH
+# ifndef OPENSSL_NO_EC
 void SSL_CTX_set_tmp_ecdh_callback(SSL_CTX *ctx,
                                    EC_KEY *(*ecdh) (SSL *ssl, int is_export,
                                                     int keylength));
diff --git a/ssl/ssl_algs.c b/ssl/ssl_algs.c
index 3843aef..504e4d7 100644
--- a/ssl/ssl_algs.c
+++ b/ssl/ssl_algs.c
@@ -122,7 +122,7 @@ int SSL_library_init(void)
     EVP_add_digest_alias(SN_dsaWithSHA1, "DSS1");
     EVP_add_digest_alias(SN_dsaWithSHA1, "dss1");
 #endif
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
     EVP_add_digest(EVP_ecdsa());
 #endif
 #ifndef OPENSSL_NO_COMP
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index 9742599..fa0c693 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -175,7 +175,7 @@ void ssl_cert_set_default_md(CERT *cert)
     cert->pkeys[SSL_PKEY_RSA_SIGN].digest = EVP_sha1();
     cert->pkeys[SSL_PKEY_RSA_ENC].digest = EVP_sha1();
 #endif
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
     cert->pkeys[SSL_PKEY_ECC].digest = EVP_sha1();
 #endif
 }
@@ -261,7 +261,7 @@ CERT *ssl_cert_dup(CERT *cert)
     ret->dh_tmp_auto = cert->dh_tmp_auto;
 #endif
 
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     if (cert->ecdh_tmp) {
         ret->ecdh_tmp = EC_KEY_dup(cert->ecdh_tmp);
         if (ret->ecdh_tmp == NULL) {
@@ -450,7 +450,7 @@ void ssl_cert_free(CERT *c)
     if (c->dh_tmp)
         DH_free(c->dh_tmp);
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     if (c->ecdh_tmp)
         EC_KEY_free(c->ecdh_tmp);
 #endif
@@ -683,7 +683,7 @@ void ssl_sess_cert_free(SESS_CERT *sc)
     if (sc->peer_dh_tmp != NULL)
         DH_free(sc->peer_dh_tmp);
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     if (sc->peer_ecdh_tmp != NULL)
         EC_KEY_free(sc->peer_ecdh_tmp);
 #endif
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 12820b6..f220e8e 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -748,12 +748,9 @@ static void ssl_cipher_get_disabled(unsigned long *mkey, unsigned long *auth,
     *mkey |= SSL_kKRB5;
     *auth |= SSL_aKRB5;
 #endif
-#ifdef OPENSSL_NO_ECDSA
-    *auth |= SSL_aECDSA;
-#endif
-#ifdef OPENSSL_NO_ECDH
+#ifdef OPENSSL_NO_EC
     *mkey |= SSL_kECDHe | SSL_kECDHr;
-    *auth |= SSL_aECDH;
+    *auth |= SSL_aECDSA | SSL_aECDH;
 #endif
 #ifdef OPENSSL_NO_PSK
     *mkey |= SSL_kPSK;
@@ -1437,7 +1434,7 @@ static int check_suiteb_cipher_list(const SSL_METHOD *meth, CERT *c,
                    SSL_R_ONLY_TLS_1_2_ALLOWED_IN_SUITEB_MODE);
         return 0;
     }
-# ifndef OPENSSL_NO_ECDH
+# ifndef OPENSSL_NO_EC
     switch (suiteb_flags) {
     case SSL_CERT_FLAG_SUITEB_128_LOS:
         if (suiteb_comb2)
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c
index 354f218..cfed40d 100644
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c
@@ -257,7 +257,7 @@ static int cmd_Curves(SSL_CONF_CTX *cctx, const char *value)
     return rv > 0;
 }
 
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
 /* ECDH temporary parameters */
 static int cmd_ECDHParameters(SSL_CONF_CTX *cctx, const char *value)
 {
@@ -447,7 +447,7 @@ static const ssl_conf_cmd_tbl ssl_conf_cmds[] = {
     SSL_CONF_CMD_STRING(SignatureAlgorithms, "sigalgs"),
     SSL_CONF_CMD_STRING(ClientSignatureAlgorithms, "client_sigalgs"),
     SSL_CONF_CMD_STRING(Curves, "curves"),
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     SSL_CONF_CMD_STRING(ECDHParameters, "named_curve"),
 #endif
     SSL_CONF_CMD_STRING(CipherString, "cipher"),
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index c535a42..3bce4cf 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2153,13 +2153,9 @@ void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
     int rsa_enc_export, dh_rsa_export, dh_dsa_export;
     int rsa_tmp_export, dh_tmp_export, kl;
     unsigned long mask_k, mask_a, emask_k, emask_a;
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
     int have_ecc_cert, ecdsa_ok, ecc_pkey_size;
-#endif
-#ifndef OPENSSL_NO_ECDH
     int have_ecdh_tmp, ecdh_ok;
-#endif
-#ifndef OPENSSL_NO_EC
     X509 *x = NULL;
     EVP_PKEY *ecc_pkey = NULL;
     int signature_nid = 0, pk_nid = 0, md_nid = 0;
@@ -2185,7 +2181,7 @@ void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
     dh_tmp = dh_tmp_export = 0;
 #endif
 
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     have_ecdh_tmp = (c->ecdh_tmp || c->ecdh_tmp_cb || c->ecdh_tmp_auto);
 #endif
     cpk = &(c->pkeys[SSL_PKEY_RSA_ENC]);
@@ -2283,10 +2279,8 @@ void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
         x = cpk->x509;
         /* This call populates extension flags (ex_flags) */
         X509_check_purpose(x, -1, 0);
-# ifndef OPENSSL_NO_ECDH
         ecdh_ok = (x->ex_flags & EXFLAG_KUSAGE) ?
             (x->ex_kusage & X509v3_KU_KEY_AGREEMENT) : 1;
-# endif
         ecdsa_ok = (x->ex_flags & EXFLAG_KUSAGE) ?
             (x->ex_kusage & X509v3_KU_DIGITAL_SIGNATURE) : 1;
         if (!(cpk->valid_flags & CERT_PKEY_SIGN))
@@ -2298,7 +2292,6 @@ void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
             signature_nid = OBJ_obj2nid(x->sig_alg->algorithm);
             OBJ_find_sigid_algs(signature_nid, &md_nid, &pk_nid);
         }
-# ifndef OPENSSL_NO_ECDH
         if (ecdh_ok) {
 
             if (pk_nid == NID_rsaEncryption || pk_nid == NID_rsa) {
@@ -2319,17 +2312,14 @@ void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
                 }
             }
         }
-# endif
-# ifndef OPENSSL_NO_ECDSA
         if (ecdsa_ok) {
             mask_a |= SSL_aECDSA;
             emask_a |= SSL_aECDSA;
         }
-# endif
     }
 #endif
 
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     if (have_ecdh_tmp) {
         mask_k |= SSL_kECDHE;
         emask_k |= SSL_kECDHE;
@@ -3267,7 +3257,7 @@ void SSL_set_tmp_dh_callback(SSL *ssl, DH *(*dh) (SSL *ssl, int is_export,
 }
 #endif
 
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
 void SSL_CTX_set_tmp_ecdh_callback(SSL_CTX *ctx,
                                    EC_KEY *(*ecdh) (SSL *ssl, int is_export,
                                                     int keylength))
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 7a8a303..a16ad08 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -1350,7 +1350,7 @@ typedef struct ssl3_state_st {
 #  ifndef OPENSSL_NO_DH
         DH *dh;
 #  endif
-#  ifndef OPENSSL_NO_ECDH
+#  ifndef OPENSSL_NO_EC
         EC_KEY *ecdh;           /* holds short lived ECDH key */
 #  endif
         /* used when SSL_ST_FLUSH_DATA is entered */
@@ -1662,7 +1662,7 @@ typedef struct cert_st {
     DH *(*dh_tmp_cb) (SSL *ssl, int is_export, int keysize);
     int dh_tmp_auto;
 # endif
-# ifndef OPENSSL_NO_ECDH
+# ifndef OPENSSL_NO_EC
     EC_KEY *ecdh_tmp;
     /* Callback for generating ephemeral ECDH keys */
     EC_KEY *(*ecdh_tmp_cb) (SSL *ssl, int is_export, int keysize);
@@ -1760,7 +1760,7 @@ typedef struct sess_cert_st {
 # ifndef OPENSSL_NO_DH
     DH *peer_dh_tmp;            /* not used for SSL 2 */
 # endif
-# ifndef OPENSSL_NO_ECDH
+# ifndef OPENSSL_NO_EC
     EC_KEY *peer_ecdh_tmp;
 # endif
     int references;             /* actually always 1 at the moment */
@@ -2317,7 +2317,7 @@ int tls1_alert_code(int code);
 int ssl3_alert_code(int code);
 int ssl_ok(SSL *s);
 
-#  ifndef OPENSSL_NO_ECDH
+#  ifndef OPENSSL_NO_EC
 int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s);
 #  endif
 
@@ -2332,9 +2332,7 @@ int tls1_set_curves(unsigned char **pext, size_t *pextlen,
                     int *curves, size_t ncurves);
 int tls1_set_curves_list(unsigned char **pext, size_t *pextlen,
                          const char *str);
-#   ifndef OPENSSL_NO_ECDH
 int tls1_check_ec_tmp_key(SSL *s, unsigned long id);
-#   endif                       /* OPENSSL_NO_ECDH */
 #  endif                        /* OPENSSL_NO_EC */
 
 #  ifndef OPENSSL_NO_TLSEXT
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 89fb44a..7a157a6 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -774,7 +774,7 @@ static void sv_usage(void)
             " -dhe1024dsa   - use 1024 bit key (with 160-bit subprime) for DHE\n");
     fprintf(stderr, " -no_dhe       - disable DHE\n");
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     fprintf(stderr, " -no_ecdhe     - disable ECDHE\n");
 #endif
 #ifndef OPENSSL_NO_PSK
@@ -803,7 +803,7 @@ static void sv_usage(void)
             " -time         - measure processor time used by client and server\n");
     fprintf(stderr, " -zlib         - use zlib compression\n");
     fprintf(stderr, " -rle          - use rle compression\n");
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     fprintf(stderr,
             " -named_curve arg  - Elliptic curve name to use for ephemeral ECDH keys.\n"
             "                 Use \"openssl ecparam -list_curves\" for all names\n"
@@ -967,7 +967,7 @@ int main(int argc, char *argv[])
     char *server_key = NULL;
     char *client_cert = TEST_CLIENT_CERT;
     char *client_key = NULL;
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     char *named_curve = NULL;
 #endif
     SSL_CTX *s_ctx = NULL;
@@ -980,7 +980,7 @@ int main(int argc, char *argv[])
     DH *dh;
     int dhe1024 = 0, dhe1024dsa = 0;
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     EC_KEY *ecdh = NULL;
 #endif
 #ifndef OPENSSL_NO_SRP
@@ -1206,7 +1206,7 @@ int main(int argc, char *argv[])
         else if (strcmp(*argv, "-named_curve") == 0) {
             if (--argc < 1)
                 goto bad;
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
             named_curve = *(++argv);
 #else
             fprintf(stderr,
@@ -1470,7 +1470,7 @@ int main(int argc, char *argv[])
     (void)no_dhe;
 #endif
 
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     if (!no_ecdhe) {
         int nid;
 
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index c91b761..8296ea1 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -798,7 +798,7 @@ static int tls1_check_cert_param(SSL *s, X509 *x, int set_ee_md)
     return rv;
 }
 
-# ifndef OPENSSL_NO_ECDH
+# ifndef OPENSSL_NO_EC
 /* Check EC temporary key is compatible with client extensions */
 int tls1_check_ec_tmp_key(SSL *s, unsigned long cid)
 {
@@ -863,7 +863,7 @@ int tls1_check_ec_tmp_key(SSL *s, unsigned long cid)
     return tls1_check_ec_key(s, curve_id, NULL);
 #  endif
 }
-# endif                         /* OPENSSL_NO_ECDH */
+# endif                         /* OPENSSL_NO_EC */
 
 #else
 
@@ -893,9 +893,8 @@ static int tls1_check_cert_param(SSL *s, X509 *x, int set_ee_md)
 #  define tlsext_sigalg_dsa(md) md, TLSEXT_signature_dsa,
 # endif
 
-# ifdef OPENSSL_NO_ECDSA
-#  define tlsext_sigalg_ecdsa(md)
-                                /* */
+# ifdef OPENSSL_NO_EC
+#  define tlsext_sigalg_ecdsa(md) /* */
 # else
 #  define tlsext_sigalg_ecdsa(md) md, TLSEXT_signature_ecdsa,
 # endif
@@ -913,7 +912,7 @@ static const unsigned char tls12_sigalgs[] = {
         tlsext_sigalg(TLSEXT_hash_sha1)
 };
 
-# ifndef OPENSSL_NO_ECDSA
+# ifndef OPENSSL_NO_EC
 static const unsigned char suiteb_sigalgs[] = {
     tlsext_sigalg_ecdsa(TLSEXT_hash_sha256)
         tlsext_sigalg_ecdsa(TLSEXT_hash_sha384)
@@ -3246,7 +3245,7 @@ static int tls12_get_pkey_idx(unsigned char sig_alg)
     case TLSEXT_signature_dsa:
         return SSL_PKEY_DSA_SIGN;
 # endif
-# ifndef OPENSSL_NO_ECDSA
+# ifndef OPENSSL_NO_EC
     case TLSEXT_signature_ecdsa:
         return SSL_PKEY_ECC;
 # endif
@@ -3326,7 +3325,7 @@ void ssl_set_sig_mask(unsigned long *pmask_a, SSL *s, int op)
                 have_dsa = 1;
             break;
 # endif
-# ifndef OPENSSL_NO_ECDSA
+# ifndef OPENSSL_NO_EC
         case TLSEXT_signature_ecdsa:
             if (!have_ecdsa && tls12_sigalg_allowed(s, op, sigalgs))
                 have_ecdsa = 1;
@@ -3521,7 +3520,7 @@ int tls1_process_sigalgs(SSL *s)
             c->pkeys[SSL_PKEY_RSA_ENC].digest = EVP_sha1();
         }
 # endif
-# ifndef OPENSSL_NO_ECDSA
+# ifndef OPENSSL_NO_EC
         if (!c->pkeys[SSL_PKEY_ECC].digest)
             c->pkeys[SSL_PKEY_ECC].digest = EVP_sha1();
 # endif
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 809e9b3..d3379d2 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -142,8 +142,6 @@ and [options] can be one of
 	no-krb5					- No KRB5
 	no-srp					- No SRP
 	no-ec					- No EC
-	no-ecdsa				- No ECDSA
-	no-ecdh					- No ECDH
 	no-engine				- No engine
 	no-hw					- No hw
 	nasm 					- Use NASM for x86 asm
@@ -298,8 +296,6 @@ $cflags.=" -DOPENSSL_NO_CMS" if $no_cms;
 $cflags.=" -DOPENSSL_NO_ERR"  if $no_err;
 $cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;
 $cflags.=" -DOPENSSL_NO_EC"   if $no_ec;
-$cflags.=" -DOPENSSL_NO_ECDSA" if $no_ecdsa;
-$cflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh;
 $cflags.=" -DOPENSSL_NO_GOST" if $no_gost;
 $cflags.=" -DOPENSSL_NO_ENGINE"   if $no_engine;
 $cflags.=" -DOPENSSL_NO_HW"   if $no_hw;
@@ -1427,8 +1423,6 @@ sub read_options
 		"no-sock" => \$no_sock,
 		"no-krb5" => \$no_krb5,
 		"no-ec" => \$no_ec,
-		"no-ecdsa" => \$no_ecdsa,
-		"no-ecdh" => \$no_ecdh,
 		"no-gost" => \$no_gost,
 		"no-engine" => \$no_engine,
 		"no-hw" => \$no_hw,

From appro at openssl.org  Thu Mar 12 07:56:07 2015
From: appro at openssl.org (Andy Polyakov)
Date: Thu, 12 Mar 2015 07:56:07 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426146967.440195.4863.nullmailer@dev.openssl.org>

The branch master has been updated
       via  6b937f8b115d817b00116bc6291d604b16dc4602 (commit)
      from  10bf4fc2c3da332a54247da1f3c0dcb44944f7ff (commit)


- Log -----------------------------------------------------------------
commit 6b937f8b115d817b00116bc6291d604b16dc4602
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Mar 12 08:54:28 2015 +0100

    ssl/s3_clnt.c: fix intermittent failures.
    
    [and respect error return value in ssltest.c]
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 ssl/s3_clnt.c | 1 +
 ssl/ssltest.c | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 1e611c4..b37a733 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -2580,6 +2580,7 @@ int ssl3_send_client_key_exchange(SSL *s)
                 DH_free(dh_clnt);
                 goto err;
             }
+            pmslen = n;
 
             if (s->s3->flags & TLS1_FLAGS_SKIP_CERT_VERIFY)
                 n = 0;
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 7a157a6..12d3efb 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -1707,13 +1707,14 @@ int main(int argc, char *argv[])
             ret = doit_biopair(s_ssl, c_ssl, bytes, &s_time, &c_time);
         else
             ret = doit(s_ssl, c_ssl, bytes);
+	if (ret)  break;
     }
 
     if (!verbose) {
         print_details(c_ssl, "");
     }
-    if ((number > 1) || (bytes > 1L))
-        BIO_printf(bio_stdout, "%d handshakes of %ld bytes done\n", number,
+    if ((i > 1) || (bytes > 1L))
+        BIO_printf(bio_stdout, "%d handshakes of %ld bytes done\n", i,
                    bytes);
     if (print_time) {
 #ifdef CLOCKS_PER_SEC

From appro at openssl.org  Thu Mar 12 08:08:55 2015
From: appro at openssl.org (Andy Polyakov)
Date: Thu, 12 Mar 2015 08:08:55 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1426147735.240489.8613.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  df57e42baa0c1c8a97035adb9ffb2f335158c440 (commit)
      from  9c5c18500bfb58fe0eedfbab71409b6ebc4d2d4c (commit)


- Log -----------------------------------------------------------------
commit df57e42baa0c1c8a97035adb9ffb2f335158c440
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Feb 9 11:46:19 2015 +0100

    evp/e_aes.c: fix SPARC T4-specific problem:
    
    - SIGSEGV/ILL in CCM (RT#3688);
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/evp/e_aes.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 41844bc..8161b26 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -790,6 +790,8 @@ static int aes_t4_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
         default:
             return 0;
         }
+#  else
+        cctx->str = NULL;
 #  endif
         cctx->key_set = 1;
     }

From matt at openssl.org  Thu Mar 12 09:35:52 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 12 Mar 2015 09:35:52 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1426152952.753983.15511.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  f06249f112a37c0caece07e90ebb01b525e62fd7 (commit)
       via  2407241fb27c5ebd69262024b8abf9486708c7e6 (commit)
       via  3942e7d9ebc262fa5c5c42aba0167e06d981f004 (commit)
       via  2679485e69c55b8186bc14d4947fc508c5f55358 (commit)
       via  e6dcb08984b2e3f765ab5a2f45aaf0a8cc263bba (commit)
       via  0c8f4229995bbb51bd29c314e2d71d7edce229de (commit)
       via  cc27bec2b40ca6741125cbeef6a214dfbe1f85f9 (commit)
      from  f5ee5213073870493a8ade98b13ea41a2b20b8d4 (commit)


- Log -----------------------------------------------------------------
commit f06249f112a37c0caece07e90ebb01b525e62fd7
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 20:50:20 2015 +0000

    Fix missing return checks in v3_cpols.c
    
    Fixed assorted missing return value checks in c3_cpols.c
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit c5f2b5336ab72e40ab91e2ca85639f51fa3178c6)

commit 2407241fb27c5ebd69262024b8abf9486708c7e6
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 20:19:08 2015 +0000

    Fix dsa_pub_encode
    
    The return value from ASN1_STRING_new() was not being checked which could
    lead to a NULL deref in the event of a malloc failure. Also fixed a mem
    leak in the error path.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 0c7ca4033dcf5398334d4b78a7dfb941c8167a40)

commit 3942e7d9ebc262fa5c5c42aba0167e06d981f004
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 20:08:16 2015 +0000

    Fix dh_pub_encode
    
    The return value from ASN1_STRING_new() was not being checked which could
    lead to a NULL deref in the event of a malloc failure. Also fixed a mem
    leak in the error path.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 6aa8dab2bbfd5ad3cfc0d07fe5d7243635d5b2a2)
    
    Conflicts:
    	crypto/dh/dh_ameth.c

commit 2679485e69c55b8186bc14d4947fc508c5f55358
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 19:41:01 2015 +0000

    Fix asn1_item_print_ctx
    
    The call to asn1_do_adb can return NULL on error, so we should check the
    return value before attempting to use it.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 34a7ed0c39aa3ab67eea1e106577525eaf0d7a00)

commit e6dcb08984b2e3f765ab5a2f45aaf0a8cc263bba
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 16:00:01 2015 +0000

    ASN1_primitive_new NULL param handling
    
    ASN1_primitive_new takes an ASN1_ITEM * param |it|. There are a couple
    of conditional code paths that check whether |it| is NULL or not - but
    later |it| is deref'd unconditionally. If |it| was ever really NULL then
    this would seg fault. In practice ASN1_primitive_new is marked as an
    internal function in the public header file. The only places it is ever
    used internally always pass a non NULL parameter for |it|. Therefore, change
    the code to sanity check that |it| is not NULL, and remove the conditional
    checking.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit 9e488fd6ab2c295941e91a47ab7bcd346b7540c7)

commit 0c8f4229995bbb51bd29c314e2d71d7edce229de
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 15:41:52 2015 +0000

    Fix EVP_DigestInit_ex with NULL digest
    
    Calling EVP_DigestInit_ex which has already had the digest set up for it
    should be possible. You are supposed to be able to pass NULL for the type.
    However currently this seg faults.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit a01087027bd0c5ec053d4eabd972bd942bfcd92f)

commit cc27bec2b40ca6741125cbeef6a214dfbe1f85f9
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 15:31:16 2015 +0000

    Fix error handling in bn_exp
    
    In the event of an error |rr| could be NULL. Therefore don't assume you can
    use |rr| in the error handling code.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit 8c5a7b33c6269c3bd6bc0df6b4c22e4fba03b485)

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

Summary of changes:
 crypto/asn1/tasn_new.c   |  7 +++++--
 crypto/asn1/tasn_prn.c   |  2 ++
 crypto/bn/bn_exp.c       |  4 ++--
 crypto/dh/dh_ameth.c     | 12 +++++++-----
 crypto/dsa/dsa_ameth.c   | 14 ++++++++------
 crypto/evp/digest.c      |  9 ++++++---
 crypto/x509v3/v3_cpols.c | 16 ++++++++++++----
 7 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c
index d25c68c..7d2964f 100644
--- a/crypto/asn1/tasn_new.c
+++ b/crypto/asn1/tasn_new.c
@@ -315,13 +315,16 @@ int ASN1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
     ASN1_STRING *str;
     int utype;
 
-    if (it && it->funcs) {
+    if (!it)
+        return 0;
+
+    if (it->funcs) {
         const ASN1_PRIMITIVE_FUNCS *pf = it->funcs;
         if (pf->prim_new)
             return pf->prim_new(pval, it);
     }
 
-    if (!it || (it->itype == ASN1_ITYPE_MSTRING))
+    if (it->itype == ASN1_ITYPE_MSTRING)
         utype = -1;
     else
         utype = it->utype;
diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
index 11d784c..4866dcd 100644
--- a/crypto/asn1/tasn_prn.c
+++ b/crypto/asn1/tasn_prn.c
@@ -289,6 +289,8 @@ static int asn1_item_print_ctx(BIO *out, ASN1_VALUE **fld, int indent,
         for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) {
             const ASN1_TEMPLATE *seqtt;
             seqtt = asn1_do_adb(fld, tt, 1);
+            if(!seqtt)
+                return 0;
             tmpfld = asn1_get_field_ptr(fld, seqtt);
             if (!asn1_template_print_ctx(out, tmpfld,
                                          indent + 2, seqtt, pctx))
diff --git a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c
index fca4014..27146c8 100644
--- a/crypto/bn/bn_exp.c
+++ b/crypto/bn/bn_exp.c
@@ -168,10 +168,10 @@ int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
                 goto err;
         }
     }
-    ret = 1;
- err:
     if (r != rr)
         BN_copy(r, rr);
+    ret = 1;
+ err:
     BN_CTX_end(ctx);
     bn_check_top(r);
     return (ret);
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index 680400f..1dec109 100644
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -126,7 +126,6 @@ static int dh_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
 static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
 {
     DH *dh;
-    void *pval = NULL;
     int ptype;
     unsigned char *penc = NULL;
     int penclen;
@@ -136,12 +135,15 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     dh = pkey->pkey.dh;
 
     str = ASN1_STRING_new();
+    if(!str) {
+        DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
     str->length = i2d_DHparams(dh, &str->data);
     if (str->length <= 0) {
         DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
         goto err;
     }
-    pval = str;
     ptype = V_ASN1_SEQUENCE;
 
     pub_key = BN_to_ASN1_INTEGER(dh->pub_key, NULL);
@@ -158,14 +160,14 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     }
 
     if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(EVP_PKEY_DH),
-                               ptype, pval, penc, penclen))
+                               ptype, str, penc, penclen))
         return 1;
 
  err:
     if (penc)
         OPENSSL_free(penc);
-    if (pval)
-        ASN1_STRING_free(pval);
+    if (str)
+        ASN1_STRING_free(str);
 
     return 0;
 }
diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index 1b29d81..a2840ea 100644
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -129,21 +129,23 @@ static int dsa_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
 static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
 {
     DSA *dsa;
-    void *pval = NULL;
     int ptype;
     unsigned char *penc = NULL;
     int penclen;
+    ASN1_STRING *str = NULL;
 
     dsa = pkey->pkey.dsa;
     if (pkey->save_parameters && dsa->p && dsa->q && dsa->g) {
-        ASN1_STRING *str;
         str = ASN1_STRING_new();
+        if (!str) {
+            DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
+            goto err;
+        }
         str->length = i2d_DSAparams(dsa, &str->data);
         if (str->length <= 0) {
             DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
             goto err;
         }
-        pval = str;
         ptype = V_ASN1_SEQUENCE;
     } else
         ptype = V_ASN1_UNDEF;
@@ -158,14 +160,14 @@ static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     }
 
     if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(EVP_PKEY_DSA),
-                               ptype, pval, penc, penclen))
+                               ptype, str, penc, penclen))
         return 1;
 
  err:
     if (penc)
         OPENSSL_free(penc);
-    if (pval)
-        ASN1_STRING_free(pval);
+    if (str)
+        ASN1_STRING_free(str);
 
     return 0;
 }
diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index 386a3f7..2e202c8 100644
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.c
@@ -191,9 +191,12 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl)
             ctx->engine = impl;
         } else
             ctx->engine = NULL;
-    } else if (!ctx->digest) {
-        EVPerr(EVP_F_EVP_DIGESTINIT_EX, EVP_R_NO_DIGEST_SET);
-        return 0;
+    } else {
+        if (!ctx->digest) {
+            EVPerr(EVP_F_EVP_DIGESTINIT_EX, EVP_R_NO_DIGEST_SET);
+            return 0;
+        }
+        type = ctx->digest;
     }
 #endif
     if (ctx->digest != type) {
diff --git a/crypto/x509v3/v3_cpols.c b/crypto/x509v3/v3_cpols.c
index 476d51c..dca6ab2 100644
--- a/crypto/x509v3/v3_cpols.c
+++ b/crypto/x509v3/v3_cpols.c
@@ -230,8 +230,12 @@ static POLICYINFO *policy_section(X509V3_CTX *ctx,
                 goto merr;
             if (!sk_POLICYQUALINFO_push(pol->qualifiers, qual))
                 goto merr;
-            qual->pqualid = OBJ_nid2obj(NID_id_qt_cps);
-            qual->d.cpsuri = M_ASN1_IA5STRING_new();
+            if(!(qual->pqualid = OBJ_nid2obj(NID_id_qt_cps))) {
+                X509V3err(X509V3_F_POLICY_SECTION, ERR_R_INTERNAL_ERROR);
+                goto err;
+            }
+            if(!(qual->d.cpsuri = M_ASN1_IA5STRING_new()))
+                goto merr;
             if (!ASN1_STRING_set(qual->d.cpsuri, cnf->value,
                                  strlen(cnf->value)))
                 goto merr;
@@ -290,14 +294,18 @@ static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
     POLICYQUALINFO *qual;
     if (!(qual = POLICYQUALINFO_new()))
         goto merr;
-    qual->pqualid = OBJ_nid2obj(NID_id_qt_unotice);
+    if(!(qual->pqualid = OBJ_nid2obj(NID_id_qt_unotice))) {
+        X509V3err(X509V3_F_NOTICE_SECTION, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
     if (!(not = USERNOTICE_new()))
         goto merr;
     qual->d.usernotice = not;
     for (i = 0; i < sk_CONF_VALUE_num(unot); i++) {
         cnf = sk_CONF_VALUE_value(unot, i);
         if (!strcmp(cnf->name, "explicitText")) {
-            not->exptext = M_ASN1_VISIBLESTRING_new();
+            if(!(not->exptext = M_ASN1_VISIBLESTRING_new()))
+                goto merr;
             if (!ASN1_STRING_set(not->exptext, cnf->value,
                                  strlen(cnf->value)))
                 goto merr;

From matt at openssl.org  Thu Mar 12 09:36:07 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 12 Mar 2015 09:36:07 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1426152967.629264.15882.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  327de270d583e716bc0282dd0d59e133f41d7ada (commit)
       via  8e91b3d99115121765a15dbb685aa772b73b97ad (commit)
       via  20223855e418e1a4cd5f964e4e504d53b8a00fd4 (commit)
       via  563fc239d23985f7e7a7300003bd8eb173224354 (commit)
       via  15919ecadc3ba9fc210472b806e6ac258825ea83 (commit)
       via  289c06823e52ce0e00b4f19ee260635ac1b02e98 (commit)
       via  ff2459b91877959bc1a3a8a927c6b5f473530f86 (commit)
       via  8944d10e2d444b7fc5e60d4f13644c6648f49e74 (commit)
      from  df57e42baa0c1c8a97035adb9ffb2f335158c440 (commit)


- Log -----------------------------------------------------------------
commit 327de270d583e716bc0282dd0d59e133f41d7ada
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 17:01:38 2015 +0000

    SSL_check_chain fix
    
    If SSL_check_chain is called with a NULL X509 object or a NULL EVP_PKEY
    or the type of the public key is unrecognised then the local variable
    |cpk| in tls1_check_chain does not get initialised. Subsequently an
    attempt is made to deref it (after the "end" label), and a seg fault will
    result.
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>
    (cherry picked from commit d813f9eb383a93e472e69750cd1edbb170205ad2)

commit 8e91b3d99115121765a15dbb685aa772b73b97ad
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 20:50:20 2015 +0000

    Fix missing return checks in v3_cpols.c
    
    Fixed assorted missing return value checks in c3_cpols.c
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit c5f2b5336ab72e40ab91e2ca85639f51fa3178c6)

commit 20223855e418e1a4cd5f964e4e504d53b8a00fd4
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 20:19:08 2015 +0000

    Fix dsa_pub_encode
    
    The return value from ASN1_STRING_new() was not being checked which could
    lead to a NULL deref in the event of a malloc failure. Also fixed a mem
    leak in the error path.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 0c7ca4033dcf5398334d4b78a7dfb941c8167a40)

commit 563fc239d23985f7e7a7300003bd8eb173224354
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 20:08:16 2015 +0000

    Fix dh_pub_encode
    
    The return value from ASN1_STRING_new() was not being checked which could
    lead to a NULL deref in the event of a malloc failure. Also fixed a mem
    leak in the error path.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 6aa8dab2bbfd5ad3cfc0d07fe5d7243635d5b2a2)

commit 15919ecadc3ba9fc210472b806e6ac258825ea83
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 19:41:01 2015 +0000

    Fix asn1_item_print_ctx
    
    The call to asn1_do_adb can return NULL on error, so we should check the
    return value before attempting to use it.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 34a7ed0c39aa3ab67eea1e106577525eaf0d7a00)

commit 289c06823e52ce0e00b4f19ee260635ac1b02e98
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 16:00:01 2015 +0000

    ASN1_primitive_new NULL param handling
    
    ASN1_primitive_new takes an ASN1_ITEM * param |it|. There are a couple
    of conditional code paths that check whether |it| is NULL or not - but
    later |it| is deref'd unconditionally. If |it| was ever really NULL then
    this would seg fault. In practice ASN1_primitive_new is marked as an
    internal function in the public header file. The only places it is ever
    used internally always pass a non NULL parameter for |it|. Therefore, change
    the code to sanity check that |it| is not NULL, and remove the conditional
    checking.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit 9e488fd6ab2c295941e91a47ab7bcd346b7540c7)

commit ff2459b91877959bc1a3a8a927c6b5f473530f86
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 15:41:52 2015 +0000

    Fix EVP_DigestInit_ex with NULL digest
    
    Calling EVP_DigestInit_ex which has already had the digest set up for it
    should be possible. You are supposed to be able to pass NULL for the type.
    However currently this seg faults.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit a01087027bd0c5ec053d4eabd972bd942bfcd92f)

commit 8944d10e2d444b7fc5e60d4f13644c6648f49e74
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 15:31:16 2015 +0000

    Fix error handling in bn_exp
    
    In the event of an error |rr| could be NULL. Therefore don't assume you can
    use |rr| in the error handling code.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit 8c5a7b33c6269c3bd6bc0df6b4c22e4fba03b485)

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

Summary of changes:
 crypto/asn1/tasn_new.c   |  7 +++++--
 crypto/asn1/tasn_prn.c   |  2 ++
 crypto/bn/bn_exp.c       |  4 ++--
 crypto/dh/dh_ameth.c     | 12 +++++++-----
 crypto/dsa/dsa_ameth.c   | 14 ++++++++------
 crypto/evp/digest.c      |  9 ++++++---
 crypto/x509v3/v3_cpols.c | 16 ++++++++++++----
 ssl/t1_lib.c             |  4 ++--
 8 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c
index d25c68c..7d2964f 100644
--- a/crypto/asn1/tasn_new.c
+++ b/crypto/asn1/tasn_new.c
@@ -315,13 +315,16 @@ int ASN1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
     ASN1_STRING *str;
     int utype;
 
-    if (it && it->funcs) {
+    if (!it)
+        return 0;
+
+    if (it->funcs) {
         const ASN1_PRIMITIVE_FUNCS *pf = it->funcs;
         if (pf->prim_new)
             return pf->prim_new(pval, it);
     }
 
-    if (!it || (it->itype == ASN1_ITYPE_MSTRING))
+    if (it->itype == ASN1_ITYPE_MSTRING)
         utype = -1;
     else
         utype = it->utype;
diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
index 11d784c..4866dcd 100644
--- a/crypto/asn1/tasn_prn.c
+++ b/crypto/asn1/tasn_prn.c
@@ -289,6 +289,8 @@ static int asn1_item_print_ctx(BIO *out, ASN1_VALUE **fld, int indent,
         for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) {
             const ASN1_TEMPLATE *seqtt;
             seqtt = asn1_do_adb(fld, tt, 1);
+            if(!seqtt)
+                return 0;
             tmpfld = asn1_get_field_ptr(fld, seqtt);
             if (!asn1_template_print_ctx(out, tmpfld,
                                          indent + 2, seqtt, pctx))
diff --git a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c
index 28a9fd5..8c46e50 100644
--- a/crypto/bn/bn_exp.c
+++ b/crypto/bn/bn_exp.c
@@ -185,10 +185,10 @@ int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
                 goto err;
         }
     }
-    ret = 1;
- err:
     if (r != rr)
         BN_copy(r, rr);
+    ret = 1;
+ err:
     BN_CTX_end(ctx);
     bn_check_top(r);
     return (ret);
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index 1d573a4..c6bfc2d 100644
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -151,7 +151,6 @@ static int dh_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
 static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
 {
     DH *dh;
-    void *pval = NULL;
     int ptype;
     unsigned char *penc = NULL;
     int penclen;
@@ -161,12 +160,15 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     dh = pkey->pkey.dh;
 
     str = ASN1_STRING_new();
+    if(!str) {
+        DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
     str->length = i2d_dhp(pkey, dh, &str->data);
     if (str->length <= 0) {
         DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
         goto err;
     }
-    pval = str;
     ptype = V_ASN1_SEQUENCE;
 
     pub_key = BN_to_ASN1_INTEGER(dh->pub_key, NULL);
@@ -183,14 +185,14 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     }
 
     if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(pkey->ameth->pkey_id),
-                               ptype, pval, penc, penclen))
+                               ptype, str, penc, penclen))
         return 1;
 
  err:
     if (penc)
         OPENSSL_free(penc);
-    if (pval)
-        ASN1_STRING_free(pval);
+    if (str)
+        ASN1_STRING_free(str);
 
     return 0;
 }
diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index 529efb7..2a5cd71 100644
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -129,21 +129,23 @@ static int dsa_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
 static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
 {
     DSA *dsa;
-    void *pval = NULL;
     int ptype;
     unsigned char *penc = NULL;
     int penclen;
+    ASN1_STRING *str = NULL;
 
     dsa = pkey->pkey.dsa;
     if (pkey->save_parameters && dsa->p && dsa->q && dsa->g) {
-        ASN1_STRING *str;
         str = ASN1_STRING_new();
+        if (!str) {
+            DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
+            goto err;
+        }
         str->length = i2d_DSAparams(dsa, &str->data);
         if (str->length <= 0) {
             DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
             goto err;
         }
-        pval = str;
         ptype = V_ASN1_SEQUENCE;
     } else
         ptype = V_ASN1_UNDEF;
@@ -158,14 +160,14 @@ static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     }
 
     if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(EVP_PKEY_DSA),
-                               ptype, pval, penc, penclen))
+                               ptype, str, penc, penclen))
         return 1;
 
  err:
     if (penc)
         OPENSSL_free(penc);
-    if (pval)
-        ASN1_STRING_free(pval);
+    if (str)
+        ASN1_STRING_free(str);
 
     return 0;
 }
diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index bd7760d..f2643f3 100644
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.c
@@ -203,9 +203,12 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl)
             ctx->engine = impl;
         } else
             ctx->engine = NULL;
-    } else if (!ctx->digest) {
-        EVPerr(EVP_F_EVP_DIGESTINIT_EX, EVP_R_NO_DIGEST_SET);
-        return 0;
+    } else {
+        if (!ctx->digest) {
+            EVPerr(EVP_F_EVP_DIGESTINIT_EX, EVP_R_NO_DIGEST_SET);
+            return 0;
+        }
+        type = ctx->digest;
     }
 #endif
     if (ctx->digest != type) {
diff --git a/crypto/x509v3/v3_cpols.c b/crypto/x509v3/v3_cpols.c
index 476d51c..dca6ab2 100644
--- a/crypto/x509v3/v3_cpols.c
+++ b/crypto/x509v3/v3_cpols.c
@@ -230,8 +230,12 @@ static POLICYINFO *policy_section(X509V3_CTX *ctx,
                 goto merr;
             if (!sk_POLICYQUALINFO_push(pol->qualifiers, qual))
                 goto merr;
-            qual->pqualid = OBJ_nid2obj(NID_id_qt_cps);
-            qual->d.cpsuri = M_ASN1_IA5STRING_new();
+            if(!(qual->pqualid = OBJ_nid2obj(NID_id_qt_cps))) {
+                X509V3err(X509V3_F_POLICY_SECTION, ERR_R_INTERNAL_ERROR);
+                goto err;
+            }
+            if(!(qual->d.cpsuri = M_ASN1_IA5STRING_new()))
+                goto merr;
             if (!ASN1_STRING_set(qual->d.cpsuri, cnf->value,
                                  strlen(cnf->value)))
                 goto merr;
@@ -290,14 +294,18 @@ static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
     POLICYQUALINFO *qual;
     if (!(qual = POLICYQUALINFO_new()))
         goto merr;
-    qual->pqualid = OBJ_nid2obj(NID_id_qt_unotice);
+    if(!(qual->pqualid = OBJ_nid2obj(NID_id_qt_unotice))) {
+        X509V3err(X509V3_F_NOTICE_SECTION, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
     if (!(not = USERNOTICE_new()))
         goto merr;
     qual->d.usernotice = not;
     for (i = 0; i < sk_CONF_VALUE_num(unot); i++) {
         cnf = sk_CONF_VALUE_value(unot, i);
         if (!strcmp(cnf->name, "explicitText")) {
-            not->exptext = M_ASN1_VISIBLESTRING_new();
+            if(!(not->exptext = M_ASN1_VISIBLESTRING_new()))
+                goto merr;
             if (!ASN1_STRING_set(not->exptext, cnf->value,
                                  strlen(cnf->value)))
                 goto merr;
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 2c3a1ec..6e991e0 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -4126,10 +4126,10 @@ int tls1_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain,
 # endif
     } else {
         if (!x || !pk)
-            goto end;
+            return 0;
         idx = ssl_cert_type(x, pk);
         if (idx == -1)
-            goto end;
+            return 0;
         cpk = c->pkeys + idx;
         if (c->cert_flags & SSL_CERT_FLAGS_CHECK_TLS_STRICT)
             check_flags = CERT_PKEY_STRICT_FLAGS;

From matt at openssl.org  Thu Mar 12 09:36:17 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 12 Mar 2015 09:36:17 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426152978.002958.16182.nullmailer@dev.openssl.org>

The branch master has been updated
       via  007fd1404fc7a2ed33f6108bc3859d3814b44224 (commit)
       via  d813f9eb383a93e472e69750cd1edbb170205ad2 (commit)
       via  c5f2b5336ab72e40ab91e2ca85639f51fa3178c6 (commit)
       via  0c7ca4033dcf5398334d4b78a7dfb941c8167a40 (commit)
       via  6aa8dab2bbfd5ad3cfc0d07fe5d7243635d5b2a2 (commit)
       via  34a7ed0c39aa3ab67eea1e106577525eaf0d7a00 (commit)
       via  9e488fd6ab2c295941e91a47ab7bcd346b7540c7 (commit)
       via  a01087027bd0c5ec053d4eabd972bd942bfcd92f (commit)
       via  8c5a7b33c6269c3bd6bc0df6b4c22e4fba03b485 (commit)
      from  6b937f8b115d817b00116bc6291d604b16dc4602 (commit)


- Log -----------------------------------------------------------------
commit 007fd1404fc7a2ed33f6108bc3859d3814b44224
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 17:43:38 2015 +0000

    Fix RSA_X931_derive_ex
    
    In the RSA_X931_derive_ex a call to BN_CTX_new is made. This can return
    NULL on error. However the return value is not tested until *after* it is
    derefed! Also at the top of the function a test is made to ensure that
    |rsa| is not NULL. If it is we go to the "err" label. Unfortunately the
    error handling code deref's rsa.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit d813f9eb383a93e472e69750cd1edbb170205ad2
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 17:01:38 2015 +0000

    SSL_check_chain fix
    
    If SSL_check_chain is called with a NULL X509 object or a NULL EVP_PKEY
    or the type of the public key is unrecognised then the local variable
    |cpk| in tls1_check_chain does not get initialised. Subsequently an
    attempt is made to deref it (after the "end" label), and a seg fault will
    result.
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

commit c5f2b5336ab72e40ab91e2ca85639f51fa3178c6
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 20:50:20 2015 +0000

    Fix missing return checks in v3_cpols.c
    
    Fixed assorted missing return value checks in c3_cpols.c
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 0c7ca4033dcf5398334d4b78a7dfb941c8167a40
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 20:19:08 2015 +0000

    Fix dsa_pub_encode
    
    The return value from ASN1_STRING_new() was not being checked which could
    lead to a NULL deref in the event of a malloc failure. Also fixed a mem
    leak in the error path.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 6aa8dab2bbfd5ad3cfc0d07fe5d7243635d5b2a2
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 20:08:16 2015 +0000

    Fix dh_pub_encode
    
    The return value from ASN1_STRING_new() was not being checked which could
    lead to a NULL deref in the event of a malloc failure. Also fixed a mem
    leak in the error path.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 34a7ed0c39aa3ab67eea1e106577525eaf0d7a00
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 19:41:01 2015 +0000

    Fix asn1_item_print_ctx
    
    The call to asn1_do_adb can return NULL on error, so we should check the
    return value before attempting to use it.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 9e488fd6ab2c295941e91a47ab7bcd346b7540c7
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 16:00:01 2015 +0000

    ASN1_primitive_new NULL param handling
    
    ASN1_primitive_new takes an ASN1_ITEM * param |it|. There are a couple
    of conditional code paths that check whether |it| is NULL or not - but
    later |it| is deref'd unconditionally. If |it| was ever really NULL then
    this would seg fault. In practice ASN1_primitive_new is marked as an
    internal function in the public header file. The only places it is ever
    used internally always pass a non NULL parameter for |it|. Therefore, change
    the code to sanity check that |it| is not NULL, and remove the conditional
    checking.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit a01087027bd0c5ec053d4eabd972bd942bfcd92f
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 15:41:52 2015 +0000

    Fix EVP_DigestInit_ex with NULL digest
    
    Calling EVP_DigestInit_ex which has already had the digest set up for it
    should be possible. You are supposed to be able to pass NULL for the type.
    However currently this seg faults.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit 8c5a7b33c6269c3bd6bc0df6b4c22e4fba03b485
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 11 15:31:16 2015 +0000

    Fix error handling in bn_exp
    
    In the event of an error |rr| could be NULL. Therefore don't assume you can
    use |rr| in the error handling code.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 crypto/asn1/tasn_new.c   |  7 +++++--
 crypto/asn1/tasn_prn.c   |  2 ++
 crypto/bn/bn_exp.c       |  4 ++--
 crypto/dh/dh_ameth.c     | 12 +++++++-----
 crypto/dsa/dsa_ameth.c   | 14 ++++++++------
 crypto/evp/digest.c      |  9 ++++++---
 crypto/rsa/rsa_x931g.c   |  9 ++++-----
 crypto/x509v3/v3_cpols.c | 16 ++++++++++++----
 ssl/t1_lib.c             |  4 ++--
 9 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c
index d25c68c..7d2964f 100644
--- a/crypto/asn1/tasn_new.c
+++ b/crypto/asn1/tasn_new.c
@@ -315,13 +315,16 @@ int ASN1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
     ASN1_STRING *str;
     int utype;
 
-    if (it && it->funcs) {
+    if (!it)
+        return 0;
+
+    if (it->funcs) {
         const ASN1_PRIMITIVE_FUNCS *pf = it->funcs;
         if (pf->prim_new)
             return pf->prim_new(pval, it);
     }
 
-    if (!it || (it->itype == ASN1_ITYPE_MSTRING))
+    if (it->itype == ASN1_ITYPE_MSTRING)
         utype = -1;
     else
         utype = it->utype;
diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
index 94e220b..2626de9 100644
--- a/crypto/asn1/tasn_prn.c
+++ b/crypto/asn1/tasn_prn.c
@@ -285,6 +285,8 @@ static int asn1_item_print_ctx(BIO *out, ASN1_VALUE **fld, int indent,
         for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) {
             const ASN1_TEMPLATE *seqtt;
             seqtt = asn1_do_adb(fld, tt, 1);
+            if(!seqtt)
+                return 0;
             tmpfld = asn1_get_field_ptr(fld, seqtt);
             if (!asn1_template_print_ctx(out, tmpfld,
                                          indent + 2, seqtt, pctx))
diff --git a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c
index 28a9fd5..8c46e50 100644
--- a/crypto/bn/bn_exp.c
+++ b/crypto/bn/bn_exp.c
@@ -185,10 +185,10 @@ int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
                 goto err;
         }
     }
-    ret = 1;
- err:
     if (r != rr)
         BN_copy(r, rr);
+    ret = 1;
+ err:
     BN_CTX_end(ctx);
     bn_check_top(r);
     return (ret);
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index 8dac573..2c77381 100644
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -151,7 +151,6 @@ static int dh_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
 static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
 {
     DH *dh;
-    void *pval = NULL;
     int ptype;
     unsigned char *penc = NULL;
     int penclen;
@@ -161,12 +160,15 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     dh = pkey->pkey.dh;
 
     str = ASN1_STRING_new();
+    if(!str) {
+        DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
     str->length = i2d_dhp(pkey, dh, &str->data);
     if (str->length <= 0) {
         DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
         goto err;
     }
-    pval = str;
     ptype = V_ASN1_SEQUENCE;
 
     pub_key = BN_to_ASN1_INTEGER(dh->pub_key, NULL);
@@ -183,14 +185,14 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     }
 
     if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(pkey->ameth->pkey_id),
-                               ptype, pval, penc, penclen))
+                               ptype, str, penc, penclen))
         return 1;
 
  err:
     if (penc)
         OPENSSL_free(penc);
-    if (pval)
-        ASN1_STRING_free(pval);
+    if (str)
+        ASN1_STRING_free(str);
 
     return 0;
 }
diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index c3a85da..d63c417 100644
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -129,21 +129,23 @@ static int dsa_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
 static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
 {
     DSA *dsa;
-    void *pval = NULL;
     int ptype;
     unsigned char *penc = NULL;
     int penclen;
+    ASN1_STRING *str = NULL;
 
     dsa = pkey->pkey.dsa;
     if (pkey->save_parameters && dsa->p && dsa->q && dsa->g) {
-        ASN1_STRING *str;
         str = ASN1_STRING_new();
+        if (!str) {
+            DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
+            goto err;
+        }
         str->length = i2d_DSAparams(dsa, &str->data);
         if (str->length <= 0) {
             DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
             goto err;
         }
-        pval = str;
         ptype = V_ASN1_SEQUENCE;
     } else
         ptype = V_ASN1_UNDEF;
@@ -158,14 +160,14 @@ static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     }
 
     if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(EVP_PKEY_DSA),
-                               ptype, pval, penc, penclen))
+                               ptype, str, penc, penclen))
         return 1;
 
  err:
     if (penc)
         OPENSSL_free(penc);
-    if (pval)
-        ASN1_STRING_free(pval);
+    if (str)
+        ASN1_STRING_free(str);
 
     return 0;
 }
diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index db755b1..48c7b00 100644
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.c
@@ -187,9 +187,12 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl)
             ctx->engine = impl;
         } else
             ctx->engine = NULL;
-    } else if (!ctx->digest) {
-        EVPerr(EVP_F_EVP_DIGESTINIT_EX, EVP_R_NO_DIGEST_SET);
-        return 0;
+    } else {
+        if (!ctx->digest) {
+            EVPerr(EVP_F_EVP_DIGESTINIT_EX, EVP_R_NO_DIGEST_SET);
+            return 0;
+        }
+        type = ctx->digest;
     }
 #endif
     if (ctx->digest != type) {
diff --git a/crypto/rsa/rsa_x931g.c b/crypto/rsa/rsa_x931g.c
index 74bf197..5991615 100644
--- a/crypto/rsa/rsa_x931g.c
+++ b/crypto/rsa/rsa_x931g.c
@@ -72,14 +72,15 @@ int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1,
 {
     BIGNUM *r0 = NULL, *r1 = NULL, *r2 = NULL, *r3 = NULL;
     BN_CTX *ctx = NULL, *ctx2 = NULL;
+    int ret = 0;
 
     if (!rsa)
         goto err;
 
     ctx = BN_CTX_new();
-    BN_CTX_start(ctx);
     if (!ctx)
         goto err;
+    BN_CTX_start(ctx);
 
     r0 = BN_CTX_get(ctx);
     r1 = BN_CTX_get(ctx);
@@ -176,6 +177,7 @@ int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1,
     /* calculate inverse of q mod p */
     rsa->iqmp = BN_mod_inverse(NULL, rsa->q, rsa->p, ctx2);
 
+    ret = 1;
  err:
     if (ctx) {
         BN_CTX_end(ctx);
@@ -183,11 +185,8 @@ int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1,
     }
     if (ctx2)
         BN_CTX_free(ctx2);
-    /* If this is set all calls successful */
-    if (rsa->iqmp != NULL)
-        return 1;
 
-    return 0;
+    return ret;
 
 }
 
diff --git a/crypto/x509v3/v3_cpols.c b/crypto/x509v3/v3_cpols.c
index 139b8f2..9826859 100644
--- a/crypto/x509v3/v3_cpols.c
+++ b/crypto/x509v3/v3_cpols.c
@@ -230,8 +230,12 @@ static POLICYINFO *policy_section(X509V3_CTX *ctx,
                 goto merr;
             if (!sk_POLICYQUALINFO_push(pol->qualifiers, qual))
                 goto merr;
-            qual->pqualid = OBJ_nid2obj(NID_id_qt_cps);
-            qual->d.cpsuri = M_ASN1_IA5STRING_new();
+            if(!(qual->pqualid = OBJ_nid2obj(NID_id_qt_cps))) {
+                X509V3err(X509V3_F_POLICY_SECTION, ERR_R_INTERNAL_ERROR);
+                goto err;
+            }
+            if(!(qual->d.cpsuri = M_ASN1_IA5STRING_new()))
+                goto merr;
             if (!ASN1_STRING_set(qual->d.cpsuri, cnf->value,
                                  strlen(cnf->value)))
                 goto merr;
@@ -290,14 +294,18 @@ static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
     POLICYQUALINFO *qual;
     if (!(qual = POLICYQUALINFO_new()))
         goto merr;
-    qual->pqualid = OBJ_nid2obj(NID_id_qt_unotice);
+    if(!(qual->pqualid = OBJ_nid2obj(NID_id_qt_unotice))) {
+        X509V3err(X509V3_F_NOTICE_SECTION, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
     if (!(not = USERNOTICE_new()))
         goto merr;
     qual->d.usernotice = not;
     for (i = 0; i < sk_CONF_VALUE_num(unot); i++) {
         cnf = sk_CONF_VALUE_value(unot, i);
         if (!strcmp(cnf->name, "explicitText")) {
-            not->exptext = M_ASN1_VISIBLESTRING_new();
+            if(!(not->exptext = M_ASN1_VISIBLESTRING_new()))
+                goto merr;
             if (!ASN1_STRING_set(not->exptext, cnf->value,
                                  strlen(cnf->value)))
                 goto merr;
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 8296ea1..b6e878a 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -3910,10 +3910,10 @@ int tls1_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain,
 # endif
     } else {
         if (!x || !pk)
-            goto end;
+            return 0;
         idx = ssl_cert_type(x, pk);
         if (idx == -1)
-            goto end;
+            return 0;
         cpk = c->pkeys + idx;
         if (c->cert_flags & SSL_CERT_FLAGS_CHECK_TLS_STRICT)
             check_flags = CERT_PKEY_STRICT_FLAGS;

From steve at openssl.org  Thu Mar 12 13:44:53 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Thu, 12 Mar 2015 13:44:53 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426167893.148912.10275.nullmailer@dev.openssl.org>

The branch master has been updated
       via  5dc1247a7494f50c88ce7492518bbe0ce6f124fa (commit)
       via  3d764db7a24e3dca1a3ee57202ce3c818d592141 (commit)
      from  007fd1404fc7a2ed33f6108bc3859d3814b44224 (commit)


- Log -----------------------------------------------------------------
commit 5dc1247a7494f50c88ce7492518bbe0ce6f124fa
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Mar 11 23:30:52 2015 +0000

    ASN.1 print fix.
    
    When printing out an ASN.1 structure if the type is an item template don't
    fall thru and attempt to interpret as a primitive type.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit 3d764db7a24e3dca1a3ee57202ce3c818d592141
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Mar 1 15:25:39 2015 +0000

    additional configuration documentation
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 crypto/asn1/tasn_prn.c                |  1 +
 doc/apps/config.pod                   | 22 ++++++++-
 doc/crypto/CONF_modules_load_file.pod | 87 +++++++++++++++++++++++++++++++++--
 3 files changed, 103 insertions(+), 7 deletions(-)

diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
index 2626de9..d8450b3 100644
--- a/crypto/asn1/tasn_prn.c
+++ b/crypto/asn1/tasn_prn.c
@@ -220,6 +220,7 @@ static int asn1_item_print_ctx(BIO *out, ASN1_VALUE **fld, int indent,
             if (!asn1_template_print_ctx(out, fld, indent,
                                          it->templates, pctx))
                 return 0;
+            break;
         }
         /* fall thru */
     case ASN1_ITYPE_MSTRING:
diff --git a/doc/apps/config.pod b/doc/apps/config.pod
index 25c5381..d5cce54 100644
--- a/doc/apps/config.pod
+++ b/doc/apps/config.pod
@@ -89,8 +89,7 @@ section containing configuration module specific information. E.g.
 
  ... engine stuff here ...
 
-Currently there are two configuration modules. One for ASN1 objects another
-for ENGINE configuration.
+The features of each configuration module are described below.
 
 =head2 ASN1 OBJECT CONFIGURATION MODULE
 
@@ -191,6 +190,25 @@ For example:
  # Supply all default algorithms
  default_algorithms = ALL
 
+=head2 EVP CONFIGURATION MODULE
+
+This modules has the name B<alg_section> which points to a section containing
+algorithm commands.
+
+Currently the only algorithm command supported is B<fips_mode> whose
+value should be a boolean string such as B<on> or B<off>. If the value is
+B<on> this attempt to enter FIPS mode. If the call fails or the library is
+not FIPS capable then an error occurs.
+
+For example:
+
+ alg_section = evp_settings
+
+ [evp_settings]
+
+ fips_mode = on
+
+
 =head1 NOTES
 
 If a configuration file attempts to expand a variable that doesn't exist
diff --git a/doc/crypto/CONF_modules_load_file.pod b/doc/crypto/CONF_modules_load_file.pod
index 0c4d926..cc0b537 100644
--- a/doc/crypto/CONF_modules_load_file.pod
+++ b/doc/crypto/CONF_modules_load_file.pod
@@ -9,9 +9,9 @@
  #include <openssl/conf.h>
 
  int CONF_modules_load_file(const char *filename, const char *appname,
-			   unsigned long flags);
+			                unsigned long flags);
  int CONF_modules_load(const CONF *cnf, const char *appname,
-		      unsigned long flags);
+		               unsigned long flags);
 
 =head1 DESCRIPTION
 
@@ -22,7 +22,7 @@ NULL the standard OpenSSL application name B<openssl_conf> is used.
 The behaviour can be cutomized using B<flags>.
 
 CONF_modules_load() is idential to CONF_modules_load_file() except it
-read configuration information from B<cnf>. 
+reads configuration information from B<cnf>.
 
 =head1 NOTES
 
@@ -30,7 +30,7 @@ The following B<flags> are currently recognized:
 
 B<CONF_MFLAGS_IGNORE_ERRORS> if set errors returned by individual
 configuration modules are ignored. If not set the first module error is
-considered fatal and no further modules are loads.
+considered fatal and no further modules are loaded.
 
 Normally any modules errors will add error information to the error queue. If
 B<CONF_MFLAGS_SILENT> is set no error information is added.
@@ -42,7 +42,84 @@ B<CONF_MFLAGS_IGNORE_MISSING_FILE> if set will make CONF_load_modules_file()
 ignore missing configuration files. Normally a missing configuration file
 return an error.
 
-=head1 RETURN VALUE
+B<CONF_MFLAGS_DEFAULT_SECTION> if set and B<appname> is not NULL will use the
+default section pointed to by B<openssl_conf> if B<appname> does not exist.
+
+Applications should call these functions after loading builtin modules using
+OPENSSL_load_builtin_modules(), any ENGINEs for example using
+ENGINE_load_builtin_engines(), any algorithms for example
+OPENSSL_add_all_algorithms() and (if the application uses libssl)
+SSL_library_init().
+
+By using CONF_modules_load_file() with appropriate flags an application can
+customise application configuration to best suit its needs. In some cases the
+use of a configuration file is optional and its absence is not an error: in
+this case B<CONF_MFLAGS_IGNORE_MISSING_FILE> would be set.
+
+Errors during configuration may also be handled differently by different
+applications. For example in some cases an error may simply print out a warning
+message and the application continue. In other cases an application might
+consider a configuration file error as fatal and exit immediately.
+
+Applications can use the CONF_modules_load() function if they wish to load a
+configuration file themselves and have finer control over how errors are
+treated.
+
+=head1 EXAMPLES
+
+Load a configuration file and print out any errors and exit (missing file
+considered fatal):
+
+ if (CONF_modules_load_file(NULL, NULL, 0) <= 0) {
+    fprintf(stderr, "FATAL: error loading configuration file\n");
+    ERR_print_errors_fp(stderr);
+    exit(1);
+ }
+
+Load default configuration file using the section indicated by "myapp",
+tolerate missing files, but exit on other errors:
+
+ if (CONF_modules_load_file(NULL, "myapp",
+                            CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) {
+    fprintf(stderr, "FATAL: error loading configuration file\n");
+    ERR_print_errors_fp(stderr);
+    exit(1);
+ }
+
+Load custom configuration file and section, only print warnings on error,
+missing configuration file ignored:
+
+ if (CONF_modules_load_file("/something/app.cnf", "myapp",
+                            CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) {
+    fprintf(stderr, "WARNING: error loading configuration file\n");
+    ERR_print_errors_fp(stderr);
+ }
+
+Load and parse configuration file manually, custom error handling:
+
+ FILE *fp;
+ CONF *cnf = NULL;
+ long eline;
+ fp = fopen("/somepath/app.cnf", "r");
+ if (fp == NULL) {
+    fprintf(stderr, "Error opening configuration file\n");
+    /* Other missing configuration file behaviour */
+ } else {
+    cnf = NCONF_new(NULL);
+    if (NCONF_load_fp(cnf, fp, &eline) == 0) {
+        fprintf(stderr, "Error on line %ld of configuration file\n", eline);
+        ERR_print_errors_fp(stderr);
+        /* Other malformed configuration file behaviour */
+    } else if (CONF_modules_load(cnf, "appname", 0) <= 0) {
+      fprintf(stderr, "Error configuring application\n");
+      ERR_print_errors_fp(stderr);
+      /* Other configuration error behaviour */
+    }
+    fclose(fp);
+    NCONF_free(cnf);
+  }
+
+=head1 RETURN VALUES
 
 These functions return 1 for success and a zero or negative value for
 failure. If module errors are not ignored the return code will reflect the

From steve at openssl.org  Thu Mar 12 13:57:13 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Thu, 12 Mar 2015 13:57:13 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_0-stable update
Message-ID: <1426168633.133109.20909.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_0-stable has been updated
       via  765db5f9e5a6e1ab2d215012036a84aec62de332 (commit)
      from  683f03e4881ffd19b8671f290387cd4e68fad457 (commit)


- Log -----------------------------------------------------------------
commit 765db5f9e5a6e1ab2d215012036a84aec62de332
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Mar 11 23:30:52 2015 +0000

    ASN.1 print fix.
    
    When printing out an ASN.1 structure if the type is an item template don't
    fall thru and attempt to interpret as a primitive type.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit 5dc1247a7494f50c88ce7492518bbe0ce6f124fa)

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

Summary of changes:
 crypto/asn1/tasn_prn.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
index 11d784c..060ffe2 100644
--- a/crypto/asn1/tasn_prn.c
+++ b/crypto/asn1/tasn_prn.c
@@ -220,6 +220,7 @@ static int asn1_item_print_ctx(BIO *out, ASN1_VALUE **fld, int indent,
             if (!asn1_template_print_ctx(out, fld, indent,
                                          it->templates, pctx))
                 return 0;
+            break;
         }
         /* fall thru */
     case ASN1_ITYPE_MSTRING:

From steve at openssl.org  Thu Mar 12 13:57:13 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Thu, 12 Mar 2015 13:57:13 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1426168633.205003.20932.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  1a098164354e8e14e0237993cca7a0bffe820ed6 (commit)
       via  0e978b9a5d2b3a13603244ceea72681ef4317214 (commit)
      from  f06249f112a37c0caece07e90ebb01b525e62fd7 (commit)


- Log -----------------------------------------------------------------
commit 1a098164354e8e14e0237993cca7a0bffe820ed6
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Mar 1 15:25:39 2015 +0000

    additional configuration documentation
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit 3d764db7a24e3dca1a3ee57202ce3c818d592141)

commit 0e978b9a5d2b3a13603244ceea72681ef4317214
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Mar 11 23:30:52 2015 +0000

    ASN.1 print fix.
    
    When printing out an ASN.1 structure if the type is an item template don't
    fall thru and attempt to interpret as a primitive type.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit 5dc1247a7494f50c88ce7492518bbe0ce6f124fa)

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

Summary of changes:
 crypto/asn1/tasn_prn.c                |  1 +
 doc/apps/config.pod                   | 22 ++++++++-
 doc/crypto/CONF_modules_load_file.pod | 87 +++++++++++++++++++++++++++++++++--
 3 files changed, 103 insertions(+), 7 deletions(-)

diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
index 4866dcd..7c54f9d 100644
--- a/crypto/asn1/tasn_prn.c
+++ b/crypto/asn1/tasn_prn.c
@@ -220,6 +220,7 @@ static int asn1_item_print_ctx(BIO *out, ASN1_VALUE **fld, int indent,
             if (!asn1_template_print_ctx(out, fld, indent,
                                          it->templates, pctx))
                 return 0;
+            break;
         }
         /* fall thru */
     case ASN1_ITYPE_MSTRING:
diff --git a/doc/apps/config.pod b/doc/apps/config.pod
index 25c5381..d5cce54 100644
--- a/doc/apps/config.pod
+++ b/doc/apps/config.pod
@@ -89,8 +89,7 @@ section containing configuration module specific information. E.g.
 
  ... engine stuff here ...
 
-Currently there are two configuration modules. One for ASN1 objects another
-for ENGINE configuration.
+The features of each configuration module are described below.
 
 =head2 ASN1 OBJECT CONFIGURATION MODULE
 
@@ -191,6 +190,25 @@ For example:
  # Supply all default algorithms
  default_algorithms = ALL
 
+=head2 EVP CONFIGURATION MODULE
+
+This modules has the name B<alg_section> which points to a section containing
+algorithm commands.
+
+Currently the only algorithm command supported is B<fips_mode> whose
+value should be a boolean string such as B<on> or B<off>. If the value is
+B<on> this attempt to enter FIPS mode. If the call fails or the library is
+not FIPS capable then an error occurs.
+
+For example:
+
+ alg_section = evp_settings
+
+ [evp_settings]
+
+ fips_mode = on
+
+
 =head1 NOTES
 
 If a configuration file attempts to expand a variable that doesn't exist
diff --git a/doc/crypto/CONF_modules_load_file.pod b/doc/crypto/CONF_modules_load_file.pod
index 0c4d926..cc0b537 100644
--- a/doc/crypto/CONF_modules_load_file.pod
+++ b/doc/crypto/CONF_modules_load_file.pod
@@ -9,9 +9,9 @@
  #include <openssl/conf.h>
 
  int CONF_modules_load_file(const char *filename, const char *appname,
-			   unsigned long flags);
+			                unsigned long flags);
  int CONF_modules_load(const CONF *cnf, const char *appname,
-		      unsigned long flags);
+		               unsigned long flags);
 
 =head1 DESCRIPTION
 
@@ -22,7 +22,7 @@ NULL the standard OpenSSL application name B<openssl_conf> is used.
 The behaviour can be cutomized using B<flags>.
 
 CONF_modules_load() is idential to CONF_modules_load_file() except it
-read configuration information from B<cnf>. 
+reads configuration information from B<cnf>.
 
 =head1 NOTES
 
@@ -30,7 +30,7 @@ The following B<flags> are currently recognized:
 
 B<CONF_MFLAGS_IGNORE_ERRORS> if set errors returned by individual
 configuration modules are ignored. If not set the first module error is
-considered fatal and no further modules are loads.
+considered fatal and no further modules are loaded.
 
 Normally any modules errors will add error information to the error queue. If
 B<CONF_MFLAGS_SILENT> is set no error information is added.
@@ -42,7 +42,84 @@ B<CONF_MFLAGS_IGNORE_MISSING_FILE> if set will make CONF_load_modules_file()
 ignore missing configuration files. Normally a missing configuration file
 return an error.
 
-=head1 RETURN VALUE
+B<CONF_MFLAGS_DEFAULT_SECTION> if set and B<appname> is not NULL will use the
+default section pointed to by B<openssl_conf> if B<appname> does not exist.
+
+Applications should call these functions after loading builtin modules using
+OPENSSL_load_builtin_modules(), any ENGINEs for example using
+ENGINE_load_builtin_engines(), any algorithms for example
+OPENSSL_add_all_algorithms() and (if the application uses libssl)
+SSL_library_init().
+
+By using CONF_modules_load_file() with appropriate flags an application can
+customise application configuration to best suit its needs. In some cases the
+use of a configuration file is optional and its absence is not an error: in
+this case B<CONF_MFLAGS_IGNORE_MISSING_FILE> would be set.
+
+Errors during configuration may also be handled differently by different
+applications. For example in some cases an error may simply print out a warning
+message and the application continue. In other cases an application might
+consider a configuration file error as fatal and exit immediately.
+
+Applications can use the CONF_modules_load() function if they wish to load a
+configuration file themselves and have finer control over how errors are
+treated.
+
+=head1 EXAMPLES
+
+Load a configuration file and print out any errors and exit (missing file
+considered fatal):
+
+ if (CONF_modules_load_file(NULL, NULL, 0) <= 0) {
+    fprintf(stderr, "FATAL: error loading configuration file\n");
+    ERR_print_errors_fp(stderr);
+    exit(1);
+ }
+
+Load default configuration file using the section indicated by "myapp",
+tolerate missing files, but exit on other errors:
+
+ if (CONF_modules_load_file(NULL, "myapp",
+                            CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) {
+    fprintf(stderr, "FATAL: error loading configuration file\n");
+    ERR_print_errors_fp(stderr);
+    exit(1);
+ }
+
+Load custom configuration file and section, only print warnings on error,
+missing configuration file ignored:
+
+ if (CONF_modules_load_file("/something/app.cnf", "myapp",
+                            CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) {
+    fprintf(stderr, "WARNING: error loading configuration file\n");
+    ERR_print_errors_fp(stderr);
+ }
+
+Load and parse configuration file manually, custom error handling:
+
+ FILE *fp;
+ CONF *cnf = NULL;
+ long eline;
+ fp = fopen("/somepath/app.cnf", "r");
+ if (fp == NULL) {
+    fprintf(stderr, "Error opening configuration file\n");
+    /* Other missing configuration file behaviour */
+ } else {
+    cnf = NCONF_new(NULL);
+    if (NCONF_load_fp(cnf, fp, &eline) == 0) {
+        fprintf(stderr, "Error on line %ld of configuration file\n", eline);
+        ERR_print_errors_fp(stderr);
+        /* Other malformed configuration file behaviour */
+    } else if (CONF_modules_load(cnf, "appname", 0) <= 0) {
+      fprintf(stderr, "Error configuring application\n");
+      ERR_print_errors_fp(stderr);
+      /* Other configuration error behaviour */
+    }
+    fclose(fp);
+    NCONF_free(cnf);
+  }
+
+=head1 RETURN VALUES
 
 These functions return 1 for success and a zero or negative value for
 failure. If module errors are not ignored the return code will reflect the

From steve at openssl.org  Thu Mar 12 13:57:13 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Thu, 12 Mar 2015 13:57:13 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1426168633.296956.20958.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  c0d69ddb3323e45afba7a7f1608fb03f9a7d6fff (commit)
       via  8cd671408401eff07a53c6051de86077f7a584b1 (commit)
      from  327de270d583e716bc0282dd0d59e133f41d7ada (commit)


- Log -----------------------------------------------------------------
commit c0d69ddb3323e45afba7a7f1608fb03f9a7d6fff
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Mar 1 15:25:39 2015 +0000

    additional configuration documentation
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit 3d764db7a24e3dca1a3ee57202ce3c818d592141)

commit 8cd671408401eff07a53c6051de86077f7a584b1
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Mar 11 23:30:52 2015 +0000

    ASN.1 print fix.
    
    When printing out an ASN.1 structure if the type is an item template don't
    fall thru and attempt to interpret as a primitive type.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit 5dc1247a7494f50c88ce7492518bbe0ce6f124fa)

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

Summary of changes:
 crypto/asn1/tasn_prn.c                |  1 +
 doc/apps/config.pod                   | 22 ++++++++-
 doc/crypto/CONF_modules_load_file.pod | 87 +++++++++++++++++++++++++++++++++--
 3 files changed, 103 insertions(+), 7 deletions(-)

diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
index 4866dcd..7c54f9d 100644
--- a/crypto/asn1/tasn_prn.c
+++ b/crypto/asn1/tasn_prn.c
@@ -220,6 +220,7 @@ static int asn1_item_print_ctx(BIO *out, ASN1_VALUE **fld, int indent,
             if (!asn1_template_print_ctx(out, fld, indent,
                                          it->templates, pctx))
                 return 0;
+            break;
         }
         /* fall thru */
     case ASN1_ITYPE_MSTRING:
diff --git a/doc/apps/config.pod b/doc/apps/config.pod
index 25c5381..d5cce54 100644
--- a/doc/apps/config.pod
+++ b/doc/apps/config.pod
@@ -89,8 +89,7 @@ section containing configuration module specific information. E.g.
 
  ... engine stuff here ...
 
-Currently there are two configuration modules. One for ASN1 objects another
-for ENGINE configuration.
+The features of each configuration module are described below.
 
 =head2 ASN1 OBJECT CONFIGURATION MODULE
 
@@ -191,6 +190,25 @@ For example:
  # Supply all default algorithms
  default_algorithms = ALL
 
+=head2 EVP CONFIGURATION MODULE
+
+This modules has the name B<alg_section> which points to a section containing
+algorithm commands.
+
+Currently the only algorithm command supported is B<fips_mode> whose
+value should be a boolean string such as B<on> or B<off>. If the value is
+B<on> this attempt to enter FIPS mode. If the call fails or the library is
+not FIPS capable then an error occurs.
+
+For example:
+
+ alg_section = evp_settings
+
+ [evp_settings]
+
+ fips_mode = on
+
+
 =head1 NOTES
 
 If a configuration file attempts to expand a variable that doesn't exist
diff --git a/doc/crypto/CONF_modules_load_file.pod b/doc/crypto/CONF_modules_load_file.pod
index 0c4d926..cc0b537 100644
--- a/doc/crypto/CONF_modules_load_file.pod
+++ b/doc/crypto/CONF_modules_load_file.pod
@@ -9,9 +9,9 @@
  #include <openssl/conf.h>
 
  int CONF_modules_load_file(const char *filename, const char *appname,
-			   unsigned long flags);
+			                unsigned long flags);
  int CONF_modules_load(const CONF *cnf, const char *appname,
-		      unsigned long flags);
+		               unsigned long flags);
 
 =head1 DESCRIPTION
 
@@ -22,7 +22,7 @@ NULL the standard OpenSSL application name B<openssl_conf> is used.
 The behaviour can be cutomized using B<flags>.
 
 CONF_modules_load() is idential to CONF_modules_load_file() except it
-read configuration information from B<cnf>. 
+reads configuration information from B<cnf>.
 
 =head1 NOTES
 
@@ -30,7 +30,7 @@ The following B<flags> are currently recognized:
 
 B<CONF_MFLAGS_IGNORE_ERRORS> if set errors returned by individual
 configuration modules are ignored. If not set the first module error is
-considered fatal and no further modules are loads.
+considered fatal and no further modules are loaded.
 
 Normally any modules errors will add error information to the error queue. If
 B<CONF_MFLAGS_SILENT> is set no error information is added.
@@ -42,7 +42,84 @@ B<CONF_MFLAGS_IGNORE_MISSING_FILE> if set will make CONF_load_modules_file()
 ignore missing configuration files. Normally a missing configuration file
 return an error.
 
-=head1 RETURN VALUE
+B<CONF_MFLAGS_DEFAULT_SECTION> if set and B<appname> is not NULL will use the
+default section pointed to by B<openssl_conf> if B<appname> does not exist.
+
+Applications should call these functions after loading builtin modules using
+OPENSSL_load_builtin_modules(), any ENGINEs for example using
+ENGINE_load_builtin_engines(), any algorithms for example
+OPENSSL_add_all_algorithms() and (if the application uses libssl)
+SSL_library_init().
+
+By using CONF_modules_load_file() with appropriate flags an application can
+customise application configuration to best suit its needs. In some cases the
+use of a configuration file is optional and its absence is not an error: in
+this case B<CONF_MFLAGS_IGNORE_MISSING_FILE> would be set.
+
+Errors during configuration may also be handled differently by different
+applications. For example in some cases an error may simply print out a warning
+message and the application continue. In other cases an application might
+consider a configuration file error as fatal and exit immediately.
+
+Applications can use the CONF_modules_load() function if they wish to load a
+configuration file themselves and have finer control over how errors are
+treated.
+
+=head1 EXAMPLES
+
+Load a configuration file and print out any errors and exit (missing file
+considered fatal):
+
+ if (CONF_modules_load_file(NULL, NULL, 0) <= 0) {
+    fprintf(stderr, "FATAL: error loading configuration file\n");
+    ERR_print_errors_fp(stderr);
+    exit(1);
+ }
+
+Load default configuration file using the section indicated by "myapp",
+tolerate missing files, but exit on other errors:
+
+ if (CONF_modules_load_file(NULL, "myapp",
+                            CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) {
+    fprintf(stderr, "FATAL: error loading configuration file\n");
+    ERR_print_errors_fp(stderr);
+    exit(1);
+ }
+
+Load custom configuration file and section, only print warnings on error,
+missing configuration file ignored:
+
+ if (CONF_modules_load_file("/something/app.cnf", "myapp",
+                            CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) {
+    fprintf(stderr, "WARNING: error loading configuration file\n");
+    ERR_print_errors_fp(stderr);
+ }
+
+Load and parse configuration file manually, custom error handling:
+
+ FILE *fp;
+ CONF *cnf = NULL;
+ long eline;
+ fp = fopen("/somepath/app.cnf", "r");
+ if (fp == NULL) {
+    fprintf(stderr, "Error opening configuration file\n");
+    /* Other missing configuration file behaviour */
+ } else {
+    cnf = NCONF_new(NULL);
+    if (NCONF_load_fp(cnf, fp, &eline) == 0) {
+        fprintf(stderr, "Error on line %ld of configuration file\n", eline);
+        ERR_print_errors_fp(stderr);
+        /* Other malformed configuration file behaviour */
+    } else if (CONF_modules_load(cnf, "appname", 0) <= 0) {
+      fprintf(stderr, "Error configuring application\n");
+      ERR_print_errors_fp(stderr);
+      /* Other configuration error behaviour */
+    }
+    fclose(fp);
+    NCONF_free(cnf);
+  }
+
+=head1 RETURN VALUES
 
 These functions return 1 for success and a zero or negative value for
 failure. If module errors are not ignored the return code will reflect the

From steve at openssl.org  Fri Mar 13 02:20:38 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Fri, 13 Mar 2015 02:20:38 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426213238.160117.21484.nullmailer@dev.openssl.org>

The branch master has been updated
       via  b5f07d6a66df963e45a5f7fe23329009b12bdf87 (commit)
       via  f9c850c7343e3a492bce3c8bba25123537140b0a (commit)
      from  5dc1247a7494f50c88ce7492518bbe0ce6f124fa (commit)


- Log -----------------------------------------------------------------
commit b5f07d6a66df963e45a5f7fe23329009b12bdf87
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu Mar 12 14:12:17 2015 +0000

    Remove obsolete declarations.
    
    Remove DECLARE_ASN1_SET_OF and DECLARE_PKCS12_STACK_OF these haven't been
    used internally in OpenSSL for some time.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit f9c850c7343e3a492bce3c8bba25123537140b0a
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu Mar 12 14:05:27 2015 +0000

    Update mkstack.pl to match safestack.h
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/asn1/asn1.h       |   5 -
 crypto/ocsp/ocsp.h       |   2 -
 crypto/ossl_typ.h        |   4 -
 crypto/pkcs12/p12_decr.c |   2 -
 crypto/pkcs12/pkcs12.h   |   2 -
 crypto/pkcs7/pkcs7.h     |   4 -
 crypto/stack/safestack.h | 231 -----------------------------------------------
 crypto/ts/ts.h           |   3 -
 crypto/x509/x509.h       |   8 --
 crypto/x509v3/x509v3.h   |   6 --
 util/mkstack.pl          |  40 +-------
 11 files changed, 2 insertions(+), 305 deletions(-)

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 692b81a..66e1fac 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -159,8 +159,6 @@ extern "C" {
     struct X509_algor_st;
 DECLARE_STACK_OF(X509_ALGOR)
 
-# define DECLARE_ASN1_SET_OF(type)/* filled in by mkstack.pl */
-
 /*
  * We MUST make sure that, except for constness, asn1_ctx_st and
  * asn1_const_ctx are exactly the same.  Fortunately, as soon as the old ASN1
@@ -521,7 +519,6 @@ typedef const ASN1_ITEM *ASN1_ITEM_EXP (void);
                                 ASN1_STRFLGS_DUMP_DER)
 
 DECLARE_STACK_OF(ASN1_INTEGER)
-DECLARE_ASN1_SET_OF(ASN1_INTEGER)
 
 DECLARE_STACK_OF(ASN1_GENERALSTRING)
 
@@ -557,7 +554,6 @@ typedef struct asn1_type_st {
 } ASN1_TYPE;
 
 DECLARE_STACK_OF(ASN1_TYPE)
-DECLARE_ASN1_SET_OF(ASN1_TYPE)
 
 typedef STACK_OF(ASN1_TYPE) ASN1_SEQUENCE_ANY;
 
@@ -795,7 +791,6 @@ ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
 DECLARE_ASN1_ITEM(ASN1_OBJECT)
 
 DECLARE_STACK_OF(ASN1_OBJECT)
-DECLARE_ASN1_SET_OF(ASN1_OBJECT)
 
 ASN1_STRING *ASN1_STRING_new(void);
 void ASN1_STRING_free(ASN1_STRING *a);
diff --git a/crypto/ocsp/ocsp.h b/crypto/ocsp/ocsp.h
index 6999788..ab45db4 100644
--- a/crypto/ocsp/ocsp.h
+++ b/crypto/ocsp/ocsp.h
@@ -100,7 +100,6 @@ DECLARE_STACK_OF(OCSP_CERTID)
 typedef struct ocsp_one_request_st OCSP_ONEREQ;
 
 DECLARE_STACK_OF(OCSP_ONEREQ)
-DECLARE_ASN1_SET_OF(OCSP_ONEREQ)
 
 typedef struct ocsp_req_info_st OCSP_REQINFO;
 typedef struct ocsp_signature_st OCSP_SIGNATURE;
@@ -131,7 +130,6 @@ typedef struct ocsp_cert_status_st OCSP_CERTSTATUS;
 typedef struct ocsp_single_response_st OCSP_SINGLERESP;
 
 DECLARE_STACK_OF(OCSP_SINGLERESP)
-DECLARE_ASN1_SET_OF(OCSP_SINGLERESP)
 
 typedef struct ocsp_response_data_st OCSP_RESPDATA;
 
diff --git a/crypto/ossl_typ.h b/crypto/ossl_typ.h
index a75f3d7..85fb7b9 100644
--- a/crypto/ossl_typ.h
+++ b/crypto/ossl_typ.h
@@ -188,10 +188,6 @@ typedef struct DIST_POINT_st DIST_POINT;
 typedef struct ISSUING_DIST_POINT_st ISSUING_DIST_POINT;
 typedef struct NAME_CONSTRAINTS_st NAME_CONSTRAINTS;
 
-  /* If placed in pkcs12.h, we end up with a circular depency with pkcs7.h */
-# define DECLARE_PKCS12_STACK_OF(type)/* Nothing */
-# define IMPLEMENT_PKCS12_STACK_OF(type)/* Nothing */
-
 typedef struct crypto_ex_data_st CRYPTO_EX_DATA;
 /* Callback types for crypto.h */
 typedef int CRYPTO_EX_new (void *parent, void *ptr, CRYPTO_EX_DATA *ad,
diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c
index b40ea10..6780b4f 100644
--- a/crypto/pkcs12/p12_decr.c
+++ b/crypto/pkcs12/p12_decr.c
@@ -198,5 +198,3 @@ ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor,
         ASN1_OCTET_STRING_free(oct);
     return NULL;
 }
-
-IMPLEMENT_PKCS12_STACK_OF(PKCS7)
diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h
index a39adf5..e58e55c 100644
--- a/crypto/pkcs12/pkcs12.h
+++ b/crypto/pkcs12/pkcs12.h
@@ -124,8 +124,6 @@ typedef struct {
 } PKCS12_SAFEBAG;
 
 DECLARE_STACK_OF(PKCS12_SAFEBAG)
-DECLARE_ASN1_SET_OF(PKCS12_SAFEBAG)
-DECLARE_PKCS12_STACK_OF(PKCS12_SAFEBAG)
 
 typedef struct pkcs12_bag_st {
     ASN1_OBJECT *type;
diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h
index 65e925a..5d5d5c2 100644
--- a/crypto/pkcs7/pkcs7.h
+++ b/crypto/pkcs7/pkcs7.h
@@ -101,7 +101,6 @@ typedef struct pkcs7_signer_info_st {
 } PKCS7_SIGNER_INFO;
 
 DECLARE_STACK_OF(PKCS7_SIGNER_INFO)
-DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO)
 
 typedef struct pkcs7_recip_info_st {
     ASN1_INTEGER *version;      /* version 0 */
@@ -112,7 +111,6 @@ typedef struct pkcs7_recip_info_st {
 } PKCS7_RECIP_INFO;
 
 DECLARE_STACK_OF(PKCS7_RECIP_INFO)
-DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO)
 
 typedef struct pkcs7_signed_st {
     ASN1_INTEGER *version;      /* version 1 */
@@ -200,8 +198,6 @@ typedef struct pkcs7_st {
 } PKCS7;
 
 DECLARE_STACK_OF(PKCS7)
-DECLARE_ASN1_SET_OF(PKCS7)
-DECLARE_PKCS12_STACK_OF(PKCS7)
 
 # define PKCS7_OP_SET_DETACHED_SIGNATURE 1
 # define PKCS7_OP_GET_DETACHED_SIGNATURE 2
diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h
index ceb0ba8..ae06a12 100644
--- a/crypto/stack/safestack.h
+++ b/crypto/stack/safestack.h
@@ -2327,237 +2327,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 # define sk_OPENSSL_PSTRING_sort(st) SKM_sk_sort(OPENSSL_PSTRING, (st))
 # define sk_OPENSSL_PSTRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_PSTRING, (st))
 
-# define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(ACCESS_DESCRIPTION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(ACCESS_DESCRIPTION, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_ACCESS_DESCRIPTION(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(ACCESS_DESCRIPTION, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_ACCESS_DESCRIPTION(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(ACCESS_DESCRIPTION, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_ASN1_INTEGER(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(ASN1_INTEGER, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_ASN1_INTEGER(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(ASN1_INTEGER, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_ASN1_INTEGER(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(ASN1_INTEGER, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_ASN1_INTEGER(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(ASN1_INTEGER, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_ASN1_OBJECT(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(ASN1_OBJECT, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_ASN1_OBJECT(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(ASN1_OBJECT, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_ASN1_OBJECT(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(ASN1_OBJECT, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_ASN1_OBJECT(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(ASN1_OBJECT, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_ASN1_TYPE(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(ASN1_TYPE, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_ASN1_TYPE(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(ASN1_TYPE, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_ASN1_TYPE(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(ASN1_TYPE, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_ASN1_TYPE(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(ASN1_TYPE, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_ASN1_UTF8STRING(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(ASN1_UTF8STRING, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_ASN1_UTF8STRING(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(ASN1_UTF8STRING, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_ASN1_UTF8STRING(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(ASN1_UTF8STRING, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_ASN1_UTF8STRING(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(ASN1_UTF8STRING, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_DIST_POINT(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(DIST_POINT, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_DIST_POINT(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(DIST_POINT, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_DIST_POINT(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(DIST_POINT, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_DIST_POINT(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(DIST_POINT, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_ESS_CERT_ID(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(ESS_CERT_ID, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_ESS_CERT_ID(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(ESS_CERT_ID, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_ESS_CERT_ID(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(ESS_CERT_ID, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_ESS_CERT_ID(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(ESS_CERT_ID, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_EVP_MD(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(EVP_MD, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_EVP_MD(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(EVP_MD, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_EVP_MD(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(EVP_MD, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_EVP_MD(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(EVP_MD, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_GENERAL_NAME(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(GENERAL_NAME, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_GENERAL_NAME(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(GENERAL_NAME, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_GENERAL_NAME(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(GENERAL_NAME, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_GENERAL_NAME(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(GENERAL_NAME, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_OCSP_ONEREQ(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(OCSP_ONEREQ, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_OCSP_ONEREQ(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(OCSP_ONEREQ, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_OCSP_ONEREQ(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(OCSP_ONEREQ, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_OCSP_ONEREQ(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(OCSP_ONEREQ, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_OCSP_SINGLERESP(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(OCSP_SINGLERESP, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_OCSP_SINGLERESP(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(OCSP_SINGLERESP, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_OCSP_SINGLERESP(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(OCSP_SINGLERESP, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_OCSP_SINGLERESP(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(OCSP_SINGLERESP, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_PKCS12_SAFEBAG(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(PKCS12_SAFEBAG, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_PKCS12_SAFEBAG(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(PKCS12_SAFEBAG, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_PKCS12_SAFEBAG(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(PKCS12_SAFEBAG, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_PKCS12_SAFEBAG(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(PKCS12_SAFEBAG, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_PKCS7(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(PKCS7, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_PKCS7(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(PKCS7, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_PKCS7(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(PKCS7, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_PKCS7(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(PKCS7, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(PKCS7_RECIP_INFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(PKCS7_RECIP_INFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_PKCS7_RECIP_INFO(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(PKCS7_RECIP_INFO, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_PKCS7_RECIP_INFO(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(PKCS7_RECIP_INFO, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(PKCS7_SIGNER_INFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(PKCS7_SIGNER_INFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_PKCS7_SIGNER_INFO(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(PKCS7_SIGNER_INFO, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_PKCS7_SIGNER_INFO(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(PKCS7_SIGNER_INFO, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_POLICYINFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(POLICYINFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_POLICYINFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(POLICYINFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_POLICYINFO(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(POLICYINFO, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_POLICYINFO(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(POLICYINFO, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_POLICYQUALINFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(POLICYQUALINFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_POLICYQUALINFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(POLICYQUALINFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_POLICYQUALINFO(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(POLICYQUALINFO, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_POLICYQUALINFO(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(POLICYQUALINFO, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_SXNETID(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(SXNETID, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_SXNETID(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(SXNETID, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_SXNETID(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(SXNETID, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_SXNETID(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(SXNETID, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_X509(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_X509_ALGOR(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509_ALGOR, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509_ALGOR(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509_ALGOR, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509_ALGOR(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509_ALGOR, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509_ALGOR(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509_ALGOR, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_X509_ATTRIBUTE(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509_ATTRIBUTE, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509_ATTRIBUTE(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509_ATTRIBUTE, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509_ATTRIBUTE(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509_ATTRIBUTE, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509_ATTRIBUTE(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509_ATTRIBUTE, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_X509_CRL(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509_CRL, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509_CRL(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509_CRL, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509_CRL(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509_CRL, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509_CRL(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509_CRL, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_X509_EXTENSION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509_EXTENSION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509_EXTENSION(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509_EXTENSION, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509_EXTENSION(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509_EXTENSION, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509_EXTENSION(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509_EXTENSION, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_X509_NAME_ENTRY(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509_NAME_ENTRY, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509_NAME_ENTRY(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509_NAME_ENTRY, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509_NAME_ENTRY(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509_NAME_ENTRY, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509_NAME_ENTRY(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509_NAME_ENTRY, (buf), (len), (d2i_func), (free_func))
-
-# define d2i_ASN1_SET_OF_X509_REVOKED(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509_REVOKED, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509_REVOKED(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509_REVOKED, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509_REVOKED(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509_REVOKED, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509_REVOKED(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509_REVOKED, (buf), (len), (d2i_func), (free_func))
-
-# define PKCS12_decrypt_d2i_PKCS12_SAFEBAG(algor, d2i_func, free_func, pass, passlen, oct, seq) \
-        SKM_PKCS12_decrypt_d2i(PKCS12_SAFEBAG, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
-
-# define PKCS12_decrypt_d2i_PKCS7(algor, d2i_func, free_func, pass, passlen, oct, seq) \
-        SKM_PKCS12_decrypt_d2i(PKCS7, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
-
 # define lh_ADDED_OBJ_new() LHM_lh_new(ADDED_OBJ,added_obj)
 # define lh_ADDED_OBJ_insert(lh,inst) LHM_lh_insert(ADDED_OBJ,lh,inst)
 # define lh_ADDED_OBJ_retrieve(lh,inst) LHM_lh_retrieve(ADDED_OBJ,lh,inst)
diff --git a/crypto/ts/ts.h b/crypto/ts/ts.h
index 8b6b5f2..c6daed2 100644
--- a/crypto/ts/ts.h
+++ b/crypto/ts/ts.h
@@ -213,7 +213,6 @@ typedef struct TS_status_info_st {
 } TS_STATUS_INFO;
 
 DECLARE_STACK_OF(ASN1_UTF8STRING)
-DECLARE_ASN1_SET_OF(ASN1_UTF8STRING)
 
 /*-
 TimeStampResp ::= SEQUENCE  {
@@ -254,7 +253,6 @@ typedef struct ESS_cert_id {
 } ESS_CERT_ID;
 
 DECLARE_STACK_OF(ESS_CERT_ID)
-DECLARE_ASN1_SET_OF(ESS_CERT_ID)
 
 /*-
 SigningCertificate ::=  SEQUENCE {
@@ -516,7 +514,6 @@ typedef struct TS_resp_ctx {
 } TS_RESP_CTX;
 
 DECLARE_STACK_OF(EVP_MD)
-DECLARE_ASN1_SET_OF(EVP_MD)
 
 /* Creates a response context that can be used for generating responses. */
 TS_RESP_CTX *TS_RESP_CTX_new(void);
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index 9835be5..afc16a3 100644
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -130,8 +130,6 @@ struct X509_algor_st {
     ASN1_TYPE *parameter;
 } /* X509_ALGOR */ ;
 
-DECLARE_ASN1_SET_OF(X509_ALGOR)
-
 typedef STACK_OF(X509_ALGOR) X509_ALGORS;
 
 typedef struct X509_val_st {
@@ -158,7 +156,6 @@ typedef struct X509_name_entry_st {
 } X509_NAME_ENTRY;
 
 DECLARE_STACK_OF(X509_NAME_ENTRY)
-DECLARE_ASN1_SET_OF(X509_NAME_ENTRY)
 
 /* we always keep X509_NAMEs in 2 forms. */
 struct X509_name_st {
@@ -183,7 +180,6 @@ typedef struct X509_extension_st {
 typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS;
 
 DECLARE_STACK_OF(X509_EXTENSION)
-DECLARE_ASN1_SET_OF(X509_EXTENSION)
 
 /* a sequence of these are used */
 typedef struct x509_attributes_st {
@@ -202,7 +198,6 @@ typedef struct x509_attributes_st {
 } X509_ATTRIBUTE;
 
 DECLARE_STACK_OF(X509_ATTRIBUTE)
-DECLARE_ASN1_SET_OF(X509_ATTRIBUTE)
 
 typedef struct X509_req_info_st {
     ASN1_ENCODING enc;
@@ -276,7 +271,6 @@ struct x509_st {
 } /* X509 */ ;
 
 DECLARE_STACK_OF(X509)
-DECLARE_ASN1_SET_OF(X509)
 
 /* This is used for a table of trust checking functions */
 
@@ -408,7 +402,6 @@ struct x509_revoked_st {
 };
 
 DECLARE_STACK_OF(X509_REVOKED)
-DECLARE_ASN1_SET_OF(X509_REVOKED)
 
 typedef struct X509_crl_info_st {
     ASN1_INTEGER *version;
@@ -444,7 +437,6 @@ struct X509_crl_st {
 } /* X509_CRL */ ;
 
 DECLARE_STACK_OF(X509_CRL)
-DECLARE_ASN1_SET_OF(X509_CRL)
 
 typedef struct private_key_st {
     int version;
diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h
index d1cd6d3..a46ec5d 100644
--- a/crypto/x509v3/x509v3.h
+++ b/crypto/x509v3/x509v3.h
@@ -218,10 +218,8 @@ typedef STACK_OF(ACCESS_DESCRIPTION) AUTHORITY_INFO_ACCESS;
 typedef STACK_OF(ASN1_OBJECT) EXTENDED_KEY_USAGE;
 
 DECLARE_STACK_OF(GENERAL_NAME)
-DECLARE_ASN1_SET_OF(GENERAL_NAME)
 
 DECLARE_STACK_OF(ACCESS_DESCRIPTION)
-DECLARE_ASN1_SET_OF(ACCESS_DESCRIPTION)
 
 typedef struct DIST_POINT_NAME_st {
     int type;
@@ -257,7 +255,6 @@ struct DIST_POINT_st {
 typedef STACK_OF(DIST_POINT) CRL_DIST_POINTS;
 
 DECLARE_STACK_OF(DIST_POINT)
-DECLARE_ASN1_SET_OF(DIST_POINT)
 
 struct AUTHORITY_KEYID_st {
     ASN1_OCTET_STRING *keyid;
@@ -273,7 +270,6 @@ typedef struct SXNET_ID_st {
 } SXNETID;
 
 DECLARE_STACK_OF(SXNETID)
-DECLARE_ASN1_SET_OF(SXNETID)
 
 typedef struct SXNET_st {
     ASN1_INTEGER *version;
@@ -300,7 +296,6 @@ typedef struct POLICYQUALINFO_st {
 } POLICYQUALINFO;
 
 DECLARE_STACK_OF(POLICYQUALINFO)
-DECLARE_ASN1_SET_OF(POLICYQUALINFO)
 
 typedef struct POLICYINFO_st {
     ASN1_OBJECT *policyid;
@@ -310,7 +305,6 @@ typedef struct POLICYINFO_st {
 typedef STACK_OF(POLICYINFO) CERTIFICATEPOLICIES;
 
 DECLARE_STACK_OF(POLICYINFO)
-DECLARE_ASN1_SET_OF(POLICYINFO)
 
 typedef struct POLICY_MAPPING_st {
     ASN1_OBJECT *issuerDomainPolicy;
diff --git a/util/mkstack.pl b/util/mkstack.pl
index 5295cdd..6e6741f 100755
--- a/util/mkstack.pl
+++ b/util/mkstack.pl
@@ -30,12 +30,6 @@ foreach $file (@source) {
         elsif (/^DECLARE_SPECIAL_STACK_OF\(([^,\s]+)\s*,\s*([^>\s]+)\)/) {
             push @sstacklst, [$1, $2];
         }
-        elsif (/^DECLARE_ASN1_SET_OF\(([^)]+)\)/) {
-            push @asn1setlst, $1;
-        }
-        elsif (/^DECLARE_PKCS12_STACK_OF\(([^)]+)\)/) {
-            push @p12stklst, $1;
-        }
         elsif (/^DECLARE_LHASH_OF\(([^)]+)\)/) {
             push @lhashlst, $1;
         }
@@ -134,16 +128,8 @@ extern "C" {
 # define STACK_OF(type) struct stack_st_##type
 # define PREDECLARE_STACK_OF(type) STACK_OF(type);
 
-# define DECLARE_STACK_OF(type) \
-STACK_OF(type) \
-    { \
-    _STACK stack; \
-    };
-# define DECLARE_SPECIAL_STACK_OF(type, type2) \
-STACK_OF(type) \
-    { \
-    _STACK stack; \
-    };
+# define DECLARE_STACK_OF(type) STACK_OF(type);
+# define DECLARE_SPECIAL_STACK_OF(type, type2) STACK_OF(type);
 
 /*-
  * Strings are special: normally an lhash entry will point to a single
@@ -329,28 +315,6 @@ foreach $type_thing (sort @sstacklst) {
 EOF
 }
 
-foreach $type_thing (sort @asn1setlst) {
-    $new_stackfile .= <<EOF;
-
-# define d2i_ASN1_SET_OF_${type_thing}(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \\
-        SKM_ASN1_SET_OF_d2i($type_thing, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_${type_thing}(st, pp, i2d_func, ex_tag, ex_class, is_set) \\
-        SKM_ASN1_SET_OF_i2d($type_thing, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_${type_thing}(st, i2d_func, buf, len) \\
-        SKM_ASN1_seq_pack($type_thing, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_${type_thing}(buf, len, d2i_func, free_func) \\
-        SKM_ASN1_seq_unpack($type_thing, (buf), (len), (d2i_func), (free_func))
-EOF
-}
-
-foreach $type_thing (sort @p12stklst) {
-    $new_stackfile .= <<EOF;
-
-# define PKCS12_decrypt_d2i_${type_thing}(algor, d2i_func, free_func, pass, passlen, oct, seq) \\
-        SKM_PKCS12_decrypt_d2i($type_thing, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
-EOF
-}
-
 foreach $type_thing (sort @lhashlst) {
     my $lc_tt = lc $type_thing;
     $new_stackfile .= <<EOF;

From steve at openssl.org  Fri Mar 13 14:22:56 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Fri, 13 Mar 2015 14:22:56 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426256576.792172.29110.nullmailer@dev.openssl.org>

The branch master has been updated
       via  ffa75828dd13decb41d075576db676c81c1198f1 (commit)
      from  b5f07d6a66df963e45a5f7fe23329009b12bdf87 (commit)


- Log -----------------------------------------------------------------
commit ffa75828dd13decb41d075576db676c81c1198f1
Author: Petr Spacek <pspacek at redhat.com>
Date:   Mon Jan 26 14:39:50 2015 +0100

    Fix key wrapping mode with padding to conform to RFC 5649.
    
    According to RFC 5649 section 4.1 step 1) we should not add padding
    if plaintext length is multiply of 8 ockets.
    
    This matches pseudo-code in http://dx.doi.org/10.6028/NIST.SP.800-38F
    on page 15, section 6.3 KWP, algorithm 5 KWP-AE, step 2.
    
    PR#3675
    
    Reviewed-by: Stephen Henson <steve at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 crypto/modes/wrap128.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/crypto/modes/wrap128.c b/crypto/modes/wrap128.c
index 2f65314..ccb58c5 100644
--- a/crypto/modes/wrap128.c
+++ b/crypto/modes/wrap128.c
@@ -230,8 +230,13 @@ size_t CRYPTO_128_wrap_pad(void *key, const unsigned char *icv,
                            const unsigned char *in, size_t inlen,
                            block128_f block)
 {
-    /* n: number of 64-bit blocks in the padded key data */
-    const size_t blocks_padded = (inlen + 8) / 8;
+    /* n: number of 64-bit blocks in the padded key data
+     *
+     * If length of plain text is not a multiple of 8, pad the plain text octet
+     * string on the right with octets of zeros, where final length is the
+     * smallest multiple of 8 that is greater than length of plain text.
+     * If length of plain text is a multiple of 8, then there is no padding. */
+    const size_t blocks_padded = (inlen + 7) / 8; /* CEILING(m/8) */
     const size_t padded_len = blocks_padded * 8;
     const size_t padding_len = padded_len - inlen;
     /* RFC 5649 section 3: Alternative Initial Value */

From steve at openssl.org  Fri Mar 13 16:54:38 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Fri, 13 Mar 2015 16:54:38 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426265678.717571.14968.nullmailer@dev.openssl.org>

The branch master has been updated
       via  3d6aa6d441fe8124d247dffee5c68c2e5efd8258 (commit)
      from  ffa75828dd13decb41d075576db676c81c1198f1 (commit)


- Log -----------------------------------------------------------------
commit 3d6aa6d441fe8124d247dffee5c68c2e5efd8258
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Feb 24 00:57:51 2015 +0000

    Allocate string types directly.
    
    Allocate and free ASN.1 string types directly instead of going through
    the ASN.1 item code.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/asn1/tasn_typ.c | 68 +++++++++++++++++++-------------------------------
 1 file changed, 26 insertions(+), 42 deletions(-)

diff --git a/crypto/asn1/tasn_typ.c b/crypto/asn1/tasn_typ.c
index 740e86d..1d806dc 100644
--- a/crypto/asn1/tasn_typ.c
+++ b/crypto/asn1/tasn_typ.c
@@ -62,54 +62,38 @@
 
 /* Declarations for string types */
 
-
-IMPLEMENT_ASN1_TYPE(ASN1_INTEGER)
-IMPLEMENT_ASN1_FUNCTIONS(ASN1_INTEGER)
-
-IMPLEMENT_ASN1_TYPE(ASN1_ENUMERATED)
-IMPLEMENT_ASN1_FUNCTIONS(ASN1_ENUMERATED)
-
-IMPLEMENT_ASN1_TYPE(ASN1_BIT_STRING)
-IMPLEMENT_ASN1_FUNCTIONS(ASN1_BIT_STRING)
-
-IMPLEMENT_ASN1_TYPE(ASN1_OCTET_STRING)
-IMPLEMENT_ASN1_FUNCTIONS(ASN1_OCTET_STRING)
+#define IMPLEMENT_ASN1_STRING_FUNCTIONS(sname) \
+    IMPLEMENT_ASN1_TYPE(sname) \
+    IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(sname, sname, sname) \
+sname *sname##_new(void) \
+{ \
+    return ASN1_STRING_type_new(V_##sname); \
+} \
+void sname##_free(sname *x) \
+{ \
+    ASN1_STRING_free(x); \
+}
+
+IMPLEMENT_ASN1_STRING_FUNCTIONS(ASN1_OCTET_STRING)
+IMPLEMENT_ASN1_STRING_FUNCTIONS(ASN1_INTEGER)
+IMPLEMENT_ASN1_STRING_FUNCTIONS(ASN1_ENUMERATED)
+IMPLEMENT_ASN1_STRING_FUNCTIONS(ASN1_BIT_STRING)
+IMPLEMENT_ASN1_STRING_FUNCTIONS(ASN1_UTF8STRING)
+IMPLEMENT_ASN1_STRING_FUNCTIONS(ASN1_PRINTABLESTRING)
+IMPLEMENT_ASN1_STRING_FUNCTIONS(ASN1_T61STRING)
+IMPLEMENT_ASN1_STRING_FUNCTIONS(ASN1_IA5STRING)
+IMPLEMENT_ASN1_STRING_FUNCTIONS(ASN1_GENERALSTRING)
+IMPLEMENT_ASN1_STRING_FUNCTIONS(ASN1_UTCTIME)
+IMPLEMENT_ASN1_STRING_FUNCTIONS(ASN1_GENERALIZEDTIME)
+IMPLEMENT_ASN1_STRING_FUNCTIONS(ASN1_VISIBLESTRING)
+IMPLEMENT_ASN1_STRING_FUNCTIONS(ASN1_UNIVERSALSTRING)
+IMPLEMENT_ASN1_STRING_FUNCTIONS(ASN1_BMPSTRING)
 
 IMPLEMENT_ASN1_TYPE(ASN1_NULL)
 IMPLEMENT_ASN1_FUNCTIONS(ASN1_NULL)
 
 IMPLEMENT_ASN1_TYPE(ASN1_OBJECT)
 
-IMPLEMENT_ASN1_TYPE(ASN1_UTF8STRING)
-IMPLEMENT_ASN1_FUNCTIONS(ASN1_UTF8STRING)
-
-IMPLEMENT_ASN1_TYPE(ASN1_PRINTABLESTRING)
-IMPLEMENT_ASN1_FUNCTIONS(ASN1_PRINTABLESTRING)
-
-IMPLEMENT_ASN1_TYPE(ASN1_T61STRING)
-IMPLEMENT_ASN1_FUNCTIONS(ASN1_T61STRING)
-
-IMPLEMENT_ASN1_TYPE(ASN1_IA5STRING)
-IMPLEMENT_ASN1_FUNCTIONS(ASN1_IA5STRING)
-
-IMPLEMENT_ASN1_TYPE(ASN1_GENERALSTRING)
-IMPLEMENT_ASN1_FUNCTIONS(ASN1_GENERALSTRING)
-
-IMPLEMENT_ASN1_TYPE(ASN1_UTCTIME)
-IMPLEMENT_ASN1_FUNCTIONS(ASN1_UTCTIME)
-
-IMPLEMENT_ASN1_TYPE(ASN1_GENERALIZEDTIME)
-IMPLEMENT_ASN1_FUNCTIONS(ASN1_GENERALIZEDTIME)
-
-IMPLEMENT_ASN1_TYPE(ASN1_VISIBLESTRING)
-IMPLEMENT_ASN1_FUNCTIONS(ASN1_VISIBLESTRING)
-
-IMPLEMENT_ASN1_TYPE(ASN1_UNIVERSALSTRING)
-IMPLEMENT_ASN1_FUNCTIONS(ASN1_UNIVERSALSTRING)
-
-IMPLEMENT_ASN1_TYPE(ASN1_BMPSTRING)
-IMPLEMENT_ASN1_FUNCTIONS(ASN1_BMPSTRING)
-
 IMPLEMENT_ASN1_TYPE(ASN1_ANY)
 
 /* Just swallow an ASN1_SEQUENCE in an ASN1_STRING */

From emilia at openssl.org  Sat Mar 14 04:15:37 2015
From: emilia at openssl.org (Emilia Kasper)
Date: Sat, 14 Mar 2015 04:15:37 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1426306537.886823.9484.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  a2fcab9978a0905c4286051993da63329fda8a19 (commit)
      from  1a098164354e8e14e0237993cca7a0bffe820ed6 (commit)


- Log -----------------------------------------------------------------
commit a2fcab9978a0905c4286051993da63329fda8a19
Author: Emilia Kasper <emilia at openssl.org>
Date:   Fri Mar 13 21:10:13 2015 -0700

    Fix undefined behaviour in shifts.
    
    Td4 and Te4 are arrays of u8. A u8 << int promotes the u8 to an int first then shifts.
    If the mathematical result of a shift (as modelled by lhs * 2^{rhs}) is not representable
    in an integer, behaviour is undefined. In other words, you can't shift into the sign bit
    of a signed integer. Fix this by casting to u32 whenever we're shifting left by 24.
    
    (For consistency, cast other shifts, too.)
    
    Caught by -fsanitize=shift
    
    Submitted by Nick Lewycky (Google)
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit 8b37e5c14f0eddb10c7f91ef91004622d90ef361)

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

Summary of changes:
 crypto/aes/aes_core.c    |  64 +++++++-------
 crypto/aes/aes_x86core.c | 224 +++++++++++++++++++++++------------------------
 2 files changed, 144 insertions(+), 144 deletions(-)

diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c
index ff0d164..2ddb086 100644
--- a/crypto/aes/aes_core.c
+++ b/crypto/aes/aes_core.c
@@ -1130,31 +1130,31 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
      * map cipher state to byte array block:
      */
     s0 =
-        (Td4[(t0 >> 24)       ] << 24) ^
-        (Td4[(t3 >> 16) & 0xff] << 16) ^
-        (Td4[(t2 >>  8) & 0xff] <<  8) ^
-        (Td4[(t1      ) & 0xff])       ^
+        ((u32)Td4[(t0 >> 24)       ] << 24) ^
+        ((u32)Td4[(t3 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(t2 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(t1      ) & 0xff])       ^
         rk[0];
     PUTU32(out     , s0);
     s1 =
-        (Td4[(t1 >> 24)       ] << 24) ^
-        (Td4[(t0 >> 16) & 0xff] << 16) ^
-        (Td4[(t3 >>  8) & 0xff] <<  8) ^
-        (Td4[(t2      ) & 0xff])       ^
+        ((u32)Td4[(t1 >> 24)       ] << 24) ^
+        ((u32)Td4[(t0 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(t3 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(t2      ) & 0xff])       ^
         rk[1];
     PUTU32(out +  4, s1);
     s2 =
-        (Td4[(t2 >> 24)       ] << 24) ^
-        (Td4[(t1 >> 16) & 0xff] << 16) ^
-        (Td4[(t0 >>  8) & 0xff] <<  8) ^
-        (Td4[(t3      ) & 0xff])       ^
+        ((u32)Td4[(t2 >> 24)       ] << 24) ^
+        ((u32)Td4[(t1 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(t0 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(t3      ) & 0xff])       ^
         rk[2];
     PUTU32(out +  8, s2);
     s3 =
-        (Td4[(t3 >> 24)       ] << 24) ^
-        (Td4[(t2 >> 16) & 0xff] << 16) ^
-        (Td4[(t1 >>  8) & 0xff] <<  8) ^
-        (Td4[(t0      ) & 0xff])       ^
+        ((u32)Td4[(t3 >> 24)       ] << 24) ^
+        ((u32)Td4[(t2 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(t1 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(t0      ) & 0xff])       ^
         rk[3];
     PUTU32(out + 12, s3);
 }
@@ -1233,10 +1233,10 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
         while (1) {
             temp  = rk[3];
             rk[4] = rk[0] ^
-                (Te4[(temp >> 16) & 0xff] << 24) ^
-                (Te4[(temp >>  8) & 0xff] << 16) ^
-                (Te4[(temp      ) & 0xff] << 8) ^
-                (Te4[(temp >> 24)       ]) ^
+                ((u32)Te4[(temp >> 16) & 0xff] << 24) ^
+                ((u32)Te4[(temp >>  8) & 0xff] << 16) ^
+                ((u32)Te4[(temp      ) & 0xff] << 8) ^
+                ((u32)Te4[(temp >> 24)       ]) ^
                 rcon[i];
             rk[5] = rk[1] ^ rk[4];
             rk[6] = rk[2] ^ rk[5];
@@ -1253,10 +1253,10 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
         while (1) {
             temp = rk[ 5];
             rk[ 6] = rk[ 0] ^
-                (Te4[(temp >> 16) & 0xff] << 24) ^
-                (Te4[(temp >>  8) & 0xff] << 16) ^
-                (Te4[(temp      ) & 0xff] << 8) ^
-                (Te4[(temp >> 24)       ]) ^
+                ((u32)Te4[(temp >> 16) & 0xff] << 24) ^
+                ((u32)Te4[(temp >>  8) & 0xff] << 16) ^
+                ((u32)Te4[(temp      ) & 0xff] << 8) ^
+                ((u32)Te4[(temp >> 24)       ]) ^
                 rcon[i];
             rk[ 7] = rk[ 1] ^ rk[ 6];
             rk[ 8] = rk[ 2] ^ rk[ 7];
@@ -1275,10 +1275,10 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
         while (1) {
             temp = rk[ 7];
             rk[ 8] = rk[ 0] ^
-                (Te4[(temp >> 16) & 0xff] << 24) ^
-                (Te4[(temp >>  8) & 0xff] << 16) ^
-                (Te4[(temp      ) & 0xff] << 8) ^
-                (Te4[(temp >> 24)       ]) ^
+                ((u32)Te4[(temp >> 16) & 0xff] << 24) ^
+                ((u32)Te4[(temp >>  8) & 0xff] << 16) ^
+                ((u32)Te4[(temp      ) & 0xff] << 8) ^
+                ((u32)Te4[(temp >> 24)       ]) ^
                 rcon[i];
             rk[ 9] = rk[ 1] ^ rk[ 8];
             rk[10] = rk[ 2] ^ rk[ 9];
@@ -1288,10 +1288,10 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
             }
             temp = rk[11];
             rk[12] = rk[ 4] ^
-                (Te4[(temp >> 24)       ] << 24) ^
-                (Te4[(temp >> 16) & 0xff] << 16) ^
-                (Te4[(temp >>  8) & 0xff] << 8) ^
-                (Te4[(temp      ) & 0xff]);
+                ((u32)Te4[(temp >> 24)       ] << 24) ^
+                ((u32)Te4[(temp >> 16) & 0xff] << 16) ^
+                ((u32)Te4[(temp >>  8) & 0xff] << 8) ^
+                ((u32)Te4[(temp      ) & 0xff]);
             rk[13] = rk[ 5] ^ rk[12];
             rk[14] = rk[ 6] ^ rk[13];
             rk[15] = rk[ 7] ^ rk[14];
diff --git a/crypto/aes/aes_x86core.c b/crypto/aes/aes_x86core.c
index f651059..1defbb1 100644
--- a/crypto/aes/aes_x86core.c
+++ b/crypto/aes/aes_x86core.c
@@ -497,10 +497,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
         while (1) {
             temp  = rk[3];
             rk[4] = rk[0] ^
-                (Te4[(temp >>  8) & 0xff]      ) ^
-                (Te4[(temp >> 16) & 0xff] <<  8) ^
-                (Te4[(temp >> 24)       ] << 16) ^
-                (Te4[(temp      ) & 0xff] << 24) ^
+                ((u32)Te4[(temp >>  8) & 0xff]      ) ^
+                ((u32)Te4[(temp >> 16) & 0xff] <<  8) ^
+                ((u32)Te4[(temp >> 24)       ] << 16) ^
+                ((u32)Te4[(temp      ) & 0xff] << 24) ^
                 rcon[i];
             rk[5] = rk[1] ^ rk[4];
             rk[6] = rk[2] ^ rk[5];
@@ -517,10 +517,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
         while (1) {
             temp = rk[ 5];
             rk[ 6] = rk[ 0] ^
-                (Te4[(temp >>  8) & 0xff]      ) ^
-                (Te4[(temp >> 16) & 0xff] <<  8) ^
-                (Te4[(temp >> 24)       ] << 16) ^
-                (Te4[(temp      ) & 0xff] << 24) ^
+                ((u32)Te4[(temp >>  8) & 0xff]      ) ^
+                ((u32)Te4[(temp >> 16) & 0xff] <<  8) ^
+                ((u32)Te4[(temp >> 24)       ] << 16) ^
+                ((u32)Te4[(temp      ) & 0xff] << 24) ^
                 rcon[i];
             rk[ 7] = rk[ 1] ^ rk[ 6];
             rk[ 8] = rk[ 2] ^ rk[ 7];
@@ -539,10 +539,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
         while (1) {
             temp = rk[ 7];
             rk[ 8] = rk[ 0] ^
-                (Te4[(temp >>  8) & 0xff]      ) ^
-                (Te4[(temp >> 16) & 0xff] <<  8) ^
-                (Te4[(temp >> 24)       ] << 16) ^
-                (Te4[(temp      ) & 0xff] << 24) ^
+                ((u32)Te4[(temp >>  8) & 0xff]      ) ^
+                ((u32)Te4[(temp >> 16) & 0xff] <<  8) ^
+                ((u32)Te4[(temp >> 24)       ] << 16) ^
+                ((u32)Te4[(temp      ) & 0xff] << 24) ^
                 rcon[i];
             rk[ 9] = rk[ 1] ^ rk[ 8];
             rk[10] = rk[ 2] ^ rk[ 9];
@@ -552,10 +552,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
             }
             temp = rk[11];
             rk[12] = rk[ 4] ^
-                (Te4[(temp      ) & 0xff]      ) ^
-                (Te4[(temp >>  8) & 0xff] <<  8) ^
-                (Te4[(temp >> 16) & 0xff] << 16) ^
-                (Te4[(temp >> 24)       ] << 24);
+                ((u32)Te4[(temp      ) & 0xff]      ) ^
+                ((u32)Te4[(temp >>  8) & 0xff] <<  8) ^
+                ((u32)Te4[(temp >> 16) & 0xff] << 16) ^
+                ((u32)Te4[(temp >> 24)       ] << 24);
             rk[13] = rk[ 5] ^ rk[12];
             rk[14] = rk[ 6] ^ rk[13];
             rk[15] = rk[ 7] ^ rk[14];
@@ -674,22 +674,22 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
 #if defined(AES_COMPACT_IN_OUTER_ROUNDS)
     prefetch256(Te4);
 
-    t[0] =  Te4[(s0      ) & 0xff]       ^
-        Te4[(s1 >>  8) & 0xff] <<  8 ^
-        Te4[(s2 >> 16) & 0xff] << 16 ^
-        Te4[(s3 >> 24)       ] << 24;
-    t[1] =  Te4[(s1      ) & 0xff]       ^
-        Te4[(s2 >>  8) & 0xff] <<  8 ^
-        Te4[(s3 >> 16) & 0xff] << 16 ^
-        Te4[(s0 >> 24)       ] << 24;
-    t[2] =  Te4[(s2      ) & 0xff]       ^
-        Te4[(s3 >>  8) & 0xff] <<  8 ^
-        Te4[(s0 >> 16) & 0xff] << 16 ^
-        Te4[(s1 >> 24)       ] << 24;
-    t[3] =  Te4[(s3      ) & 0xff]       ^
-        Te4[(s0 >>  8) & 0xff] <<  8 ^
-        Te4[(s1 >> 16) & 0xff] << 16 ^
-        Te4[(s2 >> 24)       ] << 24;
+    t[0] = (u32)Te4[(s0      ) & 0xff]       ^
+           (u32)Te4[(s1 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s2 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s3 >> 24)       ] << 24;
+    t[1] = (u32)Te4[(s1      ) & 0xff]       ^
+           (u32)Te4[(s2 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s3 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s0 >> 24)       ] << 24;
+    t[2] = (u32)Te4[(s2      ) & 0xff]       ^
+           (u32)Te4[(s3 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s0 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s1 >> 24)       ] << 24;
+    t[3] = (u32)Te4[(s3      ) & 0xff]       ^
+           (u32)Te4[(s0 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s1 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s2 >> 24)       ] << 24;
 
     /* now do the linear transform using words */
     {   int i;
@@ -740,22 +740,22 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
      */
     for (rk+=8,r=key->rounds-2; r>0; rk+=4,r--) {
 #if defined(AES_COMPACT_IN_INNER_ROUNDS)
-        t[0] =  Te4[(s0      ) & 0xff]       ^
-            Te4[(s1 >>  8) & 0xff] <<  8 ^
-            Te4[(s2 >> 16) & 0xff] << 16 ^
-            Te4[(s3 >> 24)       ] << 24;
-        t[1] =  Te4[(s1      ) & 0xff]       ^
-            Te4[(s2 >>  8) & 0xff] <<  8 ^
-            Te4[(s3 >> 16) & 0xff] << 16 ^
-            Te4[(s0 >> 24)       ] << 24;
-        t[2] =  Te4[(s2      ) & 0xff]       ^
-            Te4[(s3 >>  8) & 0xff] <<  8 ^
-            Te4[(s0 >> 16) & 0xff] << 16 ^
-            Te4[(s1 >> 24)       ] << 24;
-        t[3] =  Te4[(s3      ) & 0xff]       ^
-            Te4[(s0 >>  8) & 0xff] <<  8 ^
-            Te4[(s1 >> 16) & 0xff] << 16 ^
-            Te4[(s2 >> 24)       ] << 24;
+        t[0] = (u32)Te4[(s0      ) & 0xff]       ^
+               (u32)Te4[(s1 >>  8) & 0xff] <<  8 ^
+               (u32)Te4[(s2 >> 16) & 0xff] << 16 ^
+               (u32)Te4[(s3 >> 24)       ] << 24;
+        t[1] = (u32)Te4[(s1      ) & 0xff]       ^
+               (u32)Te4[(s2 >>  8) & 0xff] <<  8 ^
+               (u32)Te4[(s3 >> 16) & 0xff] << 16 ^
+               (u32)Te4[(s0 >> 24)       ] << 24;
+        t[2] = (u32)Te4[(s2      ) & 0xff]       ^
+               (u32)Te4[(s3 >>  8) & 0xff] <<  8 ^
+               (u32)Te4[(s0 >> 16) & 0xff] << 16 ^
+               (u32)Te4[(s1 >> 24)       ] << 24;
+        t[3] = (u32)Te4[(s3      ) & 0xff]       ^
+               (u32)Te4[(s0 >>  8) & 0xff] <<  8 ^
+               (u32)Te4[(s1 >> 16) & 0xff] << 16 ^
+               (u32)Te4[(s2 >> 24)       ] << 24;
 
         /* now do the linear transform using words */
         {
@@ -810,28 +810,28 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
     prefetch256(Te4);
 
     *(u32*)(out+0) =
-        Te4[(s0      ) & 0xff]       ^
-        Te4[(s1 >>  8) & 0xff] <<  8 ^
-        Te4[(s2 >> 16) & 0xff] << 16 ^
-        Te4[(s3 >> 24)       ] << 24 ^
+           (u32)Te4[(s0      ) & 0xff]       ^
+           (u32)Te4[(s1 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s2 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s3 >> 24)       ] << 24 ^
         rk[0];
     *(u32*)(out+4) =
-        Te4[(s1      ) & 0xff]       ^
-        Te4[(s2 >>  8) & 0xff] <<  8 ^
-        Te4[(s3 >> 16) & 0xff] << 16 ^
-        Te4[(s0 >> 24)       ] << 24 ^
+           (u32)Te4[(s1      ) & 0xff]       ^
+           (u32)Te4[(s2 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s3 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s0 >> 24)       ] << 24 ^
         rk[1];
     *(u32*)(out+8) =
-        Te4[(s2      ) & 0xff]       ^
-        Te4[(s3 >>  8) & 0xff] <<  8 ^
-        Te4[(s0 >> 16) & 0xff] << 16 ^
-        Te4[(s1 >> 24)       ] << 24 ^
+           (u32)Te4[(s2      ) & 0xff]       ^
+           (u32)Te4[(s3 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s0 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s1 >> 24)       ] << 24 ^
         rk[2];
     *(u32*)(out+12) =
-        Te4[(s3      ) & 0xff]       ^
-        Te4[(s0 >>  8) & 0xff] <<  8 ^
-        Te4[(s1 >> 16) & 0xff] << 16 ^
-        Te4[(s2 >> 24)       ] << 24 ^
+           (u32)Te4[(s3      ) & 0xff]       ^
+           (u32)Te4[(s0 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s1 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s2 >> 24)       ] << 24 ^
         rk[3];
 #else
     *(u32*)(out+0) =
@@ -888,22 +888,22 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
 #if defined(AES_COMPACT_IN_OUTER_ROUNDS)
     prefetch256(Td4);
 
-    t[0] =  Td4[(s0      ) & 0xff]       ^
-    Td4[(s3 >>  8) & 0xff] <<  8 ^
-    Td4[(s2 >> 16) & 0xff] << 16 ^
-    Td4[(s1 >> 24)       ] << 24;
-    t[1] =  Td4[(s1      ) & 0xff]       ^
-    Td4[(s0 >>  8) & 0xff] <<  8 ^
-    Td4[(s3 >> 16) & 0xff] << 16 ^
-    Td4[(s2 >> 24)       ] << 24;
-    t[2] =  Td4[(s2      ) & 0xff]       ^
-    Td4[(s1 >>  8) & 0xff] <<  8 ^
-    Td4[(s0 >> 16) & 0xff] << 16 ^
-    Td4[(s3 >> 24)       ] << 24;
-    t[3] =  Td4[(s3      ) & 0xff]       ^
-    Td4[(s2 >>  8) & 0xff] <<  8 ^
-    Td4[(s1 >> 16) & 0xff] << 16 ^
-    Td4[(s0 >> 24)       ] << 24;
+    t[0] = (u32)Td4[(s0      ) & 0xff]       ^
+           (u32)Td4[(s3 >>  8) & 0xff] <<  8 ^
+           (u32)Td4[(s2 >> 16) & 0xff] << 16 ^
+           (u32)Td4[(s1 >> 24)       ] << 24;
+    t[1] = (u32)Td4[(s1      ) & 0xff]       ^
+           (u32)Td4[(s0 >>  8) & 0xff] <<  8 ^
+           (u32)Td4[(s3 >> 16) & 0xff] << 16 ^
+           (u32)Td4[(s2 >> 24)       ] << 24;
+    t[2] = (u32)Td4[(s2      ) & 0xff]       ^
+           (u32)Td4[(s1 >>  8) & 0xff] <<  8 ^
+           (u32)Td4[(s0 >> 16) & 0xff] << 16 ^
+           (u32)Td4[(s3 >> 24)       ] << 24;
+    t[3] = (u32)Td4[(s3      ) & 0xff]       ^
+           (u32)Td4[(s2 >>  8) & 0xff] <<  8 ^
+           (u32)Td4[(s1 >> 16) & 0xff] << 16 ^
+           (u32)Td4[(s0 >> 24)       ] << 24;
 
     /* now do the linear transform using words */ 
     {
@@ -965,22 +965,22 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
      */
     for (rk+=8,r=key->rounds-2; r>0; rk+=4,r--) {
 #if defined(AES_COMPACT_IN_INNER_ROUNDS)
-        t[0] =  Td4[(s0      ) & 0xff]       ^
-        Td4[(s3 >>  8) & 0xff] <<  8 ^
-        Td4[(s2 >> 16) & 0xff] << 16 ^
-        Td4[(s1 >> 24)       ] << 24;
-        t[1] =  Td4[(s1      ) & 0xff]       ^
-        Td4[(s0 >>  8) & 0xff] <<  8 ^
-        Td4[(s3 >> 16) & 0xff] << 16 ^
-        Td4[(s2 >> 24)       ] << 24;
-        t[2] =  Td4[(s2      ) & 0xff]       ^
-        Td4[(s1 >>  8) & 0xff] <<  8 ^
-        Td4[(s0 >> 16) & 0xff] << 16 ^
-        Td4[(s3 >> 24)       ] << 24;
-        t[3] =  Td4[(s3      ) & 0xff]       ^
-        Td4[(s2 >>  8) & 0xff] <<  8 ^
-        Td4[(s1 >> 16) & 0xff] << 16 ^
-        Td4[(s0 >> 24)       ] << 24;
+        t[0] = (u32)Td4[(s0      ) & 0xff]       ^
+               (u32)Td4[(s3 >>  8) & 0xff] <<  8 ^
+               (u32)Td4[(s2 >> 16) & 0xff] << 16 ^
+               (u32)Td4[(s1 >> 24)       ] << 24;
+        t[1] = (u32)Td4[(s1      ) & 0xff]       ^
+               (u32)Td4[(s0 >>  8) & 0xff] <<  8 ^
+               (u32)Td4[(s3 >> 16) & 0xff] << 16 ^
+               (u32)Td4[(s2 >> 24)       ] << 24;
+        t[2] = (u32)Td4[(s2      ) & 0xff]       ^
+               (u32)Td4[(s1 >>  8) & 0xff] <<  8 ^
+               (u32)Td4[(s0 >> 16) & 0xff] << 16 ^
+               (u32)Td4[(s3 >> 24)       ] << 24;
+        t[3] = (u32)Td4[(s3      ) & 0xff]       ^
+               (u32)Td4[(s2 >>  8) & 0xff] <<  8 ^
+               (u32)Td4[(s1 >> 16) & 0xff] << 16 ^
+               (u32)Td4[(s0 >> 24)       ] << 24;
 
     /* now do the linear transform using words */ 
     {
@@ -1044,27 +1044,27 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
     prefetch256(Td4);
 
     *(u32*)(out+0) =
-        (Td4[(s0      ) & 0xff])    ^
-        (Td4[(s3 >>  8) & 0xff] <<  8) ^
-        (Td4[(s2 >> 16) & 0xff] << 16) ^
-        (Td4[(s1 >> 24)       ] << 24) ^
+        ((u32)Td4[(s0      ) & 0xff])    ^
+        ((u32)Td4[(s3 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(s2 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(s1 >> 24)       ] << 24) ^
         rk[0];
     *(u32*)(out+4) =
-        (Td4[(s1      ) & 0xff])     ^
-        (Td4[(s0 >>  8) & 0xff] <<  8) ^
-        (Td4[(s3 >> 16) & 0xff] << 16) ^
-        (Td4[(s2 >> 24)       ] << 24) ^
+        ((u32)Td4[(s1      ) & 0xff])     ^
+        ((u32)Td4[(s0 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(s3 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(s2 >> 24)       ] << 24) ^
         rk[1];
     *(u32*)(out+8) =
-        (Td4[(s2      ) & 0xff])     ^
-        (Td4[(s1 >>  8) & 0xff] <<  8) ^
-        (Td4[(s0 >> 16) & 0xff] << 16) ^
-        (Td4[(s3 >> 24)       ] << 24) ^
+        ((u32)Td4[(s2      ) & 0xff])     ^
+        ((u32)Td4[(s1 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(s0 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(s3 >> 24)       ] << 24) ^
         rk[2];
     *(u32*)(out+12) =
-        (Td4[(s3      ) & 0xff])     ^
-        (Td4[(s2 >>  8) & 0xff] <<  8) ^
-        (Td4[(s1 >> 16) & 0xff] << 16) ^
-        (Td4[(s0 >> 24)       ] << 24) ^
+        ((u32)Td4[(s3      ) & 0xff])     ^
+        ((u32)Td4[(s2 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(s1 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(s0 >> 24)       ] << 24) ^
         rk[3];
 }

From emilia at openssl.org  Sat Mar 14 04:15:37 2015
From: emilia at openssl.org (Emilia Kasper)
Date: Sat, 14 Mar 2015 04:15:37 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1426306537.953455.9506.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  be109b9eec79a90871e5deb7d6ede8c04f073884 (commit)
      from  c0d69ddb3323e45afba7a7f1608fb03f9a7d6fff (commit)


- Log -----------------------------------------------------------------
commit be109b9eec79a90871e5deb7d6ede8c04f073884
Author: Emilia Kasper <emilia at openssl.org>
Date:   Fri Mar 13 21:10:13 2015 -0700

    Fix undefined behaviour in shifts.
    
    Td4 and Te4 are arrays of u8. A u8 << int promotes the u8 to an int first then shifts.
    If the mathematical result of a shift (as modelled by lhs * 2^{rhs}) is not representable
    in an integer, behaviour is undefined. In other words, you can't shift into the sign bit
    of a signed integer. Fix this by casting to u32 whenever we're shifting left by 24.
    
    (For consistency, cast other shifts, too.)
    
    Caught by -fsanitize=shift
    
    Submitted by Nick Lewycky (Google)
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit 8b37e5c14f0eddb10c7f91ef91004622d90ef361)

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

Summary of changes:
 crypto/aes/aes_core.c    |  64 +++++++-------
 crypto/aes/aes_x86core.c | 224 +++++++++++++++++++++++------------------------
 2 files changed, 144 insertions(+), 144 deletions(-)

diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c
index ff0d164..2ddb086 100644
--- a/crypto/aes/aes_core.c
+++ b/crypto/aes/aes_core.c
@@ -1130,31 +1130,31 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
      * map cipher state to byte array block:
      */
     s0 =
-        (Td4[(t0 >> 24)       ] << 24) ^
-        (Td4[(t3 >> 16) & 0xff] << 16) ^
-        (Td4[(t2 >>  8) & 0xff] <<  8) ^
-        (Td4[(t1      ) & 0xff])       ^
+        ((u32)Td4[(t0 >> 24)       ] << 24) ^
+        ((u32)Td4[(t3 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(t2 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(t1      ) & 0xff])       ^
         rk[0];
     PUTU32(out     , s0);
     s1 =
-        (Td4[(t1 >> 24)       ] << 24) ^
-        (Td4[(t0 >> 16) & 0xff] << 16) ^
-        (Td4[(t3 >>  8) & 0xff] <<  8) ^
-        (Td4[(t2      ) & 0xff])       ^
+        ((u32)Td4[(t1 >> 24)       ] << 24) ^
+        ((u32)Td4[(t0 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(t3 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(t2      ) & 0xff])       ^
         rk[1];
     PUTU32(out +  4, s1);
     s2 =
-        (Td4[(t2 >> 24)       ] << 24) ^
-        (Td4[(t1 >> 16) & 0xff] << 16) ^
-        (Td4[(t0 >>  8) & 0xff] <<  8) ^
-        (Td4[(t3      ) & 0xff])       ^
+        ((u32)Td4[(t2 >> 24)       ] << 24) ^
+        ((u32)Td4[(t1 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(t0 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(t3      ) & 0xff])       ^
         rk[2];
     PUTU32(out +  8, s2);
     s3 =
-        (Td4[(t3 >> 24)       ] << 24) ^
-        (Td4[(t2 >> 16) & 0xff] << 16) ^
-        (Td4[(t1 >>  8) & 0xff] <<  8) ^
-        (Td4[(t0      ) & 0xff])       ^
+        ((u32)Td4[(t3 >> 24)       ] << 24) ^
+        ((u32)Td4[(t2 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(t1 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(t0      ) & 0xff])       ^
         rk[3];
     PUTU32(out + 12, s3);
 }
@@ -1233,10 +1233,10 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
         while (1) {
             temp  = rk[3];
             rk[4] = rk[0] ^
-                (Te4[(temp >> 16) & 0xff] << 24) ^
-                (Te4[(temp >>  8) & 0xff] << 16) ^
-                (Te4[(temp      ) & 0xff] << 8) ^
-                (Te4[(temp >> 24)       ]) ^
+                ((u32)Te4[(temp >> 16) & 0xff] << 24) ^
+                ((u32)Te4[(temp >>  8) & 0xff] << 16) ^
+                ((u32)Te4[(temp      ) & 0xff] << 8) ^
+                ((u32)Te4[(temp >> 24)       ]) ^
                 rcon[i];
             rk[5] = rk[1] ^ rk[4];
             rk[6] = rk[2] ^ rk[5];
@@ -1253,10 +1253,10 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
         while (1) {
             temp = rk[ 5];
             rk[ 6] = rk[ 0] ^
-                (Te4[(temp >> 16) & 0xff] << 24) ^
-                (Te4[(temp >>  8) & 0xff] << 16) ^
-                (Te4[(temp      ) & 0xff] << 8) ^
-                (Te4[(temp >> 24)       ]) ^
+                ((u32)Te4[(temp >> 16) & 0xff] << 24) ^
+                ((u32)Te4[(temp >>  8) & 0xff] << 16) ^
+                ((u32)Te4[(temp      ) & 0xff] << 8) ^
+                ((u32)Te4[(temp >> 24)       ]) ^
                 rcon[i];
             rk[ 7] = rk[ 1] ^ rk[ 6];
             rk[ 8] = rk[ 2] ^ rk[ 7];
@@ -1275,10 +1275,10 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
         while (1) {
             temp = rk[ 7];
             rk[ 8] = rk[ 0] ^
-                (Te4[(temp >> 16) & 0xff] << 24) ^
-                (Te4[(temp >>  8) & 0xff] << 16) ^
-                (Te4[(temp      ) & 0xff] << 8) ^
-                (Te4[(temp >> 24)       ]) ^
+                ((u32)Te4[(temp >> 16) & 0xff] << 24) ^
+                ((u32)Te4[(temp >>  8) & 0xff] << 16) ^
+                ((u32)Te4[(temp      ) & 0xff] << 8) ^
+                ((u32)Te4[(temp >> 24)       ]) ^
                 rcon[i];
             rk[ 9] = rk[ 1] ^ rk[ 8];
             rk[10] = rk[ 2] ^ rk[ 9];
@@ -1288,10 +1288,10 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
             }
             temp = rk[11];
             rk[12] = rk[ 4] ^
-                (Te4[(temp >> 24)       ] << 24) ^
-                (Te4[(temp >> 16) & 0xff] << 16) ^
-                (Te4[(temp >>  8) & 0xff] << 8) ^
-                (Te4[(temp      ) & 0xff]);
+                ((u32)Te4[(temp >> 24)       ] << 24) ^
+                ((u32)Te4[(temp >> 16) & 0xff] << 16) ^
+                ((u32)Te4[(temp >>  8) & 0xff] << 8) ^
+                ((u32)Te4[(temp      ) & 0xff]);
             rk[13] = rk[ 5] ^ rk[12];
             rk[14] = rk[ 6] ^ rk[13];
             rk[15] = rk[ 7] ^ rk[14];
diff --git a/crypto/aes/aes_x86core.c b/crypto/aes/aes_x86core.c
index 132b09a..c869ed7 100644
--- a/crypto/aes/aes_x86core.c
+++ b/crypto/aes/aes_x86core.c
@@ -499,10 +499,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
         while (1) {
             temp  = rk[3];
             rk[4] = rk[0] ^
-                (Te4[(temp >>  8) & 0xff]      ) ^
-                (Te4[(temp >> 16) & 0xff] <<  8) ^
-                (Te4[(temp >> 24)       ] << 16) ^
-                (Te4[(temp      ) & 0xff] << 24) ^
+                ((u32)Te4[(temp >>  8) & 0xff]      ) ^
+                ((u32)Te4[(temp >> 16) & 0xff] <<  8) ^
+                ((u32)Te4[(temp >> 24)       ] << 16) ^
+                ((u32)Te4[(temp      ) & 0xff] << 24) ^
                 rcon[i];
             rk[5] = rk[1] ^ rk[4];
             rk[6] = rk[2] ^ rk[5];
@@ -519,10 +519,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
         while (1) {
             temp = rk[ 5];
             rk[ 6] = rk[ 0] ^
-                (Te4[(temp >>  8) & 0xff]      ) ^
-                (Te4[(temp >> 16) & 0xff] <<  8) ^
-                (Te4[(temp >> 24)       ] << 16) ^
-                (Te4[(temp      ) & 0xff] << 24) ^
+                ((u32)Te4[(temp >>  8) & 0xff]      ) ^
+                ((u32)Te4[(temp >> 16) & 0xff] <<  8) ^
+                ((u32)Te4[(temp >> 24)       ] << 16) ^
+                ((u32)Te4[(temp      ) & 0xff] << 24) ^
                 rcon[i];
             rk[ 7] = rk[ 1] ^ rk[ 6];
             rk[ 8] = rk[ 2] ^ rk[ 7];
@@ -541,10 +541,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
         while (1) {
             temp = rk[ 7];
             rk[ 8] = rk[ 0] ^
-                (Te4[(temp >>  8) & 0xff]      ) ^
-                (Te4[(temp >> 16) & 0xff] <<  8) ^
-                (Te4[(temp >> 24)       ] << 16) ^
-                (Te4[(temp      ) & 0xff] << 24) ^
+                ((u32)Te4[(temp >>  8) & 0xff]      ) ^
+                ((u32)Te4[(temp >> 16) & 0xff] <<  8) ^
+                ((u32)Te4[(temp >> 24)       ] << 16) ^
+                ((u32)Te4[(temp      ) & 0xff] << 24) ^
                 rcon[i];
             rk[ 9] = rk[ 1] ^ rk[ 8];
             rk[10] = rk[ 2] ^ rk[ 9];
@@ -554,10 +554,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
             }
             temp = rk[11];
             rk[12] = rk[ 4] ^
-                (Te4[(temp      ) & 0xff]      ) ^
-                (Te4[(temp >>  8) & 0xff] <<  8) ^
-                (Te4[(temp >> 16) & 0xff] << 16) ^
-                (Te4[(temp >> 24)       ] << 24);
+                ((u32)Te4[(temp      ) & 0xff]      ) ^
+                ((u32)Te4[(temp >>  8) & 0xff] <<  8) ^
+                ((u32)Te4[(temp >> 16) & 0xff] << 16) ^
+                ((u32)Te4[(temp >> 24)       ] << 24);
             rk[13] = rk[ 5] ^ rk[12];
             rk[14] = rk[ 6] ^ rk[13];
             rk[15] = rk[ 7] ^ rk[14];
@@ -676,22 +676,22 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
 #if defined(AES_COMPACT_IN_OUTER_ROUNDS)
     prefetch256(Te4);
 
-    t[0] =  Te4[(s0      ) & 0xff]       ^
-        Te4[(s1 >>  8) & 0xff] <<  8 ^
-        Te4[(s2 >> 16) & 0xff] << 16 ^
-        Te4[(s3 >> 24)       ] << 24;
-    t[1] =  Te4[(s1      ) & 0xff]       ^
-        Te4[(s2 >>  8) & 0xff] <<  8 ^
-        Te4[(s3 >> 16) & 0xff] << 16 ^
-        Te4[(s0 >> 24)       ] << 24;
-    t[2] =  Te4[(s2      ) & 0xff]       ^
-        Te4[(s3 >>  8) & 0xff] <<  8 ^
-        Te4[(s0 >> 16) & 0xff] << 16 ^
-        Te4[(s1 >> 24)       ] << 24;
-    t[3] =  Te4[(s3      ) & 0xff]       ^
-        Te4[(s0 >>  8) & 0xff] <<  8 ^
-        Te4[(s1 >> 16) & 0xff] << 16 ^
-        Te4[(s2 >> 24)       ] << 24;
+    t[0] = (u32)Te4[(s0      ) & 0xff]       ^
+           (u32)Te4[(s1 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s2 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s3 >> 24)       ] << 24;
+    t[1] = (u32)Te4[(s1      ) & 0xff]       ^
+           (u32)Te4[(s2 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s3 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s0 >> 24)       ] << 24;
+    t[2] = (u32)Te4[(s2      ) & 0xff]       ^
+           (u32)Te4[(s3 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s0 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s1 >> 24)       ] << 24;
+    t[3] = (u32)Te4[(s3      ) & 0xff]       ^
+           (u32)Te4[(s0 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s1 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s2 >> 24)       ] << 24;
 
     /* now do the linear transform using words */
     {   int i;
@@ -742,22 +742,22 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
      */
     for (rk+=8,r=key->rounds-2; r>0; rk+=4,r--) {
 #if defined(AES_COMPACT_IN_INNER_ROUNDS)
-        t[0] =  Te4[(s0      ) & 0xff]       ^
-            Te4[(s1 >>  8) & 0xff] <<  8 ^
-            Te4[(s2 >> 16) & 0xff] << 16 ^
-            Te4[(s3 >> 24)       ] << 24;
-        t[1] =  Te4[(s1      ) & 0xff]       ^
-            Te4[(s2 >>  8) & 0xff] <<  8 ^
-            Te4[(s3 >> 16) & 0xff] << 16 ^
-            Te4[(s0 >> 24)       ] << 24;
-        t[2] =  Te4[(s2      ) & 0xff]       ^
-            Te4[(s3 >>  8) & 0xff] <<  8 ^
-            Te4[(s0 >> 16) & 0xff] << 16 ^
-            Te4[(s1 >> 24)       ] << 24;
-        t[3] =  Te4[(s3      ) & 0xff]       ^
-            Te4[(s0 >>  8) & 0xff] <<  8 ^
-            Te4[(s1 >> 16) & 0xff] << 16 ^
-            Te4[(s2 >> 24)       ] << 24;
+        t[0] = (u32)Te4[(s0      ) & 0xff]       ^
+               (u32)Te4[(s1 >>  8) & 0xff] <<  8 ^
+               (u32)Te4[(s2 >> 16) & 0xff] << 16 ^
+               (u32)Te4[(s3 >> 24)       ] << 24;
+        t[1] = (u32)Te4[(s1      ) & 0xff]       ^
+               (u32)Te4[(s2 >>  8) & 0xff] <<  8 ^
+               (u32)Te4[(s3 >> 16) & 0xff] << 16 ^
+               (u32)Te4[(s0 >> 24)       ] << 24;
+        t[2] = (u32)Te4[(s2      ) & 0xff]       ^
+               (u32)Te4[(s3 >>  8) & 0xff] <<  8 ^
+               (u32)Te4[(s0 >> 16) & 0xff] << 16 ^
+               (u32)Te4[(s1 >> 24)       ] << 24;
+        t[3] = (u32)Te4[(s3      ) & 0xff]       ^
+               (u32)Te4[(s0 >>  8) & 0xff] <<  8 ^
+               (u32)Te4[(s1 >> 16) & 0xff] << 16 ^
+               (u32)Te4[(s2 >> 24)       ] << 24;
 
         /* now do the linear transform using words */
         {
@@ -812,28 +812,28 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
     prefetch256(Te4);
 
     *(u32*)(out+0) =
-        Te4[(s0      ) & 0xff]       ^
-        Te4[(s1 >>  8) & 0xff] <<  8 ^
-        Te4[(s2 >> 16) & 0xff] << 16 ^
-        Te4[(s3 >> 24)       ] << 24 ^
+           (u32)Te4[(s0      ) & 0xff]       ^
+           (u32)Te4[(s1 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s2 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s3 >> 24)       ] << 24 ^
         rk[0];
     *(u32*)(out+4) =
-        Te4[(s1      ) & 0xff]       ^
-        Te4[(s2 >>  8) & 0xff] <<  8 ^
-        Te4[(s3 >> 16) & 0xff] << 16 ^
-        Te4[(s0 >> 24)       ] << 24 ^
+           (u32)Te4[(s1      ) & 0xff]       ^
+           (u32)Te4[(s2 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s3 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s0 >> 24)       ] << 24 ^
         rk[1];
     *(u32*)(out+8) =
-        Te4[(s2      ) & 0xff]       ^
-        Te4[(s3 >>  8) & 0xff] <<  8 ^
-        Te4[(s0 >> 16) & 0xff] << 16 ^
-        Te4[(s1 >> 24)       ] << 24 ^
+           (u32)Te4[(s2      ) & 0xff]       ^
+           (u32)Te4[(s3 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s0 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s1 >> 24)       ] << 24 ^
         rk[2];
     *(u32*)(out+12) =
-        Te4[(s3      ) & 0xff]       ^
-        Te4[(s0 >>  8) & 0xff] <<  8 ^
-        Te4[(s1 >> 16) & 0xff] << 16 ^
-        Te4[(s2 >> 24)       ] << 24 ^
+           (u32)Te4[(s3      ) & 0xff]       ^
+           (u32)Te4[(s0 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s1 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s2 >> 24)       ] << 24 ^
         rk[3];
 #else
     *(u32*)(out+0) =
@@ -890,22 +890,22 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
 #if defined(AES_COMPACT_IN_OUTER_ROUNDS)
     prefetch256(Td4);
 
-    t[0] =  Td4[(s0      ) & 0xff]       ^
-    Td4[(s3 >>  8) & 0xff] <<  8 ^
-    Td4[(s2 >> 16) & 0xff] << 16 ^
-    Td4[(s1 >> 24)       ] << 24;
-    t[1] =  Td4[(s1      ) & 0xff]       ^
-    Td4[(s0 >>  8) & 0xff] <<  8 ^
-    Td4[(s3 >> 16) & 0xff] << 16 ^
-    Td4[(s2 >> 24)       ] << 24;
-    t[2] =  Td4[(s2      ) & 0xff]       ^
-    Td4[(s1 >>  8) & 0xff] <<  8 ^
-    Td4[(s0 >> 16) & 0xff] << 16 ^
-    Td4[(s3 >> 24)       ] << 24;
-    t[3] =  Td4[(s3      ) & 0xff]       ^
-    Td4[(s2 >>  8) & 0xff] <<  8 ^
-    Td4[(s1 >> 16) & 0xff] << 16 ^
-    Td4[(s0 >> 24)       ] << 24;
+    t[0] = (u32)Td4[(s0      ) & 0xff]       ^
+           (u32)Td4[(s3 >>  8) & 0xff] <<  8 ^
+           (u32)Td4[(s2 >> 16) & 0xff] << 16 ^
+           (u32)Td4[(s1 >> 24)       ] << 24;
+    t[1] = (u32)Td4[(s1      ) & 0xff]       ^
+           (u32)Td4[(s0 >>  8) & 0xff] <<  8 ^
+           (u32)Td4[(s3 >> 16) & 0xff] << 16 ^
+           (u32)Td4[(s2 >> 24)       ] << 24;
+    t[2] = (u32)Td4[(s2      ) & 0xff]       ^
+           (u32)Td4[(s1 >>  8) & 0xff] <<  8 ^
+           (u32)Td4[(s0 >> 16) & 0xff] << 16 ^
+           (u32)Td4[(s3 >> 24)       ] << 24;
+    t[3] = (u32)Td4[(s3      ) & 0xff]       ^
+           (u32)Td4[(s2 >>  8) & 0xff] <<  8 ^
+           (u32)Td4[(s1 >> 16) & 0xff] << 16 ^
+           (u32)Td4[(s0 >> 24)       ] << 24;
 
     /* now do the linear transform using words */ 
     {
@@ -967,22 +967,22 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
      */
     for (rk+=8,r=key->rounds-2; r>0; rk+=4,r--) {
 #if defined(AES_COMPACT_IN_INNER_ROUNDS)
-        t[0] =  Td4[(s0      ) & 0xff]       ^
-        Td4[(s3 >>  8) & 0xff] <<  8 ^
-        Td4[(s2 >> 16) & 0xff] << 16 ^
-        Td4[(s1 >> 24)       ] << 24;
-        t[1] =  Td4[(s1      ) & 0xff]       ^
-        Td4[(s0 >>  8) & 0xff] <<  8 ^
-        Td4[(s3 >> 16) & 0xff] << 16 ^
-        Td4[(s2 >> 24)       ] << 24;
-        t[2] =  Td4[(s2      ) & 0xff]       ^
-        Td4[(s1 >>  8) & 0xff] <<  8 ^
-        Td4[(s0 >> 16) & 0xff] << 16 ^
-        Td4[(s3 >> 24)       ] << 24;
-        t[3] =  Td4[(s3      ) & 0xff]       ^
-        Td4[(s2 >>  8) & 0xff] <<  8 ^
-        Td4[(s1 >> 16) & 0xff] << 16 ^
-        Td4[(s0 >> 24)       ] << 24;
+        t[0] = (u32)Td4[(s0      ) & 0xff]       ^
+               (u32)Td4[(s3 >>  8) & 0xff] <<  8 ^
+               (u32)Td4[(s2 >> 16) & 0xff] << 16 ^
+               (u32)Td4[(s1 >> 24)       ] << 24;
+        t[1] = (u32)Td4[(s1      ) & 0xff]       ^
+               (u32)Td4[(s0 >>  8) & 0xff] <<  8 ^
+               (u32)Td4[(s3 >> 16) & 0xff] << 16 ^
+               (u32)Td4[(s2 >> 24)       ] << 24;
+        t[2] = (u32)Td4[(s2      ) & 0xff]       ^
+               (u32)Td4[(s1 >>  8) & 0xff] <<  8 ^
+               (u32)Td4[(s0 >> 16) & 0xff] << 16 ^
+               (u32)Td4[(s3 >> 24)       ] << 24;
+        t[3] = (u32)Td4[(s3      ) & 0xff]       ^
+               (u32)Td4[(s2 >>  8) & 0xff] <<  8 ^
+               (u32)Td4[(s1 >> 16) & 0xff] << 16 ^
+               (u32)Td4[(s0 >> 24)       ] << 24;
 
     /* now do the linear transform using words */ 
     {
@@ -1046,27 +1046,27 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
     prefetch256(Td4);
 
     *(u32*)(out+0) =
-        (Td4[(s0      ) & 0xff])    ^
-        (Td4[(s3 >>  8) & 0xff] <<  8) ^
-        (Td4[(s2 >> 16) & 0xff] << 16) ^
-        (Td4[(s1 >> 24)       ] << 24) ^
+        ((u32)Td4[(s0      ) & 0xff])    ^
+        ((u32)Td4[(s3 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(s2 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(s1 >> 24)       ] << 24) ^
         rk[0];
     *(u32*)(out+4) =
-        (Td4[(s1      ) & 0xff])     ^
-        (Td4[(s0 >>  8) & 0xff] <<  8) ^
-        (Td4[(s3 >> 16) & 0xff] << 16) ^
-        (Td4[(s2 >> 24)       ] << 24) ^
+        ((u32)Td4[(s1      ) & 0xff])     ^
+        ((u32)Td4[(s0 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(s3 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(s2 >> 24)       ] << 24) ^
         rk[1];
     *(u32*)(out+8) =
-        (Td4[(s2      ) & 0xff])     ^
-        (Td4[(s1 >>  8) & 0xff] <<  8) ^
-        (Td4[(s0 >> 16) & 0xff] << 16) ^
-        (Td4[(s3 >> 24)       ] << 24) ^
+        ((u32)Td4[(s2      ) & 0xff])     ^
+        ((u32)Td4[(s1 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(s0 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(s3 >> 24)       ] << 24) ^
         rk[2];
     *(u32*)(out+12) =
-        (Td4[(s3      ) & 0xff])     ^
-        (Td4[(s2 >>  8) & 0xff] <<  8) ^
-        (Td4[(s1 >> 16) & 0xff] << 16) ^
-        (Td4[(s0 >> 24)       ] << 24) ^
+        ((u32)Td4[(s3      ) & 0xff])     ^
+        ((u32)Td4[(s2 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(s1 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(s0 >> 24)       ] << 24) ^
         rk[3];
 }

From emilia at openssl.org  Sat Mar 14 04:15:38 2015
From: emilia at openssl.org (Emilia Kasper)
Date: Sat, 14 Mar 2015 04:15:38 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426306538.061221.9532.nullmailer@dev.openssl.org>

The branch master has been updated
       via  8b37e5c14f0eddb10c7f91ef91004622d90ef361 (commit)
      from  3d6aa6d441fe8124d247dffee5c68c2e5efd8258 (commit)


- Log -----------------------------------------------------------------
commit 8b37e5c14f0eddb10c7f91ef91004622d90ef361
Author: Emilia Kasper <emilia at openssl.org>
Date:   Fri Mar 13 21:10:13 2015 -0700

    Fix undefined behaviour in shifts.
    
    Td4 and Te4 are arrays of u8. A u8 << int promotes the u8 to an int first then shifts.
    If the mathematical result of a shift (as modelled by lhs * 2^{rhs}) is not representable
    in an integer, behaviour is undefined. In other words, you can't shift into the sign bit
    of a signed integer. Fix this by casting to u32 whenever we're shifting left by 24.
    
    (For consistency, cast other shifts, too.)
    
    Caught by -fsanitize=shift
    
    Submitted by Nick Lewycky (Google)
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 crypto/aes/aes_core.c    |  64 +++++++-------
 crypto/aes/aes_x86core.c | 224 +++++++++++++++++++++++------------------------
 2 files changed, 144 insertions(+), 144 deletions(-)

diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c
index e8ea369..1e4455a 100644
--- a/crypto/aes/aes_core.c
+++ b/crypto/aes/aes_core.c
@@ -1131,31 +1131,31 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
      * map cipher state to byte array block:
      */
     s0 =
-        (Td4[(t0 >> 24)       ] << 24) ^
-        (Td4[(t3 >> 16) & 0xff] << 16) ^
-        (Td4[(t2 >>  8) & 0xff] <<  8) ^
-        (Td4[(t1      ) & 0xff])       ^
+        ((u32)Td4[(t0 >> 24)       ] << 24) ^
+        ((u32)Td4[(t3 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(t2 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(t1      ) & 0xff])       ^
         rk[0];
     PUTU32(out     , s0);
     s1 =
-        (Td4[(t1 >> 24)       ] << 24) ^
-        (Td4[(t0 >> 16) & 0xff] << 16) ^
-        (Td4[(t3 >>  8) & 0xff] <<  8) ^
-        (Td4[(t2      ) & 0xff])       ^
+        ((u32)Td4[(t1 >> 24)       ] << 24) ^
+        ((u32)Td4[(t0 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(t3 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(t2      ) & 0xff])       ^
         rk[1];
     PUTU32(out +  4, s1);
     s2 =
-        (Td4[(t2 >> 24)       ] << 24) ^
-        (Td4[(t1 >> 16) & 0xff] << 16) ^
-        (Td4[(t0 >>  8) & 0xff] <<  8) ^
-        (Td4[(t3      ) & 0xff])       ^
+        ((u32)Td4[(t2 >> 24)       ] << 24) ^
+        ((u32)Td4[(t1 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(t0 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(t3      ) & 0xff])       ^
         rk[2];
     PUTU32(out +  8, s2);
     s3 =
-        (Td4[(t3 >> 24)       ] << 24) ^
-        (Td4[(t2 >> 16) & 0xff] << 16) ^
-        (Td4[(t1 >>  8) & 0xff] <<  8) ^
-        (Td4[(t0      ) & 0xff])       ^
+        ((u32)Td4[(t3 >> 24)       ] << 24) ^
+        ((u32)Td4[(t2 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(t1 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(t0      ) & 0xff])       ^
         rk[3];
     PUTU32(out + 12, s3);
 }
@@ -1234,10 +1234,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
         while (1) {
             temp  = rk[3];
             rk[4] = rk[0] ^
-                (Te4[(temp >> 16) & 0xff] << 24) ^
-                (Te4[(temp >>  8) & 0xff] << 16) ^
-                (Te4[(temp      ) & 0xff] << 8) ^
-                (Te4[(temp >> 24)       ]) ^
+                ((u32)Te4[(temp >> 16) & 0xff] << 24) ^
+                ((u32)Te4[(temp >>  8) & 0xff] << 16) ^
+                ((u32)Te4[(temp      ) & 0xff] << 8) ^
+                ((u32)Te4[(temp >> 24)       ]) ^
                 rcon[i];
             rk[5] = rk[1] ^ rk[4];
             rk[6] = rk[2] ^ rk[5];
@@ -1254,10 +1254,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
         while (1) {
             temp = rk[ 5];
             rk[ 6] = rk[ 0] ^
-                (Te4[(temp >> 16) & 0xff] << 24) ^
-                (Te4[(temp >>  8) & 0xff] << 16) ^
-                (Te4[(temp      ) & 0xff] << 8) ^
-                (Te4[(temp >> 24)       ]) ^
+                ((u32)Te4[(temp >> 16) & 0xff] << 24) ^
+                ((u32)Te4[(temp >>  8) & 0xff] << 16) ^
+                ((u32)Te4[(temp      ) & 0xff] << 8) ^
+                ((u32)Te4[(temp >> 24)       ]) ^
                 rcon[i];
             rk[ 7] = rk[ 1] ^ rk[ 6];
             rk[ 8] = rk[ 2] ^ rk[ 7];
@@ -1276,10 +1276,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
         while (1) {
             temp = rk[ 7];
             rk[ 8] = rk[ 0] ^
-                (Te4[(temp >> 16) & 0xff] << 24) ^
-                (Te4[(temp >>  8) & 0xff] << 16) ^
-                (Te4[(temp      ) & 0xff] << 8) ^
-                (Te4[(temp >> 24)       ]) ^
+                ((u32)Te4[(temp >> 16) & 0xff] << 24) ^
+                ((u32)Te4[(temp >>  8) & 0xff] << 16) ^
+                ((u32)Te4[(temp      ) & 0xff] << 8) ^
+                ((u32)Te4[(temp >> 24)       ]) ^
                 rcon[i];
             rk[ 9] = rk[ 1] ^ rk[ 8];
             rk[10] = rk[ 2] ^ rk[ 9];
@@ -1289,10 +1289,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
             }
             temp = rk[11];
             rk[12] = rk[ 4] ^
-                (Te4[(temp >> 24)       ] << 24) ^
-                (Te4[(temp >> 16) & 0xff] << 16) ^
-                (Te4[(temp >>  8) & 0xff] << 8) ^
-                (Te4[(temp      ) & 0xff]);
+                ((u32)Te4[(temp >> 24)       ] << 24) ^
+                ((u32)Te4[(temp >> 16) & 0xff] << 16) ^
+                ((u32)Te4[(temp >>  8) & 0xff] << 8) ^
+                ((u32)Te4[(temp      ) & 0xff]);
             rk[13] = rk[ 5] ^ rk[12];
             rk[14] = rk[ 6] ^ rk[13];
             rk[15] = rk[ 7] ^ rk[14];
diff --git a/crypto/aes/aes_x86core.c b/crypto/aes/aes_x86core.c
index 132b09a..c869ed7 100644
--- a/crypto/aes/aes_x86core.c
+++ b/crypto/aes/aes_x86core.c
@@ -499,10 +499,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
         while (1) {
             temp  = rk[3];
             rk[4] = rk[0] ^
-                (Te4[(temp >>  8) & 0xff]      ) ^
-                (Te4[(temp >> 16) & 0xff] <<  8) ^
-                (Te4[(temp >> 24)       ] << 16) ^
-                (Te4[(temp      ) & 0xff] << 24) ^
+                ((u32)Te4[(temp >>  8) & 0xff]      ) ^
+                ((u32)Te4[(temp >> 16) & 0xff] <<  8) ^
+                ((u32)Te4[(temp >> 24)       ] << 16) ^
+                ((u32)Te4[(temp      ) & 0xff] << 24) ^
                 rcon[i];
             rk[5] = rk[1] ^ rk[4];
             rk[6] = rk[2] ^ rk[5];
@@ -519,10 +519,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
         while (1) {
             temp = rk[ 5];
             rk[ 6] = rk[ 0] ^
-                (Te4[(temp >>  8) & 0xff]      ) ^
-                (Te4[(temp >> 16) & 0xff] <<  8) ^
-                (Te4[(temp >> 24)       ] << 16) ^
-                (Te4[(temp      ) & 0xff] << 24) ^
+                ((u32)Te4[(temp >>  8) & 0xff]      ) ^
+                ((u32)Te4[(temp >> 16) & 0xff] <<  8) ^
+                ((u32)Te4[(temp >> 24)       ] << 16) ^
+                ((u32)Te4[(temp      ) & 0xff] << 24) ^
                 rcon[i];
             rk[ 7] = rk[ 1] ^ rk[ 6];
             rk[ 8] = rk[ 2] ^ rk[ 7];
@@ -541,10 +541,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
         while (1) {
             temp = rk[ 7];
             rk[ 8] = rk[ 0] ^
-                (Te4[(temp >>  8) & 0xff]      ) ^
-                (Te4[(temp >> 16) & 0xff] <<  8) ^
-                (Te4[(temp >> 24)       ] << 16) ^
-                (Te4[(temp      ) & 0xff] << 24) ^
+                ((u32)Te4[(temp >>  8) & 0xff]      ) ^
+                ((u32)Te4[(temp >> 16) & 0xff] <<  8) ^
+                ((u32)Te4[(temp >> 24)       ] << 16) ^
+                ((u32)Te4[(temp      ) & 0xff] << 24) ^
                 rcon[i];
             rk[ 9] = rk[ 1] ^ rk[ 8];
             rk[10] = rk[ 2] ^ rk[ 9];
@@ -554,10 +554,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
             }
             temp = rk[11];
             rk[12] = rk[ 4] ^
-                (Te4[(temp      ) & 0xff]      ) ^
-                (Te4[(temp >>  8) & 0xff] <<  8) ^
-                (Te4[(temp >> 16) & 0xff] << 16) ^
-                (Te4[(temp >> 24)       ] << 24);
+                ((u32)Te4[(temp      ) & 0xff]      ) ^
+                ((u32)Te4[(temp >>  8) & 0xff] <<  8) ^
+                ((u32)Te4[(temp >> 16) & 0xff] << 16) ^
+                ((u32)Te4[(temp >> 24)       ] << 24);
             rk[13] = rk[ 5] ^ rk[12];
             rk[14] = rk[ 6] ^ rk[13];
             rk[15] = rk[ 7] ^ rk[14];
@@ -676,22 +676,22 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
 #if defined(AES_COMPACT_IN_OUTER_ROUNDS)
     prefetch256(Te4);
 
-    t[0] =  Te4[(s0      ) & 0xff]       ^
-        Te4[(s1 >>  8) & 0xff] <<  8 ^
-        Te4[(s2 >> 16) & 0xff] << 16 ^
-        Te4[(s3 >> 24)       ] << 24;
-    t[1] =  Te4[(s1      ) & 0xff]       ^
-        Te4[(s2 >>  8) & 0xff] <<  8 ^
-        Te4[(s3 >> 16) & 0xff] << 16 ^
-        Te4[(s0 >> 24)       ] << 24;
-    t[2] =  Te4[(s2      ) & 0xff]       ^
-        Te4[(s3 >>  8) & 0xff] <<  8 ^
-        Te4[(s0 >> 16) & 0xff] << 16 ^
-        Te4[(s1 >> 24)       ] << 24;
-    t[3] =  Te4[(s3      ) & 0xff]       ^
-        Te4[(s0 >>  8) & 0xff] <<  8 ^
-        Te4[(s1 >> 16) & 0xff] << 16 ^
-        Te4[(s2 >> 24)       ] << 24;
+    t[0] = (u32)Te4[(s0      ) & 0xff]       ^
+           (u32)Te4[(s1 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s2 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s3 >> 24)       ] << 24;
+    t[1] = (u32)Te4[(s1      ) & 0xff]       ^
+           (u32)Te4[(s2 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s3 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s0 >> 24)       ] << 24;
+    t[2] = (u32)Te4[(s2      ) & 0xff]       ^
+           (u32)Te4[(s3 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s0 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s1 >> 24)       ] << 24;
+    t[3] = (u32)Te4[(s3      ) & 0xff]       ^
+           (u32)Te4[(s0 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s1 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s2 >> 24)       ] << 24;
 
     /* now do the linear transform using words */
     {   int i;
@@ -742,22 +742,22 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
      */
     for (rk+=8,r=key->rounds-2; r>0; rk+=4,r--) {
 #if defined(AES_COMPACT_IN_INNER_ROUNDS)
-        t[0] =  Te4[(s0      ) & 0xff]       ^
-            Te4[(s1 >>  8) & 0xff] <<  8 ^
-            Te4[(s2 >> 16) & 0xff] << 16 ^
-            Te4[(s3 >> 24)       ] << 24;
-        t[1] =  Te4[(s1      ) & 0xff]       ^
-            Te4[(s2 >>  8) & 0xff] <<  8 ^
-            Te4[(s3 >> 16) & 0xff] << 16 ^
-            Te4[(s0 >> 24)       ] << 24;
-        t[2] =  Te4[(s2      ) & 0xff]       ^
-            Te4[(s3 >>  8) & 0xff] <<  8 ^
-            Te4[(s0 >> 16) & 0xff] << 16 ^
-            Te4[(s1 >> 24)       ] << 24;
-        t[3] =  Te4[(s3      ) & 0xff]       ^
-            Te4[(s0 >>  8) & 0xff] <<  8 ^
-            Te4[(s1 >> 16) & 0xff] << 16 ^
-            Te4[(s2 >> 24)       ] << 24;
+        t[0] = (u32)Te4[(s0      ) & 0xff]       ^
+               (u32)Te4[(s1 >>  8) & 0xff] <<  8 ^
+               (u32)Te4[(s2 >> 16) & 0xff] << 16 ^
+               (u32)Te4[(s3 >> 24)       ] << 24;
+        t[1] = (u32)Te4[(s1      ) & 0xff]       ^
+               (u32)Te4[(s2 >>  8) & 0xff] <<  8 ^
+               (u32)Te4[(s3 >> 16) & 0xff] << 16 ^
+               (u32)Te4[(s0 >> 24)       ] << 24;
+        t[2] = (u32)Te4[(s2      ) & 0xff]       ^
+               (u32)Te4[(s3 >>  8) & 0xff] <<  8 ^
+               (u32)Te4[(s0 >> 16) & 0xff] << 16 ^
+               (u32)Te4[(s1 >> 24)       ] << 24;
+        t[3] = (u32)Te4[(s3      ) & 0xff]       ^
+               (u32)Te4[(s0 >>  8) & 0xff] <<  8 ^
+               (u32)Te4[(s1 >> 16) & 0xff] << 16 ^
+               (u32)Te4[(s2 >> 24)       ] << 24;
 
         /* now do the linear transform using words */
         {
@@ -812,28 +812,28 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
     prefetch256(Te4);
 
     *(u32*)(out+0) =
-        Te4[(s0      ) & 0xff]       ^
-        Te4[(s1 >>  8) & 0xff] <<  8 ^
-        Te4[(s2 >> 16) & 0xff] << 16 ^
-        Te4[(s3 >> 24)       ] << 24 ^
+           (u32)Te4[(s0      ) & 0xff]       ^
+           (u32)Te4[(s1 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s2 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s3 >> 24)       ] << 24 ^
         rk[0];
     *(u32*)(out+4) =
-        Te4[(s1      ) & 0xff]       ^
-        Te4[(s2 >>  8) & 0xff] <<  8 ^
-        Te4[(s3 >> 16) & 0xff] << 16 ^
-        Te4[(s0 >> 24)       ] << 24 ^
+           (u32)Te4[(s1      ) & 0xff]       ^
+           (u32)Te4[(s2 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s3 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s0 >> 24)       ] << 24 ^
         rk[1];
     *(u32*)(out+8) =
-        Te4[(s2      ) & 0xff]       ^
-        Te4[(s3 >>  8) & 0xff] <<  8 ^
-        Te4[(s0 >> 16) & 0xff] << 16 ^
-        Te4[(s1 >> 24)       ] << 24 ^
+           (u32)Te4[(s2      ) & 0xff]       ^
+           (u32)Te4[(s3 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s0 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s1 >> 24)       ] << 24 ^
         rk[2];
     *(u32*)(out+12) =
-        Te4[(s3      ) & 0xff]       ^
-        Te4[(s0 >>  8) & 0xff] <<  8 ^
-        Te4[(s1 >> 16) & 0xff] << 16 ^
-        Te4[(s2 >> 24)       ] << 24 ^
+           (u32)Te4[(s3      ) & 0xff]       ^
+           (u32)Te4[(s0 >>  8) & 0xff] <<  8 ^
+           (u32)Te4[(s1 >> 16) & 0xff] << 16 ^
+           (u32)Te4[(s2 >> 24)       ] << 24 ^
         rk[3];
 #else
     *(u32*)(out+0) =
@@ -890,22 +890,22 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
 #if defined(AES_COMPACT_IN_OUTER_ROUNDS)
     prefetch256(Td4);
 
-    t[0] =  Td4[(s0      ) & 0xff]       ^
-    Td4[(s3 >>  8) & 0xff] <<  8 ^
-    Td4[(s2 >> 16) & 0xff] << 16 ^
-    Td4[(s1 >> 24)       ] << 24;
-    t[1] =  Td4[(s1      ) & 0xff]       ^
-    Td4[(s0 >>  8) & 0xff] <<  8 ^
-    Td4[(s3 >> 16) & 0xff] << 16 ^
-    Td4[(s2 >> 24)       ] << 24;
-    t[2] =  Td4[(s2      ) & 0xff]       ^
-    Td4[(s1 >>  8) & 0xff] <<  8 ^
-    Td4[(s0 >> 16) & 0xff] << 16 ^
-    Td4[(s3 >> 24)       ] << 24;
-    t[3] =  Td4[(s3      ) & 0xff]       ^
-    Td4[(s2 >>  8) & 0xff] <<  8 ^
-    Td4[(s1 >> 16) & 0xff] << 16 ^
-    Td4[(s0 >> 24)       ] << 24;
+    t[0] = (u32)Td4[(s0      ) & 0xff]       ^
+           (u32)Td4[(s3 >>  8) & 0xff] <<  8 ^
+           (u32)Td4[(s2 >> 16) & 0xff] << 16 ^
+           (u32)Td4[(s1 >> 24)       ] << 24;
+    t[1] = (u32)Td4[(s1      ) & 0xff]       ^
+           (u32)Td4[(s0 >>  8) & 0xff] <<  8 ^
+           (u32)Td4[(s3 >> 16) & 0xff] << 16 ^
+           (u32)Td4[(s2 >> 24)       ] << 24;
+    t[2] = (u32)Td4[(s2      ) & 0xff]       ^
+           (u32)Td4[(s1 >>  8) & 0xff] <<  8 ^
+           (u32)Td4[(s0 >> 16) & 0xff] << 16 ^
+           (u32)Td4[(s3 >> 24)       ] << 24;
+    t[3] = (u32)Td4[(s3      ) & 0xff]       ^
+           (u32)Td4[(s2 >>  8) & 0xff] <<  8 ^
+           (u32)Td4[(s1 >> 16) & 0xff] << 16 ^
+           (u32)Td4[(s0 >> 24)       ] << 24;
 
     /* now do the linear transform using words */ 
     {
@@ -967,22 +967,22 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
      */
     for (rk+=8,r=key->rounds-2; r>0; rk+=4,r--) {
 #if defined(AES_COMPACT_IN_INNER_ROUNDS)
-        t[0] =  Td4[(s0      ) & 0xff]       ^
-        Td4[(s3 >>  8) & 0xff] <<  8 ^
-        Td4[(s2 >> 16) & 0xff] << 16 ^
-        Td4[(s1 >> 24)       ] << 24;
-        t[1] =  Td4[(s1      ) & 0xff]       ^
-        Td4[(s0 >>  8) & 0xff] <<  8 ^
-        Td4[(s3 >> 16) & 0xff] << 16 ^
-        Td4[(s2 >> 24)       ] << 24;
-        t[2] =  Td4[(s2      ) & 0xff]       ^
-        Td4[(s1 >>  8) & 0xff] <<  8 ^
-        Td4[(s0 >> 16) & 0xff] << 16 ^
-        Td4[(s3 >> 24)       ] << 24;
-        t[3] =  Td4[(s3      ) & 0xff]       ^
-        Td4[(s2 >>  8) & 0xff] <<  8 ^
-        Td4[(s1 >> 16) & 0xff] << 16 ^
-        Td4[(s0 >> 24)       ] << 24;
+        t[0] = (u32)Td4[(s0      ) & 0xff]       ^
+               (u32)Td4[(s3 >>  8) & 0xff] <<  8 ^
+               (u32)Td4[(s2 >> 16) & 0xff] << 16 ^
+               (u32)Td4[(s1 >> 24)       ] << 24;
+        t[1] = (u32)Td4[(s1      ) & 0xff]       ^
+               (u32)Td4[(s0 >>  8) & 0xff] <<  8 ^
+               (u32)Td4[(s3 >> 16) & 0xff] << 16 ^
+               (u32)Td4[(s2 >> 24)       ] << 24;
+        t[2] = (u32)Td4[(s2      ) & 0xff]       ^
+               (u32)Td4[(s1 >>  8) & 0xff] <<  8 ^
+               (u32)Td4[(s0 >> 16) & 0xff] << 16 ^
+               (u32)Td4[(s3 >> 24)       ] << 24;
+        t[3] = (u32)Td4[(s3      ) & 0xff]       ^
+               (u32)Td4[(s2 >>  8) & 0xff] <<  8 ^
+               (u32)Td4[(s1 >> 16) & 0xff] << 16 ^
+               (u32)Td4[(s0 >> 24)       ] << 24;
 
     /* now do the linear transform using words */ 
     {
@@ -1046,27 +1046,27 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
     prefetch256(Td4);
 
     *(u32*)(out+0) =
-        (Td4[(s0      ) & 0xff])    ^
-        (Td4[(s3 >>  8) & 0xff] <<  8) ^
-        (Td4[(s2 >> 16) & 0xff] << 16) ^
-        (Td4[(s1 >> 24)       ] << 24) ^
+        ((u32)Td4[(s0      ) & 0xff])    ^
+        ((u32)Td4[(s3 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(s2 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(s1 >> 24)       ] << 24) ^
         rk[0];
     *(u32*)(out+4) =
-        (Td4[(s1      ) & 0xff])     ^
-        (Td4[(s0 >>  8) & 0xff] <<  8) ^
-        (Td4[(s3 >> 16) & 0xff] << 16) ^
-        (Td4[(s2 >> 24)       ] << 24) ^
+        ((u32)Td4[(s1      ) & 0xff])     ^
+        ((u32)Td4[(s0 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(s3 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(s2 >> 24)       ] << 24) ^
         rk[1];
     *(u32*)(out+8) =
-        (Td4[(s2      ) & 0xff])     ^
-        (Td4[(s1 >>  8) & 0xff] <<  8) ^
-        (Td4[(s0 >> 16) & 0xff] << 16) ^
-        (Td4[(s3 >> 24)       ] << 24) ^
+        ((u32)Td4[(s2      ) & 0xff])     ^
+        ((u32)Td4[(s1 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(s0 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(s3 >> 24)       ] << 24) ^
         rk[2];
     *(u32*)(out+12) =
-        (Td4[(s3      ) & 0xff])     ^
-        (Td4[(s2 >>  8) & 0xff] <<  8) ^
-        (Td4[(s1 >> 16) & 0xff] << 16) ^
-        (Td4[(s0 >> 24)       ] << 24) ^
+        ((u32)Td4[(s3      ) & 0xff])     ^
+        ((u32)Td4[(s2 >>  8) & 0xff] <<  8) ^
+        ((u32)Td4[(s1 >> 16) & 0xff] << 16) ^
+        ((u32)Td4[(s0 >> 24)       ] << 24) ^
         rk[3];
 }

From kurt at openssl.org  Sat Mar 14 17:24:32 2015
From: kurt at openssl.org (Kurt Roeckx)
Date: Sat, 14 Mar 2015 17:24:32 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426353872.957477.20148.nullmailer@dev.openssl.org>

The branch master has been updated
       via  9fbbdd73c58c29dc46cc314f7165e45e6d43fd60 (commit)
      from  8b37e5c14f0eddb10c7f91ef91004622d90ef361 (commit)


- Log -----------------------------------------------------------------
commit 9fbbdd73c58c29dc46cc314f7165e45e6d43fd60
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Feb 21 13:51:56 2015 +0100

    Avoid reading an unused byte after the buffer
    
    Other curves don't have this problem.
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Emilia K?sper <emilia at openssl.org>

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

Summary of changes:
 crypto/ec/ecp_nistp224.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/ec/ecp_nistp224.c b/crypto/ec/ecp_nistp224.c
index ffb50d8..a0c7bec 100644
--- a/crypto/ec/ecp_nistp224.c
+++ b/crypto/ec/ecp_nistp224.c
@@ -316,7 +316,7 @@ static void bin28_to_felem(felem out, const u8 in[28])
     out[0] = *((const uint64_t *)(in)) & 0x00ffffffffffffff;
     out[1] = (*((const uint64_t *)(in + 7))) & 0x00ffffffffffffff;
     out[2] = (*((const uint64_t *)(in + 14))) & 0x00ffffffffffffff;
-    out[3] = (*((const uint64_t *)(in + 21))) & 0x00ffffffffffffff;
+    out[3] = (*((const uint64_t *)(in+20))) >> 8;
 }
 
 static void felem_to_bin28(u8 out[28], const felem in)

From kurt at openssl.org  Sat Mar 14 17:31:40 2015
From: kurt at openssl.org (Kurt Roeckx)
Date: Sat, 14 Mar 2015 17:31:40 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1426354300.897863.22288.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  94be83127b08dc3977d2c14304aa61208db048d0 (commit)
      from  be109b9eec79a90871e5deb7d6ede8c04f073884 (commit)


- Log -----------------------------------------------------------------
commit 94be83127b08dc3977d2c14304aa61208db048d0
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Feb 21 13:51:56 2015 +0100

    Avoid reading an unused byte after the buffer
    
    Other curves don't have this problem.
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Emilia K?sper <emilia at openssl.org>
    (cherry picked from commit 9fbbdd73c58c29dc46cc314f7165e45e6d43fd60)

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

Summary of changes:
 crypto/ec/ecp_nistp224.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/ec/ecp_nistp224.c b/crypto/ec/ecp_nistp224.c
index 9a59ef0..ed09f97 100644
--- a/crypto/ec/ecp_nistp224.c
+++ b/crypto/ec/ecp_nistp224.c
@@ -321,7 +321,7 @@ static void bin28_to_felem(felem out, const u8 in[28])
     out[0] = *((const uint64_t *)(in)) & 0x00ffffffffffffff;
     out[1] = (*((const uint64_t *)(in + 7))) & 0x00ffffffffffffff;
     out[2] = (*((const uint64_t *)(in + 14))) & 0x00ffffffffffffff;
-    out[3] = (*((const uint64_t *)(in + 21))) & 0x00ffffffffffffff;
+    out[3] = (*((const uint64_t *)(in+20))) >> 8;
 }
 
 static void felem_to_bin28(u8 out[28], const felem in)

From kurt at openssl.org  Sat Mar 14 17:39:34 2015
From: kurt at openssl.org (Kurt Roeckx)
Date: Sat, 14 Mar 2015 17:39:34 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1426354774.811663.24005.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  eadc81e7dd3fde473a9e38a57b4c29cf6b699110 (commit)
      from  a2fcab9978a0905c4286051993da63329fda8a19 (commit)


- Log -----------------------------------------------------------------
commit eadc81e7dd3fde473a9e38a57b4c29cf6b699110
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Feb 21 13:51:56 2015 +0100

    Avoid reading an unused byte after the buffer
    
    Other curves don't have this problem.
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Emilia K?sper <emilia at openssl.org>
    (cherry picked from commit 9fbbdd73c58c29dc46cc314f7165e45e6d43fd60)

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

Summary of changes:
 crypto/ec/ecp_nistp224.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/ec/ecp_nistp224.c b/crypto/ec/ecp_nistp224.c
index 9a59ef0..ed09f97 100644
--- a/crypto/ec/ecp_nistp224.c
+++ b/crypto/ec/ecp_nistp224.c
@@ -321,7 +321,7 @@ static void bin28_to_felem(felem out, const u8 in[28])
     out[0] = *((const uint64_t *)(in)) & 0x00ffffffffffffff;
     out[1] = (*((const uint64_t *)(in + 7))) & 0x00ffffffffffffff;
     out[2] = (*((const uint64_t *)(in + 14))) & 0x00ffffffffffffff;
-    out[3] = (*((const uint64_t *)(in + 21))) & 0x00ffffffffffffff;
+    out[3] = (*((const uint64_t *)(in+20))) >> 8;
 }
 
 static void felem_to_bin28(u8 out[28], const felem in)

From kurt at openssl.org  Sat Mar 14 17:48:41 2015
From: kurt at openssl.org (Kurt Roeckx)
Date: Sat, 14 Mar 2015 17:48:41 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_0_9_8-stable update
Message-ID: <1426355321.674720.26365.nullmailer@dev.openssl.org>

The branch OpenSSL_0_9_8-stable has been updated
       via  c85c1e08ce4148b64a80497525fa5e5efc87d13a (commit)
      from  c2f5de13cd09179169b28179ad1e1cac0e4cd1fb (commit)


- Log -----------------------------------------------------------------
commit c85c1e08ce4148b64a80497525fa5e5efc87d13a
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sun Mar 8 15:11:33 2015 +0100

    Disable export and SSLv2 ciphers by default
    
    They are moved to the COMPLEMENTOFDEFAULT instead.
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

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

Summary of changes:
 CHANGES              |  3 ++-
 doc/apps/ciphers.pod |  2 +-
 ssl/ssl.h            |  3 +--
 ssl/ssl_ciph.c       | 16 +++++++++++++---
 ssl/ssl_lib.c        |  1 +
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 71856be..c2a3931 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,8 @@
 
  Changes between 0.9.8ze and 0.9.8zf [xx XXX xxxx]
 
-  *)
+  *) Removed the export and SSLv2 ciphers from the DEFAULT ciphers
+     [Kurt Roeckx]
 
  Changes between 0.9.8zd and 0.9.8ze [15 Jan 2015]
 
diff --git a/doc/apps/ciphers.pod b/doc/apps/ciphers.pod
index 694e433..01d31dd 100644
--- a/doc/apps/ciphers.pod
+++ b/doc/apps/ciphers.pod
@@ -105,7 +105,7 @@ The following is a list of all permitted cipher strings and their meanings.
 =item B<DEFAULT>
 
 the default cipher list. This is determined at compile time and is normally
-B<AES:ALL:!aNULL:!eNULL:+RC4:@STRENGTH>. This must be the first cipher string
+B<ALL:!EXPORT:!aNULL:!eNULL:!SSLv2:@STRENGTH>. This must be the first cipher string
 specified.
 
 =item B<COMPLEMENTOFDEFAULT>
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 29f8870..ee9944f 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -323,8 +323,7 @@ extern "C" {
  * The following cipher list is used by default. It also is substituted when
  * an application-defined cipher list string starts with 'DEFAULT'.
  */
-/* low priority for RC4 */
-# define SSL_DEFAULT_CIPHER_LIST "AES:ALL:!aNULL:!eNULL:+RC4:@STRENGTH"
+# define SSL_DEFAULT_CIPHER_LIST "ALL:!EXPORT:!aNULL:!eNULL:!SSLv2:@STRENGTH"
 
 /* Used in SSL_set_shutdown()/SSL_get_shutdown(); */
 # define SSL_SENT_SHUTDOWN       1
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 33a472e..773a5d1 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -174,12 +174,11 @@ static const SSL_CIPHER cipher_aliases[] = {
     {0, SSL_TXT_ALL, 0, SSL_ALL & ~SSL_eNULL & ~SSL_kECDH & ~SSL_kECDHE,
      SSL_ALL, 0, 0, 0, SSL_ALL, SSL_ALL},
     /*
-     * TODO: COMPLEMENT OF ALL and COMPLEMENT OF DEFAULT do not have ECC
-     * cipher suites handled properly.
+     * TODO: COMPLEMENT OF ALL do not have ECC cipher suites handled properly.
      */
     /* COMPLEMENT OF ALL */
     {0, SSL_TXT_CMPALL, 0, SSL_eNULL, 0, 0, 0, 0, SSL_ENC_MASK, 0},
-    {0, SSL_TXT_CMPDEF, 0, SSL_ADH, 0, 0, 0, 0, SSL_AUTH_MASK, 0},
+    {0, SSL_TXT_CMPDEF, 0, SSL_ADH, SSL_EXP_MASK, 0, 0, 0, SSL_AUTH_MASK, 0},
     /* VRS Kerberos5 */
     {0, SSL_TXT_kKRB5, 0, SSL_kKRB5, 0, 0, 0, 0, SSL_MKEY_MASK, 0},
     {0, SSL_TXT_kRSA, 0, SSL_kRSA, 0, 0, 0, 0, SSL_MKEY_MASK, 0},
@@ -636,6 +635,15 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
         curr2 = curr->next;
 
         cp = curr->cipher;
+        /* Special case: only satisfied by COMPLEMENTOFDEFAULT */
+        if (algo_strength == SSL_EXP_MASK) {
+            if ((SSL_C_IS_EXPORT(cp) || cp->algorithms & SSL_SSLV2
+                || cp->algorithms & SSL_aNULL)
+                && !(cp->algorithms & (SSL_kECDHE|SSL_kECDH)))
+                goto ok;
+            else
+                continue;
+        }
 
         /*
          * If explicit cipher suite, match only that one for its own protocol
@@ -675,6 +683,8 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
         } else if (strength_bits != cp->strength_bits)
             continue;           /* does not apply */
 
+        ok:
+
 #ifdef CIPHER_DEBUG
         printf("Action = %d\n", rule);
 #endif
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index bdbea75..7182bd2 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1562,6 +1562,7 @@ SSL_CTX *SSL_CTX_new(SSL_METHOD *meth)
 
     ssl_create_cipher_list(ret->method,
                            &ret->cipher_list, &ret->cipher_list_by_id,
+                           meth->version == SSL2_VERSION ? "SSLv2" :
                            SSL_DEFAULT_CIPHER_LIST);
     if (ret->cipher_list == NULL || sk_SSL_CIPHER_num(ret->cipher_list) <= 0) {
         SSLerr(SSL_F_SSL_CTX_NEW, SSL_R_LIBRARY_HAS_NO_CIPHERS);

From kurt at openssl.org  Sun Mar 15 11:17:49 2015
From: kurt at openssl.org (Kurt Roeckx)
Date: Sun, 15 Mar 2015 11:17:49 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426418269.185591.20390.nullmailer@dev.openssl.org>

The branch master has been updated
       via  2c3823491d8812560922a58677e3ad2db4b2ec8d (commit)
      from  9fbbdd73c58c29dc46cc314f7165e45e6d43fd60 (commit)


- Log -----------------------------------------------------------------
commit 2c3823491d8812560922a58677e3ad2db4b2ec8d
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sat Mar 14 18:09:44 2015 +0100

    Remove ssl_cert_inst()
    
    It created the cert structure in SSL_CTX or SSL if it was NULL, but they can
    never be NULL as the comments already said.
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

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

Summary of changes:
 ssl/s3_lib.c   | 32 --------------------------------
 ssl/ssl_cert.c | 25 -------------------------
 ssl/ssl_err.c  |  1 -
 ssl/ssl_lib.c  | 28 ++++++++++++----------------
 ssl/ssl_locl.h |  1 -
 ssl/ssl_rsa.c  | 28 ----------------------------
 6 files changed, 12 insertions(+), 103 deletions(-)

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index f4369eb..3e6530e 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3252,22 +3252,6 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
 {
     int ret = 0;
 
-#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_RSA)
-    if (
-# ifndef OPENSSL_NO_RSA
-           cmd == SSL_CTRL_SET_TMP_RSA || cmd == SSL_CTRL_SET_TMP_RSA_CB ||
-# endif
-# ifndef OPENSSL_NO_DSA
-           cmd == SSL_CTRL_SET_TMP_DH || cmd == SSL_CTRL_SET_TMP_DH_CB ||
-# endif
-           0) {
-        if (!ssl_cert_inst(&s->cert)) {
-            SSLerr(SSL_F_SSL3_CTRL, ERR_R_MALLOC_FAILURE);
-            return (0);
-        }
-    }
-#endif
-
     switch (cmd) {
     case SSL_CTRL_GET_SESSION_REUSED:
         ret = s->hit;
@@ -3705,22 +3689,6 @@ long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp) (void))
 {
     int ret = 0;
 
-#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_RSA)
-    if (
-# ifndef OPENSSL_NO_RSA
-           cmd == SSL_CTRL_SET_TMP_RSA_CB ||
-# endif
-# ifndef OPENSSL_NO_DSA
-           cmd == SSL_CTRL_SET_TMP_DH_CB ||
-# endif
-           0) {
-        if (!ssl_cert_inst(&s->cert)) {
-            SSLerr(SSL_F_SSL3_CALLBACK_CTRL, ERR_R_MALLOC_FAILURE);
-            return (0);
-        }
-    }
-#endif
-
     switch (cmd) {
 #ifndef OPENSSL_NO_RSA
     case SSL_CTRL_SET_TMP_RSA_CB:
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index fa0c693..a88d211 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -484,31 +484,6 @@ void ssl_cert_free(CERT *c)
     OPENSSL_free(c);
 }
 
-int ssl_cert_inst(CERT **o)
-{
-    /*
-     * Create a CERT if there isn't already one (which cannot really happen,
-     * as it is initially created in SSL_CTX_new; but the earlier code
-     * usually allows for that one being non-existant, so we follow that
-     * behaviour, as it might turn out that there actually is a reason for it
-     * -- but I'm not sure that *all* of the existing code could cope with
-     * s->cert being NULL, otherwise we could do without the initialization
-     * in SSL_CTX_new).
-     */
-
-    if (o == NULL) {
-        SSLerr(SSL_F_SSL_CERT_INST, ERR_R_PASSED_NULL_PARAMETER);
-        return (0);
-    }
-    if (*o == NULL) {
-        if ((*o = ssl_cert_new()) == NULL) {
-            SSLerr(SSL_F_SSL_CERT_INST, ERR_R_MALLOC_FAILURE);
-            return (0);
-        }
-    }
-    return (1);
-}
-
 int ssl_cert_set0_chain(SSL *s, SSL_CTX *ctx, STACK_OF(X509) *chain)
 {
     int i, r;
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index e7adcf5..f370e9e 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -202,7 +202,6 @@ static ERR_STRING_DATA SSL_str_functs[] = {
     {ERR_FUNC(SSL_F_SSL_BYTES_TO_CIPHER_LIST), "ssl_bytes_to_cipher_list"},
     {ERR_FUNC(SSL_F_SSL_CERT_ADD0_CHAIN_CERT), "ssl_cert_add0_chain_cert"},
     {ERR_FUNC(SSL_F_SSL_CERT_DUP), "ssl_cert_dup"},
-    {ERR_FUNC(SSL_F_SSL_CERT_INST), "ssl_cert_inst"},
     {ERR_FUNC(SSL_F_SSL_CERT_INSTANTIATE), "SSL_CERT_INSTANTIATE"},
     {ERR_FUNC(SSL_F_SSL_CERT_NEW), "ssl_cert_new"},
     {ERR_FUNC(SSL_F_SSL_CERT_SET0_CHAIN), "ssl_cert_set0_chain"},
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 3bce4cf..a5eb3db 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -288,22 +288,18 @@ SSL *SSL_new(SSL_CTX *ctx)
     s->mode = ctx->mode;
     s->max_cert_list = ctx->max_cert_list;
 
-    if (ctx->cert != NULL) {
-        /*
-         * Earlier library versions used to copy the pointer to the CERT, not
-         * its contents; only when setting new parameters for the per-SSL
-         * copy, ssl_cert_new would be called (and the direct reference to
-         * the per-SSL_CTX settings would be lost, but those still were
-         * indirectly accessed for various purposes, and for that reason they
-         * used to be known as s->ctx->default_cert). Now we don't look at the
-         * SSL_CTX's CERT after having duplicated it once.
-         */
-
-        s->cert = ssl_cert_dup(ctx->cert);
-        if (s->cert == NULL)
-            goto err;
-    } else
-        s->cert = NULL;         /* Cannot really happen (see SSL_CTX_new) */
+    /*
+     * Earlier library versions used to copy the pointer to the CERT, not
+     * its contents; only when setting new parameters for the per-SSL
+     * copy, ssl_cert_new would be called (and the direct reference to
+     * the per-SSL_CTX settings would be lost, but those still were
+     * indirectly accessed for various purposes, and for that reason they
+     * used to be known as s->ctx->default_cert). Now we don't look at the
+     * SSL_CTX's CERT after having duplicated it once.
+     */
+    s->cert = ssl_cert_dup(ctx->cert);
+    if (s->cert == NULL)
+        goto err;
 
     s->read_ahead = ctx->read_ahead;
     s->msg_callback = ctx->msg_callback;
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index a16ad08..3396572 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -2053,7 +2053,6 @@ int ssl_clear_bad_session(SSL *s);
 CERT *ssl_cert_new(void);
 CERT *ssl_cert_dup(CERT *cert);
 void ssl_cert_set_default_md(CERT *cert);
-int ssl_cert_inst(CERT **o);
 void ssl_cert_clear_certs(CERT *c);
 void ssl_cert_free(CERT *c);
 SESS_CERT *ssl_sess_cert_new(void);
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index 723da6e..8799d3d 100644
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -79,10 +79,6 @@ int SSL_use_certificate(SSL *ssl, X509 *x)
         return 0;
     }
 
-    if (!ssl_cert_inst(&ssl->cert)) {
-        SSLerr(SSL_F_SSL_USE_CERTIFICATE, ERR_R_MALLOC_FAILURE);
-        return (0);
-    }
     return (ssl_set_cert(ssl->cert, x));
 }
 
@@ -157,10 +153,6 @@ int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa)
         SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY, ERR_R_PASSED_NULL_PARAMETER);
         return (0);
     }
-    if (!ssl_cert_inst(&ssl->cert)) {
-        SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY, ERR_R_MALLOC_FAILURE);
-        return (0);
-    }
     if ((pkey = EVP_PKEY_new()) == NULL) {
         SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY, ERR_R_EVP_LIB);
         return (0);
@@ -302,10 +294,6 @@ int SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey)
         SSLerr(SSL_F_SSL_USE_PRIVATEKEY, ERR_R_PASSED_NULL_PARAMETER);
         return (0);
     }
-    if (!ssl_cert_inst(&ssl->cert)) {
-        SSLerr(SSL_F_SSL_USE_PRIVATEKEY, ERR_R_MALLOC_FAILURE);
-        return (0);
-    }
     ret = ssl_set_pkey(ssl->cert, pkey);
     return (ret);
 }
@@ -383,10 +371,6 @@ int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x)
         SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE, rv);
         return 0;
     }
-    if (!ssl_cert_inst(&ctx->cert)) {
-        SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE, ERR_R_MALLOC_FAILURE);
-        return (0);
-    }
     return (ssl_set_cert(ctx->cert, x));
 }
 
@@ -519,10 +503,6 @@ int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa)
         SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY, ERR_R_PASSED_NULL_PARAMETER);
         return (0);
     }
-    if (!ssl_cert_inst(&ctx->cert)) {
-        SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY, ERR_R_MALLOC_FAILURE);
-        return (0);
-    }
     if ((pkey = EVP_PKEY_new()) == NULL) {
         SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY, ERR_R_EVP_LIB);
         return (0);
@@ -603,10 +583,6 @@ int SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey)
         SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY, ERR_R_PASSED_NULL_PARAMETER);
         return (0);
     }
-    if (!ssl_cert_inst(&ctx->cert)) {
-        SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY, ERR_R_MALLOC_FAILURE);
-        return (0);
-    }
     return (ssl_set_pkey(ctx->cert, pkey));
 }
 
@@ -900,10 +876,6 @@ int SSL_CTX_use_serverinfo(SSL_CTX *ctx, const unsigned char *serverinfo,
         SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO, SSL_R_INVALID_SERVERINFO_DATA);
         return 0;
     }
-    if (!ssl_cert_inst(&ctx->cert)) {
-        SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO, ERR_R_MALLOC_FAILURE);
-        return 0;
-    }
     if (ctx->cert->key == NULL) {
         SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO, ERR_R_INTERNAL_ERROR);
         return 0;

From levitte at openssl.org  Sun Mar 15 12:16:14 2015
From: levitte at openssl.org (Richard Levitte)
Date: Sun, 15 Mar 2015 12:16:14 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1426421774.135001.30064.nullmailer@dev.openssl.org>

The branch master has been updated
       via  042b5cd96c9159769c9539aa805849fa93f995f7 (commit)
      from  c1a690a05e888b41ed73cc24a91e471ea47d4fe8 (commit)


- Log -----------------------------------------------------------------
commit 042b5cd96c9159769c9539aa805849fa93f995f7
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Mar 15 13:15:33 2015 +0100

    Use the file name produced by Makefile

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

Summary of changes:
 support/funding/support-faq.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/funding/support-faq.wml b/support/funding/support-faq.wml
index 54a0025..88eab91 100644
--- a/support/funding/support-faq.wml
+++ b/support/funding/support-faq.wml
@@ -4,4 +4,4 @@
 <title>Support Contract FAQ</title>
 <h1>Support Contract FAQ</h1>
 
-<!--#include virtual="/support/funding/fundingfaq.inc" -->
+<!--#include virtual="/support/funding/support-faq.inc" -->

From steve at openssl.org  Sun Mar 15 15:56:53 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 15 Mar 2015 15:56:53 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_0_9_8-stable update
Message-ID: <1426435013.395855.12600.nullmailer@dev.openssl.org>

The branch OpenSSL_0_9_8-stable has been updated
       via  c58f4f73bdb66355b77cd8749afd5deba3d954c1 (commit)
      from  c85c1e08ce4148b64a80497525fa5e5efc87d13a (commit)


- Log -----------------------------------------------------------------
commit c58f4f73bdb66355b77cd8749afd5deba3d954c1
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Mar 14 14:10:35 2015 +0000

    Tolerate test_sqr errors for FIPS builds.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 crypto/bn/bntest.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/crypto/bn/bntest.c b/crypto/bn/bntest.c
index e73f198..6008d15 100644
--- a/crypto/bn/bntest.c
+++ b/crypto/bn/bntest.c
@@ -722,7 +722,15 @@ int test_sqr(BIO *bp, BN_CTX *ctx)
     if (BN_cmp(c, d)) {
         fprintf(stderr, "Square test failed: BN_sqr and BN_mul produce "
                 "different results!\n");
+#ifdef OPENSSL_FIPS
+        /*
+         * This test fails if we are linked to the FIPS module. Unfortunately
+         * that can't be fixed so we print out the error but continue anyway.
+         */
+        fprintf(stderr, "    FIPS build: ignoring.\n");
+#else
         goto err;
+#endif
     }
 
     /* Regression test for a BN_sqr overflow bug. */

From steve at openssl.org  Sun Mar 15 15:56:53 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 15 Mar 2015 15:56:53 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426435013.474650.12623.nullmailer@dev.openssl.org>

The branch master has been updated
       via  eef53ee50bc6f0a6e74b27b6cfa07df44513074f (commit)
      from  2c3823491d8812560922a58677e3ad2db4b2ec8d (commit)


- Log -----------------------------------------------------------------
commit eef53ee50bc6f0a6e74b27b6cfa07df44513074f
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Mar 14 22:42:55 2015 +0000

    Update ordinals, fix error message.
    
    Update error messages to say "EC is disabled" these can then be picked up
    by mkdef.pl.
    
    Update ordinals.
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

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

Summary of changes:
 crypto/ecdh/ecdh.h   |  2 +-
 crypto/ecdsa/ecdsa.h |  2 +-
 util/libeay.num      | 78 ++++++++++++++++++++++++++--------------------------
 util/ssleay.num      |  9 ++++--
 4 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/crypto/ecdh/ecdh.h b/crypto/ecdh/ecdh.h
index 25ccdc9..8a48b12 100644
--- a/crypto/ecdh/ecdh.h
+++ b/crypto/ecdh/ecdh.h
@@ -72,7 +72,7 @@
 # include <openssl/opensslconf.h>
 
 # ifdef OPENSSL_NO_EC
-#  error ECDH is disabled.
+#  error EC is disabled.
 # endif
 
 # include <openssl/ec.h>
diff --git a/crypto/ecdsa/ecdsa.h b/crypto/ecdsa/ecdsa.h
index 3876004..f60c229 100644
--- a/crypto/ecdsa/ecdsa.h
+++ b/crypto/ecdsa/ecdsa.h
@@ -62,7 +62,7 @@
 # include <openssl/opensslconf.h>
 
 # ifdef OPENSSL_NO_EC
-#  error ECDSA is disabled.
+#  error EC is disabled.
 # endif
 
 # include <openssl/ec.h>
diff --git a/util/libeay.num b/util/libeay.num
index a991d77..3ad7e1d 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2913,7 +2913,7 @@ STORE_set_method                        3348	NOEXIST::FUNCTION:
 GENERAL_SUBTREE_free                    3349	EXIST::FUNCTION:
 NAME_CONSTRAINTS_it                     3350	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 NAME_CONSTRAINTS_it                     3350	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ECDH_get_default_method                 3351	EXIST::FUNCTION:ECDH
+ECDH_get_default_method                 3351	EXIST::FUNCTION:EC
 PKCS12_add_safe                         3352	EXIST::FUNCTION:
 EC_KEY_new_by_curve_name                3353	EXIST::FUNCTION:EC
 STORE_meth_get_update_store_fn          3354	NOEXIST::FUNCTION:
@@ -2961,7 +2961,7 @@ STORE_get_public_key                    3391	NOEXIST::FUNCTION:
 STORE_modify_arbitrary                  3392	NOEXIST::FUNCTION:
 ENGINE_get_static_state                 3393	EXIST::FUNCTION:ENGINE
 pqueue_iterator                         3394	EXIST::FUNCTION:
-ECDSA_SIG_new                           3395	EXIST::FUNCTION:ECDSA
+ECDSA_SIG_new                           3395	EXIST::FUNCTION:EC
 OPENSSL_DIR_end                         3396	EXIST::FUNCTION:
 BN_GF2m_mod_sqr                         3397	EXIST::FUNCTION:EC2M
 EC_POINT_bn2point                       3398	EXIST::FUNCTION:EC
@@ -2969,7 +2969,7 @@ X509_VERIFY_PARAM_set_depth             3399	EXIST::FUNCTION:
 EC_KEY_set_asn1_flag                    3400	EXIST::FUNCTION:EC
 STORE_get_method                        3401	NOEXIST::FUNCTION:
 EC_KEY_get_key_method_data              3402	EXIST::FUNCTION:EC
-ECDSA_sign_ex                           3403	EXIST::FUNCTION:ECDSA
+ECDSA_sign_ex                           3403	EXIST::FUNCTION:EC
 STORE_parse_attrs_end                   3404	NOEXIST::FUNCTION:
 EC_GROUP_get_point_conversion_form      3405	EXIST:!VMS:FUNCTION:EC
 EC_GROUP_get_point_conv_form            3405	EXIST:VMS:FUNCTION:EC
@@ -2983,7 +2983,7 @@ X509_VERIFY_PARAM_set1_policies         3412	EXIST::FUNCTION:
 X509_VERIFY_PARAM_set1_name             3413	EXIST::FUNCTION:
 X509_VERIFY_PARAM_set_purpose           3414	EXIST::FUNCTION:
 STORE_get_number                        3415	NOEXIST::FUNCTION:
-ECDSA_sign_setup                        3416	EXIST::FUNCTION:ECDSA
+ECDSA_sign_setup                        3416	EXIST::FUNCTION:EC
 BN_GF2m_mod_solve_quad_arr              3417	EXIST::FUNCTION:EC2M
 EC_KEY_up_ref                           3418	EXIST::FUNCTION:EC
 POLICY_MAPPING_free                     3419	EXIST::FUNCTION:
@@ -3008,11 +3008,11 @@ X509_policy_level_node_count            3434	EXIST::FUNCTION:
 STORE_new_engine                        3435	NOEXIST::FUNCTION:
 STORE_list_public_key_start             3436	NOEXIST::FUNCTION:
 X509_VERIFY_PARAM_new                   3437	EXIST::FUNCTION:
-ECDH_get_ex_data                        3438	EXIST::FUNCTION:ECDH
+ECDH_get_ex_data                        3438	EXIST::FUNCTION:EC
 EVP_PKEY_get_attr                       3439	EXIST::FUNCTION:
-ECDSA_do_sign                           3440	EXIST::FUNCTION:ECDSA
+ECDSA_do_sign                           3440	EXIST::FUNCTION:EC
 ENGINE_unregister_ECDH                  3441	EXIST::FUNCTION:ENGINE
-ECDH_OpenSSL                            3442	EXIST::FUNCTION:ECDH
+ECDH_OpenSSL                            3442	EXIST::FUNCTION:EC
 EC_KEY_set_conv_form                    3443	EXIST::FUNCTION:EC
 EC_POINT_dup                            3444	EXIST::FUNCTION:EC
 GENERAL_SUBTREE_new                     3445	EXIST::FUNCTION:
@@ -3026,7 +3026,7 @@ BN_GF2m_mod_sqrt_arr                    3451	EXIST::FUNCTION:EC2M
 i2d_ECPrivateKey_bio                    3452	EXIST::FUNCTION:EC
 ECPKParameters_print_fp                 3453	EXIST::FUNCTION:EC,STDIO
 pqueue_find                             3454	EXIST::FUNCTION:
-ECDSA_SIG_free                          3455	EXIST::FUNCTION:ECDSA
+ECDSA_SIG_free                          3455	EXIST::FUNCTION:EC
 PEM_write_bio_ECPKParameters            3456	EXIST::FUNCTION:EC
 STORE_method_set_ctrl_function          3457	NOEXIST::FUNCTION:
 STORE_list_public_key_end               3458	NOEXIST::FUNCTION:
@@ -3084,7 +3084,7 @@ X509_STORE_CTX_get0_param               3505	EXIST::FUNCTION:
 STORE_delete_arbitrary                  3506	NOEXIST::FUNCTION:
 PEM_read_X509_CERT_PAIR                 3507	NOEXIST::FUNCTION:
 X509_STORE_set_depth                    3508	EXIST::FUNCTION:
-ECDSA_get_ex_data                       3509	EXIST::FUNCTION:ECDSA
+ECDSA_get_ex_data                       3509	EXIST::FUNCTION:EC
 SHA224                                  3510	EXIST::FUNCTION:
 BIO_dump_indent_fp                      3511	EXIST::FUNCTION:STDIO
 EC_KEY_set_group                        3512	EXIST::FUNCTION:EC
@@ -3097,7 +3097,7 @@ ERR_load_STORE_strings                  3518	NOEXIST::FUNCTION:
 PEM_read_bio_EC_PUBKEY                  3519	EXIST::FUNCTION:EC
 STORE_list_private_key_end              3520	NOEXIST::FUNCTION:
 i2d_EC_PUBKEY                           3521	EXIST::FUNCTION:EC
-ECDSA_get_default_method                3522	EXIST::FUNCTION:ECDSA
+ECDSA_get_default_method                3522	EXIST::FUNCTION:EC
 ASN1_put_eoc                            3523	EXIST::FUNCTION:
 X509_STORE_CTX_get_explicit_policy      3524	EXIST:!VMS:FUNCTION:
 X509_STORE_CTX_get_expl_policy          3524	EXIST:VMS:FUNCTION:
@@ -3128,7 +3128,7 @@ EC_GROUP_set_curve_GF2m                 3545	EXIST::FUNCTION:EC,EC2M
 ENGINE_set_default_ECDSA                3546	EXIST::FUNCTION:ENGINE
 POLICY_CONSTRAINTS_new                  3547	EXIST::FUNCTION:
 BN_GF2m_mod_sqrt                        3548	EXIST::FUNCTION:EC2M
-ECDH_set_default_method                 3549	EXIST::FUNCTION:ECDH
+ECDH_set_default_method                 3549	EXIST::FUNCTION:EC
 EC_KEY_generate_key                     3550	EXIST::FUNCTION:EC
 SHA384_Update                           3551	EXIST:!VMSVAX:FUNCTION:
 BN_GF2m_arr2poly                        3552	EXIST::FUNCTION:EC2M
@@ -3173,7 +3173,7 @@ BIO_dgram_non_fatal_error               3586	EXIST::FUNCTION:
 EC_GROUP_get_asn1_flag                  3587	EXIST::FUNCTION:EC
 STORE_ATTR_INFO_in_ex                   3588	NOEXIST::FUNCTION:
 STORE_list_crl_start                    3589	NOEXIST::FUNCTION:
-ECDH_get_ex_new_index                   3590	EXIST::FUNCTION:ECDH
+ECDH_get_ex_new_index                   3590	EXIST::FUNCTION:EC
 STORE_meth_get_modify_fn                3591	NOEXIST::FUNCTION:
 STORE_method_get_modify_function        3591	NOEXIST::FUNCTION:
 v2i_ASN1_BIT_STRING                     3592	EXIST::FUNCTION:
@@ -3197,22 +3197,22 @@ ECPKParameters_print                    3607	EXIST::FUNCTION:EC
 EC_KEY_get0_private_key                 3608	EXIST::FUNCTION:EC
 PEM_write_EC_PUBKEY                     3609	EXIST::FUNCTION:EC
 X509_VERIFY_PARAM_set1                  3610	EXIST::FUNCTION:
-ECDH_set_method                         3611	EXIST::FUNCTION:ECDH
+ECDH_set_method                         3611	EXIST::FUNCTION:EC
 v2i_GENERAL_NAME_ex                     3612	EXIST::FUNCTION:
-ECDH_set_ex_data                        3613	EXIST::FUNCTION:ECDH
+ECDH_set_ex_data                        3613	EXIST::FUNCTION:EC
 STORE_generate_key                      3614	NOEXIST::FUNCTION:
 BN_nist_mod_521                         3615	EXIST::FUNCTION:
 X509_policy_tree_get0_level             3616	EXIST::FUNCTION:
 EC_GROUP_set_point_conversion_form      3617	EXIST:!VMS:FUNCTION:EC
 EC_GROUP_set_point_conv_form            3617	EXIST:VMS:FUNCTION:EC
 PEM_read_EC_PUBKEY                      3618	EXIST::FUNCTION:EC
-i2d_ECDSA_SIG                           3619	EXIST::FUNCTION:ECDSA
-ECDSA_OpenSSL                           3620	EXIST::FUNCTION:ECDSA
+i2d_ECDSA_SIG                           3619	EXIST::FUNCTION:EC
+ECDSA_OpenSSL                           3620	EXIST::FUNCTION:EC
 STORE_delete_crl                        3621	NOEXIST::FUNCTION:
 EC_KEY_get_enc_flags                    3622	EXIST::FUNCTION:EC
 ASN1_const_check_infinite_end           3623	EXIST::FUNCTION:
 EVP_PKEY_delete_attr                    3624	EXIST::FUNCTION:
-ECDSA_set_default_method                3625	EXIST::FUNCTION:ECDSA
+ECDSA_set_default_method                3625	EXIST::FUNCTION:EC
 EC_POINT_set_compressed_coordinates_GF2m 3626	EXIST:!VMS:FUNCTION:EC,EC2M
 EC_POINT_set_compr_coords_GF2m          3626	EXIST:VMS:FUNCTION:EC,EC2M
 EC_GROUP_cmp                            3627	EXIST::FUNCTION:EC
@@ -3225,7 +3225,7 @@ PEM_read_ECPrivateKey                   3632	EXIST::FUNCTION:EC
 SHA512_Init                             3633	EXIST:!VMSVAX:FUNCTION:
 STORE_parse_attrs_endp                  3634	NOEXIST::FUNCTION:
 BN_set_negative                         3635	EXIST::FUNCTION:
-ERR_load_ECDSA_strings                  3636	EXIST::FUNCTION:ECDSA
+ERR_load_ECDSA_strings                  3636	EXIST::FUNCTION:EC
 EC_GROUP_get_basis_type                 3637	EXIST::FUNCTION:EC
 STORE_list_public_key_next              3638	NOEXIST::FUNCTION:
 i2v_ASN1_BIT_STRING                     3639	EXIST::FUNCTION:
@@ -3233,7 +3233,7 @@ STORE_OBJECT_free                       3640	NOEXIST::FUNCTION:
 BN_nist_mod_384                         3641	EXIST::FUNCTION:
 i2d_X509_CERT_PAIR                      3642	NOEXIST::FUNCTION:
 PEM_write_ECPKParameters                3643	EXIST::FUNCTION:EC
-ECDH_compute_key                        3644	EXIST::FUNCTION:ECDH
+ECDH_compute_key                        3644	EXIST::FUNCTION:EC
 STORE_ATTR_INFO_get0_sha1str            3645	NOEXIST::FUNCTION:
 ENGINE_register_all_ECDH                3646	EXIST::FUNCTION:ENGINE
 pqueue_pop                              3647	EXIST::FUNCTION:
@@ -3258,13 +3258,13 @@ ENGINE_get_default_ECDSA                3662	EXIST::FUNCTION:ENGINE
 EC_KEY_new                              3663	EXIST::FUNCTION:EC
 SHA256_Transform                        3664	EXIST::FUNCTION:
 EC_KEY_set_enc_flags                    3665	EXIST::FUNCTION:EC
-ECDSA_verify                            3666	EXIST::FUNCTION:ECDSA
+ECDSA_verify                            3666	EXIST::FUNCTION:EC
 EC_POINT_point2hex                      3667	EXIST::FUNCTION:EC
 ENGINE_get_STORE                        3668	EXIST::FUNCTION:ENGINE
 SHA512                                  3669	EXIST:!VMSVAX:FUNCTION:
 STORE_get_certificate                   3670	NOEXIST::FUNCTION:
-ECDSA_do_sign_ex                        3671	EXIST::FUNCTION:ECDSA
-ECDSA_do_verify                         3672	EXIST::FUNCTION:ECDSA
+ECDSA_do_sign_ex                        3671	EXIST::FUNCTION:EC
+ECDSA_do_verify                         3672	EXIST::FUNCTION:EC
 d2i_ECPrivateKey_fp                     3673	EXIST::FUNCTION:EC,STDIO
 STORE_delete_certificate                3674	NOEXIST::FUNCTION:
 SHA512_Transform                        3675	EXIST:!VMSVAX:FUNCTION:
@@ -3301,7 +3301,7 @@ BN_nist_mod_256                         3702	EXIST::FUNCTION:
 X509_VERIFY_PARAM_add0_table            3703	EXIST::FUNCTION:
 pqueue_free                             3704	EXIST::FUNCTION:
 BN_BLINDING_create_param                3705	EXIST::FUNCTION:
-ECDSA_size                              3706	EXIST::FUNCTION:ECDSA
+ECDSA_size                              3706	EXIST::FUNCTION:EC
 d2i_EC_PUBKEY_bio                       3707	EXIST::FUNCTION:EC
 BN_get0_nist_prime_521                  3708	EXIST::FUNCTION:
 STORE_ATTR_INFO_modify_sha1str          3709	NOEXIST::FUNCTION:
@@ -3313,9 +3313,9 @@ PEM_read_bio_ECPrivateKey               3714	EXIST::FUNCTION:EC
 STORE_meth_get_cleanup_fn               3715	NOEXIST::FUNCTION:
 STORE_method_get_cleanup_function       3715	NOEXIST::FUNCTION:
 ENGINE_get_ECDH                         3716	EXIST::FUNCTION:ENGINE
-d2i_ECDSA_SIG                           3717	EXIST::FUNCTION:ECDSA
+d2i_ECDSA_SIG                           3717	EXIST::FUNCTION:EC
 BN_is_prime_fasttest_ex                 3718	EXIST::FUNCTION:
-ECDSA_sign                              3719	EXIST::FUNCTION:ECDSA
+ECDSA_sign                              3719	EXIST::FUNCTION:EC
 X509_policy_check                       3720	EXIST::FUNCTION:
 EVP_PKEY_get_attr_by_NID                3721	EXIST::FUNCTION:
 STORE_set_ex_data                       3722	NOEXIST::FUNCTION:
@@ -3324,10 +3324,10 @@ EVP_ecdsa                               3724	EXIST::FUNCTION:
 BN_BLINDING_get_flags                   3725	EXIST::FUNCTION:
 PKCS12_add_cert                         3726	EXIST::FUNCTION:
 STORE_OBJECT_new                        3727	NOEXIST::FUNCTION:
-ERR_load_ECDH_strings                   3728	EXIST::FUNCTION:ECDH
+ERR_load_ECDH_strings                   3728	EXIST::FUNCTION:EC
 EC_KEY_dup                              3729	EXIST::FUNCTION:EC
 EVP_CIPHER_CTX_rand_key                 3730	EXIST::FUNCTION:
-ECDSA_set_method                        3731	EXIST::FUNCTION:ECDSA
+ECDSA_set_method                        3731	EXIST::FUNCTION:EC
 a2i_IPADDRESS_NC                        3732	EXIST::FUNCTION:
 d2i_ECParameters                        3733	EXIST::FUNCTION:EC
 STORE_list_certificate_end              3734	NOEXIST::FUNCTION:
@@ -3335,13 +3335,13 @@ STORE_get_crl                           3735	NOEXIST::FUNCTION:
 X509_POLICY_NODE_print                  3736	EXIST::FUNCTION:
 SHA384_Init                             3737	EXIST:!VMSVAX:FUNCTION:
 EC_GF2m_simple_method                   3738	EXIST::FUNCTION:EC,EC2M
-ECDSA_set_ex_data                       3739	EXIST::FUNCTION:ECDSA
+ECDSA_set_ex_data                       3739	EXIST::FUNCTION:EC
 SHA384_Final                            3740	EXIST:!VMSVAX:FUNCTION:
 PKCS7_set_digest                        3741	EXIST::FUNCTION:
 EC_KEY_print                            3742	EXIST::FUNCTION:EC
 STORE_meth_set_lock_store_fn            3743	NOEXIST::FUNCTION:
 STORE_method_set_lock_store_function    3743	NOEXIST::FUNCTION:
-ECDSA_get_ex_new_index                  3744	EXIST::FUNCTION:ECDSA
+ECDSA_get_ex_new_index                  3744	EXIST::FUNCTION:EC
 SHA384                                  3745	EXIST:!VMSVAX:FUNCTION:
 POLICY_MAPPING_new                      3746	EXIST::FUNCTION:
 STORE_list_certificate_endp             3747	NOEXIST::FUNCTION:
@@ -4354,18 +4354,18 @@ EVP_aes_256_wrap                        4719	EXIST::FUNCTION:AES
 CRYPTO_128_wrap                         4720	EXIST::FUNCTION:
 RSA_OAEP_PARAMS_new                     4721	EXIST::FUNCTION:RSA
 CRYPTO_128_unwrap                       4722	EXIST::FUNCTION:
-ECDSA_METHOD_set_name                   4723	EXIST::FUNCTION:ECDSA
+ECDSA_METHOD_set_name                   4723	EXIST::FUNCTION:EC
 CMS_RecipientInfo_kari_decrypt          4724	EXIST::FUNCTION:CMS
 CMS_SignerInfo_get0_pkey_ctx            4725	EXIST::FUNCTION:CMS
-ECDSA_METHOD_set_flags                  4726	EXIST::FUNCTION:ECDSA
-ECDSA_METHOD_set_sign_setup             4727	EXIST::FUNCTION:ECDSA
+ECDSA_METHOD_set_flags                  4726	EXIST::FUNCTION:EC
+ECDSA_METHOD_set_sign_setup             4727	EXIST::FUNCTION:EC
 CMS_RecipientInfo_kari_orig_id_cmp      4728	EXIST:!VMS:FUNCTION:CMS
 CMS_RecipInfo_kari_orig_id_cmp          4728	EXIST:VMS:FUNCTION:CMS
 CMS_RecipientInfo_kari_get0_alg         4729	EXIST::FUNCTION:CMS
 EVP_aes_192_wrap                        4730	EXIST::FUNCTION:AES
 EVP_aes_128_cbc_hmac_sha256             4731	EXIST::FUNCTION:AES
 DH_compute_key_padded                   4732	EXIST::FUNCTION:DH
-ECDSA_METHOD_set_sign                   4733	EXIST::FUNCTION:ECDSA
+ECDSA_METHOD_set_sign                   4733	EXIST::FUNCTION:EC
 CMS_RecipientEncryptedKey_cert_cmp      4734	EXIST:!VMS:FUNCTION:CMS
 CMS_RecipEncryptedKey_cert_cmp          4734	EXIST:VMS:FUNCTION:CMS
 DH_KDF_X9_42                            4735	EXIST::FUNCTION:DH
@@ -4385,21 +4385,21 @@ CMS_RecipientInfo_kari_set0_pkey        4746	EXIST:!VMS:FUNCTION:CMS
 CMS_RecipInfo_kari_set0_pkey            4746	EXIST:VMS:FUNCTION:CMS
 i2d_RSA_OAEP_PARAMS                     4747	EXIST::FUNCTION:RSA
 d2i_RSA_OAEP_PARAMS                     4748	EXIST::FUNCTION:RSA
-ECDH_KDF_X9_62                          4749	EXIST::FUNCTION:ECDH
+ECDH_KDF_X9_62                          4749	EXIST::FUNCTION:EC
 CMS_RecipientInfo_kari_get0_ctx         4750	EXIST::FUNCTION:CMS
-ECDSA_METHOD_new                        4751	EXIST::FUNCTION:ECDSA
+ECDSA_METHOD_new                        4751	EXIST::FUNCTION:EC
 CMS_RecipientInfo_get0_pkey_ctx         4752	EXIST::FUNCTION:CMS
 CMS_RecipientEncryptedKey_get0_id       4753	EXIST:!VMS:FUNCTION:CMS
 CMS_RecipEncryptedKey_get0_id           4753	EXIST:VMS:FUNCTION:CMS
 RSA_pad_check_PKCS1_OAEP_mgf1           4754	NOEXIST::FUNCTION:
 RSA_padding_check_PKCS1_OAEP_mgf1       4754	EXIST:!VMS:FUNCTION:RSA
 RSA_padding_chk_PKCS1_OAEP_mgf1         4754	EXIST:VMS:FUNCTION:RSA
-ECDSA_METHOD_set_verify                 4755	EXIST::FUNCTION:ECDSA
+ECDSA_METHOD_set_verify                 4755	EXIST::FUNCTION:EC
 CMS_SharedInfo_encode                   4756	EXIST::FUNCTION:CMS
 RSA_padding_add_PKCS1_OAEP_mgf1         4757	EXIST::FUNCTION:RSA
 CMS_RecipientInfo_kari_get0_orig_id     4758	EXIST:!VMS:FUNCTION:CMS
 CMS_RecipInfo_kari_get0_orig_id         4758	EXIST:VMS:FUNCTION:CMS
-ECDSA_METHOD_free                       4759	EXIST::FUNCTION:ECDSA
+ECDSA_METHOD_free                       4759	EXIST::FUNCTION:EC
 X509_VERIFY_PARAM_get_count             4760	EXIST::FUNCTION:
 X509_VERIFY_PARAM_get0_name             4761	EXIST::FUNCTION:
 X509_VERIFY_PARAM_get0                  4762	EXIST::FUNCTION:
@@ -4408,9 +4408,9 @@ BIO_hex_string                          4764	EXIST::FUNCTION:
 X509_VERIFY_PARAM_set_hostflags         4765	EXIST::FUNCTION:
 BUF_strnlen                             4766	EXIST::FUNCTION:
 X509_VERIFY_PARAM_get0_peername         4767	EXIST::FUNCTION:
-ECDSA_METHOD_set_app_data               4768	EXIST::FUNCTION:ECDSA
+ECDSA_METHOD_set_app_data               4768	EXIST::FUNCTION:EC
 sk_deep_copy                            4769	EXIST::FUNCTION:
-ECDSA_METHOD_get_app_data               4770	EXIST::FUNCTION:ECDSA
+ECDSA_METHOD_get_app_data               4770	EXIST::FUNCTION:EC
 X509_VERIFY_PARAM_add1_host             4771	EXIST::FUNCTION:
 EC_GROUP_get_mont_data                  4772	EXIST::FUNCTION:EC
 i2d_re_X509_tbs                         4773	EXIST::FUNCTION:
diff --git a/util/ssleay.num b/util/ssleay.num
index 916318a..7ea4a8a 100755
--- a/util/ssleay.num
+++ b/util/ssleay.num
@@ -217,8 +217,8 @@ SSL_renegotiate_pending                 265	EXIST::FUNCTION:
 SSL_CTX_set_msg_callback                266	EXIST::FUNCTION:
 SSL_set_msg_callback                    267	EXIST::FUNCTION:
 DTLSv1_client_method                    268	EXIST::FUNCTION:
-SSL_CTX_set_tmp_ecdh_callback           269	EXIST::FUNCTION:ECDH
-SSL_set_tmp_ecdh_callback               270	EXIST::FUNCTION:ECDH
+SSL_CTX_set_tmp_ecdh_callback           269	EXIST::FUNCTION:EC
+SSL_set_tmp_ecdh_callback               270	EXIST::FUNCTION:EC
 SSL_COMP_get_name                       271	EXIST::FUNCTION:COMP
 SSL_get_current_compression             272	EXIST::FUNCTION:COMP
 DTLSv1_method                           273	EXIST::FUNCTION:
@@ -388,3 +388,8 @@ SSL_CTX_set0_security_ex_data           422	EXIST::FUNCTION:
 SSL_set_security_callback               423	EXIST::FUNCTION:
 SSL_CTX_get_security_level              424	EXIST::FUNCTION:
 SSL_CTX_get0_security_ex_data           425	EXIST::FUNCTION:
+SSL_SESSION_has_ticket                  426	EXIST::FUNCTION:
+SSL_set_wbio                            427	EXIST::FUNCTION:
+SSL_SESSION_get0_ticket                 428	EXIST::FUNCTION:
+SSL_SESSION_get_ticket_lifetime_hint    429	EXIST::FUNCTION:
+SSL_set_rbio                            430	EXIST::FUNCTION:

From rsalz at openssl.org  Sun Mar 15 18:49:58 2015
From: rsalz at openssl.org (Rich Salz)
Date: Sun, 15 Mar 2015 18:49:58 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426445398.406560.13846.nullmailer@dev.openssl.org>

The branch master has been updated
       via  556efe7961b300f0fd49c3c8aa47d652caf83c6f (commit)
      from  eef53ee50bc6f0a6e74b27b6cfa07df44513074f (commit)


- Log -----------------------------------------------------------------
commit 556efe7961b300f0fd49c3c8aa47d652caf83c6f
Author: Rich Salz <rsalz at openssl.org>
Date:   Sun Mar 15 14:49:15 2015 -0400

    OPENSSL_NO_EC* merge; missed one file
    
    Missed one file in the #ifdef merge; thanks Kurt.
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

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

Summary of changes:
 ssl/s3_srvr.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index ee66a5a..e5346b6 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -1968,7 +1968,7 @@ int ssl3_send_server_key_exchange(SSL *s)
  f_err:
     ssl3_send_alert(s, SSL3_AL_FATAL, al);
  err:
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     if (encodedPoint != NULL)
         OPENSSL_free(encodedPoint);
     BN_CTX_free(bn_ctx);
@@ -2066,7 +2066,7 @@ int ssl3_get_client_key_exchange(SSL *s)
     KSSL_ERR kssl_err;
 #endif                          /* OPENSSL_NO_KRB5 */
 
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     EC_KEY *srvr_ecdh = NULL;
     EVP_PKEY *clnt_pub_pkey = NULL;
     EC_POINT *clnt_ecpoint = NULL;
@@ -2495,7 +2495,7 @@ int ssl3_get_client_key_exchange(SSL *s)
     } else
 #endif                          /* OPENSSL_NO_KRB5 */
 
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     if (alg_k & (SSL_kECDHE | SSL_kECDHr | SSL_kECDHe)) {
         int ret = 1;
         int field_size = 0;
@@ -2832,10 +2832,10 @@ int ssl3_get_client_key_exchange(SSL *s)
     return (1);
  f_err:
     ssl3_send_alert(s, SSL3_AL_FATAL, al);
-#if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_ECDH) || defined(OPENSSL_NO_SRP)
+#if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_EC) || defined(OPENSSL_NO_SRP)
  err:
 #endif
-#ifndef OPENSSL_NO_ECDH
+#ifndef OPENSSL_NO_EC
     EVP_PKEY_free(clnt_pub_pkey);
     EC_POINT_free(clnt_ecpoint);
     if (srvr_ecdh != NULL)

From steve at openssl.org  Sun Mar 15 19:46:48 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 15 Mar 2015 19:46:48 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426448808.668318.25927.nullmailer@dev.openssl.org>

The branch master has been updated
       via  da27006df06853a33b132133699a7aa9d4277920 (commit)
      from  556efe7961b300f0fd49c3c8aa47d652caf83c6f (commit)


- Log -----------------------------------------------------------------
commit da27006df06853a33b132133699a7aa9d4277920
Author: Carl Jackson <carl at avtok.com>
Date:   Sat Jan 31 02:22:47 2015 -0800

    Fix regression in ASN1_UTCTIME_cmp_time_t
    
    Previously, ASN1_UTCTIME_cmp_time_t would return 1 if s > t, -1 if
    s < t, and 0 if s == t.
    
    This behavior was broken in a refactor [0], resulting in the opposite
    time comparison behavior.
    
    [0]: 904348a4922333106b613754136305db229475ea
    
    PR#3706
    
    Reviewed-by: Stephen Henson <steve at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/asn1/a_utctm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c
index 9b55284..e56cbbc 100644
--- a/crypto/asn1/a_utctm.c
+++ b/crypto/asn1/a_utctm.c
@@ -249,7 +249,7 @@ int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t)
     if (!OPENSSL_gmtime(&t, &ttm))
         return -2;
 
-    if (!OPENSSL_gmtime_diff(&day, &sec, &stm, &ttm))
+    if (!OPENSSL_gmtime_diff(&day, &sec, &ttm, &stm))
         return -2;
 
     if (day > 0)

From steve at openssl.org  Sun Mar 15 19:48:13 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 15 Mar 2015 19:48:13 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1426448893.049539.26821.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  912c8c92b5e703b19a6508de15b229e9fe788656 (commit)
      from  94be83127b08dc3977d2c14304aa61208db048d0 (commit)


- Log -----------------------------------------------------------------
commit 912c8c92b5e703b19a6508de15b229e9fe788656
Author: Carl Jackson <carl at avtok.com>
Date:   Sat Jan 31 02:22:47 2015 -0800

    Fix regression in ASN1_UTCTIME_cmp_time_t
    
    Previously, ASN1_UTCTIME_cmp_time_t would return 1 if s > t, -1 if
    s < t, and 0 if s == t.
    
    This behavior was broken in a refactor [0], resulting in the opposite
    time comparison behavior.
    
    [0]: 904348a4922333106b613754136305db229475ea
    
    PR#3706
    
    Reviewed-by: Stephen Henson <steve at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit da27006df06853a33b132133699a7aa9d4277920)

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

Summary of changes:
 crypto/asn1/a_utctm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c
index 0578c88..724a10b 100644
--- a/crypto/asn1/a_utctm.c
+++ b/crypto/asn1/a_utctm.c
@@ -297,7 +297,7 @@ int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t)
     if (!OPENSSL_gmtime(&t, &ttm))
         return -2;
 
-    if (!OPENSSL_gmtime_diff(&day, &sec, &stm, &ttm))
+    if (!OPENSSL_gmtime_diff(&day, &sec, &ttm, &stm))
         return -2;
 
     if (day > 0)

From steve at openssl.org  Mon Mar 16 15:56:42 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 16 Mar 2015 15:56:42 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426521402.543998.26746.nullmailer@dev.openssl.org>

The branch master has been updated
       via  9b0a453190efc9b14cc04e74ce2e8e35af45fb39 (commit)
      from  da27006df06853a33b132133699a7aa9d4277920 (commit)


- Log -----------------------------------------------------------------
commit 9b0a453190efc9b14cc04e74ce2e8e35af45fb39
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Mar 14 23:48:47 2015 +0000

    Make X509_ATTRIBUTE opaque.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 apps/pkcs12.c                    | 10 +++++----
 crypto/asn1/Makefile             | 17 ++-------------
 crypto/asn1/t_req.c              | 23 ++++++++------------
 crypto/pkcs12/p12_attr.c         | 15 +++-----------
 crypto/pkcs7/pk7_doit.c          | 22 +++++---------------
 crypto/x509/Makefile             |  4 ++--
 crypto/x509/x509.h               | 16 +-------------
 crypto/x509/x509_att.c           |  1 +
 crypto/x509/x509_lcl.h           | 16 ++++++++++++++
 crypto/x509/x509_req.c           | 45 ++++++++++------------------------------
 crypto/{asn1 => x509}/x_attrib.c |  1 +
 11 files changed, 57 insertions(+), 113 deletions(-)
 rename crypto/{asn1 => x509}/x_attrib.c (99%)

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 3c06930..e33fe24 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -993,17 +993,19 @@ int print_attribs(BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,
     }
     BIO_printf(out, "%s\n", name);
     for (i = 0; i < sk_X509_ATTRIBUTE_num(attrlst); i++) {
+        ASN1_OBJECT *attr_obj;
         attr = sk_X509_ATTRIBUTE_value(attrlst, i);
-        attr_nid = OBJ_obj2nid(attr->object);
+        attr_obj = X509_ATTRIBUTE_get0_object(attr);
+        attr_nid = OBJ_obj2nid(attr_obj);
         BIO_printf(out, "    ");
         if (attr_nid == NID_undef) {
-            i2a_ASN1_OBJECT(out, attr->object);
+            i2a_ASN1_OBJECT(out, attr_obj);
             BIO_printf(out, ": ");
         } else
             BIO_printf(out, "%s: ", OBJ_nid2ln(attr_nid));
 
-        if (sk_ASN1_TYPE_num(attr->value.set)) {
-            av = sk_ASN1_TYPE_value(attr->value.set, 0);
+        if (X509_ATTRIBUTE_count(attr)) {
+            av = X509_ATTRIBUTE_get0_type(attr, 0);
             switch (av->type) {
             case V_ASN1_BMPSTRING:
                 value = OPENSSL_uni2asc(av->value.bmpstring->data,
diff --git a/crypto/asn1/Makefile b/crypto/asn1/Makefile
index a7b6c35..3009bbf 100644
--- a/crypto/asn1/Makefile
+++ b/crypto/asn1/Makefile
@@ -20,7 +20,7 @@ LIB=$(TOP)/libcrypto.a
 LIBSRC=	a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \
 	a_print.c a_type.c a_set.c a_dup.c a_d2i_fp.c a_i2d_fp.c \
 	a_enum.c a_utf8.c a_sign.c a_digest.c a_verify.c a_mbstr.c a_strex.c \
-	x_algor.c x_val.c x_pubkey.c x_sig.c x_req.c x_attrib.c x_bignum.c \
+	x_algor.c x_val.c x_pubkey.c x_sig.c x_req.c x_bignum.c \
 	x_long.c x_name.c x_x509.c x_x509a.c x_crl.c x_info.c x_spki.c nsseq.c \
 	x_nx509.c d2i_pu.c d2i_pr.c i2d_pu.c i2d_pr.c\
 	t_req.c t_x509.c t_x509a.c t_crl.c t_pkey.c t_spki.c t_bitst.c \
@@ -34,7 +34,7 @@ LIBSRC=	a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \
 LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \
 	a_print.o a_type.o a_set.o a_dup.o a_d2i_fp.o a_i2d_fp.o \
 	a_enum.o a_utf8.o a_sign.o a_digest.o a_verify.o a_mbstr.o a_strex.o \
-	x_algor.o x_val.o x_pubkey.o x_sig.o x_req.o x_attrib.o x_bignum.o \
+	x_algor.o x_val.o x_pubkey.o x_sig.o x_req.o x_bignum.o \
 	x_long.o x_name.o x_x509.o x_x509a.o x_crl.o x_info.o x_spki.o nsseq.o \
 	x_nx509.o d2i_pu.o d2i_pr.o i2d_pu.o i2d_pr.o \
 	t_req.o t_x509.o t_x509a.o t_crl.o t_pkey.o t_spki.o t_bitst.o \
@@ -759,19 +759,6 @@ x_algor.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 x_algor.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x_algor.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 x_algor.o: ../../include/openssl/x509_vfy.h x_algor.c
-x_attrib.o: ../../e_os.h ../../include/openssl/asn1.h
-x_attrib.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
-x_attrib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-x_attrib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-x_attrib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
-x_attrib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-x_attrib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
-x_attrib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_attrib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-x_attrib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
-x_attrib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_attrib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-x_attrib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_attrib.c
 x_bignum.o: ../../e_os.h ../../include/openssl/asn1.h
 x_bignum.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 x_bignum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c
index 58986e1..2a88958 100644
--- a/crypto/asn1/t_req.c
+++ b/crypto/asn1/t_req.c
@@ -161,27 +161,22 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags,
                 ASN1_TYPE *at;
                 X509_ATTRIBUTE *a;
                 ASN1_BIT_STRING *bs = NULL;
-                ASN1_TYPE *t;
+                ASN1_OBJECT *aobj;
                 int j, type = 0, count = 1, ii = 0;
 
                 a = sk_X509_ATTRIBUTE_value(sk, i);
-                if (X509_REQ_extension_nid(OBJ_obj2nid(a->object)))
+                aobj = X509_ATTRIBUTE_get0_object(a);
+                if (X509_REQ_extension_nid(OBJ_obj2nid(aobj)))
                     continue;
                 if (BIO_printf(bp, "%12s", "") <= 0)
                     goto err;
-                if ((j = i2a_ASN1_OBJECT(bp, a->object)) > 0) {
-                    if (a->single) {
-                        t = a->value.single;
-                        type = t->type;
-                        bs = t->value.bit_string;
-                    } else {
-                        ii = 0;
-                        count = sk_ASN1_TYPE_num(a->value.set);
+                if ((j = i2a_ASN1_OBJECT(bp, aobj)) > 0) {
+                    ii = 0;
+                    count = X509_ATTRIBUTE_count(a);
  get_next:
-                        at = sk_ASN1_TYPE_value(a->value.set, ii);
-                        type = at->type;
-                        bs = at->value.asn1_string;
-                    }
+                    at = X509_ATTRIBUTE_get0_type(a, ii);
+                    type = at->type;
+                    bs = at->value.asn1_string;
                 }
                 for (j = 25 - j; j > 0; j--)
                     if (BIO_write(bp, " ", 1) != 1)
diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c
index fff3ba1..70695b7 100644
--- a/crypto/pkcs12/p12_attr.c
+++ b/crypto/pkcs12/p12_attr.c
@@ -121,18 +121,9 @@ ASN1_TYPE *PKCS12_get_attr_gen(STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid)
 {
     X509_ATTRIBUTE *attrib;
     int i;
-    if (!attrs)
-        return NULL;
-    for (i = 0; i < sk_X509_ATTRIBUTE_num(attrs); i++) {
-        attrib = sk_X509_ATTRIBUTE_value(attrs, i);
-        if (OBJ_obj2nid(attrib->object) == attr_nid) {
-            if (sk_ASN1_TYPE_num(attrib->value.set))
-                return sk_ASN1_TYPE_value(attrib->value.set, 0);
-            else
-                return NULL;
-        }
-    }
-    return NULL;
+    i = X509at_get_attr_by_NID(attrs, attr_nid, -1);
+    attrib = X509at_get_attr(attrs, i);
+    return X509_ATTRIBUTE_get0_type(attrib, 0);
 }
 
 char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag)
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index 54b7b07..f61d63b 100644
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -1067,23 +1067,11 @@ ASN1_TYPE *PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid)
 
 static ASN1_TYPE *get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid)
 {
-    int i;
+    int idx;
     X509_ATTRIBUTE *xa;
-    ASN1_OBJECT *o;
-
-    o = OBJ_nid2obj(nid);
-    if (!o || !sk)
-        return (NULL);
-    for (i = 0; i < sk_X509_ATTRIBUTE_num(sk); i++) {
-        xa = sk_X509_ATTRIBUTE_value(sk, i);
-        if (OBJ_cmp(xa->object, o) == 0) {
-            if (!xa->single && sk_ASN1_TYPE_num(xa->value.set))
-                return (sk_ASN1_TYPE_value(xa->value.set, 0));
-            else
-                return (NULL);
-        }
-    }
-    return (NULL);
+    idx = X509at_get_attr_by_NID(sk, nid, -1);
+    xa = X509at_get_attr(sk, idx);
+    return X509_ATTRIBUTE_get0_type(xa, 0);
 }
 
 ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk)
@@ -1167,7 +1155,7 @@ static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype,
 
         for (i = 0; i < sk_X509_ATTRIBUTE_num(*sk); i++) {
             attr = sk_X509_ATTRIBUTE_value(*sk, i);
-            if (OBJ_obj2nid(attr->object) == nid) {
+            if (OBJ_obj2nid(X509_ATTRIBUTE_get0_object(attr)) == nid) {
                 X509_ATTRIBUTE_free(attr);
                 attr = X509_ATTRIBUTE_create(nid, atrtype, value);
                 if (attr == NULL)
diff --git a/crypto/x509/Makefile b/crypto/x509/Makefile
index f168b47..de96405 100644
--- a/crypto/x509/Makefile
+++ b/crypto/x509/Makefile
@@ -22,13 +22,13 @@ LIBSRC=	x509_def.c x509_d2.c x509_r2x.c x509_cmp.c \
 	x509_set.c x509cset.c x509rset.c x509_err.c \
 	x509name.c x509_v3.c x509_ext.c x509_att.c \
 	x509type.c x509_lu.c x_all.c x509_txt.c \
-	x509_trs.c by_file.c by_dir.c x509_vpm.c
+	x509_trs.c by_file.c by_dir.c x509_vpm.c x_attrib.c
 LIBOBJ= x509_def.o x509_d2.o x509_r2x.o x509_cmp.o \
 	x509_obj.o x509_req.o x509spki.o x509_vfy.o \
 	x509_set.o x509cset.o x509rset.o x509_err.o \
 	x509name.o x509_v3.o x509_ext.o x509_att.o \
 	x509type.o x509_lu.o x_all.o x509_txt.o \
-	x509_trs.o by_file.o by_dir.o x509_vpm.o
+	x509_trs.o by_file.o by_dir.o x509_vpm.o x_attrib.o
 
 SRC= $(LIBSRC)
 
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index afc16a3..64f1283 100644
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -181,21 +181,7 @@ typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS;
 
 DECLARE_STACK_OF(X509_EXTENSION)
 
-/* a sequence of these are used */
-typedef struct x509_attributes_st {
-    ASN1_OBJECT *object;
-    int single;                 /* 0 for a set, 1 for a single item (which is
-                                 * wrong) */
-    union {
-        char *ptr;
-        /*
-         * 0
-         */ STACK_OF(ASN1_TYPE) *set;
-        /*
-         * 1
-         */ ASN1_TYPE *single;
-    } value;
-} X509_ATTRIBUTE;
+typedef struct x509_attributes_st X509_ATTRIBUTE;
 
 DECLARE_STACK_OF(X509_ATTRIBUTE)
 
diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c
index bd59281..212c422 100644
--- a/crypto/x509/x509_att.c
+++ b/crypto/x509/x509_att.c
@@ -64,6 +64,7 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
+#include "x509_lcl.h"
 
 int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x)
 {
diff --git a/crypto/x509/x509_lcl.h b/crypto/x509/x509_lcl.h
index c7621fd..15b8618 100644
--- a/crypto/x509/x509_lcl.h
+++ b/crypto/x509/x509_lcl.h
@@ -70,3 +70,19 @@ struct X509_VERIFY_PARAM_ID_st {
 };
 
 int x509_check_cert_time(X509_STORE_CTX *ctx, X509 *x, int quiet);
+
+/* a sequence of these are used */
+struct x509_attributes_st {
+    ASN1_OBJECT *object;
+    int single;                 /* 0 for a set, 1 for a single item (which is
+                                 * wrong) */
+    union {
+        char *ptr;
+        /*
+         * 0
+         */ STACK_OF(ASN1_TYPE) *set;
+        /*
+         * 1
+         */ ASN1_TYPE *single;
+    } value;
+};
diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c
index 01795f4..682c2c2 100644
--- a/crypto/x509/x509_req.c
+++ b/crypto/x509/x509_req.c
@@ -201,10 +201,7 @@ STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(X509_REQ *req)
         if (idx == -1)
             continue;
         attr = X509_REQ_get_attr(req, idx);
-        if (attr->single)
-            ext = attr->value.single;
-        else if (sk_ASN1_TYPE_num(attr->value.set))
-            ext = sk_ASN1_TYPE_value(attr->value.set, 0);
+        ext = X509_ATTRIBUTE_get0_type(attr, 0);
         break;
     }
     if (!ext || (ext->type != V_ASN1_SEQUENCE))
@@ -223,37 +220,17 @@ STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(X509_REQ *req)
 int X509_REQ_add_extensions_nid(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts,
                                 int nid)
 {
-    ASN1_TYPE *at = NULL;
-    X509_ATTRIBUTE *attr = NULL;
-    if (!(at = ASN1_TYPE_new()) || !(at->value.sequence = ASN1_STRING_new()))
-        goto err;
-
-    at->type = V_ASN1_SEQUENCE;
+    int extlen;
+    int rv = 0;
+    unsigned char *ext = NULL;
     /* Generate encoding of extensions */
-    at->value.sequence->length =
-        ASN1_item_i2d((ASN1_VALUE *)exts,
-                      &at->value.sequence->data,
-                      ASN1_ITEM_rptr(X509_EXTENSIONS));
-    if (!(attr = X509_ATTRIBUTE_new()))
-        goto err;
-    if (!(attr->value.set = sk_ASN1_TYPE_new_null()))
-        goto err;
-    if (!sk_ASN1_TYPE_push(attr->value.set, at))
-        goto err;
-    at = NULL;
-    attr->single = 0;
-    attr->object = OBJ_nid2obj(nid);
-    if (!req->req_info->attributes) {
-        if (!(req->req_info->attributes = sk_X509_ATTRIBUTE_new_null()))
-            goto err;
-    }
-    if (!sk_X509_ATTRIBUTE_push(req->req_info->attributes, attr))
-        goto err;
-    return 1;
- err:
-    X509_ATTRIBUTE_free(attr);
-    ASN1_TYPE_free(at);
-    return 0;
+    extlen = ASN1_item_i2d((ASN1_VALUE *)exts, &ext,
+                           ASN1_ITEM_rptr(X509_EXTENSIONS));
+    if (extlen <= 0)
+        return 0;
+    rv = X509_REQ_add1_attr_by_NID(req, nid, V_ASN1_SEQUENCE, ext, extlen);
+    OPENSSL_free(ext);
+    return rv;
 }
 
 /* This is the normal usage: use the "official" OID */
diff --git a/crypto/asn1/x_attrib.c b/crypto/x509/x_attrib.c
similarity index 99%
rename from crypto/asn1/x_attrib.c
rename to crypto/x509/x_attrib.c
index 93ef53b..335a85b 100644
--- a/crypto/asn1/x_attrib.c
+++ b/crypto/x509/x_attrib.c
@@ -61,6 +61,7 @@
 #include <openssl/objects.h>
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
+#include "x509_lcl.h"
 
 /*-
  * X509_ATTRIBUTE: this has the following form:

From levitte at openssl.org  Mon Mar 16 21:17:48 2015
From: levitte at openssl.org (Richard Levitte)
Date: Mon, 16 Mar 2015 21:17:48 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426540668.310936.17636.nullmailer@dev.openssl.org>

The branch master has been updated
       via  d52dcf8da7f15bf75fbf065bac2c4557470ea2fa (commit)
       via  7910044064e106073c097a6940d25fe36401266b (commit)
       via  5e1b23536a95597b537e97d045e3139be3d97cdf (commit)
       via  b124552999b0b05cdccc891191b89bf562ba2b90 (commit)
       via  70e4f10346da354915c343d37302eadaed40b1dd (commit)
       via  7d46b9426f6d40634c6d613ed5ce9247acd7b018 (commit)
       via  09816a2e339642e09c612ec48dde0754fec930d2 (commit)
       via  aaf878cc97478b2f4e1f72f344f5ab6247a8084a (commit)
      from  9b0a453190efc9b14cc04e74ce2e8e35af45fb39 (commit)


- Log -----------------------------------------------------------------
commit d52dcf8da7f15bf75fbf065bac2c4557470ea2fa
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Mar 16 22:01:01 2015 +0100

    Updated TABLE
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit 7910044064e106073c097a6940d25fe36401266b
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 12 14:55:05 2015 +0100

    Find debug- targets that can be combined with their non-debug counterparts and do so
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit 5e1b23536a95597b537e97d045e3139be3d97cdf
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Mar 11 00:58:50 2015 +0100

    Change all the main configurations to the new format.
    
    As part of this, remove some levitte examples that never were relevant.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit b124552999b0b05cdccc891191b89bf562ba2b90
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 10 22:04:44 2015 +0100

    Rethink templates.
    
    Because base templates express inheritance of values, the attribute is
    renamed to 'inherit_from', and texts about this talk about 'inheritance(s)'
    rather than base templates.
    
    As they were previously implemented, base templates that were listed
    together would override one another, the first one acting as defaults for
    the next and so on.
    
    However, it was pointed out that a strength of inheritance would be to
    base configurations on several templates - for example one for CPU, one
    for operating system and one for compiler - and that requires a different
    way of combining those templates.  With this change, inherited values
    from several inheritances are concatenated by default (keep on reading).
    
    Also, in-string templates with the double-curly syntax are removed,
    replaced with the possibility to have a configuration value be a coderef
    (i.e. a 'sub { /* your code goes here */ }') that gets the list of values
    from all inheritances as the list @_.  The result of executing such a
    coderef on a list of values is assumed to become a string.  ANY OTHER
    FORM OF VALUE WILL CURRENTLY BREAK.
    
    As a matter of fact, an attribute in the current config with no value is
    assumed to have this coderef as value:
    
        sub { join(' ', @_) }
    
    While we're at it, rename debug-[cl]flags to debug_[cl]flags and
    nodebug-[cl]flags to release_[cl]flags.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit 70e4f10346da354915c343d37302eadaed40b1dd
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Mar 6 10:16:05 2015 +0100

    Provide a few examples by converting my own strings to hash table configurations
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit 7d46b9426f6d40634c6d613ed5ce9247acd7b018
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Mar 6 10:01:08 2015 +0100

    Add base template processing.
    
    Base templates are templates that are used to inherit from.  They can
    loosely be compared with parent class inheritance in object orientation.
    They can be used for the same purpose as the variables with multi-field
    strings are used in old-style string configurations.
    
    Base templates are declared with the base_templates configuration
    attribute, like so:
    
    	"example_target" => {
    		base_templates => [ "x86_asm", ... ]
    		...
    	}
    
    Note: The value of base_templates MUST be an array reference (an array
    enclosed in square brackets).
    
    Any configuration target can be used as a base template by another.  It
    is also possible to have a target that's a pure template and not meant to
    be used directly as a configuration target.  Such a target is marked with
    the template configuration attribute, like so:
    
    	"example_template" => {
    		template => 1,
    		cc => "mycc",
    		...
    	},
    
    As part of this commit, all variables with multi-field strings have been
    translated to pure templates.  The variables currently remain since we
    can't expect people to shift to hash table configurations immediately.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit 09816a2e339642e09c612ec48dde0754fec930d2
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Mar 6 03:00:53 2015 +0100

    Add template reference processing.
    
    Template references are words with double brackets, and refer to the
    same field in the target pointed at the the double bracketed word.
    
    For example, if a target's configuration has the following entry:
    
        'cflags' => '-DFOO {{x86_debug}}'
    
    ... then {{x86_debug}} will be replaced with the 'cflags' value from
    target 'x86_debug'.
    
    Note: template references are resolved recursively, and circular
    references are not allowed
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit aaf878cc97478b2f4e1f72f344f5ab6247a8084a
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Mar 6 02:00:21 2015 +0100

    Rewrite Configure to handle the target values as hash tables.
    
    The reasoning is that configuration strings are hard to read and error
    prone, and that a better way would be for them to be key => value hashes.
    
    Configure is made to be able to handle target configuration values as a
    string as well as a hash.  It also does the best it can to combine a
    "debug-foo" target with a "foo" target, given that they are similar
    except for the cflags and lflags values.  The latter are spliced into
    options that are common for "debug-foo" and "foo", options that exist
    only with "debug-foo" and options that exist only with "foo", and make
    them into combinable attributes that holds common cflags, extra cflags
    for debuggin and extra cflags for non-debugging configurations.
    
    The next step is to make it possible to have template configurations.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 Configurations/10-main.conf | 1767 +++++++++++++++++++++++++++++++++++++++----
 Configurations/90-team.conf |  367 ++++++++-
 Configure                   |  946 ++++++++++++++++++++---
 TABLE                       | 1370 ++++++++++++++++++---------------
 4 files changed, 3520 insertions(+), 930 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 9c64956..eb46789 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -4,18 +4,34 @@
 ##	make -f Makefile.org TABLE
 ## This file is interpolated by the Configure script.
 
-# Filler used for when there are no asm files.
-my $no_asm_filler="::::::::::::::::void";
-
 %targets = (
 
 # Basic configs that should work on any (32 and less bit) box
-"gcc",		"gcc:-O3::(unknown):::BN_LLONG:::",
-"cc",		"cc:-O::(unknown)::::::",
+    "gcc" => {
+        cc               => "gcc",
+        cflags           => "-O3",
+        thread_cflag     => "(unknown)",
+        bn_ops           => "BN_LLONG",
+    },
+    "cc" => {
+        cc               => "cc",
+        cflags           => "-O",
+        thread_cflag     => "(unknown)",
+    },
 
 ####VOS Configurations
-"vos-gcc","gcc:-O3 -Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN::(unknown):VOS:-Wl,-map:BN_LLONG:${no_asm_filler}:::::.so:",
-"debug-vos-gcc","gcc:-O0 -g -Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG::(unknown):VOS:-Wl,-map:BN_LLONG:${no_asm_filler}:::::.so:",
+    "vos-gcc" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "gcc",
+        cflags           => "-Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN",
+        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG",
+        release_cflags   => "-O3",
+        thread_cflag     => "(unknown)",
+        sys_id           => "VOS",
+        lflags           => "-Wl,-map",
+        bn_ops           => "BN_LLONG",
+        shared_extension => ".so",
+    },
 
 #### Solaris x86 with GNU C setups
 # -DOPENSSL_NO_INLINE_ASM switches off inline assembler. We have to do it
@@ -23,7 +39,19 @@ my $no_asm_filler="::::::::::::::::void";
 # surrounds it with #APP #NO_APP comment pair which (at least Solaris
 # 7_x86) /usr/ccs/bin/as fails to assemble with "Illegal mnemonic"
 # error message.
-"solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "solaris-x86-gcc" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "gcc",
+        cflags           => "-O3 -fomit-frame-pointer -march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-lsocket -lnsl -ldl",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        dso_scheme       => "dlfcn",
+        shared_target    => "solaris-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-shared",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
 # -shared -static-libgcc might appear controversial, but modules taken
 # from static libgcc do not have relocations and linking them into our
 # shared objects doesn't have any negative side-effects. On the contrary,
@@ -32,46 +60,260 @@ my $no_asm_filler="::::::::::::::::void";
 # actually recommend to consider using gcc shared build even with vendor
 # compiler:-)
 #						<appro at fy.chalmers.se>
-"solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
+    "solaris64-x86_64-gcc" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "gcc",
+        cflags           => "-m64 -O3 -Wall -DL_ENDIAN",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-lsocket -lnsl -ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "solaris-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m64 -shared -static-libgcc",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "/64",
+    },
 
 #### Solaris x86 with Sun C setups
-"solaris-x86-cc","cc:-fast -xarch=generic -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm_filler}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
+    "solaris-x86-cc" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "cc",
+        cflags           => "-fast -xarch=generic -O -Xa",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-lsocket -lnsl -ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "solaris-shared",
+        shared_cflag     => "-KPIC",
+        shared_ldflag    => "-G -dy -z text",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "solaris64-x86_64-cc" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "cc",
+        cflags           => "-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-lsocket -lnsl -ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "solaris-shared",
+        shared_cflag     => "-KPIC",
+        shared_ldflag    => "-xarch=amd64 -G -dy -z text",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "/64",
+    },
 
 #### SPARC Solaris with GNU C setups
-"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm_filler}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-# -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc
-"solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
+    "solaris-sparcv7-gcc" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "gcc",
+        cflags           => "-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-lsocket -lnsl -ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "solaris-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-shared",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
 ####
-"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -mcpu=ultrasparc -pedantic -ansi -Wall -Wshadow -Wno-long-long -D__EXTENSIONS__ -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "solaris-sparcv8-gcc" => {
+        inherit_from     => [ "sparcv8_asm" ],
+        cc               => "gcc",
+        cflags           => "-mv8 -Wall -DB_ENDIAN",
+        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g",
+        release_cflags   => "-O3 -fomit-frame-pointer -DBN_DIV2W",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-lsocket -lnsl -ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "solaris-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-shared",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+# -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc
+    "solaris-sparcv9-gcc" => {
+        inherit_from     => [ "sparcv9_asm" ],
+        cc               => "gcc",
+        cflags           => "-m32 -mcpu=ultrasparc -Wall -DB_ENDIAN -DBN_DIV2W",
+        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -pedantic -ansi -Wshadow -Wno-long-long -D__EXTENSIONS__",
+        release_cflags   => "-O3 -fomit-frame-pointer",
+        thread_cflag     => "-D_REENTRANT",
+        sys_id           => "ULTRASPARC",
+        lflags           => "-lsocket -lnsl -ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "solaris-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-shared",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "solaris64-sparcv9-gcc" => {
+        inherit_from     => [ "sparcv9_asm" ],
+        cc               => "gcc",
+        cflags           => "-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN",
+        thread_cflag     => "-D_REENTRANT",
+        sys_id           => "ULTRASPARC",
+        lflags           => "-lsocket -lnsl -ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "solaris-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m64 -shared",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "/64",
+    },
 
 #### SPARC Solaris with Sun C setups
 # SC4.0 doesn't pass 'make test', upgrade to SC5.0 or SC4.2.
 # SC4.2 is ok, better than gcc even on bn as long as you tell it -xarch=v8
 # SC5.0 note: Compiler common patch 107357-01 or later is required!
-"solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm_filler}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
+    "solaris-sparcv7-cc" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "cc",
+        cflags           => "-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-lsocket -lnsl -ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "solaris-shared",
+        shared_cflag     => "-KPIC",
+        shared_ldflag    => "-G -dy -z text",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
 ####
-"debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "solaris-sparcv8-cc" => {
+        inherit_from     => [ "sparcv8_asm" ],
+        cc               => "cc",
+        cflags           => "-xarch=v8 -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W",
+        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O",
+        release_cflags   => "-xO5 -xdepend",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-lsocket -lnsl -ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "solaris-shared",
+        shared_cflag     => "-KPIC",
+        shared_ldflag    => "-G -dy -z text",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "solaris-sparcv9-cc" => {
+        inherit_from     => [ "sparcv9_asm" ],
+        cc               => "cc",
+        cflags           => "-xtarget=ultra -xarch=v8plus -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W",
+        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O",
+        release_cflags   => "-xO5 -xdepend",
+        thread_cflag     => "-D_REENTRANT",
+        sys_id           => "ULTRASPARC",
+        lflags           => "-lsocket -lnsl -ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "solaris-shared",
+        shared_cflag     => "-KPIC",
+        shared_ldflag    => "-G -dy -z text",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "solaris64-sparcv9-cc" => {
+        inherit_from     => [ "sparcv9_asm" ],
+        cc               => "cc",
+        cflags           => "-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN",
+        thread_cflag     => "-D_REENTRANT",
+        sys_id           => "ULTRASPARC",
+        lflags           => "-lsocket -lnsl -ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "solaris-shared",
+        shared_cflag     => "-KPIC",
+        shared_ldflag    => "-xarch=v9 -G -dy -z text",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "/64",
+    },
 
 #### IRIX 5.x configs
 # -mips2 flag is added by ./config when appropriate.
-"irix-gcc","gcc:-O3 -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR:${mips32_asm}:o32:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"irix-cc", "cc:-O2 -use_readonly_const -DB_ENDIAN::(unknown):::BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC2 DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "irix-gcc" => {
+        inherit_from     => [ "mips32_asm" ],
+        cc               => "gcc",
+        cflags           => "-O3 -DB_ENDIAN",
+        thread_cflag     => "(unknown)",
+        bn_ops           => "BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR",
+        perlasm_scheme   => "o32",
+        dso_scheme       => "dlfcn",
+        shared_target    => "irix-shared",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "irix-cc" => {
+        inherit_from     => [ "mips32_asm" ],
+        cc               => "cc",
+        cflags           => "-O2 -use_readonly_const -DB_ENDIAN",
+        thread_cflag     => "(unknown)",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC2 DES_UNROLL BF_PTR",
+        perlasm_scheme   => "o32",
+        dso_scheme       => "dlfcn",
+        shared_target    => "irix-shared",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
 #### IRIX 6.x configs
 # Only N32 and N64 ABIs are supported. If you need O32 ABI build, invoke
 # './Configure irix-cc -o32' manually.
-"irix-mips3-gcc","gcc:-mabi=n32 -O3 -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT:${mips64_asm}:n32:dlfcn:irix-shared::-mabi=n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::32",
-"irix-mips3-cc", "cc:-n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT:${mips64_asm}:n32:dlfcn:irix-shared::-n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::32",
+    "irix-mips3-gcc" => {
+        inherit_from     => [ "mips64_asm" ],
+        cc               => "gcc",
+        cflags           => "-mabi=n32 -O3 -DB_ENDIAN -DBN_DIV3W",
+        thread_cflag     => "-D_SGI_MP_SOURCE",
+        bn_ops           => "MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT",
+        perlasm_scheme   => "n32",
+        dso_scheme       => "dlfcn",
+        shared_target    => "irix-shared",
+        shared_ldflag    => "-mabi=n32",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "32",
+    },
+    "irix-mips3-cc" => {
+        inherit_from     => [ "mips64_asm" ],
+        cc               => "cc",
+        cflags           => "-n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W",
+        thread_cflag     => "-D_SGI_MP_SOURCE",
+        bn_ops           => "DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT",
+        perlasm_scheme   => "n32",
+        dso_scheme       => "dlfcn",
+        shared_target    => "irix-shared",
+        shared_ldflag    => "-n32",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "32",
+    },
 # N64 ABI builds.
-"irix64-mips4-gcc","gcc:-mabi=64 -mips4 -O3 -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips64_asm}:64:dlfcn:irix-shared::-mabi=64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips64_asm}:64:dlfcn:irix-shared::-64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+    "irix64-mips4-gcc" => {
+        inherit_from     => [ "mips64_asm" ],
+        cc               => "gcc",
+        cflags           => "-mabi=64 -mips4 -O3 -DB_ENDIAN -DBN_DIV3W",
+        thread_cflag     => "-D_SGI_MP_SOURCE",
+        bn_ops           => "RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG",
+        perlasm_scheme   => "64",
+        dso_scheme       => "dlfcn",
+        shared_target    => "irix-shared",
+        shared_ldflag    => "-mabi=64",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "64",
+    },
+    "irix64-mips4-cc" => {
+        inherit_from     => [ "mips64_asm" ],
+        cc               => "cc",
+        cflags           => "-64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W",
+        thread_cflag     => "-D_SGI_MP_SOURCE",
+        bn_ops           => "RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG",
+        perlasm_scheme   => "64",
+        dso_scheme       => "dlfcn",
+        shared_target    => "irix-shared",
+        shared_ldflag    => "-64",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "64",
+    },
 
 #### Unified HP-UX ANSI C configs.
 # Special notes:
@@ -102,36 +344,226 @@ my $no_asm_filler="::::::::::::::::void";
 #					<appro at fy.chalmers.se>
 #
 # Since there is mention of this in shlib/hpux10-cc.sh
-"hpux-parisc-cc-o4","cc:-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:${no_asm_filler}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-Wl,+s -ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:${no_asm_filler}:dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux-parisc1_1-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-Wl,+s -ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:${parisc11_asm}:dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/pa1.1",
-"hpux-parisc2-gcc","gcc:-march=2.0 -O3 -DB_ENDIAN -D_REENTRANT::::-Wl,+s -ldld:SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL DES_RISC1:".eval{my $asm=$parisc20_asm;$asm=~s/2W\./2\./;$asm=~s/:64/:32/;$asm}.":dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/pa20_32",
-"hpux64-parisc2-gcc","gcc:-O3 -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::pa-risc2W.o:::::::::::::::void:dlfcn:hpux-shared:-fpic:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/pa20_64",
+    "hpux-parisc-cc-o4" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "cc",
+        cflags           => "-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldld",
+        bn_ops           => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1",
+        dso_scheme       => "dl",
+        shared_target    => "hpux-shared",
+        shared_cflag     => "+Z",
+        shared_ldflag    => "-b",
+        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "hpux-parisc-gcc" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "gcc",
+        cflags           => "-O3 -DB_ENDIAN -DBN_DIV2W",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-Wl,+s -ldld",
+        bn_ops           => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1",
+        dso_scheme       => "dl",
+        shared_target    => "hpux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-shared",
+        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "hpux-parisc1_1-gcc" => {
+        inherit_from     => [ "parisc11_asm" ],
+        cc               => "gcc",
+        cflags           => "-O3 -DB_ENDIAN -DBN_DIV2W",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-Wl,+s -ldld",
+        bn_ops           => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1",
+        dso_scheme       => "dl",
+        shared_target    => "hpux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-shared",
+        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "/pa1.1",
+    },
+    "hpux-parisc2-gcc" => {
+        inherit_from     => [ "parisc20_32_asm" ],
+        cc               => "gcc",
+        cflags           => "-march=2.0 -O3 -DB_ENDIAN -D_REENTRANT",
+        lflags           => "-Wl,+s -ldld",
+        bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL DES_RISC1",
+        dso_scheme       => "dl",
+        shared_target    => "hpux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-shared",
+        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "/pa20_32",
+    },
+    "hpux64-parisc2-gcc" => {
+        cc               => "gcc",
+        cflags           => "-O3 -DB_ENDIAN -D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT",
+        bn_obj           => "pa-risc2W.o",
+        perlasm_scheme   => "void",
+        dso_scheme       => "dlfcn",
+        shared_target    => "hpux-shared",
+        shared_cflag     => "-fpic",
+        shared_ldflag    => "-shared",
+        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "/pa20_64",
+    },
 
 # More attempts at unified 10.X and 11.X targets for HP C compiler.
 #
 # Chris Ruemmler <ruemmler at cup.hp.com>
 # Kevin Steves <ks at hp.se>
-"hpux-parisc-cc","cc:+O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT::-Wl,+s -ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:${no_asm_filler}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux-parisc1_1-cc","cc:+DA1.1 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT::-Wl,+s -ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:${parisc11_asm}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/pa1.1",
-"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT::::-Wl,+s -ldld:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:".eval{my $asm=$parisc20_asm;$asm=~s/2W\./2\./;$asm=~s/:64/:32/;$asm}.":dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/pa20_32",
-"hpux64-parisc2-cc","cc:+DD64 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:${parisc20_asm}:dlfcn:hpux-shared:+Z:+DD64 -b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/pa20_64",
+    "hpux-parisc-cc" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "cc",
+        cflags           => "+O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-Wl,+s -ldld",
+        bn_ops           => "MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT",
+        dso_scheme       => "dl",
+        shared_target    => "hpux-shared",
+        shared_cflag     => "+Z",
+        shared_ldflag    => "-b",
+        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "hpux-parisc1_1-cc" => {
+        inherit_from     => [ "parisc11_asm" ],
+        cc               => "cc",
+        cflags           => "+DA1.1 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-Wl,+s -ldld",
+        bn_ops           => "MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT",
+        dso_scheme       => "dl",
+        shared_target    => "hpux-shared",
+        shared_cflag     => "+Z",
+        shared_ldflag    => "-b",
+        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "/pa1.1",
+    },
+    "hpux-parisc2-cc" => {
+        inherit_from     => [ "parisc20_32_asm" ],
+        cc               => "cc",
+        cflags           => "+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT",
+        lflags           => "-Wl,+s -ldld",
+        bn_ops           => "SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT",
+        dso_scheme       => "dl",
+        shared_target    => "hpux-shared",
+        shared_cflag     => "+Z",
+        shared_ldflag    => "-b",
+        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "/pa20_32",
+    },
+    "hpux64-parisc2-cc" => {
+        inherit_from     => [ "parisc20_64_asm" ],
+        cc               => "cc",
+        cflags           => "+DD64 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT",
+        dso_scheme       => "dlfcn",
+        shared_target    => "hpux-shared",
+        shared_cflag     => "+Z",
+        shared_ldflag    => "+DD64 -b",
+        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "/pa20_64",
+    },
 
 # HP/UX IA-64 targets
-"hpux-ia64-cc","cc:-Ae +DD32 +O2 +Olit=all -z -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT:${ia64_asm}:dlfcn:hpux-shared:+Z:+DD32 -b:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/hpux32",
+    "hpux-ia64-cc" => {
+        inherit_from     => [ "ia64_asm" ],
+        cc               => "cc",
+        cflags           => "-Ae +DD32 +O2 +Olit=all -z -DB_ENDIAN -D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT",
+        dso_scheme       => "dlfcn",
+        shared_target    => "hpux-shared",
+        shared_cflag     => "+Z",
+        shared_ldflag    => "+DD32 -b",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "/hpux32",
+    },
 # Frank Geurts <frank.geurts at nl.abnamro.com> has patiently assisted with
 # with debugging of the following config.
-"hpux64-ia64-cc","cc:-Ae +DD64 +O3 +Olit=all -z -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT:${ia64_asm}:dlfcn:hpux-shared:+Z:+DD64 -b:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/hpux64",
+    "hpux64-ia64-cc" => {
+        inherit_from     => [ "ia64_asm" ],
+        cc               => "cc",
+        cflags           => "-Ae +DD64 +O3 +Olit=all -z -DB_ENDIAN -D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT",
+        dso_scheme       => "dlfcn",
+        shared_target    => "hpux-shared",
+        shared_cflag     => "+Z",
+        shared_ldflag    => "+DD64 -b",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "/hpux64",
+    },
 # GCC builds...
-"hpux-ia64-gcc","gcc:-O3 -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT:${ia64_asm}:dlfcn:hpux-shared:-fpic:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/hpux32",
-"hpux64-ia64-gcc","gcc:-mlp64 -O3 -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT:${ia64_asm}:dlfcn:hpux-shared:-fpic:-mlp64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/hpux64",
+    "hpux-ia64-gcc" => {
+        inherit_from     => [ "ia64_asm" ],
+        cc               => "gcc",
+        cflags           => "-O3 -DB_ENDIAN -D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT",
+        dso_scheme       => "dlfcn",
+        shared_target    => "hpux-shared",
+        shared_cflag     => "-fpic",
+        shared_ldflag    => "-shared",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "/hpux32",
+    },
+    "hpux64-ia64-gcc" => {
+        inherit_from     => [ "ia64_asm" ],
+        cc               => "gcc",
+        cflags           => "-mlp64 -O3 -DB_ENDIAN -D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT",
+        dso_scheme       => "dlfcn",
+        shared_target    => "hpux-shared",
+        shared_cflag     => "-fpic",
+        shared_ldflag    => "-mlp64 -shared",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "/hpux64",
+    },
 
 # Legacy HPUX 9.X configs...
-"hpux-cc",	"cc:-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O2 -z::(unknown)::-Wl,+s -ldld:DES_PTR DES_UNROLL DES_RISC1:${no_asm_filler}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux-gcc",	"gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown)::-Wl,+s -ldld:DES_PTR DES_UNROLL DES_RISC1:${no_asm_filler}:dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "hpux-cc" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "cc",
+        cflags           => "-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O2 -z",
+        thread_cflag     => "(unknown)",
+        lflags           => "-Wl,+s -ldld",
+        bn_ops           => "DES_PTR DES_UNROLL DES_RISC1",
+        dso_scheme       => "dl",
+        shared_target    => "hpux-shared",
+        shared_cflag     => "+Z",
+        shared_ldflag    => "-b",
+        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "hpux-gcc" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "gcc",
+        cflags           => "-DB_ENDIAN -DBN_DIV2W -O3",
+        thread_cflag     => "(unknown)",
+        lflags           => "-Wl,+s -ldld",
+        bn_ops           => "DES_PTR DES_UNROLL DES_RISC1",
+        dso_scheme       => "dl",
+        shared_target    => "hpux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-shared",
+        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
 
 #### HP MPE/iX http://jazz.external.hp.com/src/openssl/
-"MPE/iX-gcc",	"gcc:-D_ENDIAN -DBN_DIV2W -O3 -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB::(unknown):MPE:-L/SYSLOG/PUB -lsyslog -lsocket -lcurses:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",
+    "MPE/iX-gcc" => {
+        cc               => "gcc",
+        cflags           => "-D_ENDIAN -DBN_DIV2W -O3 -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB",
+        thread_cflag     => "(unknown)",
+        sys_id           => "MPE",
+        lflags           => "-L/SYSLOG/PUB -lsyslog -lsocket -lcurses",
+        bn_ops           => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1",
+    },
 
 # DEC Alpha OSF/1/Tru64 targets.
 #
@@ -142,17 +574,70 @@ my $no_asm_filler="::::::::::::::::void";
 #
 # For gcc, the following gave a %50 speedup on a 164 over the 'DES_INT' version
 #
-"osf1-alpha-gcc", "gcc:-O3::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
-"osf1-alpha-cc",  "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
-"tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
+    "osf1-alpha-gcc" => {
+        inherit_from     => [ "alpha_asm" ],
+        cc               => "gcc",
+        cflags           => "-O3",
+        thread_cflag     => "(unknown)",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1",
+        dso_scheme       => "dlfcn",
+        shared_target    => "alpha-osf1-shared",
+        shared_extension => ".so",
+    },
+    "osf1-alpha-cc" => {
+        inherit_from     => [ "alpha_asm" ],
+        cc               => "cc",
+        cflags           => "-std1 -tune host -O4 -readonly_strings",
+        thread_cflag     => "(unknown)",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK",
+        dso_scheme       => "dlfcn",
+        shared_target    => "alpha-osf1-shared",
+        shared_extension => ".so",
+    },
+    "tru64-alpha-cc" => {
+        inherit_from     => [ "alpha_asm" ],
+        cc               => "cc",
+        cflags           => "-std1 -tune host -fast -readonly_strings",
+        thread_cflag     => "-pthread",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK",
+        dso_scheme       => "dlfcn",
+        shared_target    => "alpha-osf1-shared",
+        shared_ldflag    => "-msym",
+        shared_extension => ".so",
+    },
 
 ####
 #### Variety of LINUX:-)
 ####
 # *-generic* is endian-neutral target, but ./config is free to
 # throw in -D[BL]_ENDIAN, whichever appropriate...
-"linux-generic32","gcc:-O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm_filler}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-ppc",	"gcc:-DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "linux-generic32" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "gcc",
+        cflags           => "-Wall",
+        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g",
+        release_cflags   => "-O3 -fomit-frame-pointer",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "linux-ppc" => {
+        inherit_from     => [ "ppc32_asm" ],
+        cc               => "gcc",
+        cflags           => "-DB_ENDIAN -O3 -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL",
+        perlasm_scheme   => "linux32",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
 
 #######################################################################
 # Note that -march is not among compiler options in below linux-armv4
@@ -181,30 +666,258 @@ my $no_asm_filler="::::::::::::::::void";
 #
 #       ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8
 #
-"linux-armv4",	"gcc:-O3 -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)",
-"linux-aarch64","gcc:-O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "linux-armv4" => {
+        inherit_from     => [ "armv4_asm" ],
+        cc               => "gcc",
+        cflags           => "-O3 -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "linux-aarch64" => {
+        inherit_from     => [ "aarch64_asm" ],
+        cc               => "gcc",
+        cflags           => "-O3 -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        perlasm_scheme   => "linux64",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
 # Configure script adds minimally required -march for assembly support,
 # if no -march was specified at command line. mips32 and mips64 below
 # refer to contemporary MIPS Architecture specifications, MIPS32 and
 # MIPS64, rather than to kernel bitness.
-"linux-mips32",	"gcc:-mabi=32 -O3 -Wall -DBN_DIV3W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-mips64",   "gcc:-mabi=n32 -O3 -Wall -DBN_DIV3W::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips64_asm}:n32:dlfcn:linux-shared:-fPIC:-mabi=n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::32",
-"linux64-mips64",   "gcc:-mabi=64 -O3 -Wall -DBN_DIV3W::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips64_asm}:64:dlfcn:linux-shared:-fPIC:-mabi=64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+    "linux-mips32" => {
+        inherit_from     => [ "mips32_asm" ],
+        cc               => "gcc",
+        cflags           => "-mabi=32 -O3 -Wall -DBN_DIV3W",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        perlasm_scheme   => "o32",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "linux-mips64" => {
+        inherit_from     => [ "mips64_asm" ],
+        cc               => "gcc",
+        cflags           => "-mabi=n32 -O3 -Wall -DBN_DIV3W",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        perlasm_scheme   => "n32",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-mabi=n32",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "32",
+    },
+    "linux64-mips64" => {
+        inherit_from     => [ "mips64_asm" ],
+        cc               => "gcc",
+        cflags           => "-mabi=64 -O3 -Wall -DBN_DIV3W",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        perlasm_scheme   => "64",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-mabi=64",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "64",
+    },
 #### IA-32 targets...
-"linux-ia32-icc",	"icc:-DL_ENDIAN -O2::-D_REENTRANT::-ldl -no_cpprt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-elf",	"gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-aout",	"gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out",
+    "linux-ia32-icc" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "icc",
+        cflags           => "-DL_ENDIAN -O2",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl -no_cpprt",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-KPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "linux-elf" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "gcc",
+        cflags           => "-DL_ENDIAN -Wall",
+        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -g -march=i486",
+        release_cflags   => "-O3 -fomit-frame-pointer",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        debug_lflags     => "-lefence",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "linux-aout" => {
+        inherit_from     => [ "x86_asm" ],
+        cc               => "gcc",
+        cflags           => "-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall",
+        thread_cflag     => "(unknown)",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        perlasm_scheme   => "a.out",
+    },
 ####
-"linux-generic64","gcc:-O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm_filler}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-ppc64",	"gcc:-m64 -DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-"linux-ppc64le","gcc:-m64 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:$ppc64_asm:linux64le:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::",
-"linux-ia64",	"gcc:-DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-ia64-icc","icc:-DL_ENDIAN -O2 -Wall::-D_REENTRANT::-ldl -no_cpprt:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-x86_64",	"gcc:-m64 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-"linux-x86_64-clang",	"clang:-m64 -DL_ENDIAN -O3 -Weverything $clang_disabled_warnings -Qunused-arguments::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-"linux-x86_64-icc", "icc:-DL_ENDIAN -O2::-D_REENTRANT::-ldl -no_cpprt:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-"linux-x32",	"gcc:-mx32 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32:",
-"linux64-s390x",	"gcc:-m64 -DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+    "linux-generic64" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "gcc",
+        cflags           => "-Wall",
+        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g",
+        release_cflags   => "-O3",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "linux-ppc64" => {
+        inherit_from     => [ "ppc64_asm" ],
+        cc               => "gcc",
+        cflags           => "-m64 -DB_ENDIAN -O3 -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL",
+        perlasm_scheme   => "linux64",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m64",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "64",
+    },
+    "linux-ppc64le" => {
+        inherit_from     => [ "ppc64_asm" ],
+        cc               => "gcc",
+        cflags           => "-m64 -DL_ENDIAN -O3 -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL",
+        perlasm_scheme   => "linux64le",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m64",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "linux-ia64" => {
+        inherit_from     => [ "ia64_asm" ],
+        cc               => "gcc",
+        cflags           => "-DL_ENDIAN -O3 -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "linux-ia64-icc" => {
+        inherit_from     => [ "ia64_asm" ],
+        cc               => "icc",
+        cflags           => "-DL_ENDIAN -O2 -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl -no_cpprt",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "linux-x86_64" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "gcc",
+        cflags           => "-m64 -DL_ENDIAN -Wall",
+        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g",
+        release_cflags   => "-O3",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m64",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "64",
+    },
+    "linux-x86_64-clang" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "clang",
+        cflags           => "-m64 -DL_ENDIAN -O3 -Weverything $clang_disabled_warnings -Qunused-arguments",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m64",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "64",
+    },
+    "linux-x86_64-icc" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "icc",
+        cflags           => "-DL_ENDIAN -O2",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl -no_cpprt",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "64",
+    },
+    "linux-x32" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "gcc",
+        cflags           => "-mx32 -DL_ENDIAN -O3 -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-mx32",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "x32",
+    },
+    "linux64-s390x" => {
+        inherit_from     => [ "s390x_asm" ],
+        cc               => "gcc",
+        cflags           => "-m64 -DB_ENDIAN -O3 -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "64",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m64",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "64",
+    },
 #### So called "highgprs" target for z/Architecture CPUs
 # "Highgprs" is kernel feature first implemented in Linux 2.6.32, see
 # /proc/cpuinfo. The idea is to preserve most significant bits of
@@ -218,16 +931,68 @@ my $no_asm_filler="::::::::::::::::void";
 # ldconfig and run-time linker to autodiscover. Unfortunately it
 # doesn't work just yet, because of couple of bugs in glibc
 # sysdeps/s390/dl-procinfo.c affecting ldconfig and ld.so.1...
-"linux32-s390x",	"gcc:-m31 -Wa,-mzarch -DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$s390x_asm;$asm=~s/bn\-s390x\.o/bn_asm.o/;$asm}.":31:dlfcn:linux-shared:-fPIC:-m31:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/highgprs",
+    "linux32-s390x" => {
+        inherit_from     => [ "s390x_32_asm" ],
+        cc               => "gcc",
+        cflags           => "-m31 -Wa,-mzarch -DB_ENDIAN -O3 -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "31",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m31",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "/highgprs",
+    },
 #### SPARC Linux setups
 # Ray Miller <ray.miller at computing-services.oxford.ac.uk> has patiently
 # assisted with debugging of following two configs.
-"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "linux-sparcv8" => {
+        inherit_from     => [ "sparcv8_asm" ],
+        cc               => "gcc",
+        cflags           => "-mv8 -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -DBN_DIV2W",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
 # it's a real mess with -mcpu=ultrasparc option under Linux, but
 # -Wa,-Av8plus should do the trick no matter what.
-"linux-sparcv9","gcc:-m32 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "linux-sparcv9" => {
+        inherit_from     => [ "sparcv9_asm" ],
+        cc               => "gcc",
+        cflags           => "-m32 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W",
+        thread_cflag     => "-D_REENTRANT",
+        sys_id           => "ULTRASPARC",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m32",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
 # GCC 3.1 is a requirement
-"linux64-sparcv9","gcc:-m64 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+    "linux64-sparcv9" => {
+        inherit_from     => [ "sparcv9_asm" ],
+        cc               => "gcc",
+        cflags           => "-m64 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        sys_id           => "ULTRASPARC",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m64",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "64",
+    },
 #### Alpha Linux with GNU C and Compaq C setups
 # Special notes:
 # - linux-alpha+bwx-gcc is ment to be used from ./config only. If you
@@ -238,44 +1003,270 @@ my $no_asm_filler="::::::::::::::::void";
 #   compiler is free to issue instructions which gonna make elder CPU
 #   choke. If you wish to build "blended" toolkit, add -arch generic
 #   *after* -fast and invoke './Configure linux-alpha-ccc' manually.
-"linux-alpha-gcc","gcc:-O3 -DL_ENDIAN::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
-"linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
+    "linux-alpha-gcc" => {
+        inherit_from     => [ "alpha_asm" ],
+        cc               => "gcc",
+        cflags           => "-O3 -DL_ENDIAN",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "linux-alpha+bwx-gcc" => {
+        inherit_from     => [ "alpha_asm" ],
+        cc               => "gcc",
+        cflags           => "-O3 -DL_ENDIAN",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "linux-alpha-ccc" => {
+        inherit_from     => [ "alpha_asm" ],
+        cc               => "ccc",
+        cflags           => "-fast -readonly_strings -DL_ENDIAN",
+        thread_cflag     => "-D_REENTRANT",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL",
+    },
+    "linux-alpha+bwx-ccc" => {
+        inherit_from     => [ "alpha_asm" ],
+        cc               => "ccc",
+        cflags           => "-fast -readonly_strings -DL_ENDIAN",
+        thread_cflag     => "-D_REENTRANT",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL",
+    },
 #
 # TI_CGT_C6000_7.3.x is a requirement
-"linux-c64xplus","cl6x:--linux -ea=.s -eo=.o -mv6400+ -o2 -ox -ms -pden -DOPENSSL_SMALL_FOOTPRINT::-D_REENTRANT:::BN_LLONG:c64xpluscpuid.o:bn-c64xplus.o c64xplus-gf2m.o:::aes-c64xplus.o aes_cbc.o aes_ctr.o:::sha1-c64xplus.o sha256-c64xplus.o sha512-c64xplus.o::rc4-c64xplus.o:::::ghash-c64xplus.o::void:dlfcn:linux-shared:--pic:-z --sysv --shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):true",
+    "linux-c64xplus" => {
+        cc               => "cl6x",
+        cflags           => "--linux -ea=.s -eo=.o -mv6400+ -o2 -ox -ms -pden -DOPENSSL_SMALL_FOOTPRINT",
+        thread_cflag     => "-D_REENTRANT",
+        bn_ops           => "BN_LLONG",
+        cpuid_obj        => "c64xpluscpuid.o",
+        bn_obj           => "bn-c64xplus.o c64xplus-gf2m.o",
+        aes_obj          => "aes-c64xplus.o aes_cbc.o aes_ctr.o",
+        sha1_obj         => "sha1-c64xplus.o sha256-c64xplus.o sha512-c64xplus.o",
+        rc4_obj          => "rc4-c64xplus.o",
+        modes_obj        => "ghash-c64xplus.o",
+        perlasm_scheme   => "void",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "--pic",
+        shared_ldflag    => "-z --sysv --shared",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        ranlib           => "true",
+    },
 
 # Android: linux-* but without pointers to headers and libs.
-"android","gcc:-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:${no_asm_filler}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"android-x86","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"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)",
-"android-mips","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "android" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "gcc",
+        cflags           => "-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "android-x86" => {
+        inherit_from     => [ "android_x86_elf_asm" ],
+        cc               => "gcc",
+        cflags           => "-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "android-armv7" => {
+        inherit_from     => [ "armv4_asm" ],
+        cc               => "gcc",
+        cflags           => "-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "android-mips" => {
+        inherit_from     => [ "mips32_asm" ],
+        cc               => "gcc",
+        cflags           => "-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        perlasm_scheme   => "o32",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
 
 #### *BSD [do see comment about ${BSDthreads} in Configure!]
-"BSD-generic32","gcc:-O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm_filler}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"BSD-x86",	"gcc:-DL_ENDIAN -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)",
-"BSD-x86-elf",	"gcc:-DL_ENDIAN -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)",
-"debug-BSD-x86-elf",	"gcc:-DL_ENDIAN -O3 -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"BSD-sparcv8",	"gcc:-DB_ENDIAN -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)",
+    "BSD-generic32" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "gcc",
+        cflags           => "-O3 -fomit-frame-pointer -Wall",
+        thread_cflag     => "${BSDthreads}",
+        bn_ops           => "BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL",
+        dso_scheme       => "dlfcn",
+        shared_target    => "bsd-gcc-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "BSD-x86" => {
+        inherit_from     => [ "x86_asm" ],
+        cc               => "gcc",
+        cflags           => "-DL_ENDIAN -O3 -fomit-frame-pointer -Wall",
+        thread_cflag     => "${BSDthreads}",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        perlasm_scheme   => "a.out",
+        dso_scheme       => "dlfcn",
+        shared_target    => "bsd-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "BSD-x86-elf" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "gcc",
+        cflags           => "-DL_ENDIAN -Wall",
+        debug_cflags     => "-g",
+        release_cflags   => "-O3 -fomit-frame-pointer",
+        thread_cflag     => "${BSDthreads}",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        dso_scheme       => "dlfcn",
+        shared_target    => "bsd-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "BSD-sparcv8" => {
+        inherit_from     => [ "sparcv8_asm" ],
+        cc               => "gcc",
+        cflags           => "-DB_ENDIAN -O3 -mv8 -Wall",
+        thread_cflag     => "${BSDthreads}",
+        bn_ops           => "BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL",
+        dso_scheme       => "dlfcn",
+        shared_target    => "bsd-gcc-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
 
-"BSD-generic64","gcc:-O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm_filler}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "BSD-generic64" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "gcc",
+        cflags           => "-O3 -Wall",
+        thread_cflag     => "${BSDthreads}",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        dso_scheme       => "dlfcn",
+        shared_target    => "bsd-gcc-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
 # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
 # simply *happens* to work around a compiler bug in gcc 3.3.3,
 # triggered by RIPEMD160 code.
-"BSD-sparc64",	"gcc:-DB_ENDIAN -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)",
-"BSD-ia64",	"gcc:-DL_ENDIAN -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)",
-"BSD-x86_64",	"gcc:-DL_ENDIAN -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)",
+    "BSD-sparc64" => {
+        inherit_from     => [ "sparcv9_asm" ],
+        cc               => "gcc",
+        cflags           => "-DB_ENDIAN -O3 -DMD32_REG_T=int -Wall",
+        thread_cflag     => "${BSDthreads}",
+        bn_ops           => "BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "bsd-gcc-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "BSD-ia64" => {
+        inherit_from     => [ "ia64_asm" ],
+        cc               => "gcc",
+        cflags           => "-DL_ENDIAN -O3 -Wall",
+        thread_cflag     => "${BSDthreads}",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT",
+        dso_scheme       => "dlfcn",
+        shared_target    => "bsd-gcc-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "BSD-x86_64" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "gcc",
+        cflags           => "-DL_ENDIAN -O3 -Wall",
+        thread_cflag     => "${BSDthreads}",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "bsd-gcc-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
 
-"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)",
+    "bsdi-elf-gcc" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "gcc",
+        cflags           => "-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall",
+        thread_cflag     => "(unknown)",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        dso_scheme       => "dlfcn",
+        shared_target    => "bsd-gcc-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
 
-"nextstep",	"cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
-"nextstep3.3",	"cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+    "nextstep" => {
+        cc               => "cc",
+        cflags           => "-O -Wall",
+        unistd           => "<libc.h>",
+        thread_cflag     => "(unknown)",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+    },
+    "nextstep3.3" => {
+        cc               => "cc",
+        cflags           => "-O3 -Wall",
+        unistd           => "<libc.h>",
+        thread_cflag     => "(unknown)",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+    },
 
 # QNX
-"qnx4",	"cc:-DL_ENDIAN -DTERMIO::(unknown):::${x86_gcc_des} ${x86_gcc_opts}:",
-"QNX6",       "gcc:::::-lsocket::${no_asm_filler}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"QNX6-i386",  "gcc:-DL_ENDIAN -O2 -Wall::::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "qnx4" => {
+        cc               => "cc",
+        cflags           => "-DL_ENDIAN -DTERMIO",
+        thread_cflag     => "(unknown)",
+        bn_ops           => "${x86_gcc_des} ${x86_gcc_opts}",
+    },
+    "QNX6" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "gcc",
+        lflags           => "-lsocket",
+        dso_scheme       => "dlfcn",
+        shared_target    => "bsd-gcc-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "QNX6-i386" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "gcc",
+        cflags           => "-DL_ENDIAN -O2 -Wall",
+        lflags           => "-lsocket",
+        bn_ops           => "${x86_gcc_des} ${x86_gcc_opts}",
+        dso_scheme       => "dlfcn",
+        shared_target    => "bsd-gcc-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
 
 #### SCO/Caldera targets.
 #
@@ -289,31 +1280,160 @@ my $no_asm_filler="::::::::::::::::void";
 # patiently assisted to debug most of it.
 #
 # UnixWare 2.0x fails destest with -O.
-"unixware-2.0","cc:-DFILIO_H -DNO_STRINGS_H::-Kthread::-lsocket -lnsl -lresolv -lx:${x86_gcc_des} ${x86_gcc_opts}:::",
-"unixware-2.1","cc:-O -DFILIO_H::-Kthread::-lsocket -lnsl -lresolv -lx:${x86_gcc_des} ${x86_gcc_opts}:::",
-"unixware-7","cc:-O -DFILIO_H -Kalloca::-Kthread::-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}:${x86_elf_asm}-1:dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"unixware-7-gcc","gcc:-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall::-D_REENTRANT::-lsocket -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}-1:dlfcn:gnu-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "unixware-2.0" => {
+        cc               => "cc",
+        cflags           => "-DFILIO_H -DNO_STRINGS_H",
+        thread_cflag     => "-Kthread",
+        lflags           => "-lsocket -lnsl -lresolv -lx",
+        bn_ops           => "${x86_gcc_des} ${x86_gcc_opts}",
+    },
+    "unixware-2.1" => {
+        cc               => "cc",
+        cflags           => "-O -DFILIO_H",
+        thread_cflag     => "-Kthread",
+        lflags           => "-lsocket -lnsl -lresolv -lx",
+        bn_ops           => "${x86_gcc_des} ${x86_gcc_opts}",
+    },
+    "unixware-7" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "cc",
+        cflags           => "-O -DFILIO_H -Kalloca",
+        thread_cflag     => "-Kthread",
+        lflags           => "-lsocket -lnsl",
+        bn_ops           => "BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}",
+        perlasm_scheme   => "elf-1",
+        dso_scheme       => "dlfcn",
+        shared_target    => "svr5-shared",
+        shared_cflag     => "-Kpic",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "unixware-7-gcc" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "gcc",
+        cflags           => "-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-lsocket -lnsl",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        perlasm_scheme   => "elf-1",
+        dso_scheme       => "dlfcn",
+        shared_target    => "gnu-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
 # SCO 5 - Ben Laurie <ben at algroup.co.uk> says the -O breaks the SCO cc.
-"sco5-cc",  "cc:-belf::(unknown)::-lsocket -lnsl:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}-1:dlfcn:svr3-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"sco5-gcc",  "gcc:-O3 -fomit-frame-pointer::(unknown)::-lsocket -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}-1:dlfcn:svr3-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "sco5-cc" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "cc",
+        cflags           => "-belf",
+        thread_cflag     => "(unknown)",
+        lflags           => "-lsocket -lnsl",
+        bn_ops           => "${x86_gcc_des} ${x86_gcc_opts}",
+        perlasm_scheme   => "elf-1",
+        dso_scheme       => "dlfcn",
+        shared_target    => "svr3-shared",
+        shared_cflag     => "-Kpic",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "sco5-gcc" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "gcc",
+        cflags           => "-O3 -fomit-frame-pointer",
+        thread_cflag     => "(unknown)",
+        lflags           => "-lsocket -lnsl",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        perlasm_scheme   => "elf-1",
+        dso_scheme       => "dlfcn",
+        shared_target    => "svr3-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
 
 #### IBM's AIX.
-"aix3-cc",  "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",
-"aix-gcc",  "gcc:-O -DB_ENDIAN::-pthread:AIX::BN_LLONG RC4_CHAR:$ppc32_asm:aix32:dlfcn:aix-shared::-shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X32",
-"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-pthread:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:$ppc64_asm:aix64:dlfcn:aix-shared::-maix64 -shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",
+    "aix3-cc" => {
+        cc               => "cc",
+        cflags           => "-O -DB_ENDIAN -qmaxmem=16384",
+        thread_cflag     => "(unknown)",
+        sys_id           => "AIX",
+        bn_ops           => "BN_LLONG RC4_CHAR",
+    },
+    "aix-gcc" => {
+        inherit_from     => [ "ppc32_asm" ],
+        cc               => "gcc",
+        cflags           => "-O -DB_ENDIAN",
+        thread_cflag     => "-pthread",
+        sys_id           => "AIX",
+        bn_ops           => "BN_LLONG RC4_CHAR",
+        perlasm_scheme   => "aix32",
+        dso_scheme       => "dlfcn",
+        shared_target    => "aix-shared",
+        shared_ldflag    => "-shared -Wl,-G",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        arflags          => "-X32",
+    },
+    "aix64-gcc" => {
+        inherit_from     => [ "ppc64_asm" ],
+        cc               => "gcc",
+        cflags           => "-maix64 -O -DB_ENDIAN",
+        thread_cflag     => "-pthread",
+        sys_id           => "AIX",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
+        perlasm_scheme   => "aix64",
+        dso_scheme       => "dlfcn",
+        shared_target    => "aix-shared",
+        shared_ldflag    => "-maix64 -shared -Wl,-G",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        arflags          => "-X64",
+    },
 # Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE
 # at build time. $OBJECT_MODE is respected at ./config stage!
-"aix-cc",   "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded -D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR:$ppc32_asm:aix32:dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
-"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded -D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:$ppc64_asm:aix64:dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",
+    "aix-cc" => {
+        inherit_from     => [ "ppc32_asm" ],
+        cc               => "cc",
+        cflags           => "-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst",
+        thread_cflag     => "-qthreaded -D_THREAD_SAFE",
+        sys_id           => "AIX",
+        bn_ops           => "BN_LLONG RC4_CHAR",
+        perlasm_scheme   => "aix32",
+        dso_scheme       => "dlfcn",
+        shared_target    => "aix-shared",
+        shared_ldflag    => "-q32 -G",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        arflags          => "-X 32",
+    },
+    "aix64-cc" => {
+        inherit_from     => [ "ppc64_asm" ],
+        cc               => "cc",
+        cflags           => "-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst",
+        thread_cflag     => "-qthreaded -D_THREAD_SAFE",
+        sys_id           => "AIX",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
+        perlasm_scheme   => "aix64",
+        dso_scheme       => "dlfcn",
+        shared_target    => "aix-shared",
+        shared_ldflag    => "-q64 -G",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        arflags          => "-X 64",
+    },
 
 # SIEMENS BS2000/OSD: an EBCDIC-based mainframe
-"BS2000-OSD","c89:-O -XLLML -XLLMK -XL -DB_ENDIAN -DCHARSET_EBCDIC::(unknown)::-lsocket -lnsl:THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR:::",
+    "BS2000-OSD" => {
+        cc               => "c89",
+        cflags           => "-O -XLLML -XLLMK -XL -DB_ENDIAN -DCHARSET_EBCDIC",
+        thread_cflag     => "(unknown)",
+        lflags           => "-lsocket -lnsl",
+        bn_ops           => "THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR",
+    },
 
 # OS/390 Unix an EBCDIC-based Unix system on IBM mainframe
 # You need to compile using the c89.sh wrapper in the tools directory, because the
 # IBM compiler does not like the -L switch after any object modules.
 #
-"OS390-Unix","c89.sh:-O -DB_ENDIAN -DCHARSET_EBCDIC -DNO_SYS_PARAM_H  -D_ALL_SOURCE::(unknown):::THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR:::",
+    "OS390-Unix" => {
+        cc               => "c89.sh",
+        cflags           => "-O -DB_ENDIAN -DCHARSET_EBCDIC -DNO_SYS_PARAM_H  -D_ALL_SOURCE",
+        thread_cflag     => "(unknown)",
+        bn_ops           => "THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR",
+    },
 
 # Visual C targets
 #
@@ -323,22 +1443,90 @@ my $no_asm_filler="::::::::::::::::void";
 # positives in some situations. Disabling it altogether masks both
 # legitimate and false cases, but as we compile on multiple platforms,
 # we rely on other compilers to catch legitimate cases.
-"VC-WIN64I","cl:-W3 -wd4090 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o ia64-mont.o:::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ghash-ia64.o::ias:win32",
-"VC-WIN64A","cl:-W3 -wd4090 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:".eval{my $asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":auto:win32",
-"debug-VC-WIN64I","cl:-W3 -wd4090 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o:::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ghash-ia64.o::ias:win32",
-"debug-VC-WIN64A","cl:-W3 -wd4090 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:".eval{my $asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":auto:win32",
+    "VC-WIN64I" => {
+        cc               => "cl",
+        cflags           => "-W3 -wd4090 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE",
+        sys_id           => "WIN64I",
+        bn_ops           => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN",
+        cpuid_obj        => "ia64cpuid.o",
+        bn_obj           => "ia64.o ia64-mont.o",
+        aes_obj          => "aes_core.o aes_cbc.o aes-ia64.o",
+        md5_obj          => "md5-ia64.o",
+        sha1_obj         => "sha1-ia64.o sha256-ia64.o sha512-ia64.o",
+        modes_obj        => "ghash-ia64.o",
+        perlasm_scheme   => "ias",
+        dso_scheme       => "win32",
+    },
+    "debug-VC-WIN64I" => {
+        cc               => "cl",
+        cflags           => "-W3 -wd4090 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE",
+        sys_id           => "WIN64I",
+        bn_ops           => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN",
+        cpuid_obj        => "ia64cpuid.o",
+        bn_obj           => "ia64.o",
+        aes_obj          => "aes_core.o aes_cbc.o aes-ia64.o",
+        md5_obj          => "md5-ia64.o",
+        sha1_obj         => "sha1-ia64.o sha256-ia64.o sha512-ia64.o",
+        modes_obj        => "ghash-ia64.o",
+        perlasm_scheme   => "ias",
+        dso_scheme       => "win32",
+    },
+    "VC-WIN64A" => {
+        inherit_from     => [ "win_x86_64_asm" ],
+        cc               => "cl",
+        cflags           => "-W3 -wd4090 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE",
+        debug_cflags     => "-Zi",
+        sys_id           => "WIN64A",
+        bn_ops           => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN",
+        perlasm_scheme   => "auto",
+        dso_scheme       => "win32",
+    },
 # x86 Win32 target defaults to ANSI API, if you want UNICODE, complement
 # 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE'
-"VC-WIN32","cl:-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
-"debug-VC-WIN32","cl:-W3 -wd4090 -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
+    "VC-WIN32" => {
+        inherit_from     => [ "x86_asm" ],
+        cc               => "cl",
+        cflags           => "-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE",
+        debug_cflags     => "-Zi",
+        sys_id           => "WIN32",
+        bn_ops           => "BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}",
+        perlasm_scheme   => "win32n",
+        dso_scheme       => "win32",
+    },
 # Unified CE target
-"VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm_filler}:win32",
+    "VC-CE" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "cl",
+        sys_id           => "WINCE",
+        bn_ops           => "BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}",
+        dso_scheme       => "win32",
+    },
 
 # Borland C++ 4.5
-"BC-32","bcc32::::WIN32::BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN:${no_asm_filler}:win32",
+    "BC-32" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "bcc32",
+        sys_id           => "WIN32",
+        bn_ops           => "BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN",
+        dso_scheme       => "win32",
+    },
 
 # MinGW
-"mingw", "gcc:-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 -march=i486 -Wall::-D_MT:MINGW32:-lws2_32 -lgdi32 -lcrypt32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a",
+    "mingw" => {
+        inherit_from     => [ "x86_asm" ],
+        cc               => "gcc",
+        cflags           => "-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 -march=i486 -Wall",
+        thread_cflag     => "-D_MT",
+        sys_id           => "MINGW32",
+        lflags           => "-lws2_32 -lgdi32 -lcrypt32",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN",
+        perlasm_scheme   => "coff",
+        dso_scheme       => "win32",
+        shared_target    => "cygwin-shared",
+        shared_cflag     => "-D_WINDLL -DOPENSSL_USE_APPLINK",
+        shared_ldflag    => "-mno-cygwin",
+        shared_extension => ".dll.a",
+    },
 # As for OPENSSL_USE_APPLINK. Applink makes it possible to use .dll
 # compiled with one compiler with application compiled with another
 # compiler. It's possible to engage Applink support in mingw64 build,
@@ -346,47 +1534,196 @@ my $no_asm_filler="::::::::::::::::void";
 # handling, one can't seriously consider its binaries for using with
 # non-mingw64 run-time environment. And as mingw64 is always consistent
 # with itself, Applink is never engaged and can as well be omitted.
-"mingw64", "gcc:-mno-cygwin -DL_ENDIAN -O3 -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE::-D_MT:MINGW64:-lws2_32 -lgdi32 -lcrypt32:SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:${x86_64_asm}:mingw64:win32:cygwin-shared:-D_WINDLL:-mno-cygwin:.dll.a",
+    "mingw64" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "gcc",
+        cflags           => "-mno-cygwin -DL_ENDIAN -O3 -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE",
+        thread_cflag     => "-D_MT",
+        sys_id           => "MINGW64",
+        lflags           => "-lws2_32 -lgdi32 -lcrypt32",
+        bn_ops           => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN",
+        perlasm_scheme   => "mingw64",
+        dso_scheme       => "win32",
+        shared_target    => "cygwin-shared",
+        shared_cflag     => "-D_WINDLL",
+        shared_ldflag    => "-mno-cygwin",
+        shared_extension => ".dll.a",
+    },
 
 # UWIN
-"UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm_filler}:win32",
+    "UWIN" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "cc",
+        cflags           => "-DTERMIOS -DL_ENDIAN -O -Wall",
+        sys_id           => "UWIN",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        dso_scheme       => "win32",
+    },
 
 # Cygwin
-"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:coff:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
-"Cygwin-x86_64", "gcc:-DTERMIOS -DL_ENDIAN -O3 -Wall:::CYGWIN::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:mingw64:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
+    "Cygwin" => {
+        inherit_from     => [ "x86_asm" ],
+        cc               => "gcc",
+        cflags           => "-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall",
+        sys_id           => "CYGWIN",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        perlasm_scheme   => "coff",
+        dso_scheme       => "dlfcn",
+        shared_target    => "cygwin-shared",
+        shared_cflag     => "-D_WINDLL",
+        shared_ldflag    => "-shared",
+        shared_extension => ".dll.a",
+    },
+    "Cygwin-x86_64" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "gcc",
+        cflags           => "-DTERMIOS -DL_ENDIAN -O3 -Wall",
+        sys_id           => "CYGWIN",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "mingw64",
+        dso_scheme       => "dlfcn",
+        shared_target    => "cygwin-shared",
+        shared_cflag     => "-D_WINDLL",
+        shared_ldflag    => "-shared",
+        shared_extension => ".dll.a",
+    },
 
 # NetWare from David Ward (dsward at novell.com)
 # requires either MetroWerks NLM development tools, or gcc / nlmconv
 # NetWare defaults socket bio to WinSock sockets. However,
 # the builds can be configured to use BSD sockets instead.
 # netware-clib => legacy CLib c-runtime support
-"netware-clib", "mwccnlm::::::${x86_gcc_opts}::",
-"netware-clib-bsdsock", "mwccnlm::::::${x86_gcc_opts}::",
-"netware-clib-gcc", "i586-netware-gcc:-nostdinc -I/ndk/nwsdk/include/nlm -I/ndk/ws295sdk/include -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall:::::${x86_gcc_opts}::",
-"netware-clib-bsdsock-gcc", "i586-netware-gcc:-nostdinc -I/ndk/nwsdk/include/nlm -DNETWARE_BSDSOCK -DNETDB_USE_INTERNET -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall:::::${x86_gcc_opts}::",
+    "netware-clib" => {
+        cc               => "mwccnlm",
+        bn_ops           => "${x86_gcc_opts}",
+    },
+    "netware-clib-bsdsock" => {
+        cc               => "mwccnlm",
+        bn_ops           => "${x86_gcc_opts}",
+    },
+    "netware-clib-gcc" => {
+        cc               => "i586-netware-gcc",
+        cflags           => "-nostdinc -I/ndk/nwsdk/include/nlm -I/ndk/ws295sdk/include -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall",
+        bn_ops           => "${x86_gcc_opts}",
+    },
+    "netware-clib-bsdsock-gcc" => {
+        cc               => "i586-netware-gcc",
+        cflags           => "-nostdinc -I/ndk/nwsdk/include/nlm -DNETWARE_BSDSOCK -DNETDB_USE_INTERNET -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall",
+        bn_ops           => "${x86_gcc_opts}",
+    },
 # netware-libc => LibC/NKS support
-"netware-libc", "mwccnlm::::::BN_LLONG ${x86_gcc_opts}::",
-"netware-libc-bsdsock", "mwccnlm::::::BN_LLONG ${x86_gcc_opts}::",
-"netware-libc-gcc", "i586-netware-gcc:-nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYS_NETWARE -DTERMIO -O2 -Wall:::::BN_LLONG ${x86_gcc_opts}::",
-"netware-libc-bsdsock-gcc", "i586-netware-gcc:-nostdinc -I/ndk/libc/include -DNETWARE_BSDSOCK -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYS_NETWARE -DTERMIO -O2 -Wall:::::BN_LLONG ${x86_gcc_opts}::",
+    "netware-libc" => {
+        cc               => "mwccnlm",
+        bn_ops           => "BN_LLONG ${x86_gcc_opts}",
+    },
+    "netware-libc-bsdsock" => {
+        cc               => "mwccnlm",
+        bn_ops           => "BN_LLONG ${x86_gcc_opts}",
+    },
+    "netware-libc-gcc" => {
+        cc               => "i586-netware-gcc",
+        cflags           => "-nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYS_NETWARE -DTERMIO -O2 -Wall",
+        bn_ops           => "BN_LLONG ${x86_gcc_opts}",
+    },
+    "netware-libc-bsdsock-gcc" => {
+        cc               => "i586-netware-gcc",
+        cflags           => "-nostdinc -I/ndk/libc/include -DNETWARE_BSDSOCK -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYS_NETWARE -DTERMIO -O2 -Wall",
+        bn_ops           => "BN_LLONG ${x86_gcc_opts}",
+    },
 
 # DJGPP
-"DJGPP", "gcc:-I/dev/env/WATT_ROOT/inc -DTERMIO -DL_ENDIAN -fomit-frame-pointer -O2 -Wall:::MSDOS:-L/dev/env/WATT_ROOT/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:",
+    "DJGPP" => {
+        inherit_from     => [ "x86_asm" ],
+        cc               => "gcc",
+        cflags           => "-I/dev/env/WATT_ROOT/inc -DTERMIO -DL_ENDIAN -fomit-frame-pointer -O2 -Wall",
+        sys_id           => "MSDOS",
+        lflags           => "-L/dev/env/WATT_ROOT/lib -lwatt",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        perlasm_scheme   => "a.out",
+    },
 
 # Ultrix from Bernhard Simon <simon at zid.tuwien.ac.at>
-"ultrix-cc","cc:-std1 -O -Olimit 2500 -DL_ENDIAN::(unknown):::::::",
-"ultrix-gcc","gcc:-O3 -DL_ENDIAN::(unknown):::BN_LLONG::::",
+    "ultrix-cc" => {
+        cc               => "cc",
+        cflags           => "-std1 -O -Olimit 2500 -DL_ENDIAN",
+        thread_cflag     => "(unknown)",
+    },
+    "ultrix-gcc" => {
+        cc               => "gcc",
+        cflags           => "-O3 -DL_ENDIAN",
+        thread_cflag     => "(unknown)",
+        bn_ops           => "BN_LLONG",
+    },
 # K&R C is no longer supported; you need gcc on old Ultrix installations
 ##"ultrix","cc:-O2 -DNOPROTO -DNOCONST -DL_ENDIAN::(unknown):::::::",
 
 ##### MacOS X (a.k.a. Darwin) setup
-"darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN -Wa,-force_cpusubtype_ALL::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:".eval{my $asm=$x86_asm;$asm=~s/cast\-586\.o//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"debug-darwin64-x86_64-cc","cc:-arch x86_64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+    "darwin-ppc-cc" => {
+        inherit_from     => [ "ppc32_asm" ],
+        cc               => "cc",
+        cflags           => "-arch ppc -DB_ENDIAN -Wa,-force_cpusubtype_ALL",
+        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g -Wall -O",
+        release_cflags   => "-O3",
+        thread_cflag     => "-D_REENTRANT",
+        sys_id           => "MACOSX",
+        lflags           => "-Wl,-search_paths_first%",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
+        perlasm_scheme   => "osx32",
+        dso_scheme       => "dlfcn",
+        shared_target    => "darwin-shared",
+        shared_cflag     => "-fPIC -fno-common",
+        shared_ldflag    => "-arch ppc -dynamiclib",
+        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+    },
+    "darwin64-ppc-cc" => {
+        inherit_from     => [ "ppc64_asm" ],
+        cc               => "cc",
+        cflags           => "-arch ppc64 -O3 -DB_ENDIAN",
+        thread_cflag     => "-D_REENTRANT",
+        sys_id           => "MACOSX",
+        lflags           => "-Wl,-search_paths_first%",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
+        perlasm_scheme   => "osx64",
+        dso_scheme       => "dlfcn",
+        shared_target    => "darwin-shared",
+        shared_cflag     => "-fPIC -fno-common",
+        shared_ldflag    => "-arch ppc64 -dynamiclib",
+        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+    },
+    "darwin-i386-cc" => {
+        inherit_from     => [ "x86_asm_nocast" ],
+        cc               => "cc",
+        cflags           => "-arch i386 -DL_ENDIAN",
+        debug_cflags     => "-g3",
+        release_cflags   => "-O3 -fomit-frame-pointer",
+        thread_cflag     => "-D_REENTRANT",
+        sys_id           => "MACOSX",
+        lflags           => "-Wl,-search_paths_first%",
+        bn_ops           => "BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR",
+        perlasm_scheme   => "macosx",
+        dso_scheme       => "dlfcn",
+        shared_target    => "darwin-shared",
+        shared_cflag     => "-fPIC -fno-common",
+        shared_ldflag    => "-arch i386 -dynamiclib",
+        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+    },
+    "darwin64-x86_64-cc" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "cc",
+        cflags           => "-arch x86_64 -DL_ENDIAN -Wall",
+        debug_cflags     => "-ggdb -g2 -O0",
+        release_cflags   => "-O3",
+        thread_cflag     => "-D_REENTRANT",
+        sys_id           => "MACOSX",
+        lflags           => "-Wl,-search_paths_first%",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "macosx",
+        dso_scheme       => "dlfcn",
+        shared_target    => "darwin-shared",
+        shared_cflag     => "-fPIC -fno-common",
+        shared_ldflag    => "-arch x86_64 -dynamiclib",
+        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+    },
 # iPhoneOS/iOS
 #
 # It takes three prior-set environment variables to make it work:
@@ -402,30 +1739,148 @@ my $no_asm_filler="::::::::::::::::void";
 # CROSS_TOP=`xcode-select --print-path`/Platforms/iPhoneOS.platform/Developer
 # CROSS_SDK=iPhoneOS7.0.sdk
 #
-"iphoneos-cross","cc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm_filler}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"ios64-cross","cc:-O3 -arch arm64 -mios-version-min=7.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:ios64:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+    "iphoneos-cross" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "cc",
+        cflags           => "-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common",
+        thread_cflag     => "-D_REENTRANT",
+        sys_id           => "iOS",
+        lflags           => "-Wl,-search_paths_first%",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "darwin-shared",
+        shared_cflag     => "-fPIC -fno-common",
+        shared_ldflag    => "-dynamiclib",
+        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+    },
+    "ios64-cross" => {
+        inherit_from     => [ "aarch64_asm" ],
+        cc               => "cc",
+        cflags           => "-O3 -arch arm64 -mios-version-min=7.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common",
+        thread_cflag     => "-D_REENTRANT",
+        sys_id           => "iOS",
+        lflags           => "-Wl,-search_paths_first%",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        perlasm_scheme   => "ios64",
+        dso_scheme       => "dlfcn",
+        shared_target    => "darwin-shared",
+        shared_cflag     => "-fPIC -fno-common",
+        shared_ldflag    => "-dynamiclib",
+        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+    },
 
 ##### A/UX
-"aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
+    "aux3-gcc" => {
+        cc               => "gcc",
+        cflags           => "-O2 -DTERMIO",
+        thread_cflag     => "(unknown)",
+        sys_id           => "AUX",
+        lflags           => "-lbsd",
+        bn_ops           => "RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
+    },
 
 ##### GNU Hurd
-"hurd-x86",  "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
+    "hurd-x86" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "gcc",
+        cflags           => "-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+    },
 
 ##### OS/2 EMX
-"OS2-EMX", "gcc::::::::",
+    "OS2-EMX" => {
+        cc               => "gcc",
+    },
 
 ##### VxWorks for various targets
-"vxworks-ppc60x","ccppc:-D_REENTRANT -mrtp -mhard-float -mstrict-align -fno-implicit-fp -DPPC32_fp60x -O2 -fstrength-reduce -fno-builtin -fno-strict-aliasing -Wall -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/usr/h/wrn/coreip:::VXWORKS:-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/common:::::",
-"vxworks-ppcgen","ccppc:-D_REENTRANT -mrtp -msoft-float -mstrict-align -O1 -fno-builtin -fno-strict-aliasing -Wall -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/usr/h/wrn/coreip:::VXWORKS:-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/sfcommon:::::",
-"vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DCPU=PPC405 -I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::",
-"vxworks-ppc750","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h \$(DEBUG_FLAG):::VXWORKS:-r:::::",
-"vxworks-ppc750-debug","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g:::VXWORKS:-r:::::",
-"vxworks-ppc860","ccppc:-nostdinc -msoft-float -DCPU=PPC860 -DNO_STRINGS_H -I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::",
-"vxworks-simlinux","ccpentium:-B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DL_ENDIAN -DCPU=SIMLINUX -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/h -I\$(WIND_BASE)/target/h/wrn/coreip -DOPENSSL_NO_HW_PADLOCK:::VXWORKS:-r::${no_asm_filler}::::::ranlibpentium:",
-"vxworks-mips","ccmips:-mrtp -mips2 -O -G 0 -B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DCPU=MIPS32 -msoft-float -mno-branch-likely -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/h/wrn/coreip::-D_REENTRANT:VXWORKS:-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon::${mips32_asm}:o32::::::ranlibmips:",
+    "vxworks-ppc60x" => {
+        cc               => "ccppc",
+        cflags           => "-D_REENTRANT -mrtp -mhard-float -mstrict-align -fno-implicit-fp -DPPC32_fp60x -O2 -fstrength-reduce -fno-builtin -fno-strict-aliasing -Wall -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/usr/h/wrn/coreip",
+        sys_id           => "VXWORKS",
+        lflags           => "-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/common",
+    },
+    "vxworks-ppcgen" => {
+        cc               => "ccppc",
+        cflags           => "-D_REENTRANT -mrtp -msoft-float -mstrict-align -O1 -fno-builtin -fno-strict-aliasing -Wall -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/usr/h/wrn/coreip",
+        sys_id           => "VXWORKS",
+        lflags           => "-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/sfcommon",
+    },
+    "vxworks-ppc405" => {
+        cc               => "ccppc",
+        cflags           => "-g -msoft-float -mlongcall -DCPU=PPC405 -I\$(WIND_BASE)/target/h",
+        sys_id           => "VXWORKS",
+        lflags           => "-r",
+    },
+    "vxworks-ppc750" => {
+        cc               => "ccppc",
+        cflags           => "-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h \$(DEBUG_FLAG)",
+        sys_id           => "VXWORKS",
+        lflags           => "-r",
+    },
+    "vxworks-ppc750-debug" => {
+        cc               => "ccppc",
+        cflags           => "-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g",
+        sys_id           => "VXWORKS",
+        lflags           => "-r",
+    },
+    "vxworks-ppc860" => {
+        cc               => "ccppc",
+        cflags           => "-nostdinc -msoft-float -DCPU=PPC860 -DNO_STRINGS_H -I\$(WIND_BASE)/target/h",
+        sys_id           => "VXWORKS",
+        lflags           => "-r",
+    },
+    "vxworks-simlinux" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "ccpentium",
+        cflags           => "-B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DL_ENDIAN -DCPU=SIMLINUX -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/h -I\$(WIND_BASE)/target/h/wrn/coreip -DOPENSSL_NO_HW_PADLOCK",
+        sys_id           => "VXWORKS",
+        lflags           => "-r",
+        ranlib           => "ranlibpentium",
+    },
+    "vxworks-mips" => {
+        inherit_from     => [ "mips32_asm" ],
+        cc               => "ccmips",
+        cflags           => "-mrtp -mips2 -O -G 0 -B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DCPU=MIPS32 -msoft-float -mno-branch-likely -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/h/wrn/coreip",
+        thread_cflag     => "-D_REENTRANT",
+        sys_id           => "VXWORKS",
+        lflags           => "-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon",
+        perlasm_scheme   => "o32",
+        ranlib           => "ranlibmips",
+    },
 
 # uClinux
-"uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:${no_asm_filler}:$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",
-"uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:${no_asm_filler}:$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",
+    "uClinux-dist" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "$ENV{'CC'}",
+        cflags           => "\$(CFLAGS)",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "\$(LDFLAGS) \$(LDLIBS)",
+        bn_ops           => "BN_LLONG",
+        dso_scheme       => "$ENV{'LIBSSL_dlfcn'}",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-shared",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        ranlib           => "$ENV{'RANLIB'}",
+    },
+    "uClinux-dist64" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "$ENV{'CC'}",
+        cflags           => "\$(CFLAGS)",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "\$(LDFLAGS) \$(LDLIBS)",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
+        dso_scheme       => "$ENV{'LIBSSL_dlfcn'}",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-shared",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        ranlib           => "$ENV{'RANLIB'}",
+    },
 
 );
diff --git a/Configurations/90-team.conf b/Configurations/90-team.conf
index cfc2b16..66d1eae 100644
--- a/Configurations/90-team.conf
+++ b/Configurations/90-team.conf
@@ -4,44 +4,333 @@
 ##	make -f Makefile.org TABLE
 ## This file is interpolated by the Configure script.
 
-# Filler used for when there are no asm files.
-my $no_asm_filler="::::::::::::::::void";
-
 %targets = (
-"purify",	"purify gcc:-g -DPURIFY -Wall::(unknown)::-lsocket -lnsl::::",
-"debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror::(unknown)::-lefence::::",
-"debug-ben",	"gcc:$gcc_devteam_warn -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DDEBUG_SAFESTACK -O2 -pipe::(unknown):::::",
-"debug-ben-openbsd","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::",
-"debug-ben-openbsd-debug","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::",
-"debug-ben-debug",	"gcc:$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DOPENSSL_NO_HW_PADLOCK -g3 -O2 -pipe::(unknown)::::::",
-"debug-ben-debug-64",	"gcc:$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe::${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)",
-"debug-ben-debug-64-clang",	"clang:$gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe::${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)",
-"debug-ben-debug-64-noopt",	"gcc:$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -pipe::${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)",
-"debug-ben-macos",	"cc:$gcc_devteam_warn -DOPENSSL_NO_ASM -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -DL_ENDIAN -g3 -pipe::(unknown)::::::",
-"debug-ben-no-opt",	"gcc: -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -Wall -g3::(unknown)::::::",
-"debug-ben-strict",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown)::::::",
-"debug-ben-darwin64","cc:$gcc_devteam_warn -Wno-language-extension-token -Wno-extended-offsetof -arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:$x86_64_asm:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"debug-rse","cc:-DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
-"debug-bodo",	"gcc:$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-"debug-erbridge",   "gcc:$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-"debug-steve64", "gcc:$gcc_devteam_warn -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-steve32", "gcc:$gcc_devteam_warn -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-steve-opt", "gcc:$gcc_devteam_warn -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -ggdb -g3 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm_filler}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-levitte-linux-elf-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-levitte-linux-noasm-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm_filler}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-geoff32","gcc:-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long::-D_REENTRANT::-ldl:BN_LLONG:${no_asm_filler}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-geoff64","gcc:-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm_filler}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-linux-pentium","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentium -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
-"debug-linux-ppro","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
-"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -march=i486 -Wall::-D_REENTRANT::-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-linux-ia32-aes", "gcc:-DAES_EXPERIMENTAL -DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:x86cpuid.o:bn-586.o co-586.o x86-mont.o::des-586.o crypt586.o:aes_x86core.o aes_cbc.o aesni-x86.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o::ghash-x86.o:e_padlock-x86.o:elf:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-linux-generic32","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm_filler}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-linux-generic64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm_filler}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-linux-x86_64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-"dist",		"cc:-O::(unknown)::::::",
-"debug-test-64-clang",	"clang:$gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe::${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)",
-"darwin64-debug-test-64-clang",  "clang:-arch x86_64 -DL_ENDIAN $gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe::${BSDthreads}:MACOSX::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+    "purify" => {
+        cc               => "purify gcc",
+        cflags           => "-g -DPURIFY -Wall",
+        thread_cflag     => "(unknown)",
+        lflags           => "-lsocket -lnsl",
+    },
+    "debug" => {
+        cc               => "gcc",
+        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror",
+        thread_cflag     => "(unknown)",
+        lflags           => "-lefence",
+    },
+    "debug-ben" => {
+        cc               => "gcc",
+        cflags           => "$gcc_devteam_warn -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DDEBUG_SAFESTACK -O2 -pipe",
+        thread_cflag     => "(unknown)",
+    },
+    "debug-ben-openbsd" => {
+        cc               => "gcc",
+        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe",
+        thread_cflag     => "(unknown)",
+    },
+    "debug-ben-openbsd-debug" => {
+        cc               => "gcc",
+        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe",
+        thread_cflag     => "(unknown)",
+    },
+    "debug-ben-debug" => {
+        cc               => "gcc",
+        cflags           => "$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DOPENSSL_NO_HW_PADLOCK -g3 -O2 -pipe",
+        thread_cflag     => "(unknown)",
+    },
+    "debug-ben-debug-64" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "gcc",
+        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",
+        thread_cflag     => "${BSDthreads}",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "bsd-gcc-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-ben-debug-64-clang" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "clang",
+        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",
+        thread_cflag     => "${BSDthreads}",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "bsd-gcc-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-ben-debug-64-noopt" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "gcc",
+        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -pipe",
+        thread_cflag     => "${BSDthreads}",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "bsd-gcc-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-ben-macos" => {
+        cc               => "cc",
+        cflags           => "$gcc_devteam_warn -DOPENSSL_NO_ASM -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -DL_ENDIAN -g3 -pipe",
+        thread_cflag     => "(unknown)",
+    },
+    "debug-ben-no-opt" => {
+        cc               => "gcc",
+        cflags           => "-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -Wall -g3",
+        thread_cflag     => "(unknown)",
+    },
+    "debug-ben-strict" => {
+        cc               => "gcc",
+        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe",
+        thread_cflag     => "(unknown)",
+    },
+    "debug-ben-darwin64" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "cc",
+        cflags           => "$gcc_devteam_warn -Wno-language-extension-token -Wno-extended-offsetof -arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        sys_id           => "MACOSX",
+        lflags           => "-Wl,-search_paths_first%",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "macosx",
+        dso_scheme       => "dlfcn",
+        shared_target    => "darwin-shared",
+        shared_cflag     => "-fPIC -fno-common",
+        shared_ldflag    => "-arch x86_64 -dynamiclib",
+        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+    },
+    "debug-rse" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "cc",
+        cflags           => "-DL_ENDIAN -pipe -O -g -ggdb3 -Wall",
+        thread_cflag     => "(unknown)",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+    },
+    "debug-bodo" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "gcc",
+        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m64",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "64",
+    },
+    "debug-erbridge" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "gcc",
+        cflags           => "$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m64",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "64",
+    },
+    "debug-steve64" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "gcc",
+        cflags           => "$gcc_devteam_warn -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m64",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-steve32" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "gcc",
+        cflags           => "$gcc_devteam_warn -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g -pipe",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-rdynamic -ldl",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m32",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-steve-opt" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "gcc",
+        cflags           => "$gcc_devteam_warn -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m64",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+
+    # Richard Levitte
+    "debug-levitte-linux-noasm" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "gcc",
+        cflags           => "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-levitte-linux-elf-extreme" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "gcc",
+        cflags           => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-levitte-linux-noasm-extreme" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "gcc",
+        cflags           => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT",
+        perlasm_scheme   => "void",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+
+    "debug-geoff32" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "gcc",
+        cflags           => "-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-geoff64" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "gcc",
+        cflags           => "-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-linux-pentium" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "gcc",
+        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentium -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        dso_scheme       => "dlfcn",
+    },
+    "debug-linux-ppro" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "gcc",
+        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        dso_scheme       => "dlfcn",
+    },
+    "debug-linux-elf-noefence" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "gcc",
+        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -march=i486 -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-linux-ia32-aes" => {
+        cc               => "gcc",
+        cflags           => "-DAES_EXPERIMENTAL -DL_ENDIAN -O3 -fomit-frame-pointer -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        cpuid_obj        => "x86cpuid.o",
+        bn_obj           => "bn-586.o co-586.o x86-mont.o",
+        des_obj          => "des-586.o crypt586.o",
+        aes_obj          => "aes_x86core.o aes_cbc.o aesni-x86.o",
+        bf_obj           => "bf-586.o",
+        md5_obj          => "md5-586.o",
+        sha1_obj         => "sha1-586.o sha256-586.o sha512-586.o",
+        cast_obj         => "cast-586.o",
+        rc4_obj          => "rc4-586.o",
+        rmd160_obj       => "rmd-586.o",
+        rc5_obj          => "rc5-586.o",
+        wp_obj           => "wp_block.o wp-mmx.o",
+        modes_obj        => "ghash-x86.o",
+        engines_obj      => "e_padlock-x86.o",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "dist" => {
+        cc               => "cc",
+        cflags           => "-O",
+        thread_cflag     => "(unknown)",
+    },
+    "debug-test-64-clang" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "clang",
+        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",
+        thread_cflag     => "${BSDthreads}",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "bsd-gcc-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "darwin64-debug-test-64-clang" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "clang",
+        cflags           => "-arch x86_64 -DL_ENDIAN $gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",
+        thread_cflag     => "${BSDthreads}",
+        sys_id           => "MACOSX",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "macosx",
+        dso_scheme       => "dlfcn",
+        shared_target    => "darwin-shared",
+        shared_cflag     => "-fPIC -fno-common",
+        shared_ldflag    => "-arch x86_64 -dynamiclib",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+    },
 );
diff --git a/Configure b/Configure
index 4094c08..705f4c6 100755
--- a/Configure
+++ b/Configure
@@ -134,10 +134,13 @@ my $bits1="THIRTY_TWO_BIT ";
 my $bits2="SIXTY_FOUR_BIT ";
 
 my $x86_asm="x86cpuid.o:bn-586.o co-586.o x86-mont.o x86-gf2m.o:ecp_nistz256.o ecp_nistz256-x86.o:des-586.o crypt586.o:aes-586.o vpaes-x86.o aesni-x86.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o:cmll-x86.o:ghash-x86.o:e_padlock-x86.o";
+my $x86_asm_nocast=$x86_asm;$x86_asm_nocast=~s/cast\-586\.o//;
 
 my $x86_elf_asm="$x86_asm:elf";
+my $android_x86_elf_asm="$x86_asm:android";
 
 my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o:ecp_nistz256.o ecp_nistz256-x86_64.o::aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o::rc4-x86_64.o rc4-md5-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:ghash-x86_64.o aesni-gcm-x86_64.o:e_padlock-x86_64.o";
+my $win_x86_64_asm=$x86_asm;$win_x86_64_asm=~s/x86_64-gcc\.o/bn_asm.o/;
 my $ia64_asm="ia64cpuid.o:bn-ia64.o ia64-mont.o:::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o:::::ghash-ia64.o::void";
 my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o::des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o:aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o::md5-sparcv9.o:sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o::::::camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o:ghash-sparcv9.o::void";
 my $sparcv8_asm=":sparcv8.o::des_enc-sparc.o fcrypt_b.o:::::::::::::void";
@@ -145,10 +148,12 @@ my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o::::::sha1-alpha.o:::::::ghash-
 my $mips64_asm=":bn-mips.o mips-mont.o:::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o sha512-mips.o::::::::";
 my $mips32_asm=$mips64_asm; $mips32_asm =~ s/\s*sha512\-mips\.o//;
 my $s390x_asm="s390xcap.o s390xcpuid.o:bn-s390x.o s390x-mont.o s390x-gf2m.o:::aes-s390x.o aes-ctr.o aes-xts.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::rc4-s390x.o:::::ghash-s390x.o:";
+my $s390x_32_asm=$s390x_asm;$s390x_32_asm=~s/bn\-s390x\.o/bn_asm.o/;
 my $armv4_asm="armcap.o armv4cpuid.o:bn_asm.o armv4-mont.o armv4-gf2m.o:ecp_nistz256.o ecp_nistz256-armv4.o::aes_cbc.o aes-armv4.o bsaes-armv7.o aesv8-armx.o:::sha1-armv4-large.o sha256-armv4.o sha512-armv4.o:::::::ghash-armv4.o ghashv8-armx.o::void";
 my $aarch64_asm="armcap.o arm64cpuid.o mem_clr.o::::aes_core.o aes_cbc.o aesv8-armx.o:::sha1-armv8.o sha256-armv8.o sha512-armv8.o:::::::ghashv8-armx.o:";
 my $parisc11_asm="pariscid.o:bn_asm.o parisc-mont.o:::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o::32";
-my $parisc20_asm="pariscid.o:pa-risc2W.o parisc-mont.o:::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o::64";
+my $parisc20_64_asm="pariscid.o:pa-risc2W.o parisc-mont.o:::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o::64";
+my $parisc20_32_asm=$parisc20_64_asm;$parisc20_32_asm=~s/2W\./2\./;$parisc20_32_asm=~s/:64/:32/;
 my $ppc64_asm="ppccpuid.o ppccap.o:bn-ppc.o ppc-mont.o ppc64-mont.o:::aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o:::sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o:::::::ghashp8-ppc.o:";
 my $ppc32_asm=$ppc64_asm;
 
@@ -161,12 +166,444 @@ my $ppc32_asm=$ppc64_asm;
 # seems to be sufficient?
 my $BSDthreads="-pthread -D_THREAD_SAFE -D_REENTRANT";
 
-#config-string	$cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $ec_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
 
 # table of known configurations, read in from files
+#
+# The content of each entry can take one of two forms:
+#
+# - old style config-string, colon seperated fields with exactly the
+#   following structure.:
+#
+#	$cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $ec_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 : $perlasm_scheme : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags : $multilib
+#
+#   We use the stringtohash function - defined below - to combine with the
+#   fields and form a proper hash table from the string.
+#
+# - direct transfer of old style config string to hash table, using the names
+#   of the fields as keys:
+#
+#	{
+#	  cc => $cc,
+#	  cflags => $cflags,
+#	  unistd => $unistd,
+#	  thread_cflag => $thread_cflag,
+#	  sys_id => $sys_id,
+#	  lflags => $lflags,
+#	  bn_ops => $bn_ops,
+#	  cpuid_obj => $cpuid_obj,
+#	  bn_obj => $bn_obj,
+#	  ec_obj => $ec_obj,
+#	  des_obj => $des_obj,
+#	  aes_obj => $aes_obj,
+#	  bf_obj => $bf_obj,
+#	  md5_obj => $md5_obj,
+#	  sha1_obj => $sha1_obj,
+#	  cast_obj => $cast_obj,
+#	  rc4_obj => $rc4_obj,
+#	  rmd160_obj => $rmd160_obj,
+#	  rc5_obj => $rc5_obj,
+#	  wp_obj => $wp_obj,
+#	  cmll_obj => $cmll_obj,
+#	  modes_obj => $modes_obj,
+#	  engines_obj => $engines_obj,
+#	  perlasm_scheme => $perlasm_scheme,
+#	  dso_scheme => $dso_scheme,
+#	  shared_target => $shared_target,
+#	  shared_cflag => $shared_cflag,
+#	  shared_ldflag => $shared_ldflag,
+#	  shared_extension => $shared_extension,
+#	  ranlib => $ranlib,
+#	  arflags => $arflags,
+#	  multilib => $multilib
+#	}
+#
+# - new style config hash table, which has additional attributes for debug
+#   and non-debug flags to be added to the common flags, for cflags and lflags:
+#
+#	{
+#	  cc => $cc,
+#	  cflags => $cflags,
+#	  debug_cflags => $debug_cflags,
+#	  release_cflags => $release_cflags,
+#	  unistd => $unistd,
+#	  thread_cflag => $thread_cflag,
+#	  sys_id => $sys_id,
+#	  lflags => $lflags,
+#	  debug_lflags => $debug_lflags,
+#	  release_lflags => $release_lflags,
+#	  bn_ops => $bn_ops,
+#	  cpuid_obj => $cpuid_obj,
+#	  bn_obj => $bn_obj,
+#	  ec_obj => $ec_obj,
+#	  des_obj => $des_obj,
+#	  aes_obj => $aes_obj,
+#	  bf_obj => $bf_obj,
+#	  md5_obj => $md5_obj,
+#	  sha1_obj => $sha1_obj,
+#	  cast_obj => $cast_obj,
+#	  rc4_obj => $rc4_obj,
+#	  rmd160_obj => $rmd160_obj,
+#	  rc5_obj => $rc5_obj,
+#	  wp_obj => $wp_obj,
+#	  cmll_obj => $cmll_obj,
+#	  modes_obj => $modes_obj,
+#	  engines_obj => $engines_obj,
+#	  dso_scheme => $dso_scheme,
+#	  shared_target => $shared_target,
+#	  shared_cflag => $shared_cflag,
+#	  shared_ldflag => $shared_ldflag,
+#	  shared_extension => $shared_extension,
+#	  ranlib => $ranlib,
+#	  arflags => $arflags,
+#	  multilib => $multilib
+#	}
+#
+# The configuration reader will do what it can to translate everything into
+# new style config hash tables, including merging $target and debug-$target
+# if they are similar enough.
+#
+# The configuration hashes can refer to templates in two different manners:
+#
+# - as part of the hash, one can have a key called 'inherit_from' that
+#   indicate what other configuration hashes to inherit data from.
+#   These are resolved recursively.
+#
+#   Inheritance works as a set of default values that can be overriden
+#   by corresponding attribute values in the inheriting configuration.
+#
+#   If several configurations are given in the 'inherit_from' array, the
+#   values of same attribute are concatenated with space separation.
+#   With this, it's possible to have several smaller templates for
+#   different configuration aspects that can be combined into a complete
+#   configuration.
+#
+#   Example:
+#
+#	"foo" => {
+#		template => 1,
+#		haha => "haha",
+#		hoho => "ho"
+#	},
+#	"bar" => {
+#		template => 1,
+#		hoho => "ho",
+#		hehe => "hehe"
+#	},
+#	"laughter" => {
+#		inherit_from => [ "foo", "bar" ],
+#	}
+#
+#	The entry for "foo" will become as follows after processing:
+#
+#	"laughter" => {
+#		haha => "haha",
+#		hoho => "ho ho",
+#		hehe => "hehe"
+#	}
+#
+#   Note 1: any entry from the table can be used as a template.
+#   Note 2: pure templates have the attribute 'template => 1' and cannot
+#           be used as targets.
+#
+# - instead of a string, one can have a code block of the form
+#   'sub { /* your code here */ }', where the arguments are the list of
+#   inherited values for that key.  In fact, the concatenation of strings
+#   is really done by using 'sub { join(" ", at _) }' on the list of inherited
+#   values.
+#
+#   Example:
+#
+#	"foo" => {
+#		template => 1,
+#		haha => "ha ha",
+#		hoho => "ho",
+#		ignored => "This should not appear in the end result",
+#	},
+#	"bar" => {
+#		template => 1,
+#		haha => "ah",
+#		hoho => "haho",
+#		hehe => "hehe"
+#	},
+#	"laughter" => {
+#		inherit_from => [ "foo", "bar" ],
+#		hehe => sub { join(" ",(@_,"!!!")) },
+#		ignored => "",
+#	}
+#
+#	The entry for "foo" will become as follows after processing:
+#
+#	"laughter" => {
+#		haha => "ha ha ah",
+#		hoho => "ho haho",
+#		hehe => "hehe !!!",
+#		ignored => ""
+#	}
+#
+
 my %table=(
+
+    # All these templates are merely a translation of the corresponding
+    # variables further up.
+    #
+    # Note: as long as someone might use old style configuration strings,
+    # or we bother supporting that, those variables need to stay
+
+    # Filler used for when there are no asm files.
+    no_asm_filler => {
+	template	=> 1,
+	cpuid_obj	=> "",
+	bn_obj		=> "",
+	ec_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	=> "",
+	perlasm_scheme	=> "void"
+    },
+
+    x86_asm_nocast => {
+	template	=> 1,
+	cpuid_obj	=> "x86cpuid.o",
+	bn_obj		=> "bn-586.o co-586.o x86-mont.o x86-gf2m.o",
+	ec_obj		=> "ecp_nistz256.o ecp_nistz256-x86.o",
+	des_obj		=> "des-586.o crypt586.o",
+	aes_obj		=> "aes-586.o vpaes-x86.o aesni-x86.o",
+	bf_obj		=> "bf-586.o",
+	md5_obj		=> "md5-586.o",
+	sha1_obj	=> "sha1-586.o sha256-586.o sha512-586.o",
+	rc4_obj		=> "rc4-586.o",
+	rmd160_obj	=> "rmd-586.o",
+	rc5_obj		=> "rc5-586.o",
+	wp_obj		=> "wp_block.o wp-mmx.o",
+	cmll_obj	=> "cmll-x86.o",
+	modes_obj	=> "ghash-x86.o",
+	engines_obj	=> "e_padlock-x86.o"
+    },
+    x86_asm => {
+	template	=> 1,
+	inherit_from	=> [ "x86_asm_nocast" ],
+	cast_obj	=> "cast-586.o",
+    },
+    x86_elf_asm => {
+	template	=> 1,
+	inherit_from	=> [ "x86_asm" ],
+	perlasm_scheme	=> "elf"
+    },
+    android_x86_elf_asm => {
+	template	=> 1,
+	inherit_from	=> [ "x86_asm" ],
+	perlasm_scheme	=> "android"
+    },
+
+    _x86_64_asm => {
+	template	=> 1,
+	cpuid_obj       => "x86_64cpuid.o",
+	bn_obj          => "x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o",
+	ec_obj          => "ecp_nistz256.o ecp_nistz256-x86_64.o",
+	aes_obj         => "aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o",
+	md5_obj         => "md5-x86_64.o",
+	sha1_obj        => "sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o",
+	rc4_obj         => "rc4-x86_64.o rc4-md5-x86_64.o",
+	wp_obj          => "wp-x86_64.o",
+	cmll_obj        => "cmll-x86_64.o cmll_misc.o",
+	modes_obj       => "ghash-x86_64.o aesni-gcm-x86_64.o",
+	engines_obj     => "e_padlock-x86_64.o"
+    },
+    x86_64_asm => {
+	inherit_from	=> [ "_x86_64_asm" ],
+	template	=> 1,
+	bn_obj          => sub { join(" ","x86_64-gcc.o", at _) }
+    },
+    win_x86_64_asm => {
+	inherit_from	=> [ "_x86_64_asm" ],
+	template	=> 1,
+	bn_obj          => sub { join(" ","bn_asm.o", at _) }
+    },
+    ia64_asm => {
+	template	=> 1,
+	cpuid_obj       => "ia64cpuid.o",
+	bn_obj          => "bn-ia64.o ia64-mont.o",
+	aes_obj         => "aes_core.o aes_cbc.o aes-ia64.o",
+	md5_obj         => "md5-ia64.o",
+	sha1_obj        => "sha1-ia64.o sha256-ia64.o sha512-ia64.o",
+	rc4_obj         => "rc4-ia64.o rc4_skey.o",
+	modes_obj       => "ghash-ia64.o",
+	perlasm_scheme	=> "void"
+    },
+    sparcv9_asm => {
+	template	=> 1,
+	cpuid_obj       => "sparcv9cap.o sparccpuid.o",
+	bn_obj          => "bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o",
+	des_obj         => "des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o",
+	aes_obj         => "aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o",
+	md5_obj         => "md5-sparcv9.o",
+	sha1_obj        => "sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o",
+	cmll_obj        => "camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o",
+	modes_obj       => "ghash-sparcv9.o",
+	perlasm_scheme	=> "void"
+    },
+    sparcv8_asm => {
+	template	=> 1,
+	cpuid_obj       => "",
+	bn_obj          => "sparcv8.o",
+	des_obj         => "des_enc-sparc.o fcrypt_b.o",
+	perlasm_scheme	=> "void"
+    },
+    alpha_asm => {
+	template	=> 1,
+	cpuid_obj       => "alphacpuid.o",
+	bn_obj          => "bn_asm.o alpha-mont.o",
+	sha1_obj        => "sha1-alpha.o",
+	modes_obj       => "ghash-alpha.o",
+	perlasm_scheme	=> "void"
+    },
+    mips32_asm => {
+	template	=> 1,
+	bn_obj          => "bn-mips.o mips-mont.o",
+	aes_obj         => "aes_cbc.o aes-mips.o",
+	sha1_obj        => "sha1-mips.o sha256-mips.o",
+    },
+    mips64_asm => {
+	inherit_from	=> [ "mips32_asm" ],
+	template	=> 1,
+	sha1_obj        => sub { join(" ", @_, "sha512-mips.o") }
+    },
+    _s390x_asm => {
+	template	=> 1,
+	cpuid_obj       => "s390xcap.o s390xcpuid.o",
+	bn_obj          => "s390x-mont.o s390x-gf2m.o",
+	aes_obj         => "aes-s390x.o aes-ctr.o aes-xts.o",
+	sha1_obj        => "sha1-s390x.o sha256-s390x.o sha512-s390x.o",
+	rc4_obj         => "rc4-s390x.o",
+	modes_obj       => "ghash-s390x.o",
+    },
+    s390x_asm => {
+	template	=> 1,
+	inherit_from	=> [ "_s390x_asm" ],
+	bn_obj          => sub { join(" ", "bn-s390x.o", @_) }
+    },
+    s390x_32_asm => {
+	template	=> 1,
+	inherit_from	=> [ "_s390x_asm" ],
+	bn_obj          => sub { join(" ", "bn_asm.o", @_) }
+    },
+    armv4_asm => {
+	template	=> 1,
+	cpuid_obj       => "armcap.o armv4cpuid.o",
+	bn_obj          => "bn_asm.o armv4-mont.o armv4-gf2m.o",
+	ec_obj          => "ecp_nistz256.o ecp_nistz256-armv4.o",
+	aes_obj         => "aes_cbc.o aes-armv4.o bsaes-armv7.o aesv8-armx.o",
+	sha1_obj        => "sha1-armv4-large.o sha256-armv4.o sha512-armv4.o",
+	modes_obj       => "ghash-armv4.o ghashv8-armx.o",
+	perlasm_scheme	=> "void"
+    },
+    aarch64_asm => {
+	template	=> 1,
+	cpuid_obj       => "armcap.o arm64cpuid.o mem_clr.o",
+	aes_obj         => "aes_core.o aes_cbc.o aesv8-armx.o",
+	sha1_obj        => "sha1-armv8.o sha256-armv8.o sha512-armv8.o",
+	modes_obj       => "ghashv8-armx.o",
+    },
+    parisc11_asm => {
+	template	=> 1,
+	cpuid_obj       => "pariscid.o",
+	bn_obj          => "bn_asm.o parisc-mont.o",
+	aes_obj         => "aes_core.o aes_cbc.o aes-parisc.o",
+	sha1_obj        => "sha1-parisc.o sha256-parisc.o sha512-parisc.o",
+	rc4_obj         => "rc4-parisc.o",
+	modes_obj       => "ghash-parisc.o",
+	perlasm_scheme	=> "32"
+    },
+    _parisc20_asm => {
+	template	=> 1,
+	cpuid_obj       => "pariscid.o",
+	bn_obj          => "parisc-mont.o",
+	aes_obj         => "aes_core.o aes_cbc.o aes-parisc.o",
+	sha1_obj        => "sha1-parisc.o sha256-parisc.o sha512-parisc.o",
+	rc4_obj         => "rc4-parisc.o",
+	modes_obj       => "ghash-parisc.o",
+	perlasm_scheme	=> "64"
+    },
+    parisc20_32_asm => {
+	template	=> 1,
+	inherit_from	=> [ "_parisc20_asm" ],
+	bn_obj          => sub { join(" ", "pa-risc2.o", @_) },
+	perlasm_scheme	=> "32",
+    },
+    parisc20_64_asm => {
+	template	=> 1,
+	inherit_from	=> [ "_parisc20_asm" ],
+	bn_obj          => sub { join(" ", "pa-risc2W.o", @_) },
+	perlasm_scheme	=> "64",
+    },
+    ppc64_asm => {
+	template	=> 1,
+	cpuid_obj       => "ppccpuid.o ppccap.o",
+	bn_obj          => "bn-ppc.o ppc-mont.o ppc64-mont.o",
+	aes_obj         => "aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o",
+	sha1_obj        => "sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o",
+	modes_obj       => "ghashp8-ppc.o",
+    },
+    ppc32_asm => {
+	inherit_from	=> [ "ppc64_asm" ],
+	template	=> 1
+    },
 );
 
+sub stringtohash {
+    my $in = shift @_;
+    if (ref($in) eq "HASH") {
+	return $in;
+    }
+    my @stringsequence = (
+	"cc",
+	"cflags",
+	"unistd",
+	"thread_cflag",
+	"sys_id",
+	"lflags",
+	"bn_ops",
+	"cpuid_obj",
+	"bn_obj",
+	"ec_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",
+	"perlasm_scheme",
+	"dso_scheme",
+	"shared_target",
+	"shared_cflag",
+	"shared_ldflag",
+	"shared_extension",
+	"ranlib",
+	"arflags",
+	"multilib",
+	);
+
+    # return a ref to a hash, that's what the outer braces are for.
+    return { map { shift @stringsequence => $_ } split /:/, $in };
+};
+
 # Read configuration target stanzas from a file, so that people can have
 # local files with their own definitions
 sub read_config {
@@ -180,7 +617,227 @@ sub read_config {
 	close(CONFFILE);
 	my %targets = ();
 	eval $content;
+
+	# Make sure we have debug- targets first
+	my @keys =
+	    sort {
+		my $a_nd = $a =~ m/^debug-/ ? $' :$a;
+		my $b_nd = $b =~ m/^debug-/ ? $' :$b;
+		my $res = 0;
+
+		if (($a_nd == $a) == ($b_nd == $b)) {
+		    # they are both debug- or not, compare them as they are
+		    $res = $a cmp $b;
+		} elsif ($a_nd != $a) {
+		    # $a is debug-, make it lesser
+		    $res = -1;
+		} else {
+		    # $b is debug-, make $a greater
+		    $res = 1;
+		}
+		$res;
+	    } keys %targets;
+
+	foreach (@keys) {
+	    if (ref($targets{$_}) ne "HASH") {
+		# Value is assumed to be a string.  Split it up to
+		# become a hash table of parameters.  Also, try to
+		# merge debug- variants with the non-debug target.
+
+		# Start with converting the value from a string to a
+		# standardised hash of fields.  Using $tohash is safe,
+		# if the input is already a hash ref, it's just returned
+		# back.
+		$targets{$_} = stringtohash($targets{$_});
+
+		# If the current target is a debug target, there might
+		# be a corresponding non-debug target that we can merge
+		# with.  If it isn't a debug- target, we've already done
+		# as much merging as we can and do not need to bother
+		# with that any more.
+		if ($_ =~ m/^debug-/) {
+		    my $debugkey = $_;
+		    my $nondebugkey = $';
+		    my $debug = $targets{$debugkey};
+		    my $nondebug;
+
+		    if ($targets{$nondebugkey}) {
+			$nondebug = stringtohash($targets{$nondebugkey});
+		    }
+
+		    if ($nondebug) {
+			# There's both a debug and non-debug variant of
+			# this target, so we should try to merge them
+			# together.
+
+			# First, check that the non-debug variant isn't
+			# already built up with all it should have.
+			if ($nondebug->{debug_cflags}
+			    || $nondebug->{release_cflags}
+			    || $nondebug->{debug_lflags}
+			    || $nondebug->{release_lflags}) {
+			    warn "there's a debug target $debugkey to be merged with a target $nondebugkey, but the latter seems to already have both nodebug and debug information.  This requires human intervention.  Skipping $debugkey...";
+			    next;
+			}
+
+			# Now, check similarity.
+			# For keys they have in common, support that
+			# cflags and lflags can differ, otherwise they
+			# must have exactly the same values for them
+			# to be merged into one.
+			my $similarenough = 1;
+			for (keys %{$debug}) {
+			    if ($nondebug->{$_} ne $debug->{$_}
+				&& $_ !~ m/^[cl]flags$/) {
+				$similarenough = 0;
+				last;
+			    }
+			}
+
+			if ($similarenough) {
+			    # Here's where the magic happens, split the
+			    # options in the debug and non-debug variants
+			    # cflags and ldflags into three strings each,
+			    # one with common flags, one with extra debug
+			    # flags and one with extra non-debug flags.
+
+			    # The result ends up in %h_nondebug, which
+			    # becomes the merged variant when we're done.
+			    # for each of cflags and lflags, they are
+			    # replaced with cflags, debug_cflags,
+			    # release_cflags and similar for lflags.
+			    #
+			    # The purpose is that 'cflags' should be
+			    # used together with 'debug_cflags' or
+			    # 'release_cflags' depending on what the
+			    # user asks for.
+			    foreach (("cflags", "lflags")) {
+				my @list_d = split /\s+/, $debug->{$_};
+				my @list_nd = split /\s+/, $nondebug->{$_};
+				my %presence = (); # bitmap
+						   # 1: present in @list_d
+						   # 2: present in @list_nd
+						   # 3: present in both
+				map { $presence{$_} += 1; } @list_d;
+				map { $presence{$_} += 2; } @list_nd;
+
+				delete $nondebug->{$_};
+				# Note: we build from the original lists to
+				# preserve order, it might be important
+				$nondebug->{"debug-".$_} =
+				    join(" ",
+					 grep { $presence{$_} == 1 } @list_d);
+				$nondebug->{"nodebug-".$_} =
+				    join(" ",
+					 grep { $presence{$_} == 2 } @list_nd);
+				$nondebug->{$_} =
+				    join(" ",
+					 grep { $presence{$_} == 3 } @list_d);
+			    }
+
+			    $targets{$nondebugkey} = $nondebug;
+			    delete $targets{$debugkey};
+			}
+		    }
+		}
+	    }
+	}
+
 	%table = (%table, %targets);
+
+	# Local function to resolve inheritance
+	my $resolve_inheritance;
+	$resolve_inheritance =
+	    sub {
+		my $target = shift;
+		my @breadcrumbs = @_;
+
+		if (grep { $_ eq $target } @breadcrumbs) {
+		    die "inherit_from loop!  target backtrace:\n  "
+			,$target,"\n  ",join("\n  ", @breadcrumbs),"\n";
+		}
+
+		# Recurse through all inheritances.  They will be resolved on
+		# the fly, so when this operation is done, they will all just
+		# be a bunch of attributes with string values.
+		# What we get here, though, are keys with references to lists
+		# of the combined values of them all.  We will deal with lists
+		# after this stage is done.
+		my %combined_inheritance = ();
+		if ($table{$target}->{inherit_from}) {
+		    foreach (@{$table{$target}->{inherit_from}}) {
+			my %inherited_config =
+			    $resolve_inheritance->($_, $target, @breadcrumbs);
+
+			# 'template' is a marker that's considered private to
+			# the config that had it.
+			delete $inherited_config{template};
+
+			map {
+			    if (!$combined_inheritance{$_}) {
+				$combined_inheritance{$_} = [];
+			    }
+			    push @{$combined_inheritance{$_}}, $inherited_config{$_};
+			} keys %inherited_config;
+		    }
+		}
+
+		# We won't need inherit_from in this target any more, since
+		# we've resolved all the inheritances that lead to this
+		delete $table{$target}->{inherit_from};
+
+		# Now is the time to deal with those lists.  Here's the place
+		# to decide what shall be done with those lists, all based on
+		# the values of the target we're currently dealing with.
+		# - If a value is a coderef, it will be executed with the list
+		#   of inherited values as arguments.
+		# - If the corresponding key doesn't have a value at all or is
+		#   the emoty string, the inherited value list will be run
+		#   through the default combiner (below), and the result
+		#   becomes this target's value.
+		# - Otherwise, this target's value is assumed to be a string
+		#   that will simply override the inherited list of values.
+		my $default_combiner = sub { join(' ', at _) };
+
+		my %all_keys =
+		    map { $_ => 1 } (keys %combined_inheritance,
+				     keys %{$table{$target}});
+		foreach (sort keys %all_keys) {
+
+		    # Current target doesn't have a value for the current key?
+		    # Assign it the default combiner, the rest of this loop
+		    # body will handle it just like any other coderef.
+		    if (!exists $table{$target}->{$_}) {
+			$table{$target}->{$_} = $default_combiner;
+		    }
+
+		    my $valuetype = ref($table{$target}->{$_});
+		    if ($valuetype eq "CODE") {
+			# CODE reference, execute it with the inherited values
+			# as arguments.
+			$table{$target}->{$_} =
+			    $table{$target}->{$_}->(@{$combined_inheritance{$_}});
+		    } elsif ($valuetype eq "") {
+			# Scalar, just leave it as is.
+		    } else {
+			# Some other type of reference that we don't handle.
+			# Better to abort at this point.
+			die "cannot handle reference type $valuetype,"
+			    ," found in target $target -> $_\n";
+		    }
+		}
+
+		# Finally done, return the result.
+		%{$table{$target}};
+	};
+
+	# Go through all new targets and resolve inheritance and template
+	# references.
+	foreach (keys %targets) {
+	    # We're ignoring the returned values here, they are only valuable
+	    # to the inner recursion of this function.
+	    $resolve_inheritance->($_);
+	}
 }
 
 my ($vol, $dir, $dummy) = File::Spec->splitpath($0);
@@ -196,40 +853,6 @@ my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A
 		    netware-clib netware-clib-bsdsock
 		    netware-libc netware-libc-bsdsock);
 
-my $idx = 0;
-my $idx_cc = $idx++;
-my $idx_cflags = $idx++;
-my $idx_unistd = $idx++;
-my $idx_thread_cflag = $idx++;
-my $idx_sys_id = $idx++;
-my $idx_lflags = $idx++;
-my $idx_bn_ops = $idx++;
-my $idx_cpuid_obj = $idx++;
-my $idx_bn_obj = $idx++;
-my $idx_ec_obj = $idx++;
-my $idx_des_obj = $idx++;
-my $idx_aes_obj = $idx++;
-my $idx_bf_obj = $idx++;
-my $idx_md5_obj = $idx++;
-my $idx_sha1_obj = $idx++;
-my $idx_cast_obj = $idx++;
-my $idx_rc4_obj = $idx++;
-my $idx_rmd160_obj = $idx++;
-my $idx_rc5_obj = $idx++;
-my $idx_wp_obj = $idx++;
-my $idx_cmll_obj = $idx++;
-my $idx_modes_obj = $idx++;
-my $idx_engines_obj = $idx++;
-my $idx_perlasm_scheme = $idx++;
-my $idx_dso_scheme = $idx++;
-my $idx_shared_target = $idx++;
-my $idx_shared_cflag = $idx++;
-my $idx_shared_ldflag = $idx++;
-my $idx_shared_extension = $idx++;
-my $idx_ranlib = $idx++;
-my $idx_arflags = $idx++;
-my $idx_multilib = $idx++;
-
 my $prefix="";
 my $libdir="";
 my $openssldir="";
@@ -584,7 +1207,7 @@ if (defined($disabled{"tlsext"}))
 
 if ($target eq "TABLE") {
 	foreach $target (sort keys %table) {
-		print_table_entry($target);
+		print_table_entry($target, "TABLE");
 	}
 	exit 0;
 }
@@ -597,13 +1220,35 @@ if ($target eq "LIST") {
 	exit 0;
 }
 
+if ($target eq "HASH") {
+	print "%table = (\n";
+	foreach (sort keys %table) {
+		print_table_entry($_, "HASH");
+	}
+	exit 0;
+}
+
 if ($target =~ m/^CygWin32(-.*)$/) {
 	$target = "Cygwin".$1;
 }
 
 print "Configuring for $target\n";
 
-&usage if (!defined($table{$target}));
+my ($d, $t) = $target =~ m/^(debug-)?(.*)$/;
+my $debug_prefix = "release_";
+if ($d) {
+    $debug_prefix = "debug_";
+
+    # If we do not find debug-foo in the table, the target is set to foo,
+    # but only if the foo target has a noon-empty debug_cflags or debug_lflags
+    # attribute.
+    if (!$table{$target} && ($table{$t}->{debug_cflags}
+			     || $table{$t}->{debug_lflags})) {
+	$target = $t;
+    }
+}
+
+&usage if (!defined($table{$target}) || $table{$target}->{template});
 
 if ($fips)
 	{
@@ -707,44 +1352,48 @@ $openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]:[\\\/]
 
 print "IsMK1MF=$IsMK1MF\n";
 
-my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
-my $cc = $fields[$idx_cc];
 # Allow environment CC to override compiler...
-if($ENV{CC}) {
-    $cc = $ENV{CC};
-}
-my $cflags = $fields[$idx_cflags];
-my $unistd = $fields[$idx_unistd];
-my $thread_cflag = $fields[$idx_thread_cflag];
-my $sys_id = $fields[$idx_sys_id];
-my $lflags = $fields[$idx_lflags];
-my $bn_ops = $fields[$idx_bn_ops];
-my $cpuid_obj = $fields[$idx_cpuid_obj];
-my $bn_obj = $fields[$idx_bn_obj];
-my $ec_obj = $fields[$idx_ec_obj];
-my $des_obj = $fields[$idx_des_obj];
-my $aes_obj = $fields[$idx_aes_obj];
-my $bf_obj = $fields[$idx_bf_obj];
-my $md5_obj = $fields[$idx_md5_obj];
-my $sha1_obj = $fields[$idx_sha1_obj];
-my $cast_obj = $fields[$idx_cast_obj];
-my $rc4_obj = $fields[$idx_rc4_obj];
-my $rmd160_obj = $fields[$idx_rmd160_obj];
-my $rc5_obj = $fields[$idx_rc5_obj];
-my $wp_obj = $fields[$idx_wp_obj];
-my $cmll_obj = $fields[$idx_cmll_obj];
-my $modes_obj = $fields[$idx_modes_obj];
-my $engines_obj = $fields[$idx_engines_obj];
-my $perlasm_scheme = $fields[$idx_perlasm_scheme];
-my $dso_scheme = $fields[$idx_dso_scheme];
-my $shared_target = $fields[$idx_shared_target];
-my $shared_cflag = $fields[$idx_shared_cflag];
-my $shared_ldflag = $fields[$idx_shared_ldflag];
-my $shared_extension = $fields[$idx_shared_extension];
-my $ranlib = $ENV{'RANLIB'} || $fields[$idx_ranlib];
+my $cc = $ENV{CC} || $table{$t}->{cc};
+
+# For cflags and lflags, add the debug_ or release_ attributes
+# Do it in such a way that no spurious space is appended (hence the grep).
+my $cflags = join(" ",
+		  grep { $_ } ($table{$t}->{cflags},
+			       $table{$t}->{$debug_prefix."cflags"}));
+my $lflags = join(" ",
+		  grep { $_ } ($table{$t}->{lflags},
+			       $table{$t}->{$debug_prefix."lflags"}));
+
+my $unistd = $table{$t}->{unistd};
+my $thread_cflag = $table{$t}->{thread_cflag};
+my $sys_id = $table{$t}->{sys_id};
+my $bn_ops = $table{$t}->{bn_ops};
+my $cpuid_obj = $table{$t}->{cpuid_obj};
+my $bn_obj = $table{$t}->{bn_obj};
+my $ec_obj = $table{$t}->{ec_obj};
+my $des_obj = $table{$t}->{des_obj};
+my $aes_obj = $table{$t}->{aes_obj};
+my $bf_obj = $table{$t}->{bf_obj};
+my $md5_obj = $table{$t}->{md5_obj};
+my $sha1_obj = $table{$t}->{sha1_obj};
+my $cast_obj = $table{$t}->{cast_obj};
+my $rc4_obj = $table{$t}->{rc4_obj};
+my $rmd160_obj = $table{$t}->{rmd160_obj};
+my $rc5_obj = $table{$t}->{rc5_obj};
+my $wp_obj = $table{$t}->{wp_obj};
+my $cmll_obj = $table{$t}->{cmll_obj};
+my $modes_obj = $table{$t}->{modes_obj};
+my $engines_obj = $table{$t}->{engines_obj};
+my $perlasm_scheme = $table{$t}->{perlasm_scheme};
+my $dso_scheme = $table{$t}->{dso_scheme};
+my $shared_target = $table{$t}->{shared_target};
+my $shared_cflag = $table{$t}->{shared_cflag};
+my $shared_ldflag = $table{$t}->{shared_ldflag};
+my $shared_extension = $table{$t}->{shared_extension};
+my $ranlib = $ENV{'RANLIB'} || $table{$t}->{ranlib};
 my $ar = $ENV{'AR'} || "ar";
-my $arflags = $fields[$idx_arflags];
-my $multilib = $fields[$idx_multilib];
+my $arflags = $table{$t}->{arflags};
+my $multilib = $table{$t}->{multilib};
 
 # if $prefix/lib$multilib is not an existing directory, then
 # assume that it's not searched by linker automatically, in
@@ -1585,7 +2234,7 @@ BEGIN
 	    VALUE "ProductVersion", "$version\\0"
 	    // Optional:
 	    //VALUE "Comments", "\\0"
-	    VALUE "LegalCopyright", "Copyright ? 1998-2005 The OpenSSL Project. Copyright ? 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0"
+	    VALUE "LegalCopyright", "Copyright ?? 1998-2005 The OpenSSL Project. Copyright ?? 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0"
 	    //VALUE "LegalTrademarks", "\\0"
 	    //VALUE "PrivateBuild", "\\0"
 	    //VALUE "SpecialBuild", "\\0"
@@ -1693,51 +2342,101 @@ sub dofile
 sub print_table_entry
 	{
 	my $target = shift;
+	my $type = shift;
 
-	my ($cc, $cflags, $unistd, $thread_cflag, $sys_id, $lflags,
-	    $bn_ops, $cpuid_obj, $bn_obj, $ec_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,
-	    $perlasm_scheme, $dso_scheme, $shared_target, $shared_cflag,
-	    $shared_ldflag, $shared_extension, $ranlib, $arflags, $multilib)=
-	split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
+	# Don't print the templates
+	return if $table{$target}->{template};
 
-	print <<EOF
+	if ($type eq "TABLE") {
+	    print <<EOF
 
 *** $target
-\$cc           = $cc
-\$cflags       = $cflags
-\$unistd       = $unistd
-\$thread_cflag = $thread_cflag
-\$sys_id       = $sys_id
-\$lflags       = $lflags
-\$bn_ops       = $bn_ops
-\$cpuid_obj    = $cpuid_obj
-\$bn_obj       = $bn_obj
-\$ec_obj       = $ec_obj
-\$des_obj      = $des_obj
-\$aes_obj      = $aes_obj
-\$bf_obj       = $bf_obj
-\$md5_obj      = $md5_obj
-\$sha1_obj     = $sha1_obj
-\$cast_obj     = $cast_obj
-\$rc4_obj      = $rc4_obj
-\$rmd160_obj   = $rmd160_obj
-\$rc5_obj      = $rc5_obj
-\$wp_obj       = $wp_obj
-\$cmll_obj     = $cmll_obj
-\$modes_obj    = $modes_obj
-\$engines_obj  = $engines_obj
-\$perlasm_scheme = $perlasm_scheme
-\$dso_scheme   = $dso_scheme
-\$shared_target= $shared_target
-\$shared_cflag = $shared_cflag
-\$shared_ldflag = $shared_ldflag
-\$shared_extension = $shared_extension
-\$ranlib       = $ranlib
-\$arflags      = $arflags
-\$multilib     = $multilib
+\$cc           = $table{$target}->{cc}
+\$cflags       = $table{$target}->{cflags}
+\$debug_cflags   = $table{$target}->{debug_cflags}
+\$release_cflags = $table{$target}->{release_cflags}
+\$unistd       = $table{$target}->{unistd}
+\$thread_cflag = $table{$target}->{thread_cflag}
+\$sys_id       = $table{$target}->{sys_id}
+\$lflags       = $table{$target}->{lflags}
+\$debug_lflags   = $table{$target}->{debug_lflags}
+\$release_lflags = $table{$target}->{release_lflags}
+\$bn_ops       = $table{$target}->{bn_ops}
+\$cpuid_obj    = $table{$target}->{cpuid_obj}
+\$bn_obj       = $table{$target}->{bn_obj}
+\$ec_obj       = $table{$target}->{ec_obj}
+\$des_obj      = $table{$target}->{des_obj}
+\$aes_obj      = $table{$target}->{aes_obj}
+\$bf_obj       = $table{$target}->{bf_obj}
+\$md5_obj      = $table{$target}->{md5_obj}
+\$sha1_obj     = $table{$target}->{sha1_obj}
+\$cast_obj     = $table{$target}->{cast_obj}
+\$rc4_obj      = $table{$target}->{rc4_obj}
+\$rmd160_obj   = $table{$target}->{rmd160_obj}
+\$rc5_obj      = $table{$target}->{rc5_obj}
+\$wp_obj       = $table{$target}->{wp_obj}
+\$cmll_obj     = $table{$target}->{cmll_obj}
+\$modes_obj    = $table{$target}->{modes_obj}
+\$engines_obj  = $table{$target}->{engines_obj}
+\$perlasm_scheme = $table{$target}->{perlasm_scheme}
+\$dso_scheme   = $table{$target}->{dso_scheme}
+\$shared_target= $table{$target}->{shared_target}
+\$shared_cflag = $table{$target}->{shared_cflag}
+\$shared_ldflag = $table{$target}->{shared_ldflag}
+\$shared_extension = $table{$target}->{shared_extension}
+\$ranlib       = $table{$target}->{ranlib}
+\$arflags      = $table{$target}->{arflags}
+\$multilib     = $table{$target}->{multilib}
 EOF
+	} elsif ($type eq "HASH") {
+	    my @sequence = (
+		"cc",
+		"cflags",
+		"debug_cflags",
+		"release_cflags",
+		"unistd",
+		"thread_cflag",
+		"sys_id",
+		"lflags",
+		"debug_lflags",
+		"release_lflags",
+		"bn_ops",
+		"cpuid_obj",
+		"bn_obj",
+		"ec_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",
+		"perlasm_scheme",
+		"dso_scheme",
+		"shared_target",
+		"shared_cflag",
+		"shared_ldflag",
+		"shared_extension",
+		"ranlib",
+		"arflags",
+		"multilib",
+		);
+	    my $largest =
+		length((sort { length($a) <=> length($b) } @sequence)[-1]);
+	    print "    '$target' => {\n";
+	    foreach (@sequence) {
+		if ($table{$target}->{$_}) {
+		    print "      '",$_,"'"," " x ($largest - length($_))," => '",$table{$target}->{$_},"',\n";
+		}
+	    }
+	    print "    },\n";
+	}
 	}
 
 sub test_sanity
@@ -1751,24 +2450,27 @@ sub test_sanity
 
 	foreach $target (sort keys %table)
 		{
-		@fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
+		my $pre_dso_scheme = "perlasm_scheme";
+		my $dso_scheme = "dso_scheme";
+		my $post_dso_scheme = "shared_target";
+
 
-		if ($fields[$idx_dso_scheme-1] =~ /^(beos|dl|dlfcn|win32|vms)$/)
+		if ($table{$target}->{$pre_dso_scheme} =~ /^(beos|dl|dlfcn|win32|vms)$/)
 			{
 			$errorcnt++;
-			print STDERR "SANITY ERROR: '$target' has the dso_scheme [$idx_dso_scheme] values\n";
+			print STDERR "SANITY ERROR: '$target' has the dso_scheme values\n";
 			print STDERR "              in the previous field\n";
 			}
-		elsif ($fields[$idx_dso_scheme+1] =~ /^(beos|dl|dlfcn|win32|vms)$/)
+		elsif ($table{$target}->{$post_dso_scheme} =~ /^(beos|dl|dlfcn|win32|vms)$/)
 			{
 			$errorcnt++;
-			print STDERR "SANITY ERROR: '$target' has the dso_scheme [$idx_dso_scheme] values\n";
+			print STDERR "SANITY ERROR: '$target' has the dso_scheme values\n";
 			print STDERR "              in the following field\n";
 			}
-		elsif ($fields[$idx_dso_scheme] !~ /^(beos|dl|dlfcn|win32|vms|)$/)
+		elsif ($table{$target}->{$dso_scheme} !~ /^(beos|dl|dlfcn|win32|vms|)$/)
 			{
 			$errorcnt++;
-			print STDERR "SANITY ERROR: '$target' has the dso_scheme [$idx_dso_scheme] field = ",$fields[$idx_dso_scheme],"\n";
+			print STDERR "SANITY ERROR: '$target' has the dso_scheme field = ",$table{$target}->{$dso_scheme},"\n";
 			print STDERR "              valid values are 'beos', 'dl', 'dlfcn', 'win32' and 'vms'\n";
 			}
 		}
diff --git a/TABLE b/TABLE
index f214b7b..dfd39b8 100644
--- a/TABLE
+++ b/TABLE
@@ -3,10 +3,14 @@ Output of `Configure TABLE':
 *** BC-32
 $cc           = bcc32
 $cflags       = 
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = WIN32
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN
 $cpuid_obj    = 
 $bn_obj       = 
@@ -37,10 +41,14 @@ $multilib     =
 *** BS2000-OSD
 $cc           = c89
 $cflags       = -O -XLLML -XLLMK -XL -DB_ENDIAN -DCHARSET_EBCDIC
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = -lsocket -lnsl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
@@ -71,10 +79,14 @@ $multilib     =
 *** BSD-generic32
 $cc           = gcc
 $cflags       = -O3 -fomit-frame-pointer -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL
 $cpuid_obj    = 
 $bn_obj       = 
@@ -105,10 +117,14 @@ $multilib     =
 *** BSD-generic64
 $cc           = gcc
 $cflags       = -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = 
 $bn_obj       = 
@@ -139,10 +155,14 @@ $multilib     =
 *** BSD-ia64
 $cc           = gcc
 $cflags       = -DL_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT
 $cpuid_obj    = ia64cpuid.o
 $bn_obj       = bn-ia64.o ia64-mont.o
@@ -173,10 +193,14 @@ $multilib     =
 *** BSD-sparc64
 $cc           = gcc
 $cflags       = -DB_ENDIAN -O3 -DMD32_REG_T=int -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR
 $cpuid_obj    = sparcv9cap.o sparccpuid.o
 $bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
@@ -207,10 +231,14 @@ $multilib     =
 *** BSD-sparcv8
 $cc           = gcc
 $cflags       = -DB_ENDIAN -O3 -mv8 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL
 $cpuid_obj    = 
 $bn_obj       = sparcv8.o
@@ -241,10 +269,14 @@ $multilib     =
 *** BSD-x86
 $cc           = gcc
 $cflags       = -DL_ENDIAN -O3 -fomit-frame-pointer -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -274,11 +306,15 @@ $multilib     =
 
 *** BSD-x86-elf
 $cc           = gcc
-$cflags       = -DL_ENDIAN -O3 -fomit-frame-pointer -Wall
+$cflags       = -DL_ENDIAN -Wall
+$debug_cflags   = -g
+$release_cflags = -O3 -fomit-frame-pointer
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -309,10 +345,14 @@ $multilib     =
 *** BSD-x86_64
 $cc           = gcc
 $cflags       = -DL_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -343,10 +383,14 @@ $multilib     =
 *** Cygwin
 $cc           = gcc
 $cflags       = -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = CYGWIN
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -377,10 +421,14 @@ $multilib     =
 *** Cygwin-x86_64
 $cc           = gcc
 $cflags       = -DTERMIOS -DL_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = CYGWIN
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -411,10 +459,14 @@ $multilib     =
 *** DJGPP
 $cc           = gcc
 $cflags       = -I/dev/env/WATT_ROOT/inc -DTERMIO -DL_ENDIAN -fomit-frame-pointer -O2 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = MSDOS
 $lflags       = -L/dev/env/WATT_ROOT/lib -lwatt
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -445,10 +497,14 @@ $multilib     =
 *** MPE/iX-gcc
 $cc           = gcc
 $cflags       = -D_ENDIAN -DBN_DIV2W -O3 -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = MPE
 $lflags       = -L/SYSLOG/PUB -lsyslog -lsocket -lcurses
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
 $cpuid_obj    = 
 $bn_obj       = 
@@ -479,10 +535,14 @@ $multilib     =
 *** OS2-EMX
 $cc           = gcc
 $cflags       = 
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -513,10 +573,14 @@ $multilib     =
 *** OS390-Unix
 $cc           = c89.sh
 $cflags       = -O -DB_ENDIAN -DCHARSET_EBCDIC -DNO_SYS_PARAM_H  -D_ALL_SOURCE
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
@@ -547,10 +611,14 @@ $multilib     =
 *** QNX6
 $cc           = gcc
 $cflags       = 
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = -lsocket
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -581,10 +649,14 @@ $multilib     =
 *** QNX6-i386
 $cc           = gcc
 $cflags       = -DL_ENDIAN -O2 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = -lsocket
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -615,10 +687,14 @@ $multilib     =
 *** UWIN
 $cc           = cc
 $cflags       = -DTERMIOS -DL_ENDIAN -O -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = UWIN
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
@@ -649,10 +725,14 @@ $multilib     =
 *** VC-CE
 $cc           = cl
 $cflags       = 
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = WINCE
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
@@ -683,10 +763,14 @@ $multilib     =
 *** VC-WIN32
 $cc           = cl
 $cflags       = -W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE
+$debug_cflags   = -Zi
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = WIN32
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -717,10 +801,14 @@ $multilib     =
 *** VC-WIN64A
 $cc           = cl
 $cflags       = -W3 -wd4090 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
+$debug_cflags   = -Zi
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = WIN64A
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = bn_asm.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -751,10 +839,14 @@ $multilib     =
 *** VC-WIN64I
 $cc           = cl
 $cflags       = -W3 -wd4090 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = WIN64I
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
 $cpuid_obj    = ia64cpuid.o
 $bn_obj       = ia64.o ia64-mont.o
@@ -785,10 +877,14 @@ $multilib     =
 *** aix-cc
 $cc           = cc
 $cflags       = -q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -qthreaded -D_THREAD_SAFE
 $sys_id       = AIX
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR
 $cpuid_obj    = ppccpuid.o ppccap.o
 $bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
@@ -819,10 +915,14 @@ $multilib     =
 *** aix-gcc
 $cc           = gcc
 $cflags       = -O -DB_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread
 $sys_id       = AIX
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR
 $cpuid_obj    = ppccpuid.o ppccap.o
 $bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
@@ -853,10 +953,14 @@ $multilib     =
 *** aix3-cc
 $cc           = cc
 $cflags       = -O -DB_ENDIAN -qmaxmem=16384
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = AIX
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR
 $cpuid_obj    = 
 $bn_obj       = 
@@ -887,10 +991,14 @@ $multilib     =
 *** aix64-cc
 $cc           = cc
 $cflags       = -q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -qthreaded -D_THREAD_SAFE
 $sys_id       = AIX
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR
 $cpuid_obj    = ppccpuid.o ppccap.o
 $bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
@@ -921,10 +1029,14 @@ $multilib     =
 *** aix64-gcc
 $cc           = gcc
 $cflags       = -maix64 -O -DB_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread
 $sys_id       = AIX
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR
 $cpuid_obj    = ppccpuid.o ppccap.o
 $bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
@@ -955,10 +1067,14 @@ $multilib     =
 *** android
 $cc           = gcc
 $cflags       = -mandroid -I$(ANDROID_DEV)/include -B$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
@@ -989,10 +1105,14 @@ $multilib     =
 *** android-armv7
 $cc           = gcc
 $cflags       = -march=armv7-a -mandroid -I$(ANDROID_DEV)/include -B$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = armcap.o armv4cpuid.o
 $bn_obj       = bn_asm.o armv4-mont.o armv4-gf2m.o
@@ -1023,10 +1143,14 @@ $multilib     =
 *** android-mips
 $cc           = gcc
 $cflags       = -mandroid -I$(ANDROID_DEV)/include -B$(ANDROID_DEV)/lib -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
@@ -1057,10 +1181,14 @@ $multilib     =
 *** android-x86
 $cc           = gcc
 $cflags       = -mandroid -I$(ANDROID_DEV)/include -B$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -1091,10 +1219,14 @@ $multilib     =
 *** aux3-gcc
 $cc           = gcc
 $cflags       = -O2 -DTERMIO
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = AUX
 $lflags       = -lbsd
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
@@ -1125,10 +1257,14 @@ $multilib     =
 *** bsdi-elf-gcc
 $cc           = gcc
 $cflags       = -DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -1159,10 +1295,14 @@ $multilib     =
 *** cc
 $cc           = cc
 $cflags       = -O
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -1192,11 +1332,15 @@ $multilib     =
 
 *** darwin-i386-cc
 $cc           = cc
-$cflags       = -arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN
+$cflags       = -arch i386 -DL_ENDIAN
+$debug_cflags   = -g3
+$release_cflags = -O3 -fomit-frame-pointer
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = MACOSX
 $lflags       = -Wl,-search_paths_first%
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -1226,11 +1370,15 @@ $multilib     =
 
 *** darwin-ppc-cc
 $cc           = cc
-$cflags       = -arch ppc -O3 -DB_ENDIAN -Wa,-force_cpusubtype_ALL
+$cflags       = -arch ppc -DB_ENDIAN -Wa,-force_cpusubtype_ALL
+$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g -Wall -O
+$release_cflags = -O3
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = MACOSX
 $lflags       = -Wl,-search_paths_first%
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = ppccpuid.o ppccap.o
 $bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
@@ -1261,10 +1409,14 @@ $multilib     =
 *** darwin64-debug-test-64-clang
 $cc           = clang
 $cflags       = -arch x86_64 -DL_ENDIAN -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = MACOSX
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -1295,10 +1447,14 @@ $multilib     =
 *** darwin64-ppc-cc
 $cc           = cc
 $cflags       = -arch ppc64 -O3 -DB_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = MACOSX
 $lflags       = -Wl,-search_paths_first%
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = ppccpuid.o ppccap.o
 $bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
@@ -1328,11 +1484,15 @@ $multilib     =
 
 *** darwin64-x86_64-cc
 $cc           = cc
-$cflags       = -arch x86_64 -O3 -DL_ENDIAN -Wall
+$cflags       = -arch x86_64 -DL_ENDIAN -Wall
+$debug_cflags   = -ggdb -g2 -O0
+$release_cflags = -O3
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = MACOSX
 $lflags       = -Wl,-search_paths_first%
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -1363,10 +1523,14 @@ $multilib     =
 *** debug
 $cc           = gcc
 $cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = -lefence
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -1394,115 +1558,17 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** debug-BSD-x86-elf
-$cc           = gcc
-$cflags       = -DL_ENDIAN -O3 -Wall -g
-$unistd       = 
-$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
-$sys_id       = 
-$lflags       = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= bsd-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-VC-WIN32
-$cc           = cl
-$cflags       = -W3 -wd4090 -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE
-$unistd       = 
-$thread_cflag = 
-$sys_id       = WIN32
-$lflags       = 
-$bn_ops       = BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = win32n
-$dso_scheme   = win32
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-VC-WIN64A
-$cc           = cl
-$cflags       = -W3 -wd4090 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
-$unistd       = 
-$thread_cflag = 
-$sys_id       = WIN64A
-$lflags       = 
-$bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = bn_asm.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = auto
-$dso_scheme   = win32
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** debug-VC-WIN64I
 $cc           = cl
 $cflags       = -W3 -wd4090 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = WIN64I
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
 $cpuid_obj    = ia64cpuid.o
 $bn_obj       = ia64.o
@@ -1533,10 +1599,14 @@ $multilib     =
 *** debug-ben
 $cc           = gcc
 $cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DDEBUG_SAFESTACK -O2 -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -1567,10 +1637,14 @@ $multilib     =
 *** debug-ben-darwin64
 $cc           = cc
 $cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-language-extension-token -Wno-extended-offsetof -arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = MACOSX
 $lflags       = -Wl,-search_paths_first%
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -1601,10 +1675,14 @@ $multilib     =
 *** debug-ben-debug
 $cc           = gcc
 $cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DOPENSSL_NO_HW_PADLOCK -g3 -O2 -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -1635,10 +1713,14 @@ $multilib     =
 *** debug-ben-debug-64
 $cc           = gcc
 $cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -1669,10 +1751,14 @@ $multilib     =
 *** debug-ben-debug-64-clang
 $cc           = clang
 $cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -1703,10 +1789,14 @@ $multilib     =
 *** debug-ben-debug-64-noopt
 $cc           = gcc
 $cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -1737,10 +1827,14 @@ $multilib     =
 *** debug-ben-macos
 $cc           = cc
 $cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_ASM -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -DL_ENDIAN -g3 -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -1771,10 +1865,14 @@ $multilib     =
 *** debug-ben-no-opt
 $cc           = gcc
 $cflags       = -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -Wall -g3
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -1805,10 +1903,14 @@ $multilib     =
 *** debug-ben-openbsd
 $cc           = gcc
 $cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -1839,10 +1941,14 @@ $multilib     =
 *** debug-ben-openbsd-debug
 $cc           = gcc
 $cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -1873,10 +1979,14 @@ $multilib     =
 *** debug-ben-strict
 $cc           = gcc
 $cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -1907,10 +2017,14 @@ $multilib     =
 *** debug-bodo
 $cc           = gcc
 $cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -1938,115 +2052,17 @@ $ranlib       =
 $arflags      = 
 $multilib     = 64
 
-*** debug-darwin-i386-cc
-$cc           = cc
-$cflags       = -arch i386 -g3 -DL_ENDIAN
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = MACOSX
-$lflags       = -Wl,-search_paths_first%
-$bn_ops       = BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = macosx
-$dso_scheme   = dlfcn
-$shared_target= darwin-shared
-$shared_cflag = -fPIC -fno-common
-$shared_ldflag = -arch i386 -dynamiclib
-$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-darwin-ppc-cc
-$cc           = cc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = MACOSX
-$lflags       = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = ppccpuid.o ppccap.o
-$bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghashp8-ppc.o
-$engines_obj  = 
-$perlasm_scheme = osx32
-$dso_scheme   = dlfcn
-$shared_target= darwin-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -dynamiclib
-$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-darwin64-x86_64-cc
-$cc           = cc
-$cflags       = -arch x86_64 -ggdb -g2 -O0 -DL_ENDIAN -Wall
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = MACOSX
-$lflags       = -Wl,-search_paths_first%
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = macosx
-$dso_scheme   = dlfcn
-$shared_target= darwin-shared
-$shared_cflag = -fPIC -fno-common
-$shared_ldflag = -arch x86_64 -dynamiclib
-$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** debug-erbridge
 $cc           = gcc
 $cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DBN_DEBUG -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -2077,10 +2093,14 @@ $multilib     = 64
 *** debug-geoff32
 $cc           = gcc
 $cflags       = -DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG
 $cpuid_obj    = 
 $bn_obj       = 
@@ -2111,198 +2131,32 @@ $multilib     =
 *** debug-geoff64
 $cc           = gcc
 $cflags       = -DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
 $ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-levitte-linux-elf
-$cc           = gcc
-$cflags       = -DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -ggdb -g3 -Wall
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-levitte-linux-elf-extreme
-$cc           = gcc
-$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-levitte-linux-noasm
-$cc           = gcc
-$cflags       = -DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-levitte-linux-noasm-extreme
-$cc           = gcc
-$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-linux-elf
-$cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -march=i486 -Wall
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -lefence -ldl
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
+$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  = 
+$perlasm_scheme = void
 $dso_scheme   = dlfcn
 $shared_target= linux-shared
 $shared_cflag = -fPIC
@@ -2312,13 +2166,17 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** debug-linux-elf-noefence
+*** debug-levitte-linux-elf-extreme
 $cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -march=i486 -Wall
+$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -2346,14 +2204,18 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** debug-linux-generic32
+*** debug-levitte-linux-noasm
 $cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g -Wall
+$cflags       = -DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
 $ec_obj       = 
@@ -2380,14 +2242,18 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** debug-linux-generic64
+*** debug-levitte-linux-noasm-extreme
 $cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g -Wall
+$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
 $ec_obj       = 
@@ -2414,13 +2280,55 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
+*** debug-linux-elf-noefence
+$cc           = gcc
+$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -march=i486 -Wall
+$debug_cflags   = 
+$release_cflags = 
+$unistd       = 
+$thread_cflag = -D_REENTRANT
+$sys_id       = 
+$lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
+$cpuid_obj    = x86cpuid.o
+$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
+$des_obj      = des-586.o crypt586.o
+$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
+$bf_obj       = bf-586.o
+$md5_obj      = md5-586.o
+$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
+$cast_obj     = cast-586.o
+$rc4_obj      = rc4-586.o
+$rmd160_obj   = rmd-586.o
+$rc5_obj      = rc5-586.o
+$wp_obj       = wp_block.o wp-mmx.o
+$cmll_obj     = cmll-x86.o
+$modes_obj    = ghash-x86.o
+$engines_obj  = e_padlock-x86.o
+$perlasm_scheme = elf
+$dso_scheme   = dlfcn
+$shared_target= linux-shared
+$shared_cflag = -fPIC
+$shared_ldflag = 
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
+$ranlib       = 
+$arflags      = 
+$multilib     = 
+
 *** debug-linux-ia32-aes
 $cc           = gcc
 $cflags       = -DAES_EXPERIMENTAL -DL_ENDIAN -O3 -fomit-frame-pointer -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o
@@ -2451,10 +2359,14 @@ $multilib     =
 *** debug-linux-pentium
 $cc           = gcc
 $cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentium -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -2485,10 +2397,14 @@ $multilib     =
 *** debug-linux-ppro
 $cc           = gcc
 $cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -2516,47 +2432,17 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** debug-linux-x86_64
-$cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -g -Wall
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -m64
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 64
-
 *** debug-rse
 $cc           = cc
 $cflags       = -DL_ENDIAN -pipe -O -g -ggdb3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -2584,149 +2470,17 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** debug-solaris-sparcv8-cc
-$cc           = cc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -lsocket -lnsl -ldl
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = sparcv8.o
-$ec_obj       = 
-$des_obj      = des_enc-sparc.o fcrypt_b.o
-$aes_obj      = 
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = 
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -KPIC
-$shared_ldflag = -G -dy -z text
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-solaris-sparcv8-gcc
-$cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -lsocket -lnsl -ldl
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = sparcv8.o
-$ec_obj       = 
-$des_obj      = des_enc-sparc.o fcrypt_b.o
-$aes_obj      = 
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = 
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -shared
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-solaris-sparcv9-cc
-$cc           = cc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = ULTRASPARC
-$lflags       = -lsocket -lnsl -ldl
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR
-$cpuid_obj    = sparcv9cap.o sparccpuid.o
-$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
-$ec_obj       = 
-$des_obj      = des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o
-$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o
-$bf_obj       = 
-$md5_obj      = md5-sparcv9.o
-$sha1_obj     = sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o
-$modes_obj    = ghash-sparcv9.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -KPIC
-$shared_ldflag = -G -dy -z text
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-solaris-sparcv9-gcc
-$cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -mcpu=ultrasparc -pedantic -ansi -Wall -Wshadow -Wno-long-long -D__EXTENSIONS__ -DB_ENDIAN -DBN_DIV2W
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = ULTRASPARC
-$lflags       = -lsocket -lnsl -ldl
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = sparcv9cap.o sparccpuid.o
-$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
-$ec_obj       = 
-$des_obj      = des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o
-$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o
-$bf_obj       = 
-$md5_obj      = md5-sparcv9.o
-$sha1_obj     = sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o
-$modes_obj    = ghash-sparcv9.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -shared
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** debug-steve-opt
 $cc           = gcc
 $cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -2757,10 +2511,14 @@ $multilib     =
 *** debug-steve32
 $cc           = gcc
 $cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -rdynamic -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -2791,10 +2549,14 @@ $multilib     =
 *** debug-steve64
 $cc           = gcc
 $cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -2825,10 +2587,14 @@ $multilib     =
 *** debug-test-64-clang
 $cc           = clang
 $cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -2856,47 +2622,17 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** debug-vos-gcc
-$cc           = gcc
-$cflags       = -O0 -g -Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = VOS
-$lflags       = -Wl,-map
-$bn_ops       = BN_LLONG
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = .so
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** dist
 $cc           = cc
 $cflags       = -O
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -2927,10 +2663,14 @@ $multilib     =
 *** gcc
 $cc           = gcc
 $cflags       = -O3
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG
 $cpuid_obj    = 
 $bn_obj       = 
@@ -2961,10 +2701,14 @@ $multilib     =
 *** hpux-cc
 $cc           = cc
 $cflags       = -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O2 -z
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = -Wl,+s -ldld
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = DES_PTR DES_UNROLL DES_RISC1
 $cpuid_obj    = 
 $bn_obj       = 
@@ -2995,10 +2739,14 @@ $multilib     =
 *** hpux-gcc
 $cc           = gcc
 $cflags       = -DB_ENDIAN -DBN_DIV2W -O3
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = -Wl,+s -ldld
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = DES_PTR DES_UNROLL DES_RISC1
 $cpuid_obj    = 
 $bn_obj       = 
@@ -3029,10 +2777,14 @@ $multilib     =
 *** hpux-ia64-cc
 $cc           = cc
 $cflags       = -Ae +DD32 +O2 +Olit=all -z -DB_ENDIAN -D_REENTRANT
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT
 $cpuid_obj    = ia64cpuid.o
 $bn_obj       = bn-ia64.o ia64-mont.o
@@ -3063,10 +2815,14 @@ $multilib     = /hpux32
 *** hpux-ia64-gcc
 $cc           = gcc
 $cflags       = -O3 -DB_ENDIAN -D_REENTRANT
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT
 $cpuid_obj    = ia64cpuid.o
 $bn_obj       = bn-ia64.o ia64-mont.o
@@ -3097,10 +2853,14 @@ $multilib     = /hpux32
 *** hpux-parisc-cc
 $cc           = cc
 $cflags       = +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -Wl,+s -ldld
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
 $cpuid_obj    = 
 $bn_obj       = 
@@ -3131,10 +2891,14 @@ $multilib     =
 *** hpux-parisc-cc-o4
 $cc           = cc
 $cflags       = -Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldld
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
 $cpuid_obj    = 
 $bn_obj       = 
@@ -3165,10 +2929,14 @@ $multilib     =
 *** hpux-parisc-gcc
 $cc           = gcc
 $cflags       = -O3 -DB_ENDIAN -DBN_DIV2W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -Wl,+s -ldld
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
 $cpuid_obj    = 
 $bn_obj       = 
@@ -3199,10 +2967,14 @@ $multilib     =
 *** hpux-parisc1_1-cc
 $cc           = cc
 $cflags       = +DA1.1 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -Wl,+s -ldld
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
 $cpuid_obj    = pariscid.o
 $bn_obj       = bn_asm.o parisc-mont.o
@@ -3233,10 +3005,14 @@ $multilib     = /pa1.1
 *** hpux-parisc1_1-gcc
 $cc           = gcc
 $cflags       = -O3 -DB_ENDIAN -DBN_DIV2W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -Wl,+s -ldld
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
 $cpuid_obj    = pariscid.o
 $bn_obj       = bn_asm.o parisc-mont.o
@@ -3267,10 +3043,14 @@ $multilib     = /pa1.1
 *** hpux-parisc2-cc
 $cc           = cc
 $cflags       = +DA2.0 +DS2.0 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = -Wl,+s -ldld
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
 $cpuid_obj    = pariscid.o
 $bn_obj       = pa-risc2.o parisc-mont.o
@@ -3301,10 +3081,14 @@ $multilib     = /pa20_32
 *** hpux-parisc2-gcc
 $cc           = gcc
 $cflags       = -march=2.0 -O3 -DB_ENDIAN -D_REENTRANT
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = -Wl,+s -ldld
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL DES_RISC1
 $cpuid_obj    = pariscid.o
 $bn_obj       = pa-risc2.o parisc-mont.o
@@ -3335,10 +3119,14 @@ $multilib     = /pa20_32
 *** hpux64-ia64-cc
 $cc           = cc
 $cflags       = -Ae +DD64 +O3 +Olit=all -z -DB_ENDIAN -D_REENTRANT
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT
 $cpuid_obj    = ia64cpuid.o
 $bn_obj       = bn-ia64.o ia64-mont.o
@@ -3369,10 +3157,14 @@ $multilib     = /hpux64
 *** hpux64-ia64-gcc
 $cc           = gcc
 $cflags       = -mlp64 -O3 -DB_ENDIAN -D_REENTRANT
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT
 $cpuid_obj    = ia64cpuid.o
 $bn_obj       = bn-ia64.o ia64-mont.o
@@ -3403,10 +3195,14 @@ $multilib     = /hpux64
 *** hpux64-parisc2-cc
 $cc           = cc
 $cflags       = +DD64 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
 $cpuid_obj    = pariscid.o
 $bn_obj       = pa-risc2W.o parisc-mont.o
@@ -3437,10 +3233,14 @@ $multilib     = /pa20_64
 *** hpux64-parisc2-gcc
 $cc           = gcc
 $cflags       = -O3 -DB_ENDIAN -D_REENTRANT
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
 $cpuid_obj    = 
 $bn_obj       = pa-risc2W.o
@@ -3471,10 +3271,14 @@ $multilib     = /pa20_64
 *** hurd-x86
 $cc           = gcc
 $cflags       = -DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -3505,10 +3309,14 @@ $multilib     =
 *** ios64-cross
 $cc           = cc
 $cflags       = -O3 -arch arm64 -mios-version-min=7.0.0 -isysroot $(CROSS_TOP)/SDKs/$(CROSS_SDK) -fno-common
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = iOS
 $lflags       = -Wl,-search_paths_first%
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = armcap.o arm64cpuid.o mem_clr.o
 $bn_obj       = 
@@ -3539,10 +3347,14 @@ $multilib     =
 *** iphoneos-cross
 $cc           = cc
 $cflags       = -O3 -isysroot $(CROSS_TOP)/SDKs/$(CROSS_SDK) -fomit-frame-pointer -fno-common
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = iOS
 $lflags       = -Wl,-search_paths_first%
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
@@ -3573,10 +3385,14 @@ $multilib     =
 *** irix-cc
 $cc           = cc
 $cflags       = -O2 -use_readonly_const -DB_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC2 DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
@@ -3607,10 +3423,14 @@ $multilib     =
 *** irix-gcc
 $cc           = gcc
 $cflags       = -O3 -DB_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
@@ -3641,10 +3461,14 @@ $multilib     =
 *** irix-mips3-cc
 $cc           = cc
 $cflags       = -n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_SGI_MP_SOURCE
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
@@ -3675,10 +3499,14 @@ $multilib     = 32
 *** irix-mips3-gcc
 $cc           = gcc
 $cflags       = -mabi=n32 -O3 -DB_ENDIAN -DBN_DIV3W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_SGI_MP_SOURCE
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
@@ -3709,10 +3537,14 @@ $multilib     = 32
 *** irix64-mips4-cc
 $cc           = cc
 $cflags       = -64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_SGI_MP_SOURCE
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
@@ -3743,10 +3575,14 @@ $multilib     = 64
 *** irix64-mips4-gcc
 $cc           = gcc
 $cflags       = -mabi=64 -mips4 -O3 -DB_ENDIAN -DBN_DIV3W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_SGI_MP_SOURCE
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
@@ -3777,10 +3613,14 @@ $multilib     = 64
 *** linux-aarch64
 $cc           = gcc
 $cflags       = -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = armcap.o arm64cpuid.o mem_clr.o
 $bn_obj       = 
@@ -3811,10 +3651,14 @@ $multilib     =
 *** linux-alpha+bwx-ccc
 $cc           = ccc
 $cflags       = -fast -readonly_strings -DL_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL
 $cpuid_obj    = alphacpuid.o
 $bn_obj       = bn_asm.o alpha-mont.o
@@ -3845,10 +3689,14 @@ $multilib     =
 *** linux-alpha+bwx-gcc
 $cc           = gcc
 $cflags       = -O3 -DL_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL
 $cpuid_obj    = alphacpuid.o
 $bn_obj       = bn_asm.o alpha-mont.o
@@ -3879,10 +3727,14 @@ $multilib     =
 *** linux-alpha-ccc
 $cc           = ccc
 $cflags       = -fast -readonly_strings -DL_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL
 $cpuid_obj    = alphacpuid.o
 $bn_obj       = bn_asm.o alpha-mont.o
@@ -3913,10 +3765,14 @@ $multilib     =
 *** linux-alpha-gcc
 $cc           = gcc
 $cflags       = -O3 -DL_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL
 $cpuid_obj    = alphacpuid.o
 $bn_obj       = bn_asm.o alpha-mont.o
@@ -3947,10 +3803,14 @@ $multilib     =
 *** linux-aout
 $cc           = gcc
 $cflags       = -DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -3981,10 +3841,14 @@ $multilib     =
 *** linux-armv4
 $cc           = gcc
 $cflags       = -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = armcap.o armv4cpuid.o
 $bn_obj       = bn_asm.o armv4-mont.o armv4-gf2m.o
@@ -4015,10 +3879,14 @@ $multilib     =
 *** linux-c64xplus
 $cc           = cl6x
 $cflags       = --linux -ea=.s -eo=.o -mv6400+ -o2 -ox -ms -pden -DOPENSSL_SMALL_FOOTPRINT
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG
 $cpuid_obj    = c64xpluscpuid.o
 $bn_obj       = bn-c64xplus.o c64xplus-gf2m.o
@@ -4048,11 +3916,15 @@ $multilib     =
 
 *** linux-elf
 $cc           = gcc
-$cflags       = -DL_ENDIAN -O3 -fomit-frame-pointer -Wall
+$cflags       = -DL_ENDIAN -Wall
+$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -g -march=i486
+$release_cflags = -O3 -fomit-frame-pointer
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = -lefence
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -4082,11 +3954,15 @@ $multilib     =
 
 *** linux-generic32
 $cc           = gcc
-$cflags       = -O3 -fomit-frame-pointer -Wall
+$cflags       = -Wall
+$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g
+$release_cflags = -O3 -fomit-frame-pointer
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
@@ -4116,11 +3992,15 @@ $multilib     =
 
 *** linux-generic64
 $cc           = gcc
-$cflags       = -O3 -Wall
+$cflags       = -Wall
+$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g
+$release_cflags = -O3
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
@@ -4151,10 +4031,14 @@ $multilib     =
 *** linux-ia32-icc
 $cc           = icc
 $cflags       = -DL_ENDIAN -O2
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl -no_cpprt
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -4185,10 +4069,14 @@ $multilib     =
 *** linux-ia64
 $cc           = gcc
 $cflags       = -DL_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT
 $cpuid_obj    = ia64cpuid.o
 $bn_obj       = bn-ia64.o ia64-mont.o
@@ -4219,10 +4107,14 @@ $multilib     =
 *** linux-ia64-icc
 $cc           = icc
 $cflags       = -DL_ENDIAN -O2 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl -no_cpprt
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT
 $cpuid_obj    = ia64cpuid.o
 $bn_obj       = bn-ia64.o ia64-mont.o
@@ -4253,10 +4145,14 @@ $multilib     =
 *** linux-mips32
 $cc           = gcc
 $cflags       = -mabi=32 -O3 -Wall -DBN_DIV3W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
@@ -4287,10 +4183,14 @@ $multilib     =
 *** linux-mips64
 $cc           = gcc
 $cflags       = -mabi=n32 -O3 -Wall -DBN_DIV3W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
@@ -4321,10 +4221,14 @@ $multilib     = 32
 *** linux-ppc
 $cc           = gcc
 $cflags       = -DB_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL
 $cpuid_obj    = ppccpuid.o ppccap.o
 $bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
@@ -4355,10 +4259,14 @@ $multilib     =
 *** linux-ppc64
 $cc           = gcc
 $cflags       = -m64 -DB_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL
 $cpuid_obj    = ppccpuid.o ppccap.o
 $bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
@@ -4389,10 +4297,14 @@ $multilib     = 64
 *** linux-ppc64le
 $cc           = gcc
 $cflags       = -m64 -DL_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL
 $cpuid_obj    = ppccpuid.o ppccap.o
 $bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
@@ -4423,10 +4335,14 @@ $multilib     =
 *** linux-sparcv8
 $cc           = gcc
 $cflags       = -mv8 -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -DBN_DIV2W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = sparcv8.o
@@ -4457,10 +4373,14 @@ $multilib     =
 *** linux-sparcv9
 $cc           = gcc
 $cflags       = -m32 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = ULTRASPARC
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = sparcv9cap.o sparccpuid.o
 $bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
@@ -4491,10 +4411,14 @@ $multilib     =
 *** linux-x32
 $cc           = gcc
 $cflags       = -mx32 -DL_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -4524,11 +4448,15 @@ $multilib     = x32
 
 *** linux-x86_64
 $cc           = gcc
-$cflags       = -m64 -DL_ENDIAN -O3 -Wall
+$cflags       = -m64 -DL_ENDIAN -Wall
+$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g
+$release_cflags = -O3
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -4559,10 +4487,14 @@ $multilib     = 64
 *** linux-x86_64-clang
 $cc           = clang
 $cflags       = -m64 -DL_ENDIAN -O3 -Weverything -Wno-language-extension-token -Wno-extended-offsetof -Wno-padded -Wno-shorten-64-to-32 -Wno-format-nonliteral -Wno-missing-noreturn -Wno-unused-parameter -Wno-sign-conversion -Wno-unreachable-code -Wno-conversion -Wno-documentation -Wno-missing-variable-declarations -Wno-cast-align -Wno-incompatible-pointer-types-discards-qualifiers -Wno-missing-variable-declarations -Wno-missing-field-initializers -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-conditional-uninitialized -Wno-switch-enum -Qunused-arguments
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -4593,10 +4525,14 @@ $multilib     = 64
 *** linux-x86_64-icc
 $cc           = icc
 $cflags       = -DL_ENDIAN -O2
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl -no_cpprt
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -4627,10 +4563,14 @@ $multilib     = 64
 *** linux32-s390x
 $cc           = gcc
 $cflags       = -m31 -Wa,-mzarch -DB_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = s390xcap.o s390xcpuid.o
 $bn_obj       = bn_asm.o s390x-mont.o s390x-gf2m.o
@@ -4661,10 +4601,14 @@ $multilib     = /highgprs
 *** linux64-mips64
 $cc           = gcc
 $cflags       = -mabi=64 -O3 -Wall -DBN_DIV3W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
@@ -4695,10 +4639,14 @@ $multilib     = 64
 *** linux64-s390x
 $cc           = gcc
 $cflags       = -m64 -DB_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = s390xcap.o s390xcpuid.o
 $bn_obj       = bn-s390x.o s390x-mont.o s390x-gf2m.o
@@ -4729,10 +4677,14 @@ $multilib     = 64
 *** linux64-sparcv9
 $cc           = gcc
 $cflags       = -m64 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = ULTRASPARC
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR
 $cpuid_obj    = sparcv9cap.o sparccpuid.o
 $bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
@@ -4763,10 +4715,14 @@ $multilib     = 64
 *** mingw
 $cc           = gcc
 $cflags       = -mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 -march=i486 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_MT
 $sys_id       = MINGW32
 $lflags       = -lws2_32 -lgdi32 -lcrypt32
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT EXPORT_VAR_AS_FN
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -4797,10 +4753,14 @@ $multilib     =
 *** mingw64
 $cc           = gcc
 $cflags       = -mno-cygwin -DL_ENDIAN -O3 -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_MT
 $sys_id       = MINGW64
 $lflags       = -lws2_32 -lgdi32 -lcrypt32
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -4831,10 +4791,14 @@ $multilib     =
 *** netware-clib
 $cc           = mwccnlm
 $cflags       = 
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
@@ -4865,10 +4829,14 @@ $multilib     =
 *** netware-clib-bsdsock
 $cc           = mwccnlm
 $cflags       = 
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
@@ -4899,10 +4867,14 @@ $multilib     =
 *** netware-clib-bsdsock-gcc
 $cc           = i586-netware-gcc
 $cflags       = -nostdinc -I/ndk/nwsdk/include/nlm -DNETWARE_BSDSOCK -DNETDB_USE_INTERNET -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
@@ -4933,10 +4905,14 @@ $multilib     =
 *** netware-clib-gcc
 $cc           = i586-netware-gcc
 $cflags       = -nostdinc -I/ndk/nwsdk/include/nlm -I/ndk/ws295sdk/include -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
@@ -4967,10 +4943,14 @@ $multilib     =
 *** netware-libc
 $cc           = mwccnlm
 $cflags       = 
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
@@ -5001,10 +4981,14 @@ $multilib     =
 *** netware-libc-bsdsock
 $cc           = mwccnlm
 $cflags       = 
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
@@ -5035,10 +5019,14 @@ $multilib     =
 *** netware-libc-bsdsock-gcc
 $cc           = i586-netware-gcc
 $cflags       = -nostdinc -I/ndk/libc/include -DNETWARE_BSDSOCK -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYS_NETWARE -DTERMIO -O2 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
@@ -5069,10 +5057,14 @@ $multilib     =
 *** netware-libc-gcc
 $cc           = i586-netware-gcc
 $cflags       = -nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYS_NETWARE -DTERMIO -O2 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
@@ -5103,10 +5095,14 @@ $multilib     =
 *** nextstep
 $cc           = cc
 $cflags       = -O -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = <libc.h>
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
@@ -5137,10 +5133,14 @@ $multilib     =
 *** nextstep3.3
 $cc           = cc
 $cflags       = -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = <libc.h>
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
@@ -5171,10 +5171,14 @@ $multilib     =
 *** osf1-alpha-cc
 $cc           = cc
 $cflags       = -std1 -tune host -O4 -readonly_strings
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK
 $cpuid_obj    = alphacpuid.o
 $bn_obj       = bn_asm.o alpha-mont.o
@@ -5205,10 +5209,14 @@ $multilib     =
 *** osf1-alpha-gcc
 $cc           = gcc
 $cflags       = -O3
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1
 $cpuid_obj    = alphacpuid.o
 $bn_obj       = bn_asm.o alpha-mont.o
@@ -5239,10 +5247,14 @@ $multilib     =
 *** purify
 $cc           = purify gcc
 $cflags       = -g -DPURIFY -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = -lsocket -lnsl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -5273,10 +5285,14 @@ $multilib     =
 *** qnx4
 $cc           = cc
 $cflags       = -DL_ENDIAN -DTERMIO
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
@@ -5307,10 +5323,14 @@ $multilib     =
 *** sco5-cc
 $cc           = cc
 $cflags       = -belf
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = -lsocket -lnsl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -5341,10 +5361,14 @@ $multilib     =
 *** sco5-gcc
 $cc           = gcc
 $cflags       = -O3 -fomit-frame-pointer
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = -lsocket -lnsl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -5375,10 +5399,14 @@ $multilib     =
 *** solaris-sparcv7-cc
 $cc           = cc
 $cflags       = -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
@@ -5409,10 +5437,14 @@ $multilib     =
 *** solaris-sparcv7-gcc
 $cc           = gcc
 $cflags       = -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
@@ -5442,11 +5474,15 @@ $multilib     =
 
 *** solaris-sparcv8-cc
 $cc           = cc
-$cflags       = -xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W
+$cflags       = -xarch=v8 -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W
+$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O
+$release_cflags = -xO5 -xdepend
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = sparcv8.o
@@ -5476,11 +5512,15 @@ $multilib     =
 
 *** solaris-sparcv8-gcc
 $cc           = gcc
-$cflags       = -mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W
+$cflags       = -mv8 -Wall -DB_ENDIAN
+$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g
+$release_cflags = -O3 -fomit-frame-pointer -DBN_DIV2W
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = sparcv8.o
@@ -5510,11 +5550,15 @@ $multilib     =
 
 *** solaris-sparcv9-cc
 $cc           = cc
-$cflags       = -xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W
+$cflags       = -xtarget=ultra -xarch=v8plus -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W
+$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O
+$release_cflags = -xO5 -xdepend
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = ULTRASPARC
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR
 $cpuid_obj    = sparcv9cap.o sparccpuid.o
 $bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
@@ -5544,11 +5588,15 @@ $multilib     =
 
 *** solaris-sparcv9-gcc
 $cc           = gcc
-$cflags       = -m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W
+$cflags       = -m32 -mcpu=ultrasparc -Wall -DB_ENDIAN -DBN_DIV2W
+$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -pedantic -ansi -Wshadow -Wno-long-long -D__EXTENSIONS__
+$release_cflags = -O3 -fomit-frame-pointer
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = ULTRASPARC
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = sparcv9cap.o sparccpuid.o
 $bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
@@ -5579,10 +5627,14 @@ $multilib     =
 *** solaris-x86-cc
 $cc           = cc
 $cflags       = -fast -xarch=generic -O -Xa
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
@@ -5613,10 +5665,14 @@ $multilib     =
 *** solaris-x86-gcc
 $cc           = gcc
 $cflags       = -O3 -fomit-frame-pointer -march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -5647,10 +5703,14 @@ $multilib     =
 *** solaris64-sparcv9-cc
 $cc           = cc
 $cflags       = -xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = ULTRASPARC
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR
 $cpuid_obj    = sparcv9cap.o sparccpuid.o
 $bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
@@ -5681,10 +5741,14 @@ $multilib     = /64
 *** solaris64-sparcv9-gcc
 $cc           = gcc
 $cflags       = -m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = ULTRASPARC
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR
 $cpuid_obj    = sparcv9cap.o sparccpuid.o
 $bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
@@ -5715,10 +5779,14 @@ $multilib     = /64
 *** solaris64-x86_64-cc
 $cc           = cc
 $cflags       = -fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -5749,10 +5817,14 @@ $multilib     = /64
 *** solaris64-x86_64-gcc
 $cc           = gcc
 $cflags       = -m64 -O3 -Wall -DL_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
 $bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
@@ -5783,10 +5855,14 @@ $multilib     = /64
 *** tru64-alpha-cc
 $cc           = cc
 $cflags       = -std1 -tune host -fast -readonly_strings
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK
 $cpuid_obj    = alphacpuid.o
 $bn_obj       = bn_asm.o alpha-mont.o
@@ -5817,10 +5893,14 @@ $multilib     =
 *** uClinux-dist
 $cc           = 
 $cflags       = $(CFLAGS)
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = $(LDFLAGS) $(LDLIBS)
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG
 $cpuid_obj    = 
 $bn_obj       = 
@@ -5851,10 +5931,14 @@ $multilib     =
 *** uClinux-dist64
 $cc           = 
 $cflags       = $(CFLAGS)
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = $(LDFLAGS) $(LDLIBS)
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG
 $cpuid_obj    = 
 $bn_obj       = 
@@ -5885,10 +5969,14 @@ $multilib     =
 *** ultrix-cc
 $cc           = cc
 $cflags       = -std1 -O -Olimit 2500 -DL_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -5919,10 +6007,14 @@ $multilib     =
 *** ultrix-gcc
 $cc           = gcc
 $cflags       = -O3 -DL_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG
 $cpuid_obj    = 
 $bn_obj       = 
@@ -5953,10 +6045,14 @@ $multilib     =
 *** unixware-2.0
 $cc           = cc
 $cflags       = -DFILIO_H -DNO_STRINGS_H
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -Kthread
 $sys_id       = 
 $lflags       = -lsocket -lnsl -lresolv -lx
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
@@ -5987,10 +6083,14 @@ $multilib     =
 *** unixware-2.1
 $cc           = cc
 $cflags       = -O -DFILIO_H
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -Kthread
 $sys_id       = 
 $lflags       = -lsocket -lnsl -lresolv -lx
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
@@ -6021,10 +6121,14 @@ $multilib     =
 *** unixware-7
 $cc           = cc
 $cflags       = -O -DFILIO_H -Kalloca
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -Kthread
 $sys_id       = 
 $lflags       = -lsocket -lnsl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG MD2_CHAR RC4_INDEX DES_PTR DES_RISC1 DES_UNROLL
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -6055,10 +6159,14 @@ $multilib     =
 *** unixware-7-gcc
 $cc           = gcc
 $cflags       = -DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -lsocket -lnsl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
@@ -6088,11 +6196,15 @@ $multilib     =
 
 *** vos-gcc
 $cc           = gcc
-$cflags       = -O3 -Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN
+$cflags       = -Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN
+$debug_cflags   = -O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG
+$release_cflags = -O3
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = VOS
 $lflags       = -Wl,-map
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG
 $cpuid_obj    = 
 $bn_obj       = 
@@ -6123,10 +6235,14 @@ $multilib     =
 *** vxworks-mips
 $cc           = ccmips
 $cflags       = -mrtp -mips2 -O -G 0 -B$(WIND_BASE)/host/$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE="$(WIND_BASE)/target/lib/h/config/vsbConfig.h" -DCPU=MIPS32 -msoft-float -mno-branch-likely -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I$(WIND_BASE)/target/usr/h -I$(WIND_BASE)/target/h/wrn/coreip
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = VXWORKS
 $lflags       = -Wl,--defsym,__wrs_rtp_base=0xe0000000 -L $(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
@@ -6157,10 +6273,14 @@ $multilib     =
 *** vxworks-ppc405
 $cc           = ccppc
 $cflags       = -g -msoft-float -mlongcall -DCPU=PPC405 -I$(WIND_BASE)/target/h
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = VXWORKS
 $lflags       = -r
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -6191,10 +6311,14 @@ $multilib     =
 *** vxworks-ppc60x
 $cc           = ccppc
 $cflags       = -D_REENTRANT -mrtp -mhard-float -mstrict-align -fno-implicit-fp -DPPC32_fp60x -O2 -fstrength-reduce -fno-builtin -fno-strict-aliasing -Wall -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -I$(WIND_BASE)/target/usr/h -I$(WIND_BASE)/target/usr/h/wrn/coreip
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = VXWORKS
 $lflags       = -Wl,--defsym,__wrs_rtp_base=0xe0000000 -L $(WIND_BASE)/target/usr/lib/ppc/PPC32/common
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -6225,10 +6349,14 @@ $multilib     =
 *** vxworks-ppc750
 $cc           = ccppc
 $cflags       = -ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I$(WIND_BASE)/target/h $(DEBUG_FLAG)
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = VXWORKS
 $lflags       = -r
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -6259,10 +6387,14 @@ $multilib     =
 *** vxworks-ppc750-debug
 $cc           = ccppc
 $cflags       = -ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = VXWORKS
 $lflags       = -r
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -6293,10 +6425,14 @@ $multilib     =
 *** vxworks-ppc860
 $cc           = ccppc
 $cflags       = -nostdinc -msoft-float -DCPU=PPC860 -DNO_STRINGS_H -I$(WIND_BASE)/target/h
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = VXWORKS
 $lflags       = -r
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -6327,10 +6463,14 @@ $multilib     =
 *** vxworks-ppcgen
 $cc           = ccppc
 $cflags       = -D_REENTRANT -mrtp -msoft-float -mstrict-align -O1 -fno-builtin -fno-strict-aliasing -Wall -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -I$(WIND_BASE)/target/usr/h -I$(WIND_BASE)/target/usr/h/wrn/coreip
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = VXWORKS
 $lflags       = -Wl,--defsym,__wrs_rtp_base=0xe0000000 -L $(WIND_BASE)/target/usr/lib/ppc/PPC32/sfcommon
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
@@ -6361,10 +6501,14 @@ $multilib     =
 *** vxworks-simlinux
 $cc           = ccpentium
 $cflags       = -B$(WIND_BASE)/host/$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE="$(WIND_BASE)/target/lib/h/config/vsbConfig.h" -DL_ENDIAN -DCPU=SIMLINUX -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DOPENSSL_NO_HW_PADLOCK
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = VXWORKS
 $lflags       = -r
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 

From levitte at openssl.org  Mon Mar 16 22:30:39 2015
From: levitte at openssl.org (Richard Levitte)
Date: Mon, 16 Mar 2015 22:30:39 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426545039.141497.30767.nullmailer@dev.openssl.org>

The branch master has been updated
       via  e3c159648d19e0396b23dba02b85be2bf12ce24c (commit)
       via  a5250ec02f4d8b27d786c415ae882801972bfccd (commit)
      from  d52dcf8da7f15bf75fbf065bac2c4557470ea2fa (commit)


- Log -----------------------------------------------------------------
commit e3c159648d19e0396b23dba02b85be2bf12ce24c
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Mar 16 22:36:19 2015 +0100

    Do not keep TABLE in version control.
    
    TABLE was always a debugging tool, and permitted everyone to see the
    effect of changes in the string-format configs.  The hash-format
    configs being much more readable, distributing TABLE becomes much less
    necessary.
    
    Being able to produce a TABLE is kept, however, as it still is a
    useful debugging tool for configs, what with multi-level inheritance
    and all.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit a5250ec02f4d8b27d786c415ae882801972bfccd
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 12 14:58:07 2015 +0100

    Configuration cleanup: personal configs
    
    Move obviously personal configurations to personal files.
    
    Note: those files should really not be in the main repo at all
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 .gitignore                              |   1 +
 Configurations/90-team.conf             | 214 ------------
 Configurations/99-personal-ben.conf     |  94 ++++++
 Configurations/99-personal-bodo.conf    |  23 ++
 Configurations/99-personal-geoff.conf   |  32 ++
 Configurations/99-personal-levitte.conf |  59 ++++
 Configurations/99-personal-rse.conf     |  15 +
 Configurations/99-personal-steve.conf   |  49 +++
 TABLE                                   | 556 ++------------------------------
 9 files changed, 304 insertions(+), 739 deletions(-)
 create mode 100644 Configurations/99-personal-ben.conf
 create mode 100644 Configurations/99-personal-bodo.conf
 create mode 100644 Configurations/99-personal-geoff.conf
 create mode 100644 Configurations/99-personal-levitte.conf
 create mode 100644 Configurations/99-personal-rse.conf
 create mode 100644 Configurations/99-personal-steve.conf

diff --git a/.gitignore b/.gitignore
index 4a624e8..2f27dc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 /Makefile.bak
 /Makefile
 /MINFO
+/TABLE
 /*.a
 /include
 /*.pc
diff --git a/Configurations/90-team.conf b/Configurations/90-team.conf
index 66d1eae..0e78a14 100644
--- a/Configurations/90-team.conf
+++ b/Configurations/90-team.conf
@@ -17,114 +17,6 @@
         thread_cflag     => "(unknown)",
         lflags           => "-lefence",
     },
-    "debug-ben" => {
-        cc               => "gcc",
-        cflags           => "$gcc_devteam_warn -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DDEBUG_SAFESTACK -O2 -pipe",
-        thread_cflag     => "(unknown)",
-    },
-    "debug-ben-openbsd" => {
-        cc               => "gcc",
-        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe",
-        thread_cflag     => "(unknown)",
-    },
-    "debug-ben-openbsd-debug" => {
-        cc               => "gcc",
-        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe",
-        thread_cflag     => "(unknown)",
-    },
-    "debug-ben-debug" => {
-        cc               => "gcc",
-        cflags           => "$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DOPENSSL_NO_HW_PADLOCK -g3 -O2 -pipe",
-        thread_cflag     => "(unknown)",
-    },
-    "debug-ben-debug-64" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "gcc",
-        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",
-        thread_cflag     => "${BSDthreads}",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
-        perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "bsd-gcc-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "debug-ben-debug-64-clang" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "clang",
-        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",
-        thread_cflag     => "${BSDthreads}",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
-        perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "bsd-gcc-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "debug-ben-debug-64-noopt" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "gcc",
-        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -pipe",
-        thread_cflag     => "${BSDthreads}",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
-        perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "bsd-gcc-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "debug-ben-macos" => {
-        cc               => "cc",
-        cflags           => "$gcc_devteam_warn -DOPENSSL_NO_ASM -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -DL_ENDIAN -g3 -pipe",
-        thread_cflag     => "(unknown)",
-    },
-    "debug-ben-no-opt" => {
-        cc               => "gcc",
-        cflags           => "-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -Wall -g3",
-        thread_cflag     => "(unknown)",
-    },
-    "debug-ben-strict" => {
-        cc               => "gcc",
-        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe",
-        thread_cflag     => "(unknown)",
-    },
-    "debug-ben-darwin64" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "cc",
-        cflags           => "$gcc_devteam_warn -Wno-language-extension-token -Wno-extended-offsetof -arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "MACOSX",
-        lflags           => "-Wl,-search_paths_first%",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
-        perlasm_scheme   => "macosx",
-        dso_scheme       => "dlfcn",
-        shared_target    => "darwin-shared",
-        shared_cflag     => "-fPIC -fno-common",
-        shared_ldflag    => "-arch x86_64 -dynamiclib",
-        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-    },
-    "debug-rse" => {
-        inherit_from     => [ "x86_elf_asm" ],
-        cc               => "cc",
-        cflags           => "-DL_ENDIAN -pipe -O -g -ggdb3 -Wall",
-        thread_cflag     => "(unknown)",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
-    },
-    "debug-bodo" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "gcc",
-        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
-        perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-m64",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-        multilib         => "64",
-    },
     "debug-erbridge" => {
         inherit_from     => [ "x86_64_asm" ],
         cc               => "gcc",
@@ -140,112 +32,6 @@
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "64",
     },
-    "debug-steve64" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "gcc",
-        cflags           => "$gcc_devteam_warn -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
-        perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-m64",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "debug-steve32" => {
-        inherit_from     => [ "x86_elf_asm" ],
-        cc               => "gcc",
-        cflags           => "$gcc_devteam_warn -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g -pipe",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-rdynamic -ldl",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-m32",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "debug-steve-opt" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "gcc",
-        cflags           => "$gcc_devteam_warn -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
-        perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-m64",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-
-    # Richard Levitte
-    "debug-levitte-linux-noasm" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "gcc",
-        cflags           => "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "debug-levitte-linux-elf-extreme" => {
-        inherit_from     => [ "x86_elf_asm" ],
-        cc               => "gcc",
-        cflags           => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT",
-        perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "debug-levitte-linux-noasm-extreme" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "gcc",
-        cflags           => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT",
-        perlasm_scheme   => "void",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-
-    "debug-geoff32" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "gcc",
-        cflags           => "-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "debug-geoff64" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "gcc",
-        cflags           => "-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
     "debug-linux-pentium" => {
         inherit_from     => [ "x86_elf_asm" ],
         cc               => "gcc",
diff --git a/Configurations/99-personal-ben.conf b/Configurations/99-personal-ben.conf
new file mode 100644
index 0000000..94ea6d0
--- /dev/null
+++ b/Configurations/99-personal-ben.conf
@@ -0,0 +1,94 @@
+## Personal configuration targets
+##
+## If you edit this file, run this command before committing
+##	make -f Makefile.org TABLE
+## This file is interpolated by the Configure script.
+
+%targets = (
+    "debug-ben" => {
+        cc               => "gcc",
+        cflags           => "$gcc_devteam_warn -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DDEBUG_SAFESTACK -O2 -pipe",
+        thread_cflag     => "(unknown)",
+    },
+    "debug-ben-openbsd" => {
+        cc               => "gcc",
+        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe",
+        thread_cflag     => "(unknown)",
+    },
+    "debug-ben-openbsd-debug" => {
+        cc               => "gcc",
+        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe",
+        thread_cflag     => "(unknown)",
+    },
+    "debug-ben-debug" => {
+        cc               => "gcc",
+        cflags           => "$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DOPENSSL_NO_HW_PADLOCK -g3 -O2 -pipe",
+        thread_cflag     => "(unknown)",
+    },
+    "debug-ben-debug-64" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "gcc",
+        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",
+        thread_cflag     => "${BSDthreads}",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "bsd-gcc-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-ben-debug-64-clang" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "clang",
+        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",
+        thread_cflag     => "${BSDthreads}",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "bsd-gcc-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-ben-debug-64-noopt" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "gcc",
+        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -pipe",
+        thread_cflag     => "${BSDthreads}",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "bsd-gcc-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-ben-macos" => {
+        cc               => "cc",
+        cflags           => "$gcc_devteam_warn -DOPENSSL_NO_ASM -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -DL_ENDIAN -g3 -pipe",
+        thread_cflag     => "(unknown)",
+    },
+    "debug-ben-no-opt" => {
+        cc               => "gcc",
+        cflags           => " -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -Wall -g3",
+        thread_cflag     => "(unknown)",
+    },
+    "debug-ben-strict" => {
+        cc               => "gcc",
+        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe",
+        thread_cflag     => "(unknown)",
+    },
+    "debug-ben-darwin64" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "cc",
+        cflags           => "$gcc_devteam_warn -Wno-language-extension-token -Wno-extended-offsetof -arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        sys_id           => "MACOSX",
+        lflags           => "-Wl,-search_paths_first%",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "macosx",
+        dso_scheme       => "dlfcn",
+        shared_target    => "darwin-shared",
+        shared_cflag     => "-fPIC -fno-common",
+        shared_ldflag    => "-arch x86_64 -dynamiclib",
+        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+    },
+);
diff --git a/Configurations/99-personal-bodo.conf b/Configurations/99-personal-bodo.conf
new file mode 100644
index 0000000..c9a7534
--- /dev/null
+++ b/Configurations/99-personal-bodo.conf
@@ -0,0 +1,23 @@
+## Personal configuration targets
+##
+## If you edit this file, run this command before committing
+##	make -f Makefile.org TABLE
+## This file is interpolated by the Configure script.
+
+%targets = (
+    "debug-bodo" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "gcc",
+        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m64",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        multilib         => "64",
+    },
+);
diff --git a/Configurations/99-personal-geoff.conf b/Configurations/99-personal-geoff.conf
new file mode 100644
index 0000000..adf0990
--- /dev/null
+++ b/Configurations/99-personal-geoff.conf
@@ -0,0 +1,32 @@
+## Personal configuration targets
+##
+## If you edit this file, run this command before committing
+##	make -f Makefile.org TABLE
+## This file is interpolated by the Configure script.
+
+%targets = (
+    "debug-geoff32" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "gcc",
+        cflags           => "-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-geoff64" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "gcc",
+        cflags           => "-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+);
diff --git a/Configurations/99-personal-levitte.conf b/Configurations/99-personal-levitte.conf
new file mode 100644
index 0000000..18fbcdc
--- /dev/null
+++ b/Configurations/99-personal-levitte.conf
@@ -0,0 +1,59 @@
+## Personal configuration targets
+##
+## If you edit this file, run this command before committing
+##	make -f Makefile.org TABLE
+## This file is interpolated by the Configure script.
+
+%targets = (
+    "levitte-linux-elf" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "gcc",
+        cflags           => "-DL_ENDIAN -Wall",
+        debug_cflags     => "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG-ggdb -g3",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-levitte-linux-noasm" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "gcc",
+        cflags           => "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-levitte-linux-elf-extreme" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "gcc",
+        cflags           => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-levitte-linux-noasm-extreme" => {
+        inherit_from     => [ "no_asm_filler" ],
+        cc               => "gcc",
+        cflags           => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT",
+        perlasm_scheme   => "void",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+);
diff --git a/Configurations/99-personal-rse.conf b/Configurations/99-personal-rse.conf
new file mode 100644
index 0000000..e9318fc
--- /dev/null
+++ b/Configurations/99-personal-rse.conf
@@ -0,0 +1,15 @@
+## Personal configuration targets
+##
+## If you edit this file, run this command before committing
+##	make -f Makefile.org TABLE
+## This file is interpolated by the Configure script.
+
+%targets = (
+    "debug-rse" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "cc",
+        cflags           => "-DL_ENDIAN -pipe -O -g -ggdb3 -Wall",
+        thread_cflag     => "(unknown)",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+    },
+);
diff --git a/Configurations/99-personal-steve.conf b/Configurations/99-personal-steve.conf
new file mode 100644
index 0000000..454b283
--- /dev/null
+++ b/Configurations/99-personal-steve.conf
@@ -0,0 +1,49 @@
+## Personal configuration targets
+##
+## If you edit this file, run this command before committing
+##	make -f Makefile.org TABLE
+## This file is interpolated by the Configure script.
+
+%targets = (
+    "debug-steve64" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "gcc",
+        cflags           => "$gcc_devteam_warn -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m64",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-steve32" => {
+        inherit_from     => [ "x86_elf_asm" ],
+        cc               => "gcc",
+        cflags           => "$gcc_devteam_warn -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g -pipe",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-rdynamic -ldl",
+        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m32",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "debug-steve-opt" => {
+        inherit_from     => [ "x86_64_asm" ],
+        cc               => "gcc",
+        cflags           => "$gcc_devteam_warn -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g",
+        thread_cflag     => "-D_REENTRANT",
+        lflags           => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        perlasm_scheme   => "elf",
+        dso_scheme       => "dlfcn",
+        shared_target    => "linux-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-m64",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+);
diff --git a/TABLE b/TABLE
index dfd39b8..f0e8b9b 100644
--- a/TABLE
+++ b/TABLE
@@ -950,44 +950,6 @@ $ranlib       =
 $arflags      = -X32
 $multilib     = 
 
-*** aix3-cc
-$cc           = cc
-$cflags       = -O -DB_ENDIAN -qmaxmem=16384
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = AIX
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** aix64-cc
 $cc           = cc
 $cflags       = -q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst
@@ -1216,44 +1178,6 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** aux3-gcc
-$cc           = gcc
-$cflags       = -O2 -DTERMIO
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = AUX
-$lflags       = -lbsd
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** bsdi-elf-gcc
 $cc           = gcc
 $cflags       = -DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall
@@ -1864,7 +1788,7 @@ $multilib     =
 
 *** debug-ben-no-opt
 $cc           = gcc
-$cflags       = -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -Wall -g3
+$cflags       =  -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -Wall -g3
 $debug_cflags   = 
 $release_cflags = 
 $unistd       = 
@@ -2698,82 +2622,6 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** hpux-cc
-$cc           = cc
-$cflags       = -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O2 -z
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = -Wl,+s -ldld
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = DES_PTR DES_UNROLL DES_RISC1
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dl
-$shared_target= hpux-shared
-$shared_cflag = +Z
-$shared_ldflag = -b
-$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** hpux-gcc
-$cc           = gcc
-$cflags       = -DB_ENDIAN -DBN_DIV2W -O3
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = -Wl,+s -ldld
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = DES_PTR DES_UNROLL DES_RISC1
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dl
-$shared_target= hpux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -shared
-$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** hpux-ia64-cc
 $cc           = cc
 $cflags       = -Ae +DD32 +O2 +Olit=all -z -DB_ENDIAN -D_REENTRANT
@@ -2850,120 +2698,6 @@ $ranlib       =
 $arflags      = 
 $multilib     = /hpux32
 
-*** hpux-parisc-cc
-$cc           = cc
-$cflags       = +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -Wl,+s -ldld
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dl
-$shared_target= hpux-shared
-$shared_cflag = +Z
-$shared_ldflag = -b
-$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** hpux-parisc-cc-o4
-$cc           = cc
-$cflags       = -Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldld
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dl
-$shared_target= hpux-shared
-$shared_cflag = +Z
-$shared_ldflag = -b
-$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** hpux-parisc-gcc
-$cc           = gcc
-$cflags       = -O3 -DB_ENDIAN -DBN_DIV2W
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -Wl,+s -ldld
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dl
-$shared_target= hpux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -shared
-$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** hpux-parisc1_1-cc
 $cc           = cc
 $cflags       = +DA1.1 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY
@@ -3040,82 +2774,6 @@ $ranlib       =
 $arflags      = 
 $multilib     = /pa1.1
 
-*** hpux-parisc2-cc
-$cc           = cc
-$cflags       = +DA2.0 +DS2.0 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = -Wl,+s -ldld
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
-$cpuid_obj    = pariscid.o
-$bn_obj       = pa-risc2.o parisc-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-parisc.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-parisc.o sha256-parisc.o sha512-parisc.o
-$cast_obj     = 
-$rc4_obj      = rc4-parisc.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-parisc.o
-$engines_obj  = 
-$perlasm_scheme = 32
-$dso_scheme   = dl
-$shared_target= hpux-shared
-$shared_cflag = +Z
-$shared_ldflag = -b
-$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = /pa20_32
-
-*** hpux-parisc2-gcc
-$cc           = gcc
-$cflags       = -march=2.0 -O3 -DB_ENDIAN -D_REENTRANT
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = -Wl,+s -ldld
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL DES_RISC1
-$cpuid_obj    = pariscid.o
-$bn_obj       = pa-risc2.o parisc-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-parisc.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-parisc.o sha256-parisc.o sha512-parisc.o
-$cast_obj     = 
-$rc4_obj      = rc4-parisc.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-parisc.o
-$engines_obj  = 
-$perlasm_scheme = 32
-$dso_scheme   = dl
-$shared_target= hpux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -shared
-$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = /pa20_32
-
 *** hpux64-ia64-cc
 $cc           = cc
 $cflags       = -Ae +DD64 +O3 +Olit=all -z -DB_ENDIAN -D_REENTRANT
@@ -3610,10 +3268,10 @@ $ranlib       =
 $arflags      = 
 $multilib     = 64
 
-*** linux-aarch64
+*** levitte-linux-elf
 $cc           = gcc
-$cflags       = -O3 -Wall
-$debug_cflags   = 
+$cflags       = -DL_ENDIAN -Wall
+$debug_cflags   = -DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG-ggdb -g3
 $release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
@@ -3621,24 +3279,24 @@ $sys_id       =
 $lflags       = -ldl
 $debug_lflags   = 
 $release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
-$cpuid_obj    = armcap.o arm64cpuid.o mem_clr.o
-$bn_obj       = 
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aesv8-armx.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-armv8.o sha256-armv8.o sha512-armv8.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghashv8-armx.o
-$engines_obj  = 
-$perlasm_scheme = linux64
+$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
+$cpuid_obj    = x86cpuid.o
+$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
+$des_obj      = des-586.o crypt586.o
+$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
+$bf_obj       = bf-586.o
+$md5_obj      = md5-586.o
+$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
+$cast_obj     = cast-586.o
+$rc4_obj      = rc4-586.o
+$rmd160_obj   = rmd-586.o
+$rc5_obj      = rc5-586.o
+$wp_obj       = wp_block.o wp-mmx.o
+$cmll_obj     = cmll-x86.o
+$modes_obj    = ghash-x86.o
+$engines_obj  = e_padlock-x86.o
+$perlasm_scheme = elf
 $dso_scheme   = dlfcn
 $shared_target= linux-shared
 $shared_cflag = -fPIC
@@ -3648,47 +3306,9 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** linux-alpha+bwx-ccc
-$cc           = ccc
-$cflags       = -fast -readonly_strings -DL_ENDIAN
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL
-$cpuid_obj    = alphacpuid.o
-$bn_obj       = bn_asm.o alpha-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = 
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-alpha.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-alpha.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-alpha+bwx-gcc
+*** linux-aarch64
 $cc           = gcc
-$cflags       = -O3 -DL_ENDIAN
+$cflags       = -O3 -Wall
 $debug_cflags   = 
 $release_cflags = 
 $unistd       = 
@@ -3697,24 +3317,24 @@ $sys_id       =
 $lflags       = -ldl
 $debug_lflags   = 
 $release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL
-$cpuid_obj    = alphacpuid.o
-$bn_obj       = bn_asm.o alpha-mont.o
+$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
+$cpuid_obj    = armcap.o arm64cpuid.o mem_clr.o
+$bn_obj       = 
 $ec_obj       = 
 $des_obj      = 
-$aes_obj      = 
+$aes_obj      = aes_core.o aes_cbc.o aesv8-armx.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-alpha.o
+$sha1_obj     = sha1-armv8.o sha256-armv8.o sha512-armv8.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$modes_obj    = ghash-alpha.o
+$modes_obj    = ghashv8-armx.o
 $engines_obj  = 
-$perlasm_scheme = void
+$perlasm_scheme = linux64
 $dso_scheme   = dlfcn
 $shared_target= linux-shared
 $shared_cflag = -fPIC
@@ -3724,44 +3344,6 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** linux-alpha-ccc
-$cc           = ccc
-$cflags       = -fast -readonly_strings -DL_ENDIAN
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL
-$cpuid_obj    = alphacpuid.o
-$bn_obj       = bn_asm.o alpha-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = 
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-alpha.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-alpha.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** linux-alpha-gcc
 $cc           = gcc
 $cflags       = -O3 -DL_ENDIAN
@@ -5396,82 +4978,6 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** solaris-sparcv7-cc
-$cc           = cc
-$cflags       = -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -lsocket -lnsl -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -KPIC
-$shared_ldflag = -G -dy -z text
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** solaris-sparcv7-gcc
-$cc           = gcc
-$cflags       = -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -lsocket -lnsl -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -shared
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** solaris-sparcv8-cc
 $cc           = cc
 $cflags       = -xarch=v8 -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W

From matt at openssl.org  Tue Mar 17 14:04:35 2015
From: matt at openssl.org (Matt Caswell)
Date: Tue, 17 Mar 2015 14:04:35 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426601075.507723.27701.nullmailer@dev.openssl.org>

The branch master has been updated
       via  e4676e900f165f5272991443225813002300b09b (commit)
       via  3475c7a1854977e290ab44deb16551f6d55ad9a7 (commit)
       via  dfef52f6f277327e118fdd0fe34486852c2789b6 (commit)
       via  668f6f08c62177ab5893fc26ebb67053aafdffc8 (commit)
       via  7132ac830fa08d9a936e011d7c541b0c52115b33 (commit)
       via  be1477adc97e76f4b83ed8075589f529069bd5d1 (commit)
       via  a561bfe944c0beba73551731cb98af70dfee3549 (commit)
      from  e3c159648d19e0396b23dba02b85be2bf12ce24c (commit)


- Log -----------------------------------------------------------------
commit e4676e900f165f5272991443225813002300b09b
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Mar 13 12:48:57 2015 +0000

    Fix probable_prime over large shift
    
    In the probable_prime() function we behave slightly different if the number
    of bits we are interested in is <= BN_BITS2 (the num of bits in a BN_ULONG).
    As part of the calculation we work out a size_limit as follows:
    
        size_limit = (((BN_ULONG)1) << bits) - BN_get_word(rnd) - 1;
    
    There is a problem though if bits == BN_BITS2. Shifting by that much causes
    undefined behaviour. I did some tests. On my system BN_BITS2 == 64. So I
    set bits to 64 and calculated the result of:
    
        (((BN_ULONG)1) << bits)
    
    I was expecting to get the result 0. I actually got 1! Strangely this...
    
        (((BN_ULONG)0) << BN_BITS2)
    
    ...does equal 0! This means that, on my system at least, size_limit will be
    off by 1 when bits == BN_BITS2.
    
    This commit fixes the behaviour so that we always get consistent results.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit 3475c7a1854977e290ab44deb16551f6d55ad9a7
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 15:59:07 2015 +0000

    Fix unintended sign extension
    
    The function CRYPTO_128_unwrap_pad uses an 8 byte AIV (Alternative Initial
    Value). The least significant 4 bytes of this is placed into the local
    variable |ptext_len|. This is done as follows:
    
        ptext_len = (aiv[4] << 24) | (aiv[5] << 16) | (aiv[6] << 8) | aiv[7];
    
    aiv[4] is an unsigned char, but (aiv[4] << 24) is promoted to a *signed*
    int - therefore we could end up shifting into the sign bit and end up with
    a negative value. |ptext_len| is a size_t (typically 64-bits). If the
    result of the shifts is negative then the upper bits of |ptext_len| will
    all be 1.
    
    This commit fixes the issue by explicitly casting to an unsigned int.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit dfef52f6f277327e118fdd0fe34486852c2789b6
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 16:42:55 2015 +0000

    Fix seg fault in s_time
    
    Passing a negative value for the "-time" option to s_time results in a seg
    fault. This commit fixes it so that time has to be greater than 0.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit 668f6f08c62177ab5893fc26ebb67053aafdffc8
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 14:37:26 2015 +0000

    Add sanity check to PRF
    
    The function tls1_PRF counts the number of digests in use and partitions
    security evenly between them. There always needs to be at least one digest
    in use, otherwise this is an internal error. Add a sanity check for this.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 7132ac830fa08d9a936e011d7c541b0c52115b33
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 12:54:44 2015 +0000

    Fix memset call in stack.c
    
    The function sk_zero is supposed to zero the elements held within a stack.
    It uses memset to do this. However it calculates the size of each element
    as being sizeof(char **) instead of sizeof(char *). This probably doesn't
    make much practical difference in most cases, but isn't a portable
    assumption.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit be1477adc97e76f4b83ed8075589f529069bd5d1
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 11:25:03 2015 +0000

    Move malloc fail checks closer to malloc
    
    Move memory allocation failure checks closer to the site of the malloc in
    dgst app. Only a problem if the debug flag is set...but still should be
    fixed.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

commit a561bfe944c0beba73551731cb98af70dfee3549
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 11:10:47 2015 +0000

    Add malloc failure checks
    
    Add some missing checks for memory allocation failures in ca app.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 apps/ca.c              | 13 +++++++++++++
 apps/dgst.c            | 10 +++++-----
 apps/s_time.c          |  7 ++++++-
 crypto/bn/bn_prime.c   | 12 +++++++++++-
 crypto/modes/wrap128.c |  5 ++++-
 crypto/stack/stack.c   |  2 +-
 ssl/t1_enc.c           |  5 +++++
 7 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/apps/ca.c b/apps/ca.c
index 814162d..9ef0ce3 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -2809,6 +2809,11 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
     ASN1_GENERALIZEDTIME *comp_time = NULL;
     tmp = BUF_strdup(str);
 
+    if(!tmp) {
+        BIO_printf(bio_err, "memory allocation failure\n");
+        goto err;
+    }
+
     p = strchr(tmp, ',');
 
     rtime_str = tmp;
@@ -2826,6 +2831,10 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
 
     if (prevtm) {
         *prevtm = ASN1_UTCTIME_new();
+        if(!*prevtm) {
+            BIO_printf(bio_err, "memory allocation failure\n");
+            goto err;
+        }
         if (!ASN1_UTCTIME_set_string(*prevtm, rtime_str)) {
             BIO_printf(bio_err, "invalid revocation date %s\n", rtime_str);
             goto err;
@@ -2866,6 +2875,10 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
                 goto err;
             }
             comp_time = ASN1_GENERALIZEDTIME_new();
+            if(!comp_time) {
+                BIO_printf(bio_err, "memory allocation failure\n");
+                goto err;
+            }
             if (!ASN1_GENERALIZEDTIME_set_string(comp_time, arg_str)) {
                 BIO_printf(bio_err, "invalid compromised time %s\n", arg_str);
                 goto err;
diff --git a/apps/dgst.c b/apps/dgst.c
index 47c2f69..95e5fa3 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -293,6 +293,11 @@ int MAIN(int argc, char **argv)
 
     in = BIO_new(BIO_s_file());
     bmd = BIO_new(BIO_f_md());
+    if ((in == NULL) || (bmd == NULL)) {
+        ERR_print_errors(bio_err);
+        goto end;
+    }
+
     if (debug) {
         BIO_set_callback(in, BIO_debug_callback);
         /* needed for windows 3.1 */
@@ -304,11 +309,6 @@ int MAIN(int argc, char **argv)
         goto end;
     }
 
-    if ((in == NULL) || (bmd == NULL)) {
-        ERR_print_errors(bio_err);
-        goto end;
-    }
-
     if (out_bin == -1) {
         if (keyfile)
             out_bin = 1;
diff --git a/apps/s_time.c b/apps/s_time.c
index 102ee72..96e39aa 100644
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -283,6 +283,10 @@ static int parseArgs(int argc, char **argv)
             if (--argc < 1)
                 goto bad;
             maxTime = atoi(*(++argv));
+            if(maxTime <= 0) {
+                BIO_printf(bio_err, "time must be > 0\n");
+                badop = 1;
+            }
         } else {
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badop = 1;
@@ -527,7 +531,8 @@ int MAIN(int argc, char **argv)
          nConn, totalTime, ((double)nConn / totalTime), bytes_read);
     printf
         ("%d connections in %ld real seconds, %ld bytes read per connection\n",
-         nConn, (long)time(NULL) - finishtime + maxTime, bytes_read / nConn);
+         nConn, (long)time(NULL) - finishtime + maxTime,
+         bytes_read / (nConn?nConn:1));
 
     ret = 0;
  end:
diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c
index b12295e..2a7822e 100644
--- a/crypto/bn/bn_prime.c
+++ b/crypto/bn/bn_prime.c
@@ -518,7 +518,17 @@ static int probable_prime(BIGNUM *rnd, int bits)
      * additionally don't want to exceed that many bits.
      */
     if (is_single_word) {
-        BN_ULONG size_limit = (((BN_ULONG)1) << bits) - BN_get_word(rnd) - 1;
+        BN_ULONG size_limit;
+        
+        if (bits == BN_BITS2) {
+            /*
+             * Shifting by this much has undefined behaviour so we do it a
+             * different way
+             */
+            size_limit = ~((BN_ULONG)0) - BN_get_word(rnd);
+        } else {
+            size_limit = (((BN_ULONG)1) << bits) - BN_get_word(rnd) - 1;
+        }
         if (size_limit < maxdelta)
             maxdelta = size_limit;
     }
diff --git a/crypto/modes/wrap128.c b/crypto/modes/wrap128.c
index ccb58c5..73718ae 100644
--- a/crypto/modes/wrap128.c
+++ b/crypto/modes/wrap128.c
@@ -350,7 +350,10 @@ size_t CRYPTO_128_unwrap_pad(void *key, const unsigned char *icv,
      * LSB(32,AIV).
      */
 
-    ptext_len = (aiv[4] << 24) | (aiv[5] << 16) | (aiv[6] << 8) | aiv[7];
+    ptext_len =   ((unsigned int)aiv[4] << 24)
+                | ((unsigned int)aiv[5] << 16)
+                | ((unsigned int)aiv[6] <<  8)
+                |  (unsigned int)aiv[7];
     if (8 * (n - 1) >= ptext_len || ptext_len > 8 * n) {
         OPENSSL_cleanse(out, inlen);
         return 0;
diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index 1b89f55..7d97c2c 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -299,7 +299,7 @@ void sk_zero(_STACK *st)
         return;
     if (st->num <= 0)
         return;
-    memset((char *)st->data, 0, sizeof(st->data) * st->num);
+    memset((char *)st->data, 0, sizeof(*st->data) * st->num);
     st->num = 0;
 }
 
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 1833eb7..26f8415 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -260,6 +260,11 @@ static int tls1_PRF(long digest_mask,
         if ((m << TLS1_PRF_DGST_SHIFT) & digest_mask)
             count++;
     }
+    if(!count) {
+        /* Should never happen */
+        SSLerr(SSL_F_TLS1_PRF, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
     len = slen / count;
     if (count == 1)
         slen = 0;

From matt at openssl.org  Tue Mar 17 14:04:46 2015
From: matt at openssl.org (Matt Caswell)
Date: Tue, 17 Mar 2015 14:04:46 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1426601086.433587.28441.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  6c4ce00753c5763cf836f6fec9ec07ed7c2e6e03 (commit)
       via  fcb61b6c92ac21c51ad23e4b983600747cdd8db1 (commit)
       via  b2b81639640e84046cdd5d869009eacef22448f5 (commit)
       via  56490fc26ff9dc2da162e6dc0675762edf607c1d (commit)
       via  f2e95a02b114d824905a5e2642287e060270515c (commit)
      from  912c8c92b5e703b19a6508de15b229e9fe788656 (commit)


- Log -----------------------------------------------------------------
commit 6c4ce00753c5763cf836f6fec9ec07ed7c2e6e03
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 16:42:55 2015 +0000

    Fix seg fault in s_time
    
    Passing a negative value for the "-time" option to s_time results in a seg
    fault. This commit fixes it so that time has to be greater than 0.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit dfef52f6f277327e118fdd0fe34486852c2789b6)

commit fcb61b6c92ac21c51ad23e4b983600747cdd8db1
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 14:37:26 2015 +0000

    Add sanity check to PRF
    
    The function tls1_PRF counts the number of digests in use and partitions
    security evenly between them. There always needs to be at least one digest
    in use, otherwise this is an internal error. Add a sanity check for this.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 668f6f08c62177ab5893fc26ebb67053aafdffc8)

commit b2b81639640e84046cdd5d869009eacef22448f5
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 12:54:44 2015 +0000

    Fix memset call in stack.c
    
    The function sk_zero is supposed to zero the elements held within a stack.
    It uses memset to do this. However it calculates the size of each element
    as being sizeof(char **) instead of sizeof(char *). This probably doesn't
    make much practical difference in most cases, but isn't a portable
    assumption.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 7132ac830fa08d9a936e011d7c541b0c52115b33)

commit 56490fc26ff9dc2da162e6dc0675762edf607c1d
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 11:25:03 2015 +0000

    Move malloc fail checks closer to malloc
    
    Move memory allocation failure checks closer to the site of the malloc in
    dgst app. Only a problem if the debug flag is set...but still should be
    fixed.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit be1477adc97e76f4b83ed8075589f529069bd5d1)

commit f2e95a02b114d824905a5e2642287e060270515c
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 11:10:47 2015 +0000

    Add malloc failure checks
    
    Add some missing checks for memory allocation failures in ca app.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit a561bfe944c0beba73551731cb98af70dfee3549)

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

Summary of changes:
 apps/ca.c            | 13 +++++++++++++
 apps/dgst.c          | 10 +++++-----
 apps/s_time.c        |  7 ++++++-
 crypto/stack/stack.c |  2 +-
 ssl/t1_enc.c         |  5 +++++
 5 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/apps/ca.c b/apps/ca.c
index 3215c56..d64ec4f 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -2821,6 +2821,11 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
     ASN1_GENERALIZEDTIME *comp_time = NULL;
     tmp = BUF_strdup(str);
 
+    if(!tmp) {
+        BIO_printf(bio_err, "memory allocation failure\n");
+        goto err;
+    }
+
     p = strchr(tmp, ',');
 
     rtime_str = tmp;
@@ -2838,6 +2843,10 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
 
     if (prevtm) {
         *prevtm = ASN1_UTCTIME_new();
+        if(!*prevtm) {
+            BIO_printf(bio_err, "memory allocation failure\n");
+            goto err;
+        }
         if (!ASN1_UTCTIME_set_string(*prevtm, rtime_str)) {
             BIO_printf(bio_err, "invalid revocation date %s\n", rtime_str);
             goto err;
@@ -2878,6 +2887,10 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
                 goto err;
             }
             comp_time = ASN1_GENERALIZEDTIME_new();
+            if(!comp_time) {
+                BIO_printf(bio_err, "memory allocation failure\n");
+                goto err;
+            }
             if (!ASN1_GENERALIZEDTIME_set_string(comp_time, arg_str)) {
                 BIO_printf(bio_err, "invalid compromised time %s\n", arg_str);
                 goto err;
diff --git a/apps/dgst.c b/apps/dgst.c
index 47c2f69..95e5fa3 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -293,6 +293,11 @@ int MAIN(int argc, char **argv)
 
     in = BIO_new(BIO_s_file());
     bmd = BIO_new(BIO_f_md());
+    if ((in == NULL) || (bmd == NULL)) {
+        ERR_print_errors(bio_err);
+        goto end;
+    }
+
     if (debug) {
         BIO_set_callback(in, BIO_debug_callback);
         /* needed for windows 3.1 */
@@ -304,11 +309,6 @@ int MAIN(int argc, char **argv)
         goto end;
     }
 
-    if ((in == NULL) || (bmd == NULL)) {
-        ERR_print_errors(bio_err);
-        goto end;
-    }
-
     if (out_bin == -1) {
         if (keyfile)
             out_bin = 1;
diff --git a/apps/s_time.c b/apps/s_time.c
index 5846f3a..a40997a 100644
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -302,6 +302,10 @@ static int parseArgs(int argc, char **argv)
             if (--argc < 1)
                 goto bad;
             maxTime = atoi(*(++argv));
+            if(maxTime <= 0) {
+                BIO_printf(bio_err, "time must be > 0\n");
+                badop = 1;
+            }
         } else {
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badop = 1;
@@ -550,7 +554,8 @@ int MAIN(int argc, char **argv)
          nConn, totalTime, ((double)nConn / totalTime), bytes_read);
     printf
         ("%d connections in %ld real seconds, %ld bytes read per connection\n",
-         nConn, (long)time(NULL) - finishtime + maxTime, bytes_read / nConn);
+         nConn, (long)time(NULL) - finishtime + maxTime,
+         bytes_read / (nConn?nConn:1));
 
     ret = 0;
  end:
diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index 47457c7..de437ac 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -312,7 +312,7 @@ void sk_zero(_STACK *st)
         return;
     if (st->num <= 0)
         return;
-    memset((char *)st->data, 0, sizeof(st->data) * st->num);
+    memset((char *)st->data, 0, sizeof(*st->data) * st->num);
     st->num = 0;
 }
 
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 84f5896..577885f 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -260,6 +260,11 @@ static int tls1_PRF(long digest_mask,
         if ((m << TLS1_PRF_DGST_SHIFT) & digest_mask)
             count++;
     }
+    if(!count) {
+        /* Should never happen */
+        SSLerr(SSL_F_TLS1_PRF, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
     len = slen / count;
     if (count == 1)
         slen = 0;

From matt at openssl.org  Tue Mar 17 14:05:00 2015
From: matt at openssl.org (Matt Caswell)
Date: Tue, 17 Mar 2015 14:05:00 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1426601100.758496.28751.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  6a43243d1d54a8bc4056eab76237e7d474edaafc (commit)
       via  f08731cd82566d14275b7749ca553bdd7f6267f3 (commit)
       via  f4b8760056ebc6d22666652fc34dc9ad8577856c (commit)
       via  d3554bff69d97b15fef063bdb0176a0b68021325 (commit)
       via  3f9117e161246f2f09754e277f2c986a840c1f74 (commit)
      from  eadc81e7dd3fde473a9e38a57b4c29cf6b699110 (commit)


- Log -----------------------------------------------------------------
commit 6a43243d1d54a8bc4056eab76237e7d474edaafc
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 16:42:55 2015 +0000

    Fix seg fault in s_time
    
    Passing a negative value for the "-time" option to s_time results in a seg
    fault. This commit fixes it so that time has to be greater than 0.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit dfef52f6f277327e118fdd0fe34486852c2789b6)

commit f08731cd82566d14275b7749ca553bdd7f6267f3
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 14:37:26 2015 +0000

    Add sanity check to PRF
    
    The function tls1_PRF counts the number of digests in use and partitions
    security evenly between them. There always needs to be at least one digest
    in use, otherwise this is an internal error. Add a sanity check for this.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 668f6f08c62177ab5893fc26ebb67053aafdffc8)

commit f4b8760056ebc6d22666652fc34dc9ad8577856c
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 12:54:44 2015 +0000

    Fix memset call in stack.c
    
    The function sk_zero is supposed to zero the elements held within a stack.
    It uses memset to do this. However it calculates the size of each element
    as being sizeof(char **) instead of sizeof(char *). This probably doesn't
    make much practical difference in most cases, but isn't a portable
    assumption.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 7132ac830fa08d9a936e011d7c541b0c52115b33)

commit d3554bff69d97b15fef063bdb0176a0b68021325
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 11:25:03 2015 +0000

    Move malloc fail checks closer to malloc
    
    Move memory allocation failure checks closer to the site of the malloc in
    dgst app. Only a problem if the debug flag is set...but still should be
    fixed.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit be1477adc97e76f4b83ed8075589f529069bd5d1)

commit 3f9117e161246f2f09754e277f2c986a840c1f74
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 11:10:47 2015 +0000

    Add malloc failure checks
    
    Add some missing checks for memory allocation failures in ca app.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit a561bfe944c0beba73551731cb98af70dfee3549)

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

Summary of changes:
 apps/ca.c            | 13 +++++++++++++
 apps/dgst.c          | 10 +++++-----
 apps/s_time.c        |  7 ++++++-
 crypto/stack/stack.c |  2 +-
 ssl/t1_enc.c         |  5 +++++
 5 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/apps/ca.c b/apps/ca.c
index 055548a..5d29a64 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -2803,6 +2803,11 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
     ASN1_GENERALIZEDTIME *comp_time = NULL;
     tmp = BUF_strdup(str);
 
+    if(!tmp) {
+        BIO_printf(bio_err, "memory allocation failure\n");
+        goto err;
+    }
+
     p = strchr(tmp, ',');
 
     rtime_str = tmp;
@@ -2820,6 +2825,10 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
 
     if (prevtm) {
         *prevtm = ASN1_UTCTIME_new();
+        if(!*prevtm) {
+            BIO_printf(bio_err, "memory allocation failure\n");
+            goto err;
+        }
         if (!ASN1_UTCTIME_set_string(*prevtm, rtime_str)) {
             BIO_printf(bio_err, "invalid revocation date %s\n", rtime_str);
             goto err;
@@ -2860,6 +2869,10 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
                 goto err;
             }
             comp_time = ASN1_GENERALIZEDTIME_new();
+            if(!comp_time) {
+                BIO_printf(bio_err, "memory allocation failure\n");
+                goto err;
+            }
             if (!ASN1_GENERALIZEDTIME_set_string(comp_time, arg_str)) {
                 BIO_printf(bio_err, "invalid compromised time %s\n", arg_str);
                 goto err;
diff --git a/apps/dgst.c b/apps/dgst.c
index 8459c19..ad2f234 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -287,6 +287,11 @@ int MAIN(int argc, char **argv)
 
     in = BIO_new(BIO_s_file());
     bmd = BIO_new(BIO_f_md());
+    if ((in == NULL) || (bmd == NULL)) {
+        ERR_print_errors(bio_err);
+        goto end;
+    }
+
     if (debug) {
         BIO_set_callback(in, BIO_debug_callback);
         /* needed for windows 3.1 */
@@ -298,11 +303,6 @@ int MAIN(int argc, char **argv)
         goto end;
     }
 
-    if ((in == NULL) || (bmd == NULL)) {
-        ERR_print_errors(bio_err);
-        goto end;
-    }
-
     if (out_bin == -1) {
         if (keyfile)
             out_bin = 1;
diff --git a/apps/s_time.c b/apps/s_time.c
index 5846f3a..a40997a 100644
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -302,6 +302,10 @@ static int parseArgs(int argc, char **argv)
             if (--argc < 1)
                 goto bad;
             maxTime = atoi(*(++argv));
+            if(maxTime <= 0) {
+                BIO_printf(bio_err, "time must be > 0\n");
+                badop = 1;
+            }
         } else {
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badop = 1;
@@ -550,7 +554,8 @@ int MAIN(int argc, char **argv)
          nConn, totalTime, ((double)nConn / totalTime), bytes_read);
     printf
         ("%d connections in %ld real seconds, %ld bytes read per connection\n",
-         nConn, (long)time(NULL) - finishtime + maxTime, bytes_read / nConn);
+         nConn, (long)time(NULL) - finishtime + maxTime,
+         bytes_read / (nConn?nConn:1));
 
     ret = 0;
  end:
diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index fbe9d6e..331f907 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -278,7 +278,7 @@ void sk_zero(_STACK *st)
         return;
     if (st->num <= 0)
         return;
-    memset((char *)st->data, 0, sizeof(st->data) * st->num);
+    memset((char *)st->data, 0, sizeof(*st->data) * st->num);
     st->num = 0;
 }
 
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index fa1c002..4e2845f 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -261,6 +261,11 @@ static int tls1_PRF(long digest_mask,
         if ((m << TLS1_PRF_DGST_SHIFT) & digest_mask)
             count++;
     }
+    if(!count) {
+        /* Should never happen */
+        SSLerr(SSL_F_TLS1_PRF, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
     len = slen / count;
     if (count == 1)
         slen = 0;

From matt at openssl.org  Tue Mar 17 14:54:24 2015
From: matt at openssl.org (Matt Caswell)
Date: Tue, 17 Mar 2015 14:54:24 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1426604064.792268.5779.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  636c42d747deb5cab78b66566e5feb4ffd61d15d (commit)
       via  28e4f659c5542f1625b5c20c51eab3987914b485 (commit)
      from  6a43243d1d54a8bc4056eab76237e7d474edaafc (commit)


- Log -----------------------------------------------------------------
commit 636c42d747deb5cab78b66566e5feb4ffd61d15d
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 14:09:00 2015 +0000

    Dead code removal from apps
    
    Some miscellaneous removal of dead code from apps. Also fix an issue with
    error handling with pkcs7.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 11abf92259e899f4f7da4a3e80781e84b0fb1a64)

commit 28e4f659c5542f1625b5c20c51eab3987914b485
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 14:08:21 2015 +0000

    Remove dead code from crypto
    
    Some miscellaneous removal of dead code from lib crypto.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit b7573c597c1932ef709b2455ffab47348b5c54e5)

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

Summary of changes:
 apps/pkcs7.c           | 10 +++++-----
 apps/s_server.c        |  2 +-
 crypto/bio/b_print.c   |  7 ++-----
 crypto/dso/dso_dlfcn.c |  7 +++----
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 4d80f82..643507f 100644
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -189,11 +189,11 @@ int MAIN(int argc, char **argv)
     if (infile == NULL)
         BIO_set_fp(in, stdin, BIO_NOCLOSE);
     else {
-        if (BIO_read_filename(in, infile) <= 0)
-            if (in == NULL) {
-                perror(infile);
-                goto end;
-            }
+        if (BIO_read_filename(in, infile) <= 0) {
+            BIO_printf(bio_err, "unable to load input file\n");
+            ERR_print_errors(bio_err);
+            goto end;
+        }
     }
 
     if (informat == FORMAT_ASN1)
diff --git a/apps/s_server.c b/apps/s_server.c
index caba5b3..bcf5c33 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -334,7 +334,7 @@ static unsigned int psk_server_cb(SSL *ssl, const char *identity,
     }
     if (s_debug)
         BIO_printf(bio_s_out, "identity_len=%d identity=%s\n",
-                   identity ? (int)strlen(identity) : 0, identity);
+                   (int)strlen(identity), identity);
 
     /* here we could lookup the given identity e.g. from a database */
     if (strcmp(identity, psk_identity) != 0) {
diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index f7940f2..c2cf6e6 100644
--- a/crypto/bio/b_print.c
+++ b/crypto/bio/b_print.c
@@ -592,7 +592,6 @@ fmtfp(char **sbuffer,
     int fplace = 0;
     int padlen = 0;
     int zpadlen = 0;
-    int caps = 0;
     long intpart;
     long fracpart;
     long max10;
@@ -630,8 +629,7 @@ fmtfp(char **sbuffer,
 
     /* convert integer part */
     do {
-        iconvert[iplace++] =
-            (caps ? "0123456789ABCDEF" : "0123456789abcdef")[intpart % 10];
+        iconvert[iplace++] = "0123456789"[intpart % 10];
         intpart = (intpart / 10);
     } while (intpart && (iplace < (int)sizeof(iconvert)));
     if (iplace == sizeof iconvert)
@@ -640,8 +638,7 @@ fmtfp(char **sbuffer,
 
     /* convert fractional part */
     do {
-        fconvert[fplace++] =
-            (caps ? "0123456789ABCDEF" : "0123456789abcdef")[fracpart % 10];
+        fconvert[fplace++] = "0123456789"[fracpart % 10];
         fracpart = (fracpart / 10);
     } while (fplace < max);
     if (fplace == sizeof fconvert)
diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
index c0fcbb1..f629f03 100644
--- a/crypto/dso/dso_dlfcn.c
+++ b/crypto/dso/dso_dlfcn.c
@@ -314,7 +314,7 @@ static char *dlfcn_merger(DSO *dso, const char *filespec1,
             return (NULL);
         }
         strcpy(merged, filespec2);
-    } else
+    } else {
         /*
          * This part isn't as trivial as it looks.  It assumes that the
          * second file specification really is a directory, and makes no
@@ -322,13 +322,12 @@ static char *dlfcn_merger(DSO *dso, const char *filespec1,
          * concatenation of filespec2 followed by a slash followed by
          * filespec1.
          */
-    {
         int spec2len, len;
 
         spec2len = strlen(filespec2);
-        len = spec2len + (filespec1 ? strlen(filespec1) : 0);
+        len = spec2len + strlen(filespec1);
 
-        if (filespec2 && filespec2[spec2len - 1] == '/') {
+        if (spec2len && filespec2[spec2len - 1] == '/') {
             spec2len--;
             len--;
         }

From matt at openssl.org  Tue Mar 17 14:54:34 2015
From: matt at openssl.org (Matt Caswell)
Date: Tue, 17 Mar 2015 14:54:34 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1426604074.812946.6121.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  c1559f5046092b542f8033bb8eec8bd88ce0d8f2 (commit)
       via  d8d2e503593ac429fa04b96c7722dcf1c33bdeb3 (commit)
      from  6c4ce00753c5763cf836f6fec9ec07ed7c2e6e03 (commit)


- Log -----------------------------------------------------------------
commit c1559f5046092b542f8033bb8eec8bd88ce0d8f2
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 14:09:00 2015 +0000

    Dead code removal from apps
    
    Some miscellaneous removal of dead code from apps. Also fix an issue with
    error handling with pkcs7.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 11abf92259e899f4f7da4a3e80781e84b0fb1a64)

commit d8d2e503593ac429fa04b96c7722dcf1c33bdeb3
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 14:08:21 2015 +0000

    Remove dead code from crypto
    
    Some miscellaneous removal of dead code from lib crypto.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit b7573c597c1932ef709b2455ffab47348b5c54e5)

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

Summary of changes:
 apps/pkcs7.c           | 10 +++++-----
 apps/s_server.c        |  2 +-
 crypto/bio/b_print.c   |  7 ++-----
 crypto/dso/dso_dlfcn.c |  7 +++----
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 4d80f82..643507f 100644
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -189,11 +189,11 @@ int MAIN(int argc, char **argv)
     if (infile == NULL)
         BIO_set_fp(in, stdin, BIO_NOCLOSE);
     else {
-        if (BIO_read_filename(in, infile) <= 0)
-            if (in == NULL) {
-                perror(infile);
-                goto end;
-            }
+        if (BIO_read_filename(in, infile) <= 0) {
+            BIO_printf(bio_err, "unable to load input file\n");
+            ERR_print_errors(bio_err);
+            goto end;
+        }
     }
 
     if (informat == FORMAT_ASN1)
diff --git a/apps/s_server.c b/apps/s_server.c
index d5d2492..a8491ac 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -347,7 +347,7 @@ static unsigned int psk_server_cb(SSL *ssl, const char *identity,
     }
     if (s_debug)
         BIO_printf(bio_s_out, "identity_len=%d identity=%s\n",
-                   identity ? (int)strlen(identity) : 0, identity);
+                   (int)strlen(identity), identity);
 
     /* here we could lookup the given identity e.g. from a database */
     if (strcmp(identity, psk_identity) != 0) {
diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index f7940f2..c2cf6e6 100644
--- a/crypto/bio/b_print.c
+++ b/crypto/bio/b_print.c
@@ -592,7 +592,6 @@ fmtfp(char **sbuffer,
     int fplace = 0;
     int padlen = 0;
     int zpadlen = 0;
-    int caps = 0;
     long intpart;
     long fracpart;
     long max10;
@@ -630,8 +629,7 @@ fmtfp(char **sbuffer,
 
     /* convert integer part */
     do {
-        iconvert[iplace++] =
-            (caps ? "0123456789ABCDEF" : "0123456789abcdef")[intpart % 10];
+        iconvert[iplace++] = "0123456789"[intpart % 10];
         intpart = (intpart / 10);
     } while (intpart && (iplace < (int)sizeof(iconvert)));
     if (iplace == sizeof iconvert)
@@ -640,8 +638,7 @@ fmtfp(char **sbuffer,
 
     /* convert fractional part */
     do {
-        fconvert[fplace++] =
-            (caps ? "0123456789ABCDEF" : "0123456789abcdef")[fracpart % 10];
+        fconvert[fplace++] = "0123456789"[fracpart % 10];
         fracpart = (fracpart / 10);
     } while (fplace < max);
     if (fplace == sizeof fconvert)
diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
index c0fcbb1..f629f03 100644
--- a/crypto/dso/dso_dlfcn.c
+++ b/crypto/dso/dso_dlfcn.c
@@ -314,7 +314,7 @@ static char *dlfcn_merger(DSO *dso, const char *filespec1,
             return (NULL);
         }
         strcpy(merged, filespec2);
-    } else
+    } else {
         /*
          * This part isn't as trivial as it looks.  It assumes that the
          * second file specification really is a directory, and makes no
@@ -322,13 +322,12 @@ static char *dlfcn_merger(DSO *dso, const char *filespec1,
          * concatenation of filespec2 followed by a slash followed by
          * filespec1.
          */
-    {
         int spec2len, len;
 
         spec2len = strlen(filespec2);
-        len = spec2len + (filespec1 ? strlen(filespec1) : 0);
+        len = spec2len + strlen(filespec1);
 
-        if (filespec2 && filespec2[spec2len - 1] == '/') {
+        if (spec2len && filespec2[spec2len - 1] == '/') {
             spec2len--;
             len--;
         }

From matt at openssl.org  Tue Mar 17 14:54:42 2015
From: matt at openssl.org (Matt Caswell)
Date: Tue, 17 Mar 2015 14:54:42 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426604082.207483.6391.nullmailer@dev.openssl.org>

The branch master has been updated
       via  11abf92259e899f4f7da4a3e80781e84b0fb1a64 (commit)
       via  b7573c597c1932ef709b2455ffab47348b5c54e5 (commit)
      from  e4676e900f165f5272991443225813002300b09b (commit)


- Log -----------------------------------------------------------------
commit 11abf92259e899f4f7da4a3e80781e84b0fb1a64
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 14:09:00 2015 +0000

    Dead code removal from apps
    
    Some miscellaneous removal of dead code from apps. Also fix an issue with
    error handling with pkcs7.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit b7573c597c1932ef709b2455ffab47348b5c54e5
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 12 14:08:21 2015 +0000

    Remove dead code from crypto
    
    Some miscellaneous removal of dead code from lib crypto.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 apps/pkcs7.c           | 10 +++++-----
 apps/s_server.c        |  2 +-
 crypto/bio/b_print.c   |  7 ++-----
 crypto/dso/dso_dlfcn.c |  7 +++----
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 4d80f82..643507f 100644
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -189,11 +189,11 @@ int MAIN(int argc, char **argv)
     if (infile == NULL)
         BIO_set_fp(in, stdin, BIO_NOCLOSE);
     else {
-        if (BIO_read_filename(in, infile) <= 0)
-            if (in == NULL) {
-                perror(infile);
-                goto end;
-            }
+        if (BIO_read_filename(in, infile) <= 0) {
+            BIO_printf(bio_err, "unable to load input file\n");
+            ERR_print_errors(bio_err);
+            goto end;
+        }
     }
 
     if (informat == FORMAT_ASN1)
diff --git a/apps/s_server.c b/apps/s_server.c
index 874b402..ec2fe6f 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -303,7 +303,7 @@ static unsigned int psk_server_cb(SSL *ssl, const char *identity,
     }
     if (s_debug)
         BIO_printf(bio_s_out, "identity_len=%d identity=%s\n",
-                   identity ? (int)strlen(identity) : 0, identity);
+                   (int)strlen(identity), identity);
 
     /* here we could lookup the given identity e.g. from a database */
     if (strcmp(identity, psk_identity) != 0) {
diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index f7940f2..c2cf6e6 100644
--- a/crypto/bio/b_print.c
+++ b/crypto/bio/b_print.c
@@ -592,7 +592,6 @@ fmtfp(char **sbuffer,
     int fplace = 0;
     int padlen = 0;
     int zpadlen = 0;
-    int caps = 0;
     long intpart;
     long fracpart;
     long max10;
@@ -630,8 +629,7 @@ fmtfp(char **sbuffer,
 
     /* convert integer part */
     do {
-        iconvert[iplace++] =
-            (caps ? "0123456789ABCDEF" : "0123456789abcdef")[intpart % 10];
+        iconvert[iplace++] = "0123456789"[intpart % 10];
         intpart = (intpart / 10);
     } while (intpart && (iplace < (int)sizeof(iconvert)));
     if (iplace == sizeof iconvert)
@@ -640,8 +638,7 @@ fmtfp(char **sbuffer,
 
     /* convert fractional part */
     do {
-        fconvert[fplace++] =
-            (caps ? "0123456789ABCDEF" : "0123456789abcdef")[fracpart % 10];
+        fconvert[fplace++] = "0123456789"[fracpart % 10];
         fracpart = (fracpart / 10);
     } while (fplace < max);
     if (fplace == sizeof fconvert)
diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
index c9a9a8b..8ebb2b5 100644
--- a/crypto/dso/dso_dlfcn.c
+++ b/crypto/dso/dso_dlfcn.c
@@ -299,7 +299,7 @@ static char *dlfcn_merger(DSO *dso, const char *filespec1,
             return (NULL);
         }
         strcpy(merged, filespec2);
-    } else
+    } else {
         /*
          * This part isn't as trivial as it looks.  It assumes that the
          * second file specification really is a directory, and makes no
@@ -307,13 +307,12 @@ static char *dlfcn_merger(DSO *dso, const char *filespec1,
          * concatenation of filespec2 followed by a slash followed by
          * filespec1.
          */
-    {
         int spec2len, len;
 
         spec2len = strlen(filespec2);
-        len = spec2len + (filespec1 ? strlen(filespec1) : 0);
+        len = spec2len + strlen(filespec1);
 
-        if (filespec2 && filespec2[spec2len - 1] == '/') {
+        if (spec2len && filespec2[spec2len - 1] == '/') {
             spec2len--;
             len--;
         }

From levitte at openssl.org  Tue Mar 17 16:04:05 2015
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 17 Mar 2015 16:04:05 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426608245.990772.20784.nullmailer@dev.openssl.org>

The branch master has been updated
       via  9e43c6b5c28731d13afcb4658dc2fa4dd188cc0b (commit)
      from  11abf92259e899f4f7da4a3e80781e84b0fb1a64 (commit)


- Log -----------------------------------------------------------------
commit 9e43c6b5c28731d13afcb4658dc2fa4dd188cc0b
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 17 16:30:54 2015 +0100

    Correct the request of debug builds
    
    ./config would translate -d into having the target get a 'debug-'
    prefix, and then run './Configure LIST' to find out if such a
    debugging target exists or not.
    
    With the recent changes, the separate 'debug-foo' targets are
    disappearing, and we're giving the normal targets debugging
    capabilities instead.  Unfortunately, './config' wasn't changed to
    match this new behavior.
    
    This change introduces the arguments '--debug' and '--release' - the
    latter just for orthogonality - to ./Configure, and ./config now
    treats -d by adding '--debug' to the options for ./Configure.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 Configure | 25 +++++++++++++++++++------
 config    |  2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/Configure b/Configure
index 705f4c6..4a34b4e 100755
--- a/Configure
+++ b/Configure
@@ -946,6 +946,7 @@ my $options;
 my $symlink;
 my $make_depend=0;
 my %withargs=();
+my $build_prefix = "release_";
 
 my @argvcopy=@ARGV;
 my $argvstring="";
@@ -1020,10 +1021,18 @@ PROCESS_ARGS:
 			{
 			exit(&test_sanity());
 			}
-		elsif (/^--strict-warnings/)
+		elsif (/^--strict-warnings$/)
 			{
 			$strict_warnings = 1;
 			}
+		elsif (/^--debug$/)
+			{
+			$build_prefix = "debug_";
+			}
+		elsif (/^--release$/)
+			{
+			$build_prefix = "release_";
+			}
 		elsif (/^reconfigure/ || /^reconf/)
 			{
 			if (open(IN,"<$Makefile"))
@@ -1234,10 +1243,10 @@ if ($target =~ m/^CygWin32(-.*)$/) {
 
 print "Configuring for $target\n";
 
+# Support for legacy targets having a name starting with 'debug-'
 my ($d, $t) = $target =~ m/^(debug-)?(.*)$/;
-my $debug_prefix = "release_";
 if ($d) {
-    $debug_prefix = "debug_";
+    $build_prefix = "debug_";
 
     # If we do not find debug-foo in the table, the target is set to foo,
     # but only if the foo target has a noon-empty debug_cflags or debug_lflags
@@ -1248,7 +1257,11 @@ if ($d) {
     }
 }
 
-&usage if (!defined($table{$target}) || $table{$target}->{template});
+&usage if (!defined($table{$target})
+	   || $table{$target}->{template}
+	   || ($build_prefix eq "debug_"
+	       && !($table{$target}->{debug_cflags}
+		    || $table{$target}->{debug_lflags})));
 
 if ($fips)
 	{
@@ -1359,10 +1372,10 @@ my $cc = $ENV{CC} || $table{$t}->{cc};
 # Do it in such a way that no spurious space is appended (hence the grep).
 my $cflags = join(" ",
 		  grep { $_ } ($table{$t}->{cflags},
-			       $table{$t}->{$debug_prefix."cflags"}));
+			       $table{$t}->{$build_prefix."cflags"}));
 my $lflags = join(" ",
 		  grep { $_ } ($table{$t}->{lflags},
-			       $table{$t}->{$debug_prefix."lflags"}));
+			       $table{$t}->{$build_prefix."lflags"}));
 
 my $unistd = $table{$t}->{unistd};
 my $thread_cflag = $table{$t}->{thread_cflag};
diff --git a/config b/config
index 8644211..44c48c1 100755
--- a/config
+++ b/config
@@ -29,7 +29,7 @@ EXE=""
 for i
 do
 case "$i" in 
--d*) PREFIX="debug-";;
+-d*) options=$options" --debug";;
 -t*) TEST="true";;
 -h*) TEST="true"; cat <<EOF
 Usage: config [options]

From steve at openssl.org  Wed Mar 18 12:32:18 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Wed, 18 Mar 2015 12:32:18 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1426681938.509236.13926.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  8b84495380098592ef7bb2fa9209ccb87803bf1d (commit)
      from  c1559f5046092b542f8033bb8eec8bd88ce0d8f2 (commit)


- Log -----------------------------------------------------------------
commit 8b84495380098592ef7bb2fa9209ccb87803bf1d
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Mar 17 15:55:11 2015 +0000

    Add support for ServerInfo SSL_CONF option.
    
    Add support for ServerInfo SSL_CONF option and update documentation. This
    was wrongly omitted from the 1.0.2 release.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 doc/ssl/SSL_CONF_cmd.pod |  5 +++++
 ssl/ssl_conf.c           | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/doc/ssl/SSL_CONF_cmd.pod b/doc/ssl/SSL_CONF_cmd.pod
index 6d073cb..2bf1a60 100644
--- a/doc/ssl/SSL_CONF_cmd.pod
+++ b/doc/ssl/SSL_CONF_cmd.pod
@@ -195,6 +195,11 @@ context. This option is only supported if certificate operations
 are permitted. Note: if no B<-key> option is set then a private key is
 not loaded: it does not currently use the B<Certificate> file.
 
+=item B<ServerInfoFile>
+
+Attempts to use the file B<value> in the "serverinfo" extension using the
+function SSL_CTX_use_serverinfo_file.
+
 =item B<DHParameters>
 
 Attempts to use the file B<value> as the set of temporary DH parameters for
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c
index d950242..5478840 100644
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c
@@ -386,6 +386,18 @@ static int cmd_PrivateKey(SSL_CONF_CTX *cctx, const char *value)
     return rv > 0;
 }
 
+static int cmd_ServerInfoFile(SSL_CONF_CTX *cctx, const char *value)
+{
+    int rv = 1;
+    if (!(cctx->flags & SSL_CONF_FLAG_CERTIFICATE))
+        return -2;
+    if (!(cctx->flags & SSL_CONF_FLAG_SERVER))
+        return -2;
+    if (cctx->ctx)
+        rv = SSL_CTX_use_serverinfo_file(cctx->ctx, value);
+    return rv > 0;
+}
+
 #ifndef OPENSSL_NO_DH
 static int cmd_DHParameters(SSL_CONF_CTX *cctx, const char *value)
 {
@@ -444,6 +456,7 @@ static const ssl_conf_cmd_tbl ssl_conf_cmds[] = {
     SSL_CONF_CMD_STRING(Options, NULL),
     SSL_CONF_CMD(Certificate, "cert", SSL_CONF_TYPE_FILE),
     SSL_CONF_CMD(PrivateKey, "key", SSL_CONF_TYPE_FILE),
+    SSL_CONF_CMD(ServerInfoFile, NULL, SSL_CONF_TYPE_FILE),
 #ifndef OPENSSL_NO_DH
     SSL_CONF_CMD(DHParameters, "dhparam", SSL_CONF_TYPE_FILE)
 #endif

From appro at openssl.org  Wed Mar 18 15:29:04 2015
From: appro at openssl.org (Andy Polyakov)
Date: Wed, 18 Mar 2015 15:29:04 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426692544.058986.16875.nullmailer@dev.openssl.org>

The branch master has been updated
       via  7ead0c89185c46378e3ed85c0012d083f4b3039b (commit)
      from  9e43c6b5c28731d13afcb4658dc2fa4dd188cc0b (commit)


- Log -----------------------------------------------------------------
commit 7ead0c89185c46378e3ed85c0012d083f4b3039b
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Mar 16 22:33:36 2015 +0100

    Configure: fold related configurations more aggressively and clean-up.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 Configurations/10-main.conf | 1268 ++++++++++++++-----------------------------
 Configure                   |   90 +--
 2 files changed, 418 insertions(+), 940 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index eb46789..9d38554 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -6,10 +6,12 @@
 
 %targets = (
 
-# Basic configs that should work on any (32 and less bit) box
+#### Basic configs that should work on any 32-bit box
     "gcc" => {
         cc               => "gcc",
-        cflags           => "-O3",
+        cflags           => "",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O3",
         thread_cflag     => "(unknown)",
         bn_ops           => "BN_LLONG",
     },
@@ -19,9 +21,8 @@
         thread_cflag     => "(unknown)",
     },
 
-####VOS Configurations
+#### VOS Configurations
     "vos-gcc" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "gcc",
         cflags           => "-Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN",
         debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG",
@@ -34,15 +35,17 @@
     },
 
 #### Solaris x86 with GNU C setups
-# -DOPENSSL_NO_INLINE_ASM switches off inline assembler. We have to do it
-# here because whenever GNU C instantiates an assembler template it
-# surrounds it with #APP #NO_APP comment pair which (at least Solaris
-# 7_x86) /usr/ccs/bin/as fails to assemble with "Illegal mnemonic"
-# error message.
     "solaris-x86-gcc" => {
-        inherit_from     => [ "x86_elf_asm" ],
-        cc               => "gcc",
-        cflags           => "-O3 -fomit-frame-pointer -march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM",
+        # -DOPENSSL_NO_INLINE_ASM switches off inline assembler. We have
+        # to do it here because whenever GNU C instantiates an assembler
+        # template it surrounds it with #APP #NO_APP comment pair which
+        # (at least Solaris 7_x86) /usr/ccs/bin/as fails to assemble
+        # with "Illegal mnemonic" error message.
+        inherit_from     => [ asm("x86_elf_asm") ],
+        cc               => "gcc",
+        cflags           => "-march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O3 -fomit-frame-pointer",
         thread_cflag     => "-D_REENTRANT",
         lflags           => "-lsocket -lnsl -ldl",
         bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
@@ -52,18 +55,20 @@
         shared_ldflag    => "-shared",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
-# -shared -static-libgcc might appear controversial, but modules taken
-# from static libgcc do not have relocations and linking them into our
-# shared objects doesn't have any negative side-effects. On the contrary,
-# doing so makes it possible to use gcc shared build with Sun C. Given
-# that gcc generates faster code [thanks to inline assembler], I would
-# actually recommend to consider using gcc shared build even with vendor
-# compiler:-)
-#						<appro at fy.chalmers.se>
     "solaris64-x86_64-gcc" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "gcc",
-        cflags           => "-m64 -O3 -Wall -DL_ENDIAN",
+        # -shared -static-libgcc might appear controversial, but modules
+        # taken from static libgcc do not have relocations and linking
+        # them into our shared objects doesn't have any negative side
+        # effects. On the contrary, doing so makes it possible to use
+        # gcc shared build with Sun C. Given that gcc generates faster
+        # code [thanks to inline assembler], I would actually recommend
+        # to consider using gcc shared build even with vendor compiler:-)
+        #					<appro at fy.chalmers.se>
+        inherit_from     => [ asm("x86_64_asm") ],
+        cc               => "gcc",
+        cflags           => "-m64 -Wall -DL_ENDIAN",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O3",
         thread_cflag     => "-D_REENTRANT",
         lflags           => "-lsocket -lnsl -ldl",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
@@ -78,9 +83,10 @@
 
 #### Solaris x86 with Sun C setups
     "solaris-x86-cc" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "cc",
-        cflags           => "-fast -xarch=generic -O -Xa",
+        cflags           => "-xarch=generic -xstrconst -Xa -DL_ENDIAN",
+        debug_cflags     => "-g",
+        release_cflags   => "-xO5 -xregs=frameptr -xdepend -xbuiltin",
         thread_cflag     => "-D_REENTRANT",
         lflags           => "-lsocket -lnsl -ldl",
         bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR",
@@ -91,9 +97,11 @@
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "solaris64-x86_64-cc" => {
-        inherit_from     => [ "x86_64_asm" ],
+        inherit_from     => [ asm("x86_64_asm") ],
         cc               => "cc",
-        cflags           => "-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN",
+        cflags           => "-xarch=generic64 -xstrconst -Xa -DL_ENDIAN",
+        debug_cflags     => "-g",
+        release_cflags   => "-xO5 -xdepend -xbuiltin",
         thread_cflag     => "-D_REENTRANT",
         lflags           => "-lsocket -lnsl -ldl",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
@@ -101,16 +109,17 @@
         dso_scheme       => "dlfcn",
         shared_target    => "solaris-shared",
         shared_cflag     => "-KPIC",
-        shared_ldflag    => "-xarch=amd64 -G -dy -z text",
+        shared_ldflag    => "-xarch=generic64 -G -dy -z text",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "/64",
     },
 
 #### SPARC Solaris with GNU C setups
     "solaris-sparcv7-gcc" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "gcc",
-        cflags           => "-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W",
+        cflags           => "-Wall -DB_ENDIAN -DBN_DIV2W",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O3",
         thread_cflag     => "-D_REENTRANT",
         lflags           => "-lsocket -lnsl -ldl",
         bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
@@ -120,52 +129,25 @@
         shared_ldflag    => "-shared",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
-####
     "solaris-sparcv8-gcc" => {
-        inherit_from     => [ "sparcv8_asm" ],
-        cc               => "gcc",
-        cflags           => "-mv8 -Wall -DB_ENDIAN",
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g",
-        release_cflags   => "-O3 -fomit-frame-pointer -DBN_DIV2W",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-lsocket -lnsl -ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "solaris-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-shared",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        inherit_from     => [ "solaris-sparcv7-gcc", asm("sparcv8_asm") ],
+        cflags           => sub { join(" ","-mv8", at _); },
     },
-# -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc
     "solaris-sparcv9-gcc" => {
-        inherit_from     => [ "sparcv9_asm" ],
+        # -m32 should be safe to add as long as driver recognizes
+	# -mcpu=ultrasparc
+        inherit_from     => [ "solaris-sparcv7-gcc", asm("sparcv9_asm") ],
         cc               => "gcc",
-        cflags           => "-m32 -mcpu=ultrasparc -Wall -DB_ENDIAN -DBN_DIV2W",
+        cflags           => sub { join(" ","-m32 -mcpu=ultrasparc", at _); },
         debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -pedantic -ansi -Wshadow -Wno-long-long -D__EXTENSIONS__",
-        release_cflags   => "-O3 -fomit-frame-pointer",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "ULTRASPARC",
-        lflags           => "-lsocket -lnsl -ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "solaris-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-shared",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        release_cflags   => "-O3",
     },
     "solaris64-sparcv9-gcc" => {
-        inherit_from     => [ "sparcv9_asm" ],
+        inherit_from     => [ "solaris-sparcv9-gcc" ],
         cc               => "gcc",
-        cflags           => "-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "ULTRASPARC",
-        lflags           => "-lsocket -lnsl -ldl",
+        cflags           => "-m64 -mcpu=ultrasparc -Wall -DB_ENDIAN",
         bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "solaris-shared",
-        shared_cflag     => "-fPIC",
         shared_ldflag    => "-m64 -shared",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "/64",
     },
 
@@ -174,9 +156,10 @@
 # SC4.2 is ok, better than gcc even on bn as long as you tell it -xarch=v8
 # SC5.0 note: Compiler common patch 107357-01 or later is required!
     "solaris-sparcv7-cc" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "cc",
-        cflags           => "-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W",
+        cflags           => "-xstrconst -Xa -DB_ENDIAN -DBN_DIV2W",
+        debug_cflags     => "-g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL",
+        release_cflags   => "-xO5 -xdepend",
         thread_cflag     => "-D_REENTRANT",
         lflags           => "-lsocket -lnsl -ldl",
         bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR",
@@ -188,58 +171,29 @@
     },
 ####
     "solaris-sparcv8-cc" => {
-        inherit_from     => [ "sparcv8_asm" ],
-        cc               => "cc",
-        cflags           => "-xarch=v8 -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W",
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O",
-        release_cflags   => "-xO5 -xdepend",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-lsocket -lnsl -ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "solaris-shared",
-        shared_cflag     => "-KPIC",
-        shared_ldflag    => "-G -dy -z text",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        inherit_from     => [ "solaris-sparcv7-cc", asm("sparcv8_asm") ],
+        cflags           => sub { join(" ","-xarch=v8", at _); },
     },
     "solaris-sparcv9-cc" => {
-        inherit_from     => [ "sparcv9_asm" ],
-        cc               => "cc",
-        cflags           => "-xtarget=ultra -xarch=v8plus -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W",
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O",
-        release_cflags   => "-xO5 -xdepend",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "ULTRASPARC",
-        lflags           => "-lsocket -lnsl -ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "solaris-shared",
-        shared_cflag     => "-KPIC",
-        shared_ldflag    => "-G -dy -z text",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        inherit_from     => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ],
+        cflags           => sub { join(" ","-xarch=v8plus -xtarget=ultra", at _); },
     },
     "solaris64-sparcv9-cc" => {
-        inherit_from     => [ "sparcv9_asm" ],
-        cc               => "cc",
-        cflags           => "-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "ULTRASPARC",
-        lflags           => "-lsocket -lnsl -ldl",
+        inherit_from     => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ],
+        cflags           => sub { join(" ","-xarch=v9 -xtarget=ultra", at _); },
         bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "solaris-shared",
-        shared_cflag     => "-KPIC",
         shared_ldflag    => "-xarch=v9 -G -dy -z text",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "/64",
     },
 
 #### IRIX 5.x configs
 # -mips2 flag is added by ./config when appropriate.
     "irix-gcc" => {
-        inherit_from     => [ "mips32_asm" ],
+        inherit_from     => [ asm("mips32_asm") ],
         cc               => "gcc",
-        cflags           => "-O3 -DB_ENDIAN",
+        cflags           => "-DB_ENDIAN",
+        debug_cflags     => "-g -O0",
+        release_cflags   => "-O3",
         thread_cflag     => "(unknown)",
         bn_ops           => "BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR",
         perlasm_scheme   => "o32",
@@ -248,9 +202,11 @@
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "irix-cc" => {
-        inherit_from     => [ "mips32_asm" ],
+        inherit_from     => [ asm("mips32_asm") ],
         cc               => "cc",
-        cflags           => "-O2 -use_readonly_const -DB_ENDIAN",
+        cflags           => "-use_readonly_const -DB_ENDIAN",
+        debug_cflags     => "-g -O0",
+        release_cflags   => "-O2",
         thread_cflag     => "(unknown)",
         bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC2 DES_UNROLL BF_PTR",
         perlasm_scheme   => "o32",
@@ -262,9 +218,11 @@
 # Only N32 and N64 ABIs are supported. If you need O32 ABI build, invoke
 # './Configure irix-cc -o32' manually.
     "irix-mips3-gcc" => {
-        inherit_from     => [ "mips64_asm" ],
+        inherit_from     => [ asm("mips64_asm") ],
         cc               => "gcc",
-        cflags           => "-mabi=n32 -O3 -DB_ENDIAN -DBN_DIV3W",
+        cflags           => "-mabi=n32 -DB_ENDIAN -DBN_DIV3W",
+        debug_cflags     => "-g -O0",
+        release_cflags   => "-O3",
         thread_cflag     => "-D_SGI_MP_SOURCE",
         bn_ops           => "MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT",
         perlasm_scheme   => "n32",
@@ -275,9 +233,11 @@
         multilib         => "32",
     },
     "irix-mips3-cc" => {
-        inherit_from     => [ "mips64_asm" ],
+        inherit_from     => [ asm("mips64_asm") ],
         cc               => "cc",
-        cflags           => "-n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W",
+        cflags           => "-n32 -mips3 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W",
+        debug_cflags     => "-g -O0",
+        release_cflags   => "-O2",
         thread_cflag     => "-D_SGI_MP_SOURCE",
         bn_ops           => "DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT",
         perlasm_scheme   => "n32",
@@ -287,11 +247,13 @@
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "32",
     },
-# N64 ABI builds.
+    # N64 ABI builds.
     "irix64-mips4-gcc" => {
-        inherit_from     => [ "mips64_asm" ],
+        inherit_from     => [ asm("mips64_asm") ],
         cc               => "gcc",
-        cflags           => "-mabi=64 -mips4 -O3 -DB_ENDIAN -DBN_DIV3W",
+        cflags           => "-mabi=64 -mips4 -DB_ENDIAN -DBN_DIV3W",
+        debug_cflags     => "-g -O0",
+        release_cflags   => "-O3",
         thread_cflag     => "-D_SGI_MP_SOURCE",
         bn_ops           => "RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "64",
@@ -302,9 +264,11 @@
         multilib         => "64",
     },
     "irix64-mips4-cc" => {
-        inherit_from     => [ "mips64_asm" ],
+        inherit_from     => [ asm("mips64_asm") ],
         cc               => "cc",
-        cflags           => "-64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W",
+        cflags           => "-64 -mips4 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W",
+        debug_cflags     => "-g -O0",
+        release_cflags   => "-O2",
         thread_cflag     => "-D_SGI_MP_SOURCE",
         bn_ops           => "RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "64",
@@ -331,36 +295,23 @@
 # - Keep in mind that the HP compiler by default generates code
 #   suitable for execution on the host you're currently compiling at.
 #   If the toolkit is ment to be used on various PA-RISC processors
-#   consider './config +DAportable'.
-# - +DD64 is chosen in favour of +DA2.0W because it's meant to be
-#   compatible with *future* releases.
-# - If you run ./Configure hpux-parisc-[g]cc manually don't forget to
-#   pass -D_REENTRANT on HP-UX 10 and later.
+#   consider './Configure hpux-parisc-[g]cc +DAportable'.
 # - -DMD32_XARRAY triggers workaround for compiler bug we ran into in
 #   32-bit message digests. (For the moment of this writing) HP C
 #   doesn't seem to "digest" too many local variables (they make "him"
 #   chew forever:-). For more details look-up MD32_XARRAY comment in
 #   crypto/sha/sha_lcl.h.
+# - originally there were 32-bit hpux-parisc2-* targets. They were
+#   scrapped, because a) they were not interchangable with other 32-bit
+#   targets; a) when critical 32-bit assembly modules detect if they
+#   are executed on PA-RISC 2.0 and thus adequate performance is
+#   provided. 
 #					<appro at fy.chalmers.se>
-#
-# Since there is mention of this in shlib/hpux10-cc.sh
-    "hpux-parisc-cc-o4" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "cc",
-        cflags           => "-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldld",
-        bn_ops           => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1",
-        dso_scheme       => "dl",
-        shared_target    => "hpux-shared",
-        shared_cflag     => "+Z",
-        shared_ldflag    => "-b",
-        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
     "hpux-parisc-gcc" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "gcc",
-        cflags           => "-O3 -DB_ENDIAN -DBN_DIV2W",
+        cflags           => "-DB_ENDIAN -DBN_DIV2W",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O3",
         thread_cflag     => "-D_REENTRANT",
         lflags           => "-Wl,+s -ldld",
         bn_ops           => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1",
@@ -371,39 +322,18 @@
         shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "hpux-parisc1_1-gcc" => {
-        inherit_from     => [ "parisc11_asm" ],
-        cc               => "gcc",
-        cflags           => "-O3 -DB_ENDIAN -DBN_DIV2W",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-Wl,+s -ldld",
-        bn_ops           => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1",
-        dso_scheme       => "dl",
-        shared_target    => "hpux-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-shared",
-        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        inherit_from     => [ "hpux-parisc-gcc", asm("parisc11_asm") ],
         multilib         => "/pa1.1",
     },
-    "hpux-parisc2-gcc" => {
-        inherit_from     => [ "parisc20_32_asm" ],
-        cc               => "gcc",
-        cflags           => "-march=2.0 -O3 -DB_ENDIAN -D_REENTRANT",
-        lflags           => "-Wl,+s -ldld",
-        bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL DES_RISC1",
-        dso_scheme       => "dl",
-        shared_target    => "hpux-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-shared",
-        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-        multilib         => "/pa20_32",
-    },
     "hpux64-parisc2-gcc" => {
+        inherit_from     => [ asm("parisc20_64_asm") ],
         cc               => "gcc",
-        cflags           => "-O3 -DB_ENDIAN -D_REENTRANT",
+        cflags           => "-DB_ENDIAN",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O3",
+        thread_cflag     => "-D_REENTRANT",
         lflags           => "-ldl",
         bn_ops           => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT",
-        bn_obj           => "pa-risc2W.o",
-        perlasm_scheme   => "void",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         shared_cflag     => "-fpic",
@@ -412,14 +342,15 @@
         multilib         => "/pa20_64",
     },
 
-# More attempts at unified 10.X and 11.X targets for HP C compiler.
-#
-# Chris Ruemmler <ruemmler at cup.hp.com>
-# Kevin Steves <ks at hp.se>
+    # More attempts at unified 10.X and 11.X targets for HP C compiler.
+    #
+    # Chris Ruemmler <ruemmler at cup.hp.com>
+    # Kevin Steves <ks at hp.se>
     "hpux-parisc-cc" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "cc",
-        cflags           => "+O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY",
+        cflags           => "+Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY",
+        debug_cflags      => "+O0 +d -g",
+        release_cflags   => "+O3",
         thread_cflag     => "-D_REENTRANT",
         lflags           => "-Wl,+s -ldld",
         bn_ops           => "MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT",
@@ -430,36 +361,17 @@
         shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "hpux-parisc1_1-cc" => {
-        inherit_from     => [ "parisc11_asm" ],
-        cc               => "cc",
-        cflags           => "+DA1.1 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-Wl,+s -ldld",
-        bn_ops           => "MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT",
-        dso_scheme       => "dl",
-        shared_target    => "hpux-shared",
-        shared_cflag     => "+Z",
-        shared_ldflag    => "-b",
-        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        inherit_from     => [ "hpux-parisc-cc", asm("parisc11_asm") ],
+        cflags           => sub { join(" ","+DA1.1", at _); },
         multilib         => "/pa1.1",
     },
-    "hpux-parisc2-cc" => {
-        inherit_from     => [ "parisc20_32_asm" ],
-        cc               => "cc",
-        cflags           => "+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT",
-        lflags           => "-Wl,+s -ldld",
-        bn_ops           => "SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT",
-        dso_scheme       => "dl",
-        shared_target    => "hpux-shared",
-        shared_cflag     => "+Z",
-        shared_ldflag    => "-b",
-        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-        multilib         => "/pa20_32",
-    },
     "hpux64-parisc2-cc" => {
-        inherit_from     => [ "parisc20_64_asm" ],
+        inherit_from     => [ asm("parisc20_64_asm") ],
         cc               => "cc",
-        cflags           => "+DD64 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT",
+        cflags           => "+DD64 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY",
+        debug_cflags      => "+O0 +d -g",
+        release_cflags   => "+O3",
+        thread_cflag     => "-D_REENTRANT",
         lflags           => "-ldl",
         bn_ops           => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT",
         dso_scheme       => "dlfcn",
@@ -470,11 +382,14 @@
         multilib         => "/pa20_64",
     },
 
-# HP/UX IA-64 targets
+    # HP/UX IA-64 targets
     "hpux-ia64-cc" => {
-        inherit_from     => [ "ia64_asm" ],
+        inherit_from     => [ asm("ia64_asm") ],
         cc               => "cc",
-        cflags           => "-Ae +DD32 +O2 +Olit=all -z -DB_ENDIAN -D_REENTRANT",
+        cflags           => "-Ae +DD32 +Olit=all -z -DB_ENDIAN",
+        debug_cflags     => "+O0 +d -g",
+        release_cflags   => "+O2",
+        thread_cflag     => "-D_REENTRANT",
         lflags           => "-ldl",
         bn_ops           => "SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT",
         dso_scheme       => "dlfcn",
@@ -484,12 +399,15 @@
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "/hpux32",
     },
-# Frank Geurts <frank.geurts at nl.abnamro.com> has patiently assisted with
-# with debugging of the following config.
+    # Frank Geurts <frank.geurts at nl.abnamro.com> has patiently assisted
+    # with debugging of the following config.
     "hpux64-ia64-cc" => {
-        inherit_from     => [ "ia64_asm" ],
+        inherit_from     => [ asm("ia64_asm") ],
         cc               => "cc",
-        cflags           => "-Ae +DD64 +O3 +Olit=all -z -DB_ENDIAN -D_REENTRANT",
+        cflags           => "-Ae +DD64 +Olit=all -z -DB_ENDIAN",
+        debug_cflags     => "+O0 +d -g",
+        release_cflags   => "+O3",
+        thread_cflag     => "-D_REENTRANT",
         lflags           => "-ldl",
         bn_ops           => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT",
         dso_scheme       => "dlfcn",
@@ -499,11 +417,14 @@
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "/hpux64",
     },
-# GCC builds...
+    # GCC builds...
     "hpux-ia64-gcc" => {
-        inherit_from     => [ "ia64_asm" ],
+        inherit_from     => [ asm("ia64_asm") ],
         cc               => "gcc",
-        cflags           => "-O3 -DB_ENDIAN -D_REENTRANT",
+        cflags           => "-DB_ENDIAN",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O3",
+        thread_cflag     => "-D_REENTRANT",
         lflags           => "-ldl",
         bn_ops           => "SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT",
         dso_scheme       => "dlfcn",
@@ -514,9 +435,12 @@
         multilib         => "/hpux32",
     },
     "hpux64-ia64-gcc" => {
-        inherit_from     => [ "ia64_asm" ],
+        inherit_from     => [ asm("ia64_asm") ],
         cc               => "gcc",
-        cflags           => "-mlp64 -O3 -DB_ENDIAN -D_REENTRANT",
+        cflags           => "-mlp64 -DB_ENDIAN",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O3",
+        thread_cflag     => "-D_REENTRANT",
         lflags           => "-ldl",
         bn_ops           => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT",
         dso_scheme       => "dlfcn",
@@ -527,34 +451,6 @@
         multilib         => "/hpux64",
     },
 
-# Legacy HPUX 9.X configs...
-    "hpux-cc" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "cc",
-        cflags           => "-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O2 -z",
-        thread_cflag     => "(unknown)",
-        lflags           => "-Wl,+s -ldld",
-        bn_ops           => "DES_PTR DES_UNROLL DES_RISC1",
-        dso_scheme       => "dl",
-        shared_target    => "hpux-shared",
-        shared_cflag     => "+Z",
-        shared_ldflag    => "-b",
-        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "hpux-gcc" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "gcc",
-        cflags           => "-DB_ENDIAN -DBN_DIV2W -O3",
-        thread_cflag     => "(unknown)",
-        lflags           => "-Wl,+s -ldld",
-        bn_ops           => "DES_PTR DES_UNROLL DES_RISC1",
-        dso_scheme       => "dl",
-        shared_target    => "hpux-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-shared",
-        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-
 #### HP MPE/iX http://jazz.external.hp.com/src/openssl/
     "MPE/iX-gcc" => {
         cc               => "gcc",
@@ -565,7 +461,7 @@
         bn_ops           => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1",
     },
 
-# DEC Alpha OSF/1/Tru64 targets.
+#### DEC Alpha OSF/1/Tru64 targets.
 #
 #	"What's in a name? That which we call a rose
 #	 By any other word would smell as sweet."
@@ -575,7 +471,7 @@
 # For gcc, the following gave a %50 speedup on a 164 over the 'DES_INT' version
 #
     "osf1-alpha-gcc" => {
-        inherit_from     => [ "alpha_asm" ],
+        inherit_from     => [ asm("alpha_asm") ],
         cc               => "gcc",
         cflags           => "-O3",
         thread_cflag     => "(unknown)",
@@ -585,7 +481,7 @@
         shared_extension => ".so",
     },
     "osf1-alpha-cc" => {
-        inherit_from     => [ "alpha_asm" ],
+        inherit_from     => [ asm("alpha_asm") ],
         cc               => "cc",
         cflags           => "-std1 -tune host -O4 -readonly_strings",
         thread_cflag     => "(unknown)",
@@ -595,7 +491,7 @@
         shared_extension => ".so",
     },
     "tru64-alpha-cc" => {
-        inherit_from     => [ "alpha_asm" ],
+        inherit_from     => [ asm("alpha_asm") ],
         cc               => "cc",
         cflags           => "-std1 -tune host -fast -readonly_strings",
         thread_cflag     => "-pthread",
@@ -612,11 +508,10 @@
 # *-generic* is endian-neutral target, but ./config is free to
 # throw in -D[BL]_ENDIAN, whichever appropriate...
     "linux-generic32" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "gcc",
         cflags           => "-Wall",
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g",
-        release_cflags   => "-O3 -fomit-frame-pointer",
+        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG",
+        release_cflags   => "-O3",
         thread_cflag     => "-D_REENTRANT",
         lflags           => "-ldl",
         bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
@@ -625,425 +520,206 @@
         shared_cflag     => "-fPIC",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
+    "linux-generic64" => {
+        inherit_from     => [ "linux-generic32" ],
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+    },
+
     "linux-ppc" => {
-        inherit_from     => [ "ppc32_asm" ],
-        cc               => "gcc",
-        cflags           => "-DB_ENDIAN -O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL",
+        inherit_from     => [ "linux-generic32", asm("ppc32_asm") ],
         perlasm_scheme   => "linux32",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "linux-ppc64" => {
+        inherit_from     => [ "linux-generic64", asm("ppc64_asm") ],
+        cflags           => "-m64 -Wall -DB_ENDIAN",
+        perlasm_scheme   => "linux64",
+        shared_ldflag    => "-m64",
+        multilib         => "64",
+    },
+    "linux-ppc64le" => {
+        inherit_from     => [ "linux-generic64", asm("ppc64_asm") ],
+        cflags           => "-m64 -Wall -DL_ENDIAN",
+        perlasm_scheme   => "linux64le",
+        shared_ldflag    => "-m64",
     },
 
-#######################################################################
-# Note that -march is not among compiler options in below linux-armv4
-# target line. Not specifying one is intentional to give you choice to:
-#
-# a) rely on your compiler default by not specifying one;
-# b) specify your target platform explicitly for optimal performance,
-#    e.g. -march=armv6 or -march=armv7-a;
-# c) build "universal" binary that targets *range* of platforms by
-#    specifying minimum and maximum supported architecture;
-#
-# As for c) option. It actually makes no sense to specify maximum to be
-# less than ARMv7, because it's the least requirement for run-time
-# switch between platform-specific code paths. And without run-time
-# switch performance would be equivalent to one for minimum. Secondly,
-# there are some natural limitations that you'd have to accept and
-# respect. Most notably you can *not* build "universal" binary for
-# big-endian platform. This is because ARMv7 processor always picks
-# instructions in little-endian order. Another similar limitation is
-# that -mthumb can't "cross" -march=armv6t2 boundary, because that's
-# where it became Thumb-2. Well, this limitation is a bit artificial,
-# because it's not really impossible, but it's deemed too tricky to
-# support. And of course you have to be sure that your binutils are
-# actually up to the task of handling maximum target platform. With all
-# this in mind here is an example of how to configure "universal" build:
-#
-#       ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8
-#
     "linux-armv4" => {
-        inherit_from     => [ "armv4_asm" ],
-        cc               => "gcc",
-        cflags           => "-O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        ################################################################
+        # Note that -march is not among compiler options in linux-armv4
+        # target description. Not specifying one is intentional to give
+        # you choice to:
+        #
+        # a) rely on your compiler default by not specifying one;
+        # b) specify your target platform explicitly for optimal
+        # performance, e.g. -march=armv6 or -march=armv7-a;
+        # c) build "universal" binary that targets *range* of platforms
+        # by specifying minimum and maximum supported architecture;
+        #
+        # As for c) option. It actually makes no sense to specify
+        # maximum to be less than ARMv7, because it's the least
+        # requirement for run-time switch between platform-specific
+        # code paths. And without run-time switch performance would be
+        # equivalent to one for minimum. Secondly, there are some
+        # natural limitations that you'd have to accept and respect.
+        # Most notably you can *not* build "universal" binary for
+        # big-endian platform. This is because ARMv7 processor always
+        # picks instructions in little-endian order. Another similar
+        # limitation is that -mthumb can't "cross" -march=armv6t2
+        # boundary, because that's where it became Thumb-2. Well, this
+        # limitation is a bit artificial, because it's not really
+        # impossible, but it's deemed too tricky to support. And of
+        # course you have to be sure that your binutils are actually
+        # up to the task of handling maximum target platform. With all
+        # this in mind here is an example of how to configure
+        # "universal" build:
+        #
+        # ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8
+        #
+        inherit_from     => [ "linux-generic32", asm("armv4_asm") ],
+        perlasm_scheme   => "linux32",
     },
     "linux-aarch64" => {
-        inherit_from     => [ "aarch64_asm" ],
-        cc               => "gcc",
-        cflags           => "-O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        inherit_from     => [ "linux-generic64", asm("aarch64_asm") ],
         perlasm_scheme   => "linux64",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
-# Configure script adds minimally required -march for assembly support,
-# if no -march was specified at command line. mips32 and mips64 below
-# refer to contemporary MIPS Architecture specifications, MIPS32 and
-# MIPS64, rather than to kernel bitness.
+
     "linux-mips32" => {
-        inherit_from     => [ "mips32_asm" ],
-        cc               => "gcc",
-        cflags           => "-mabi=32 -O3 -Wall -DBN_DIV3W",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        # Configure script adds minimally required -march for assembly
+        # support, if no -march was specified at command line.
+        inherit_from     => [ "linux-generic32", asm("mips32_asm") ],
+        cflags           => "-mabi=32 -Wall -DBN_DIV3W",
         perlasm_scheme   => "o32",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        shared_ldflag    => "-mabi=32",
     },
+    # mips32 and mips64 below refer to contemporary MIPS Architecture
+    # specifications, MIPS32 and MIPS64, rather than to kernel bitness.
     "linux-mips64" => {
-        inherit_from     => [ "mips64_asm" ],
-        cc               => "gcc",
-        cflags           => "-mabi=n32 -O3 -Wall -DBN_DIV3W",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
+        inherit_from     => [ "linux-generic32", asm("mips64_asm") ],
+        cflags           => "-mabi=n32 -Wall -DBN_DIV3W",
         bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
         perlasm_scheme   => "n32",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
         shared_ldflag    => "-mabi=n32",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "32",
     },
     "linux64-mips64" => {
-        inherit_from     => [ "mips64_asm" ],
-        cc               => "gcc",
+        inherit_from     => [ "linux-generic64", asm("mips64_asm") ],
         cflags           => "-mabi=64 -O3 -Wall -DBN_DIV3W",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
         perlasm_scheme   => "64",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
         shared_ldflag    => "-mabi=64",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "64",
     },
-#### IA-32 targets...
-    "linux-ia32-icc" => {
-        inherit_from     => [ "x86_elf_asm" ],
-        cc               => "icc",
-        cflags           => "-DL_ENDIAN -O2",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl -no_cpprt",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-KPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
+
+    #### IA-32 targets...
     "linux-elf" => {
-        inherit_from     => [ "x86_elf_asm" ],
+        inherit_from     => [ "linux-generic32", asm("x86_elf_asm") ],
         cc               => "gcc",
-        cflags           => "-DL_ENDIAN -Wall",
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -g -march=i486",
+        cflags           => "-march=i486 -DL_ENDIAN -Wall",
+        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG",
         release_cflags   => "-O3 -fomit-frame-pointer",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
         debug_lflags     => "-lefence",
         bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "linux-aout" => {
-        inherit_from     => [ "x86_asm" ],
+        inherit_from     => [ asm("x86_asm") ],
         cc               => "gcc",
-        cflags           => "-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall",
+        cflags           => "-DL_ENDIAN -march=i486 -Wall",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O3 -fomit-frame-pointer",
         thread_cflag     => "(unknown)",
         bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
         perlasm_scheme   => "a.out",
     },
-####
-    "linux-generic64" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "gcc",
-        cflags           => "-Wall",
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g",
-        release_cflags   => "-O3",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "linux-ppc64" => {
-        inherit_from     => [ "ppc64_asm" ],
-        cc               => "gcc",
-        cflags           => "-m64 -DB_ENDIAN -O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL",
-        perlasm_scheme   => "linux64",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-m64",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-        multilib         => "64",
-    },
-    "linux-ppc64le" => {
-        inherit_from     => [ "ppc64_asm" ],
-        cc               => "gcc",
-        cflags           => "-m64 -DL_ENDIAN -O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL",
-        perlasm_scheme   => "linux64le",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-m64",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "linux-ia64" => {
-        inherit_from     => [ "ia64_asm" ],
-        cc               => "gcc",
-        cflags           => "-DL_ENDIAN -O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "linux-ia64-icc" => {
-        inherit_from     => [ "ia64_asm" ],
-        cc               => "icc",
-        cflags           => "-DL_ENDIAN -O2 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl -no_cpprt",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
+
     "linux-x86_64" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "gcc",
+        inherit_from     => [ "linux-generic64", asm("x86_64_asm") ],
         cflags           => "-m64 -DL_ENDIAN -Wall",
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g",
-        release_cflags   => "-O3",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
-        perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-m64",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-        multilib         => "64",
-    },
-    "linux-x86_64-clang" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "clang",
-        cflags           => "-m64 -DL_ENDIAN -O3 -Weverything $clang_disabled_warnings -Qunused-arguments",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
-        perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-m64",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-        multilib         => "64",
-    },
-    "linux-x86_64-icc" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "icc",
-        cflags           => "-DL_ENDIAN -O2",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl -no_cpprt",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
         perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        shared_ldflag    => "-m64",
         multilib         => "64",
     },
+    "linux-x86_64-clang" => {
+        inherit_from     => [ "linux-x86_64" ],
+        cc               => "clang",
+        cflags           => "-m64 -DL_ENDIAN -Weverything $clang_disabled_warnings -Qunused-arguments",
+    },
     "linux-x32" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "gcc",
-        cflags           => "-mx32 -DL_ENDIAN -O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
+        inherit_from     => [ "linux-generic32", asm("x86_64_asm") ],
+        cflags           => "-mx32 -DL_ENDIAN -Wall",
         bn_ops           => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT DES_UNROLL",
         perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
         shared_ldflag    => "-mx32",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "x32",
     },
+
+    "linux-ia64" => {
+        inherit_from     => [ "linux-generic64", asm("ia64_asm") ],
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT",
+    },
+
     "linux64-s390x" => {
-        inherit_from     => [ "s390x_asm" ],
-        cc               => "gcc",
-        cflags           => "-m64 -DB_ENDIAN -O3 -Wall",
+        inherit_from     => [ "linux-generic64", asm("s390x_asm") ],
+        cflags           => "-m64 -Wall -DB_ENDIAN",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL",
         perlasm_scheme   => "64",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
         shared_ldflag    => "-m64",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "64",
     },
-#### So called "highgprs" target for z/Architecture CPUs
-# "Highgprs" is kernel feature first implemented in Linux 2.6.32, see
-# /proc/cpuinfo. The idea is to preserve most significant bits of
-# general purpose registers not only upon 32-bit process context
-# switch, but even on asynchronous signal delivery to such process.
-# This makes it possible to deploy 64-bit instructions even in legacy
-# application context and achieve better [or should we say adequate]
-# performance. The build is binary compatible with linux-generic32,
-# and the idea is to be able to install the resulting libcrypto.so
-# alongside generic one, e.g. as /lib/highgprs/libcrypto.so.x.y, for
-# ldconfig and run-time linker to autodiscover. Unfortunately it
-# doesn't work just yet, because of couple of bugs in glibc
-# sysdeps/s390/dl-procinfo.c affecting ldconfig and ld.so.1...
     "linux32-s390x" => {
-        inherit_from     => [ "s390x_32_asm" ],
-        cc               => "gcc",
-        cflags           => "-m31 -Wa,-mzarch -DB_ENDIAN -O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL",
+        #### So called "highgprs" target for z/Architecture CPUs
+        # "Highgprs" is kernel feature first implemented in Linux
+        # 2.6.32, see /proc/cpuinfo. The idea is to preserve most
+        # significant bits of general purpose registers not only
+        # upon 32-bit process context switch, but even on
+        # asynchronous signal delivery to such process. This makes
+        # it possible to deploy 64-bit instructions even in legacy
+        # application context and achieve better [or should we say
+        # adequate] performance. The build is binary compatible with
+        # linux-generic32, and the idea is to be able to install the
+        # resulting libcrypto.so alongside generic one, e.g. as
+        # /lib/highgprs/libcrypto.so.x.y, for ldconfig and run-time
+        # linker to autodiscover. Unfortunately it doesn't work just
+        # yet, because of couple of bugs in glibc
+        # sysdeps/s390/dl-procinfo.c affecting ldconfig and ld.so.1...
+        #
+        inherit_from     => [ "linux-generic32", asm("s390x_asm") ],
+        cflags           => "-m31 -Wall -Wa,-mzarch -DB_ENDIAN",
+        bn_obj           => sub { my $r=join(" ", at _); $r=~s/bn\-s390x/bn_asm/; $r; },
         perlasm_scheme   => "31",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
         shared_ldflag    => "-m31",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "/highgprs",
     },
-#### SPARC Linux setups
-# Ray Miller <ray.miller at computing-services.oxford.ac.uk> has patiently
-# assisted with debugging of following two configs.
+
+    #### SPARC Linux setups
+    # Ray Miller <ray.miller at computing-services.oxford.ac.uk> has
+    # patiently assisted with debugging of following two configs.
     "linux-sparcv8" => {
-        inherit_from     => [ "sparcv8_asm" ],
-        cc               => "gcc",
-        cflags           => "-mv8 -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -DBN_DIV2W",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        inherit_from     => [ "linux-generic32", asm("sparcv8_asm") ],
+        cflags           => "-mv8 -Wall -DB_ENDIAN -DBN_DIV2W",
     },
-# it's a real mess with -mcpu=ultrasparc option under Linux, but
-# -Wa,-Av8plus should do the trick no matter what.
     "linux-sparcv9" => {
-        inherit_from     => [ "sparcv9_asm" ],
-        cc               => "gcc",
-        cflags           => "-m32 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "ULTRASPARC",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
+        # it's a real mess with -mcpu=ultrasparc option under Linux,
+        # but -Wa,-Av8plus should do the trick no matter what.
+        inherit_from     => [ "linux-generic32", asm("sparcv9_asm") ],
+        cflags           => "-m32 -mcpu=ultrasparc -Wall -Wa,-Av8plus -DB_ENDIAN -DBN_DIV2W",
         shared_ldflag    => "-m32",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
-# GCC 3.1 is a requirement
     "linux64-sparcv9" => {
-        inherit_from     => [ "sparcv9_asm" ],
-        cc               => "gcc",
-        cflags           => "-m64 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "ULTRASPARC",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
+        # GCC 3.1 is a requirement
+        inherit_from     => [ "linux-generic64", asm("sparcv9_asm") ],
+        cflags           => "-m64 -mcpu=ultrasparc -Wall -DB_ENDIAN",
+        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
         shared_ldflag    => "-m64",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "64",
     },
-#### Alpha Linux with GNU C and Compaq C setups
-# Special notes:
-# - linux-alpha+bwx-gcc is ment to be used from ./config only. If you
-#   ought to run './Configure linux-alpha+bwx-gcc' manually, do
-#   complement the command line with -mcpu=ev56, -mcpu=ev6 or whatever
-#   which is appropriate.
-# - If you use ccc keep in mind that -fast implies -arch host and the
-#   compiler is free to issue instructions which gonna make elder CPU
-#   choke. If you wish to build "blended" toolkit, add -arch generic
-#   *after* -fast and invoke './Configure linux-alpha-ccc' manually.
+
     "linux-alpha-gcc" => {
-        inherit_from     => [ "alpha_asm" ],
-        cc               => "gcc",
-        cflags           => "-O3 -DL_ENDIAN",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
+        inherit_from     => [ "linux-generic64", asm("alpha_asm") ],
+        cflags           => "-DL_ENDIAN",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "linux-alpha+bwx-gcc" => {
-        inherit_from     => [ "alpha_asm" ],
-        cc               => "gcc",
-        cflags           => "-O3 -DL_ENDIAN",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "linux-alpha-ccc" => {
-        inherit_from     => [ "alpha_asm" ],
-        cc               => "ccc",
-        cflags           => "-fast -readonly_strings -DL_ENDIAN",
-        thread_cflag     => "-D_REENTRANT",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL",
     },
-    "linux-alpha+bwx-ccc" => {
-        inherit_from     => [ "alpha_asm" ],
-        cc               => "ccc",
-        cflags           => "-fast -readonly_strings -DL_ENDIAN",
-        thread_cflag     => "-D_REENTRANT",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL",
-    },
-#
-# TI_CGT_C6000_7.3.x is a requirement
     "linux-c64xplus" => {
+        # TI_CGT_C6000_7.3.x is a requirement
         cc               => "cl6x",
         cflags           => "--linux -ea=.s -eo=.o -mv6400+ -o2 -ox -ms -pden -DOPENSSL_SMALL_FOOTPRINT",
         thread_cflag     => "-D_REENTRANT",
@@ -1063,62 +739,33 @@
         ranlib           => "true",
     },
 
-# Android: linux-* but without pointers to headers and libs.
+#### Android: linux-* but without pointers to headers and libs.
     "android" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "gcc",
-        cflags           => "-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        inherit_from     => [ "linux-generic32" ],
+        cflags           => "-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -Wall",
+        debug_cflags     => "-O0 -g",
     },
     "android-x86" => {
-        inherit_from     => [ "android_x86_elf_asm" ],
-        cc               => "gcc",
-        cflags           => "-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
+        inherit_from     => [ "android", asm("x86_asm") ],
+        release_cflags   => "-O3 -fomit-frame-pointer",
         bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        perlasm_scheme   => "android",
     },
     "android-armv7" => {
-        inherit_from     => [ "armv4_asm" ],
-        cc               => "gcc",
-        cflags           => "-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        inherit_from     => [ "android", asm("armv4_asm") ],
+        cflags           => sub { join (" ","-march=armv7-a", at _); },
     },
     "android-mips" => {
-        inherit_from     => [ "mips32_asm" ],
-        cc               => "gcc",
-        cflags           => "-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        inherit_from     => [ "android", asm("mips32_asm") ],
         perlasm_scheme   => "o32",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
 
 #### *BSD [do see comment about ${BSDthreads} in Configure!]
     "BSD-generic32" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "gcc",
-        cflags           => "-O3 -fomit-frame-pointer -Wall",
+        cflags           => "-Wall",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O3",
         thread_cflag     => "${BSDthreads}",
         bn_ops           => "BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL",
         dso_scheme       => "dlfcn",
@@ -1126,94 +773,52 @@
         shared_cflag     => "-fPIC",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
-    "BSD-x86" => {
-        inherit_from     => [ "x86_asm" ],
-        cc               => "gcc",
-        cflags           => "-DL_ENDIAN -O3 -fomit-frame-pointer -Wall",
-        thread_cflag     => "${BSDthreads}",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
-        perlasm_scheme   => "a.out",
-        dso_scheme       => "dlfcn",
-        shared_target    => "bsd-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "BSD-generic64" => {
+        inherit_from     => [ "BSD-generic32" ],
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
     },
-    "BSD-x86-elf" => {
-        inherit_from     => [ "x86_elf_asm" ],
-        cc               => "gcc",
+
+    "BSD-x86" => {
+        inherit_from     => [ "BSD-generic32", asm("x86_asm") ],
         cflags           => "-DL_ENDIAN -Wall",
-        debug_cflags     => "-g",
         release_cflags   => "-O3 -fomit-frame-pointer",
-        thread_cflag     => "${BSDthreads}",
         bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
-        dso_scheme       => "dlfcn",
         shared_target    => "bsd-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        perlasm_scheme   => "a.out",
     },
-    "BSD-sparcv8" => {
-        inherit_from     => [ "sparcv8_asm" ],
-        cc               => "gcc",
-        cflags           => "-DB_ENDIAN -O3 -mv8 -Wall",
-        thread_cflag     => "${BSDthreads}",
-        bn_ops           => "BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL",
-        dso_scheme       => "dlfcn",
-        shared_target    => "bsd-gcc-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "BSD-x86-elf" => {
+        inherit_from     => [ "BSD-x86" ],
+        perlasm_scheme   => "elf",
     },
 
-    "BSD-generic64" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "gcc",
-        cflags           => "-O3 -Wall",
-        thread_cflag     => "${BSDthreads}",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
-        dso_scheme       => "dlfcn",
-        shared_target    => "bsd-gcc-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "BSD-sparcv8" => {
+        inherit_from     => [ "BSD-generic32", asm("sparcv8_asm") ],
+        cflags           => "-mv8 -Wall -DB_ENDIAN",
     },
-# -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
-# simply *happens* to work around a compiler bug in gcc 3.3.3,
-# triggered by RIPEMD160 code.
     "BSD-sparc64" => {
-        inherit_from     => [ "sparcv9_asm" ],
-        cc               => "gcc",
-        cflags           => "-DB_ENDIAN -O3 -DMD32_REG_T=int -Wall",
-        thread_cflag     => "${BSDthreads}",
+        # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
+        # simply *happens* to work around a compiler bug in gcc 3.3.3,
+        # triggered by RIPEMD160 code.
+        inherit_from     => [ "BSD-generic64", asm("sparcv9_asm") ],
+        cflags           => "-DB_ENDIAN -DMD32_REG_T=int -Wall",
         bn_ops           => "BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "bsd-gcc-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
+
     "BSD-ia64" => {
-        inherit_from     => [ "ia64_asm" ],
-        cc               => "gcc",
-        cflags           => "-DL_ENDIAN -O3 -Wall",
-        thread_cflag     => "${BSDthreads}",
+        inherit_from     => [ "BSD-generic64", asm("ia64_asm") ],
+        cflags           => "-DL_ENDIAN -Wall",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT",
-        dso_scheme       => "dlfcn",
-        shared_target    => "bsd-gcc-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
+
     "BSD-x86_64" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "gcc",
-        cflags           => "-DL_ENDIAN -O3 -Wall",
-        thread_cflag     => "${BSDthreads}",
+        inherit_from     => [ "BSD-generic64", asm("x86_64_asm") ],
+        cflags           => "-DL_ENDIAN -Wall",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
         perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "bsd-gcc-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
 
     "bsdi-elf-gcc" => {
-        inherit_from     => [ "x86_elf_asm" ],
+        inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "gcc",
         cflags           => "-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall",
         thread_cflag     => "(unknown)",
@@ -1248,7 +853,6 @@
         bn_ops           => "${x86_gcc_des} ${x86_gcc_opts}",
     },
     "QNX6" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "gcc",
         lflags           => "-lsocket",
         dso_scheme       => "dlfcn",
@@ -1257,7 +861,7 @@
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "QNX6-i386" => {
-        inherit_from     => [ "x86_elf_asm" ],
+        inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "gcc",
         cflags           => "-DL_ENDIAN -O2 -Wall",
         lflags           => "-lsocket",
@@ -1295,7 +899,7 @@
         bn_ops           => "${x86_gcc_des} ${x86_gcc_opts}",
     },
     "unixware-7" => {
-        inherit_from     => [ "x86_elf_asm" ],
+        inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "cc",
         cflags           => "-O -DFILIO_H -Kalloca",
         thread_cflag     => "-Kthread",
@@ -1308,7 +912,7 @@
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "unixware-7-gcc" => {
-        inherit_from     => [ "x86_elf_asm" ],
+        inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "gcc",
         cflags           => "-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall",
         thread_cflag     => "-D_REENTRANT",
@@ -1322,7 +926,7 @@
     },
 # SCO 5 - Ben Laurie <ben at algroup.co.uk> says the -O breaks the SCO cc.
     "sco5-cc" => {
-        inherit_from     => [ "x86_elf_asm" ],
+        inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "cc",
         cflags           => "-belf",
         thread_cflag     => "(unknown)",
@@ -1335,7 +939,7 @@
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "sco5-gcc" => {
-        inherit_from     => [ "x86_elf_asm" ],
+        inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "gcc",
         cflags           => "-O3 -fomit-frame-pointer",
         thread_cflag     => "(unknown)",
@@ -1349,17 +953,12 @@
     },
 
 #### IBM's AIX.
-    "aix3-cc" => {
-        cc               => "cc",
-        cflags           => "-O -DB_ENDIAN -qmaxmem=16384",
-        thread_cflag     => "(unknown)",
-        sys_id           => "AIX",
-        bn_ops           => "BN_LLONG RC4_CHAR",
-    },
     "aix-gcc" => {
-        inherit_from     => [ "ppc32_asm" ],
+        inherit_from     => [ asm("ppc32_asm") ],
         cc               => "gcc",
-        cflags           => "-O -DB_ENDIAN",
+        cflags           => "-DB_ENDIAN",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O",
         thread_cflag     => "-pthread",
         sys_id           => "AIX",
         bn_ops           => "BN_LLONG RC4_CHAR",
@@ -1371,9 +970,11 @@
         arflags          => "-X32",
     },
     "aix64-gcc" => {
-        inherit_from     => [ "ppc64_asm" ],
+        inherit_from     => [ asm("ppc64_asm") ],
         cc               => "gcc",
-        cflags           => "-maix64 -O -DB_ENDIAN",
+        cflags           => "-maix64 -DB_ENDIAN",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O",
         thread_cflag     => "-pthread",
         sys_id           => "AIX",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
@@ -1384,12 +985,15 @@
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         arflags          => "-X64",
     },
-# Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE
-# at build time. $OBJECT_MODE is respected at ./config stage!
+    # Below targets assume AIX 5. Idea is to effectively disregard
+    # $OBJECT_MODE at build time. $OBJECT_MODE is respected at
+    # ./config stage!
     "aix-cc" => {
-        inherit_from     => [ "ppc32_asm" ],
+        inherit_from     => [ asm("ppc32_asm") ],
         cc               => "cc",
-        cflags           => "-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst",
+        cflags           => "-q32 -DB_ENDIAN -qmaxmem=16384 -qro -qroconst",
+        debug_cflags     => "",
+        release_cflags   => "-O",
         thread_cflag     => "-qthreaded -D_THREAD_SAFE",
         sys_id           => "AIX",
         bn_ops           => "BN_LLONG RC4_CHAR",
@@ -1401,9 +1005,11 @@
         arflags          => "-X 32",
     },
     "aix64-cc" => {
-        inherit_from     => [ "ppc64_asm" ],
+        inherit_from     => [ asm("ppc64_asm") ],
         cc               => "cc",
-        cflags           => "-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst",
+        cflags           => "-q64 -DB_ENDIAN -qmaxmem=16384 -qro -qroconst",
+        debug_cflags     => "",
+        release_cflags   => "-O",
         thread_cflag     => "-qthreaded -D_THREAD_SAFE",
         sys_id           => "AIX",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
@@ -1435,7 +1041,7 @@
         bn_ops           => "THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR",
     },
 
-# Visual C targets
+#### Visual C targets
 #
 # Win64 targets, WIN64I denotes IA-64 and WIN64A - AMD64
 #
@@ -1443,79 +1049,59 @@
 # positives in some situations. Disabling it altogether masks both
 # legitimate and false cases, but as we compile on multiple platforms,
 # we rely on other compilers to catch legitimate cases.
-    "VC-WIN64I" => {
+    "VC-common" => {
+        template         => 1,
         cc               => "cl",
-        cflags           => "-W3 -wd4090 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE",
-        sys_id           => "WIN64I",
-        bn_ops           => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN",
-        cpuid_obj        => "ia64cpuid.o",
-        bn_obj           => "ia64.o ia64-mont.o",
-        aes_obj          => "aes_core.o aes_cbc.o aes-ia64.o",
-        md5_obj          => "md5-ia64.o",
-        sha1_obj         => "sha1-ia64.o sha256-ia64.o sha512-ia64.o",
-        modes_obj        => "ghash-ia64.o",
-        perlasm_scheme   => "ias",
+        cflags           => "-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE",
         dso_scheme       => "win32",
     },
-    "debug-VC-WIN64I" => {
-        cc               => "cl",
-        cflags           => "-W3 -wd4090 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE",
+    "VC-WIN64I" => {
+        inherit_from     => [ "VC-common", asm("ia64_asm") ],
+        cflags           => sub { join(" ", at _,"-DUNICODE -D_UNICODE"); },
         sys_id           => "WIN64I",
         bn_ops           => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN",
-        cpuid_obj        => "ia64cpuid.o",
-        bn_obj           => "ia64.o",
-        aes_obj          => "aes_core.o aes_cbc.o aes-ia64.o",
-        md5_obj          => "md5-ia64.o",
-        sha1_obj         => "sha1-ia64.o sha256-ia64.o sha512-ia64.o",
-        modes_obj        => "ghash-ia64.o",
+        bn_obj           => sub { my $r=join(" ", at _); $r=~s/bn\-//; $r; },
+        rc4_obj          => "",
         perlasm_scheme   => "ias",
-        dso_scheme       => "win32",
     },
     "VC-WIN64A" => {
-        inherit_from     => [ "win_x86_64_asm" ],
-        cc               => "cl",
-        cflags           => "-W3 -wd4090 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE",
-        debug_cflags     => "-Zi",
+        inherit_from     => [ "VC-common", asm("x86_64_asm") ],
+        cflags           => sub { join(" ", at _,"-DUNICODE -D_UNICODE"); },
         sys_id           => "WIN64A",
         bn_ops           => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN",
+        bn_obj           => sub { my $r=join(" ", at _); $r=~s/x86_64\-gcc/bn_asm/; $r; },
         perlasm_scheme   => "auto",
-        dso_scheme       => "win32",
     },
-# x86 Win32 target defaults to ANSI API, if you want UNICODE, complement
-# 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE'
     "VC-WIN32" => {
-        inherit_from     => [ "x86_asm" ],
-        cc               => "cl",
-        cflags           => "-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE",
-        debug_cflags     => "-Zi",
+        # x86 Win32 target defaults to ANSI API, if you want UNICODE,
+        # configure with 'perl Configure VC-WIN32 -DUNICODE -D_UNICODE'
+        inherit_from     => [ "VC-common", asm("x86_asm") ],
         sys_id           => "WIN32",
         bn_ops           => "BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}",
         perlasm_scheme   => "win32n",
-        dso_scheme       => "win32",
     },
-# Unified CE target
     "VC-CE" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "cl",
         sys_id           => "WINCE",
         bn_ops           => "BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}",
         dso_scheme       => "win32",
     },
 
-# Borland C++ 4.5
+#### Borland C++ 4.5
     "BC-32" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "bcc32",
         sys_id           => "WIN32",
         bn_ops           => "BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN",
         dso_scheme       => "win32",
     },
 
-# MinGW
+#### MinGW
     "mingw" => {
-        inherit_from     => [ "x86_asm" ],
+        inherit_from     => [ asm("x86_asm") ],
         cc               => "gcc",
-        cflags           => "-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 -march=i486 -Wall",
+        cflags           => "-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -march=i486 -Wall",
+        debug_cflags     => "-g -O0",
+        release_clags    => "-O3 -fomit-frame-pointer",
         thread_cflag     => "-D_MT",
         sys_id           => "MINGW32",
         lflags           => "-lws2_32 -lgdi32 -lcrypt32",
@@ -1527,17 +1113,20 @@
         shared_ldflag    => "-mno-cygwin",
         shared_extension => ".dll.a",
     },
-# As for OPENSSL_USE_APPLINK. Applink makes it possible to use .dll
-# compiled with one compiler with application compiled with another
-# compiler. It's possible to engage Applink support in mingw64 build,
-# but it's not done, because till mingw64 supports structured exception
-# handling, one can't seriously consider its binaries for using with
-# non-mingw64 run-time environment. And as mingw64 is always consistent
-# with itself, Applink is never engaged and can as well be omitted.
     "mingw64" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "gcc",
-        cflags           => "-mno-cygwin -DL_ENDIAN -O3 -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE",
+        # As for OPENSSL_USE_APPLINK. Applink makes it possible to use
+        # .dll compiled with one compiler with application compiled with
+        # another compiler. It's possible to engage Applink support in
+        # mingw64 build, but it's not done, because till mingw64
+        # supports structured exception handling, one can't seriously
+        # consider its binaries for using with non-mingw64 run-time
+        # environment. And as mingw64 is always consistent with itself,
+        # Applink is never engaged and can as well be omitted.
+        inherit_from     => [ asm("x86_64_asm") ],
+        cc               => "gcc",
+        cflags           => "-mno-cygwin -DL_ENDIAN -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE",
+        debug_cflags     => "-g -O0",
+        release_clags    => "-O3",
         thread_cflag     => "-D_MT",
         sys_id           => "MINGW64",
         lflags           => "-lws2_32 -lgdi32 -lcrypt32",
@@ -1550,9 +1139,8 @@
         shared_extension => ".dll.a",
     },
 
-# UWIN
+#### UWIN
     "UWIN" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "cc",
         cflags           => "-DTERMIOS -DL_ENDIAN -O -Wall",
         sys_id           => "UWIN",
@@ -1560,11 +1148,13 @@
         dso_scheme       => "win32",
     },
 
-# Cygwin
+#### Cygwin
     "Cygwin" => {
-        inherit_from     => [ "x86_asm" ],
+        inherit_from     => [ asm("x86_asm") ],
         cc               => "gcc",
-        cflags           => "-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall",
+        cflags           => "-DTERMIOS -DL_ENDIAN -march=i486 -Wall",
+        debug_cflags     => "-g -O0",
+        release_clags    => "-O3 -fomit-frame-pointer",
         sys_id           => "CYGWIN",
         bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
         perlasm_scheme   => "coff",
@@ -1575,9 +1165,11 @@
         shared_extension => ".dll.a",
     },
     "Cygwin-x86_64" => {
-        inherit_from     => [ "x86_64_asm" ],
+        inherit_from     => [ asm("x86_64_asm") ],
         cc               => "gcc",
-        cflags           => "-DTERMIOS -DL_ENDIAN -O3 -Wall",
+        cflags           => "-DTERMIOS -DL_ENDIAN -Wall",
+        debug_cflags     => "-g -O0",
+        release_clags    => "-O3",
         sys_id           => "CYGWIN",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
         perlasm_scheme   => "mingw64",
@@ -1588,7 +1180,7 @@
         shared_extension => ".dll.a",
     },
 
-# NetWare from David Ward (dsward at novell.com)
+#### NetWare from David Ward (dsward at novell.com)
 # requires either MetroWerks NLM development tools, or gcc / nlmconv
 # NetWare defaults socket bio to WinSock sockets. However,
 # the builds can be configured to use BSD sockets instead.
@@ -1611,7 +1203,7 @@
         cflags           => "-nostdinc -I/ndk/nwsdk/include/nlm -DNETWARE_BSDSOCK -DNETDB_USE_INTERNET -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall",
         bn_ops           => "${x86_gcc_opts}",
     },
-# netware-libc => LibC/NKS support
+    # netware-libc => LibC/NKS support
     "netware-libc" => {
         cc               => "mwccnlm",
         bn_ops           => "BN_LLONG ${x86_gcc_opts}",
@@ -1631,9 +1223,9 @@
         bn_ops           => "BN_LLONG ${x86_gcc_opts}",
     },
 
-# DJGPP
+#### DJGPP
     "DJGPP" => {
-        inherit_from     => [ "x86_asm" ],
+        inherit_from     => [ asm("x86_asm") ],
         cc               => "gcc",
         cflags           => "-I/dev/env/WATT_ROOT/inc -DTERMIO -DL_ENDIAN -fomit-frame-pointer -O2 -Wall",
         sys_id           => "MSDOS",
@@ -1642,7 +1234,7 @@
         perlasm_scheme   => "a.out",
     },
 
-# Ultrix from Bernhard Simon <simon at zid.tuwien.ac.at>
+#### Ultrix from Bernhard Simon <simon at zid.tuwien.ac.at>
     "ultrix-cc" => {
         cc               => "cc",
         cflags           => "-std1 -O -Olimit 2500 -DL_ENDIAN",
@@ -1658,11 +1250,11 @@
 ##"ultrix","cc:-O2 -DNOPROTO -DNOCONST -DL_ENDIAN::(unknown):::::::",
 
 ##### MacOS X (a.k.a. Darwin) setup
-    "darwin-ppc-cc" => {
-        inherit_from     => [ "ppc32_asm" ],
+    "darwin-common" => {
+        template         => 1,
         cc               => "cc",
-        cflags           => "-arch ppc -DB_ENDIAN -Wa,-force_cpusubtype_ALL",
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g -Wall -O",
+        cflags           => "",
+        debug_cflags     => "-g -O0",
         release_cflags   => "-O3",
         thread_cflag     => "-D_REENTRANT",
         sys_id           => "MACOSX",
@@ -1672,59 +1264,39 @@
         dso_scheme       => "dlfcn",
         shared_target    => "darwin-shared",
         shared_cflag     => "-fPIC -fno-common",
-        shared_ldflag    => "-arch ppc -dynamiclib",
+        shared_ldflag    => "-dynamiclib",
         shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
     },
+    "darwin-ppc-cc" => {
+        inherit_from     => [ "darwin-common", asm("ppc32_asm") ],
+        cflags           => "-arch ppc -DB_ENDIAN -Wa,-force_cpusubtype_ALL",
+        perlasm_scheme   => "osx32",
+        shared_ldflag    => "-arch ppc -dynamiclib",
+    },
     "darwin64-ppc-cc" => {
-        inherit_from     => [ "ppc64_asm" ],
-        cc               => "cc",
-        cflags           => "-arch ppc64 -O3 -DB_ENDIAN",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "MACOSX",
-        lflags           => "-Wl,-search_paths_first%",
+        inherit_from     => [ "darwin-common", asm("ppc64_asm") ],
+        cflags           => "-arch ppc64 -DB_ENDIAN",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
         perlasm_scheme   => "osx64",
-        dso_scheme       => "dlfcn",
-        shared_target    => "darwin-shared",
-        shared_cflag     => "-fPIC -fno-common",
         shared_ldflag    => "-arch ppc64 -dynamiclib",
-        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
     },
     "darwin-i386-cc" => {
-        inherit_from     => [ "x86_asm_nocast" ],
-        cc               => "cc",
+        inherit_from     => [ "darwin-common", asm("x86_asm") ],
         cflags           => "-arch i386 -DL_ENDIAN",
-        debug_cflags     => "-g3",
         release_cflags   => "-O3 -fomit-frame-pointer",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "MACOSX",
-        lflags           => "-Wl,-search_paths_first%",
         bn_ops           => "BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR",
         perlasm_scheme   => "macosx",
-        dso_scheme       => "dlfcn",
-        shared_target    => "darwin-shared",
-        shared_cflag     => "-fPIC -fno-common",
         shared_ldflag    => "-arch i386 -dynamiclib",
-        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
     },
     "darwin64-x86_64-cc" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "cc",
+        inherit_from     => [ "darwin-common", asm("x86_64_asm") ],
         cflags           => "-arch x86_64 -DL_ENDIAN -Wall",
-        debug_cflags     => "-ggdb -g2 -O0",
-        release_cflags   => "-O3",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "MACOSX",
-        lflags           => "-Wl,-search_paths_first%",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
         perlasm_scheme   => "macosx",
-        dso_scheme       => "dlfcn",
-        shared_target    => "darwin-shared",
-        shared_cflag     => "-fPIC -fno-common",
         shared_ldflag    => "-arch x86_64 -dynamiclib",
-        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
     },
-# iPhoneOS/iOS
+
+#### iPhoneOS/iOS
 #
 # It takes three prior-set environment variables to make it work:
 #
@@ -1737,51 +1309,24 @@
 #
 # CROSS_COMPILE=`xcode-select --print-path`/Toolchains/XcodeDefault.xctoolchain/usr/bin/
 # CROSS_TOP=`xcode-select --print-path`/Platforms/iPhoneOS.platform/Developer
-# CROSS_SDK=iPhoneOS7.0.sdk
+# CROSS_SDK=iPhoneOS.sdk
 #
     "iphoneos-cross" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "cc",
-        cflags           => "-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common",
-        thread_cflag     => "-D_REENTRANT",
+        inherit_from     => [ "darwin-common" ],
+        cflags           => "-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common",
         sys_id           => "iOS",
-        lflags           => "-Wl,-search_paths_first%",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "darwin-shared",
-        shared_cflag     => "-fPIC -fno-common",
-        shared_ldflag    => "-dynamiclib",
-        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
     },
     "ios64-cross" => {
-        inherit_from     => [ "aarch64_asm" ],
-        cc               => "cc",
-        cflags           => "-O3 -arch arm64 -mios-version-min=7.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common",
-        thread_cflag     => "-D_REENTRANT",
+        inherit_from     => [ "darwin-common", asm("aarch64_asm") ],
+        cflags           => "-arch arm64 -mios-version-min=7.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common",
         sys_id           => "iOS",
-        lflags           => "-Wl,-search_paths_first%",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
         perlasm_scheme   => "ios64",
-        dso_scheme       => "dlfcn",
-        shared_target    => "darwin-shared",
-        shared_cflag     => "-fPIC -fno-common",
-        shared_ldflag    => "-dynamiclib",
-        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-    },
-
-##### A/UX
-    "aux3-gcc" => {
-        cc               => "gcc",
-        cflags           => "-O2 -DTERMIO",
-        thread_cflag     => "(unknown)",
-        sys_id           => "AUX",
-        lflags           => "-lbsd",
-        bn_ops           => "RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
     },
 
 ##### GNU Hurd
     "hurd-x86" => {
-        inherit_from     => [ "x86_elf_asm" ],
+        inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "gcc",
         cflags           => "-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall",
         thread_cflag     => "-D_REENTRANT",
@@ -1835,7 +1380,6 @@
         lflags           => "-r",
     },
     "vxworks-simlinux" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "ccpentium",
         cflags           => "-B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DL_ENDIAN -DCPU=SIMLINUX -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/h -I\$(WIND_BASE)/target/h/wrn/coreip -DOPENSSL_NO_HW_PADLOCK",
         sys_id           => "VXWORKS",
@@ -1843,7 +1387,7 @@
         ranlib           => "ranlibpentium",
     },
     "vxworks-mips" => {
-        inherit_from     => [ "mips32_asm" ],
+        inherit_from     => [ asm("mips32_asm") ],
         cc               => "ccmips",
         cflags           => "-mrtp -mips2 -O -G 0 -B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DCPU=MIPS32 -msoft-float -mno-branch-likely -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/h/wrn/coreip",
         thread_cflag     => "-D_REENTRANT",
@@ -1853,9 +1397,8 @@
         ranlib           => "ranlibmips",
     },
 
-# uClinux
+#### uClinux
     "uClinux-dist" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "$ENV{'CC'}",
         cflags           => "\$(CFLAGS)",
         thread_cflag     => "-D_REENTRANT",
@@ -1869,7 +1412,6 @@
         ranlib           => "$ENV{'RANLIB'}",
     },
     "uClinux-dist64" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "$ENV{'CC'}",
         cflags           => "\$(CFLAGS)",
         thread_cflag     => "-D_REENTRANT",
diff --git a/Configure b/Configure
index 4a34b4e..c038f85 100755
--- a/Configure
+++ b/Configure
@@ -166,7 +166,6 @@ my $ppc32_asm=$ppc64_asm;
 # seems to be sufficient?
 my $BSDthreads="-pthread -D_THREAD_SAFE -D_REENTRANT";
 
-
 # table of known configurations, read in from files
 #
 # The content of each entry can take one of two forms:
@@ -349,29 +348,7 @@ my %table=(
     # Note: as long as someone might use old style configuration strings,
     # or we bother supporting that, those variables need to stay
 
-    # Filler used for when there are no asm files.
-    no_asm_filler => {
-	template	=> 1,
-	cpuid_obj	=> "",
-	bn_obj		=> "",
-	ec_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	=> "",
-	perlasm_scheme	=> "void"
-    },
-
-    x86_asm_nocast => {
+    x86_asm => {
 	template	=> 1,
 	cpuid_obj	=> "x86cpuid.o",
 	bn_obj		=> "bn-586.o co-586.o x86-mont.o x86-gf2m.o",
@@ -389,26 +366,15 @@ my %table=(
 	modes_obj	=> "ghash-x86.o",
 	engines_obj	=> "e_padlock-x86.o"
     },
-    x86_asm => {
-	template	=> 1,
-	inherit_from	=> [ "x86_asm_nocast" ],
-	cast_obj	=> "cast-586.o",
-    },
     x86_elf_asm => {
 	template	=> 1,
 	inherit_from	=> [ "x86_asm" ],
 	perlasm_scheme	=> "elf"
     },
-    android_x86_elf_asm => {
-	template	=> 1,
-	inherit_from	=> [ "x86_asm" ],
-	perlasm_scheme	=> "android"
-    },
-
-    _x86_64_asm => {
+    x86_64_asm => {
 	template	=> 1,
 	cpuid_obj       => "x86_64cpuid.o",
-	bn_obj          => "x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o",
+	bn_obj          => "x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o",
 	ec_obj          => "ecp_nistz256.o ecp_nistz256-x86_64.o",
 	aes_obj         => "aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o",
 	md5_obj         => "md5-x86_64.o",
@@ -419,16 +385,6 @@ my %table=(
 	modes_obj       => "ghash-x86_64.o aesni-gcm-x86_64.o",
 	engines_obj     => "e_padlock-x86_64.o"
     },
-    x86_64_asm => {
-	inherit_from	=> [ "_x86_64_asm" ],
-	template	=> 1,
-	bn_obj          => sub { join(" ","x86_64-gcc.o", at _) }
-    },
-    win_x86_64_asm => {
-	inherit_from	=> [ "_x86_64_asm" ],
-	template	=> 1,
-	bn_obj          => sub { join(" ","bn_asm.o", at _) }
-    },
     ia64_asm => {
 	template	=> 1,
 	cpuid_obj       => "ia64cpuid.o",
@@ -478,25 +434,15 @@ my %table=(
 	template	=> 1,
 	sha1_obj        => sub { join(" ", @_, "sha512-mips.o") }
     },
-    _s390x_asm => {
+    s390x_asm => {
 	template	=> 1,
 	cpuid_obj       => "s390xcap.o s390xcpuid.o",
-	bn_obj          => "s390x-mont.o s390x-gf2m.o",
+	bn_obj          => "bn-s390x.o s390x-mont.o s390x-gf2m.o",
 	aes_obj         => "aes-s390x.o aes-ctr.o aes-xts.o",
 	sha1_obj        => "sha1-s390x.o sha256-s390x.o sha512-s390x.o",
 	rc4_obj         => "rc4-s390x.o",
 	modes_obj       => "ghash-s390x.o",
     },
-    s390x_asm => {
-	template	=> 1,
-	inherit_from	=> [ "_s390x_asm" ],
-	bn_obj          => sub { join(" ", "bn-s390x.o", @_) }
-    },
-    s390x_32_asm => {
-	template	=> 1,
-	inherit_from	=> [ "_s390x_asm" ],
-	bn_obj          => sub { join(" ", "bn_asm.o", @_) }
-    },
     armv4_asm => {
 	template	=> 1,
 	cpuid_obj       => "armcap.o armv4cpuid.o",
@@ -524,26 +470,10 @@ my %table=(
 	modes_obj       => "ghash-parisc.o",
 	perlasm_scheme	=> "32"
     },
-    _parisc20_asm => {
-	template	=> 1,
-	cpuid_obj       => "pariscid.o",
-	bn_obj          => "parisc-mont.o",
-	aes_obj         => "aes_core.o aes_cbc.o aes-parisc.o",
-	sha1_obj        => "sha1-parisc.o sha256-parisc.o sha512-parisc.o",
-	rc4_obj         => "rc4-parisc.o",
-	modes_obj       => "ghash-parisc.o",
-	perlasm_scheme	=> "64"
-    },
-    parisc20_32_asm => {
-	template	=> 1,
-	inherit_from	=> [ "_parisc20_asm" ],
-	bn_obj          => sub { join(" ", "pa-risc2.o", @_) },
-	perlasm_scheme	=> "32",
-    },
     parisc20_64_asm => {
 	template	=> 1,
-	inherit_from	=> [ "_parisc20_asm" ],
-	bn_obj          => sub { join(" ", "pa-risc2W.o", @_) },
+	inherit_from	=> [ "parisc11_asm" ],
+	bn_obj          => sub { my $r=join(" ", at _); $r=~s/bn_asm/pa-risc2W/; $r; },
 	perlasm_scheme	=> "64",
     },
     ppc64_asm => {
@@ -560,6 +490,12 @@ my %table=(
     },
 );
 
+{   my $no_asm_templates=0;
+    foreach (@ARGV) { $no_asm_templates=1 if (/^\-?no\-asm$/); }
+    sub asm { $no_asm_templates?():@_; }
+}
+
+
 sub stringtohash {
     my $in = shift @_;
     if (ref($in) eq "HASH") {

From mark at openssl.org  Thu Mar 19 08:22:41 2015
From: mark at openssl.org (Mark J. Cox)
Date: Thu, 19 Mar 2015 08:22:41 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1426753361.561122.9712.nullmailer@dev.openssl.org>

The branch master has been updated
       via  3235f836e9c03d9d38b1e7aad30b4f6406ac096e (commit)
      from  042b5cd96c9159769c9539aa805849fa93f995f7 (commit)


- Log -----------------------------------------------------------------
commit 3235f836e9c03d9d38b1e7aad30b4f6406ac096e
Author: Mark J. Cox <mark at awe.com>
Date:   Thu Mar 19 08:22:09 2015 +0000

    Display the severity rating on the vulnerabilities page (if one exists)

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

Summary of changes:
 news/vulnerabilities.xsl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/news/vulnerabilities.xsl b/news/vulnerabilities.xsl
index 008532e..717325b 100644
--- a/news/vulnerabilities.xsl
+++ b/news/vulnerabilities.xsl
@@ -63,6 +63,9 @@ receive security updates</p>
 <xsl:template match="issue">
   <dt>
   <xsl:apply-templates select="cve"/>
+  <xsl:if test="impact/@severity">
+    [<xsl:value-of select="impact/@severity"/> severity]
+  </xsl:if>
 <xsl:call-template name="dateformat">
   <xsl:with-param name="date" select="@public"/>
 </xsl:call-template>

From levitte at openssl.org  Thu Mar 19 08:45:11 2015
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 19 Mar 2015 08:45:11 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1426754711.181894.22647.nullmailer@dev.openssl.org>

The branch master has been updated
       via  0eae3397eac95c6b243a822668c6e8a2c24d5be8 (commit)
      from  3235f836e9c03d9d38b1e7aad30b4f6406ac096e (commit)


- Log -----------------------------------------------------------------
commit 0eae3397eac95c6b243a822668c6e8a2c24d5be8
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 19 09:45:04 2015 +0100

    source/license.inc is generated, ignore it

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

Summary of changes:
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 953a4cc..f6bef20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ pod2htmi.tmp
 blog
 news/changelog.inc
 news/vulnerabilities.wml
+source/license.inc
 support/faq.inc
 support/funding/support-faq.inc
 .ssh

From matt at openssl.org  Thu Mar 19 13:57:31 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 19 Mar 2015 13:57:31 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1426773451.699285.3187.nullmailer@dev.openssl.org>

The branch master has been updated
       via  6c8d1f82eb0d6b290cca7daed4e0095b462b04af (commit)
      from  0eae3397eac95c6b243a822668c6e8a2c24d5be8 (commit)


- Log -----------------------------------------------------------------
commit 6c8d1f82eb0d6b290cca7daed4e0095b462b04af
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 13:49:38 2015 +0000

    Updates for new release

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

Summary of changes:
 news/newsflash.txt       |   4 +
 news/secadv_20150319.txt | 332 +++++++++++++++++++++++++
 news/vulnerabilities.xml | 633 ++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 958 insertions(+), 11 deletions(-)
 create mode 100644 news/secadv_20150319.txt

diff --git a/news/newsflash.txt b/news/newsflash.txt
index b429a49..b596da0 100644
--- a/news/newsflash.txt
+++ b/news/newsflash.txt
@@ -1,3 +1,7 @@
+19-Mar-2015: <a href="ROOT/news/secadv_20150319.txt">Security Advisory</a>: twelve security fixes
+19-Mar-2015: OpenSSL 1.0.1m is now <a href="ROOT/source/">available</a>, including bug and security fixes
+19-Mar-2015: OpenSSL 1.0.0r is now <a href="ROOT/source/">available</a>, including bug and security fixes
+19-Mar-2015: OpenSSL 0.9.8zf is now <a href="ROOT/source/">available</a>, including bug and security fixes
 22-Jan-2015: OpenSSL 1.0.2 is now <a href="ROOT/source/">available</a>, a major release
 15-Jan-2015: New releases to resolve Windows/OpenVMS compilation problems:
 15-Jan-2015: OpenSSL 1.0.1l is now <a href="ROOT/source/">available</a>, including bug fixes
diff --git a/news/secadv_20150319.txt b/news/secadv_20150319.txt
new file mode 100644
index 0000000..002736d
--- /dev/null
+++ b/news/secadv_20150319.txt
@@ -0,0 +1,332 @@
+OpenSSL Security Advisory [19 Mar 2015]
+=======================================
+
+OpenSSL 1.0.2 ClientHello sigalgs DoS (CVE-2015-0291)
+=====================================================
+
+Severity: High
+
+If a client connects to an OpenSSL 1.0.2 server and renegotiates with an
+invalid signature algorithms extension a NULL pointer dereference will occur.
+This can be exploited in a DoS attack against the server.
+
+This issue affects OpenSSL version: 1.0.2
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2a.
+
+This issue was was reported to OpenSSL on 26th February 2015 by David Ramos
+of Stanford University. The fix was developed by Stephen Henson and Matt
+Caswell of the OpenSSL development team.
+
+Reclassified: RSA silently downgrades to EXPORT_RSA [Client] (CVE-2015-0204)
+============================================================================
+
+Severity: High
+
+This security issue was previously announced by the OpenSSL project and
+classified as "low" severity. This severity rating has now been changed to
+"high".
+
+This was classified low because it was originally thought that server RSA
+export ciphersuite support was rare: a client was only vulnerable to a MITM
+attack against a server which supports an RSA export ciphersuite. Recent
+studies have shown that RSA export ciphersuites support is far more common.
+
+This issue affects OpenSSL versions: 1.0.1, 1.0.0 and 0.9.8.
+
+OpenSSL 1.0.1 users should upgrade to 1.0.1k.
+OpenSSL 1.0.0 users should upgrade to 1.0.0p.
+OpenSSL 0.9.8 users should upgrade to 0.9.8zd.
+
+This issue was reported to OpenSSL on 22nd October 2014 by Karthikeyan
+Bhargavan of the PROSECCO team at INRIA. The fix was developed by Stephen
+Henson of the OpenSSL core team. It was previously announced in the OpenSSL
+security advisory on 8th January 2015.
+
+Multiblock corrupted pointer (CVE-2015-0290)
+============================================
+
+Severity: Moderate
+
+OpenSSL 1.0.2 introduced the "multiblock" performance improvement. This feature
+only applies on 64 bit x86 architecture platforms that support AES NI
+instructions. A defect in the implementation of "multiblock" can cause OpenSSL's
+internal write buffer to become incorrectly set to NULL when using non-blocking
+IO. Typically, when the user application is using a socket BIO for writing, this
+will only result in a failed connection. However if some other BIO is used then
+it is likely that a segmentation fault will be triggered, thus enabling a
+potential DoS attack.
+
+This issue affects OpenSSL version: 1.0.2
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2a.
+
+This issue was reported to OpenSSL on 13th February 2015 by Daniel Danner and
+Rainer Mueller. The fix was developed by Matt Caswell of the OpenSSL development
+team.
+
+Segmentation fault in DTLSv1_listen (CVE-2015-0207)
+===================================================
+
+Severity: Moderate
+
+The DTLSv1_listen function is intended to be stateless and processes the initial
+ClientHello from many peers. It is common for user code to loop over the call to
+DTLSv1_listen until a valid ClientHello is received with an associated cookie. A
+defect in the implementation of DTLSv1_listen means that state is preserved in
+the SSL object from one invocation to the next that can lead to a segmentation
+fault. Errors processing the initial ClientHello can trigger this scenario. An
+example of such an error could be that a DTLS1.0 only client is attempting to
+connect to a DTLS1.2 only server.
+
+This issue affects OpenSSL version: 1.0.2
+
+OpenSSL 1.0.2 DTLS users should upgrade to 1.0.2a.
+
+This issue was reported to OpenSSL on 27th January 2015 by Per Allansson. The
+fix was developed by Matt Caswell of the OpenSSL development team.
+
+Segmentation fault in ASN1_TYPE_cmp (CVE-2015-0286)
+===================================================
+
+Severity: Moderate
+
+The function ASN1_TYPE_cmp will crash with an invalid read if an attempt is
+made to compare ASN.1 boolean types. Since ASN1_TYPE_cmp is used to check
+certificate signature algorithm consistency this can be used to crash any
+certificate verification operation and exploited in a DoS attack. Any
+application which performs certificate verification is vulnerable including
+OpenSSL clients and servers which enable client authentication.
+
+This issue affects all current OpenSSL versions: 1.0.2, 1.0.1, 1.0.0 and 0.9.8.
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2a
+OpenSSL 1.0.1 users should upgrade to 1.0.1m.
+OpenSSL 1.0.0 users should upgrade to 1.0.0r.
+OpenSSL 0.9.8 users should upgrade to 0.9.8zf.
+
+This issue was discovered and fixed by Stephen Henson of the OpenSSL
+development team.
+
+Segmentation fault for invalid PSS parameters (CVE-2015-0208)
+=============================================================
+
+Severity: Moderate
+
+The signature verification routines will crash with a NULL pointer
+dereference if presented with an ASN.1 signature using the RSA PSS
+algorithm and invalid parameters. Since these routines are used to verify
+certificate signature algorithms this can be used to crash any
+certificate verification operation and exploited in a DoS attack. Any
+application which performs certificate verification is vulnerable including
+OpenSSL clients and servers which enable client authentication.
+
+This issue affects OpenSSL version: 1.0.2
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2a
+
+This issue was was reported to OpenSSL on 31st January 2015 by Brian Carpenter
+and a fix developed by Stephen Henson of the OpenSSL development team.
+
+ASN.1 structure reuse memory corruption (CVE-2015-0287)
+=======================================================
+
+Severity: Moderate
+
+Reusing a structure in ASN.1 parsing may allow an attacker to cause
+memory corruption via an invalid write. Such reuse is and has been
+strongly discouraged and is believed to be rare.
+
+Applications that parse structures containing CHOICE or ANY DEFINED BY
+components may be affected. Certificate parsing (d2i_X509 and related
+functions) are however not affected. OpenSSL clients and servers are
+not affected.
+
+This issue affects all current OpenSSL versions: 1.0.2, 1.0.1, 1.0.0
+and 0.9.8.
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2a
+OpenSSL 1.0.1 users should upgrade to 1.0.1m.
+OpenSSL 1.0.0 users should upgrade to 1.0.0r.
+OpenSSL 0.9.8 users should upgrade to 0.9.8zf.
+
+This issue was discovered by Emilia K?sper and a fix developed by
+Stephen Henson of the OpenSSL development team.
+
+PKCS7 NULL pointer dereferences (CVE-2015-0289)
+===============================================
+
+Severity: Moderate
+
+The PKCS#7 parsing code does not handle missing outer ContentInfo correctly.
+An attacker can craft malformed ASN.1-encoded PKCS#7 blobs with
+missing content and trigger a NULL pointer dereference on parsing.
+
+Applications that verify PKCS#7 signatures, decrypt PKCS#7 data or
+otherwise parse PKCS#7 structures from untrusted sources are
+affected. OpenSSL clients and servers are not affected.
+
+This issue affects all current OpenSSL versions: 1.0.2, 1.0.1, 1.0.0
+and 0.9.8.
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2a
+OpenSSL 1.0.1 users should upgrade to 1.0.1m.
+OpenSSL 1.0.0 users should upgrade to 1.0.0r.
+OpenSSL 0.9.8 users should upgrade to 0.9.8zf.
+
+This issue was reported to OpenSSL on February 16th 2015 by Michal
+Zalewski (Google) and a fix developed by Emilia K?sper of the OpenSSL
+development team.
+
+Base64 decode (CVE-2015-0292)
+=============================
+
+Severity: Moderate
+
+A vulnerability existed in previous versions of OpenSSL related to the
+processing of base64 encoded data. Any code path that reads base64 data from an
+untrusted source could be affected (such as the PEM processing routines).
+Maliciously crafted base 64 data could trigger a segmenation fault or memory
+corruption. This was addressed in previous versions of OpenSSL but has not been
+included in any security advisory until now.
+
+This issue affects OpenSSL versions: 1.0.1, 1.0.0 and 0.9.8.
+
+OpenSSL 1.0.1 users should upgrade to 1.0.1h.
+OpenSSL 1.0.0 users should upgrade to 1.0.0m.
+OpenSSL 0.9.8 users should upgrade to 0.9.8za.
+
+The fix for this issue can be identified by commits d0666f289a (1.0.1),
+84fe686173 (1.0.0) and 9febee0272 (0.9.8). This issue was originally reported by
+Robert Dugal and subsequently by David Ramos.
+
+DoS via reachable assert in SSLv2 servers (CVE-2015-0293)
+=========================================================
+
+Severity: Moderate
+
+A malicious client can trigger an OPENSSL_assert (i.e., an abort) in
+servers that both support SSLv2 and enable export cipher suites by sending
+a specially crafted SSLv2 CLIENT-MASTER-KEY message.
+
+This issue affects all current OpenSSL versions: 1.0.2, 1.0.1, 1.0.0
+and 0.9.8.
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2a
+OpenSSL 1.0.1 users should upgrade to 1.0.1m.
+OpenSSL 1.0.0 users should upgrade to 1.0.0r.
+OpenSSL 0.9.8 users should upgrade to 0.9.8zf.
+
+This issue was discovered by Sean Burford (Google) and Emilia K?sper
+(OpenSSL development team) in March 2015 and the fix was developed by
+Emilia K?sper.
+
+Empty CKE with client auth and DHE (CVE-2015-1787)
+==================================================
+
+Severity: Moderate
+
+If client auth is used then a server can seg fault in the event of a DHE
+ciphersuite being selected and a zero length ClientKeyExchange message being
+sent by the client. This could be exploited in a DoS attack.
+
+This issue affects OpenSSL version: 1.0.2
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2a.
+
+This issue was discovered and the fix was developed by Matt Caswell of the
+OpenSSL development team.
+
+Handshake with unseeded PRNG (CVE-2015-0285)
+============================================
+
+Severity: Low
+
+Under certain conditions an OpenSSL 1.0.2 client can complete a handshake with
+an unseeded PRNG. The conditions are:
+- The client is on a platform where the PRNG has not been seeded automatically,
+and the user has not seeded manually
+- A protocol specific client method version has been used (i.e. not
+SSL_client_methodv23)
+- A ciphersuite is used that does not require additional random data from the
+PRNG beyond the initial ClientHello client random (e.g. PSK-RC4-SHA).
+
+If the handshake succeeds then the client random that has been used will have
+been generated from a PRNG with insufficient entropy and therefore the output
+may be predictable.
+
+For example using the following command with an unseeded openssl will succeed on
+an unpatched platform:
+
+openssl s_client -psk 1a2b3c4d -tls1_2 -cipher PSK-RC4-SHA
+
+This issue affects OpenSSL version: 1.0.2
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2a.
+
+This issue was discovered and the fix was developed by Matt Caswell of the
+OpenSSL development team.
+
+Use After Free following d2i_ECPrivatekey error (CVE-2015-0209)
+===============================================================
+
+Severity: Low
+
+A malformed EC private key file consumed via the d2i_ECPrivateKey function could
+cause a use after free condition. This, in turn, could cause a double
+free in several private key parsing functions (such as d2i_PrivateKey
+or EVP_PKCS82PKEY) and could lead to a DoS attack or memory corruption
+for applications that receive EC private keys from untrusted
+sources. This scenario is considered rare.
+
+This issue affects all current OpenSSL versions: 1.0.2, 1.0.1, 1.0.0 and 0.9.8.
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2a
+OpenSSL 1.0.1 users should upgrade to 1.0.1m.
+OpenSSL 1.0.0 users should upgrade to 1.0.0r.
+OpenSSL 0.9.8 users should upgrade to 0.9.8zf.
+
+This issue was discovered by the BoringSSL project and fixed in their commit
+517073cd4b. The OpenSSL fix was developed by Matt Caswell of the OpenSSL
+development team.
+
+X509_to_X509_REQ NULL pointer deref (CVE-2015-0288)
+===================================================
+
+Severity: Low
+
+The function X509_to_X509_REQ will crash with a NULL pointer dereference if
+the certificate key is invalid. This function is rarely used in practice.
+
+This issue affects all current OpenSSL versions: 1.0.2, 1.0.1, 1.0.0
+and 0.9.8.
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2a
+OpenSSL 1.0.1 users should upgrade to 1.0.1m.
+OpenSSL 1.0.0 users should upgrade to 1.0.0r.
+OpenSSL 0.9.8 users should upgrade to 0.9.8zf.
+
+This issue was discovered by Brian Carpenter and a fix developed by Stephen
+Henson of the OpenSSL development team.
+
+Note
+====
+
+As per our previous announcements and our Release Strategy
+(https://www.openssl.org/about/releasestrat.html), support for OpenSSL versions
+1.0.0 and 0.9.8 will cease on 31st December 2015. No security updates for these
+releases will be provided after that date. Users of these releases are advised
+to upgrade.
+
+References
+==========
+
+URL for this Security Advisory:
+https://www.openssl.org/news/secadv_20150319.txt
+
+Note: the online version of the advisory may be updated with additional
+details over time.
+
+For details of OpenSSL severity classifications please see:
+https://www.openssl.org/about/secpolicy.html
+
diff --git a/news/vulnerabilities.xml b/news/vulnerabilities.xml
index f13418b..01d3ce5 100644
--- a/news/vulnerabilities.xml
+++ b/news/vulnerabilities.xml
@@ -5,9 +5,138 @@
      1.0.0 on 20100329
 -->
 
-<security updated="20150108">
-  <issue public="20150108">
-    <cve name="2014-3571"/>
+<security updated="20150319">
+  <issue public="20150319">
+    <impact severity="High"/>
+    <cve name="2015-0291"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <fixed base="1.0.2" version="1.0.2a" date="20150319"/>
+
+    <description>
+ClientHello sigalgs DoS.  If a client connects to an OpenSSL 1.0.2 server and renegotiates with an
+invalid signature algorithms extension a NULL pointer dereference will occur.
+This can be exploited in a DoS attack against the server.
+    </description>
+    <advisory url="http://www.openssl.org/news/secadv_20150319.txt"/>
+    <reported source=" David Ramos (Stanford University)"/>
+  </issue>
+
+  <issue public="20150319">
+    <cve name="2015-0290"/>
+    <impact severity="Moderate"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <fixed base="1.0.2" version="1.0.2a" date="20150319"/>
+
+    <description>
+Multiblock corrupted pointer.
+OpenSSL 1.0.2 introduced the "multiblock" performance improvement. This feature
+only applies on 64 bit x86 architecture platforms that support AES NI
+instructions. A defect in the implementation of "multiblock" can cause OpenSSL's
+internal write buffer to become incorrectly set to NULL when using non-blocking
+IO. Typically, when the user application is using a socket BIO for writing, this
+will only result in a failed connection. However if some other BIO is used then
+it is likely that a segmentation fault will be triggered, thus enabling a
+potential DoS attack.
+    </description>
+    <advisory url="http://www.openssl.org/news/secadv_20150319.txt"/>
+    <reported source="Daniel Danner and Rainer Mueller"/>
+  </issue>
+
+  <issue public="20150319">
+    <cve name="2015-0207"/>
+    <impact severity="Moderate"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <fixed base="1.0.2" version="1.0.2a" date="20150319"/>
+
+    <description>
+Segmentation fault in DTLSv1_listen. 
+A defect in the implementation of DTLSv1_listen means that state is preserved in
+the SSL object from one invocation to the next that can lead to a segmentation
+fault. Errors processing the initial ClientHello can trigger this scenario. An
+example of such an error could be that a DTLS1.0 only client is attempting to
+connect to a DTLS1.2 only server.
+    </description>
+    <advisory url="http://www.openssl.org/news/secadv_20150319.txt"/>
+    <reported source="Per Allansson"/>
+  </issue>
+
+  <issue public="20150319">
+    <cve name="2015-0286"/>
+    <impact severity="Moderate"/>
+    <affects base="0.9.8" version="0.9.8zd"/>
+    <affects base="0.9.8" version="0.9.8ze"/>
+    <affects base="1.0.0" version="1.0.0"/>
+    <affects base="1.0.0" version="1.0.0a"/>
+    <affects base="1.0.0" version="1.0.0b"/>
+    <affects base="1.0.0" version="1.0.0c"/>
+    <affects base="1.0.0" version="1.0.0d"/>
+    <affects base="1.0.0" version="1.0.0e"/>
+    <affects base="1.0.0" version="1.0.0f"/>
+    <affects base="1.0.0" version="1.0.0g"/>
+    <affects base="1.0.0" version="1.0.0i"/>
+    <affects base="1.0.0" version="1.0.0j"/>
+    <affects base="1.0.0" version="1.0.0k"/>
+    <affects base="1.0.0" version="1.0.0l"/>
+    <affects base="1.0.0" version="1.0.0m"/>
+    <affects base="1.0.0" version="1.0.0n"/>
+    <affects base="1.0.0" version="1.0.0o"/>
+    <affects base="1.0.0" version="1.0.0p"/>
+    <affects base="1.0.0" version="1.0.0q"/>
+    <affects base="1.0.1" version="1.0.1"/>
+    <affects base="1.0.1" version="1.0.1a"/>
+    <affects base="1.0.1" version="1.0.1b"/>
+    <affects base="1.0.1" version="1.0.1c"/>
+    <affects base="1.0.1" version="1.0.1d"/>
+    <affects base="1.0.1" version="1.0.1e"/>
+    <affects base="1.0.1" version="1.0.1f"/>
+    <affects base="1.0.1" version="1.0.1g"/>
+    <affects base="1.0.1" version="1.0.1h"/>
+    <affects base="1.0.1" version="1.0.1i"/>
+    <affects base="1.0.1" version="1.0.1j"/>
+    <affects base="1.0.1" version="1.0.1k"/>
+    <affects base="1.0.1" version="1.0.1l"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <fixed base="1.0.2" version="1.0.2a" date="20150319"/>
+    <fixed base="1.0.1" version="1.0.1m" date="20150319"/>
+    <fixed base="1.0.0" version="1.0.0r" date="20150319"/>
+    <fixed base="0.9.8" version="0.9.8zf" date="20150319"/>
+
+    <description>
+Segmentation fault in ASN1_TYPE_cmp.
+The function ASN1_TYPE_cmp will crash with an invalid read if an attempt is
+made to compare ASN.1 boolean types. Since ASN1_TYPE_cmp is used to check
+certificate signature algorithm consistency this can be used to crash any
+certificate verification operation and exploited in a DoS attack. Any
+application which performs certificate verification is vulnerable including
+OpenSSL clients and servers which enable client authentication.
+    </description>
+    <advisory url="http://www.openssl.org/news/secadv_20150319.txt"/>
+    <reported source="Stephen Henson (OpenSSL development team)"/>
+  </issue>
+
+  <issue public="20150319">
+    <cve name="2015-0208"/>
+    <impact severity="Moderate"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <fixed base="1.0.2" version="1.0.2a" date="20150319"/>
+
+    <description>
+Segmentation fault for invalid PSS parameters.
+The signature verification routines will crash with a NULL pointer
+dereference if presented with an ASN.1 signature using the RSA PSS
+algorithm and invalid parameters. Since these routines are used to verify
+certificate signature algorithms this can be used to crash any
+certificate verification operation and exploited in a DoS attack. Any
+application which performs certificate verification is vulnerable including
+OpenSSL clients and servers which enable client authentication.
+    </description>
+    <advisory url="http://www.openssl.org/news/secadv_20150319.txt"/>
+    <reported source="Brian Carpenter"/>
+  </issue>
+
+  <issue public="20150319">
+    <cve name="2015-0287"/>
+    <impact severity="Moderate"/>
     <affects base="0.9.8" version="0.9.8"/>
     <affects base="0.9.8" version="0.9.8a"/>
     <affects base="0.9.8" version="0.9.8b"/>
@@ -37,6 +166,8 @@
     <affects base="0.9.8" version="0.9.8za"/>
     <affects base="0.9.8" version="0.9.8zb"/>
     <affects base="0.9.8" version="0.9.8zc"/>
+    <affects base="0.9.8" version="0.9.8zd"/>
+    <affects base="0.9.8" version="0.9.8ze"/>
     <affects base="1.0.0" version="1.0.0"/>
     <affects base="1.0.0" version="1.0.0a"/>
     <affects base="1.0.0" version="1.0.0b"/>
@@ -52,6 +183,8 @@
     <affects base="1.0.0" version="1.0.0m"/>
     <affects base="1.0.0" version="1.0.0n"/>
     <affects base="1.0.0" version="1.0.0o"/>
+    <affects base="1.0.0" version="1.0.0p"/>
+    <affects base="1.0.0" version="1.0.0q"/>
     <affects base="1.0.1" version="1.0.1"/>
     <affects base="1.0.1" version="1.0.1a"/>
     <affects base="1.0.1" version="1.0.1b"/>
@@ -63,17 +196,443 @@
     <affects base="1.0.1" version="1.0.1h"/>
     <affects base="1.0.1" version="1.0.1i"/>
     <affects base="1.0.1" version="1.0.1j"/>
-    <fixed base="1.0.1" version="1.0.1k" date="20150108"/>
-    <fixed base="1.0.0" version="1.0.0p" date="20150108"/>
-    <fixed base="0.9.8" version="0.9.8zd" date="20150108"/>
+    <affects base="1.0.1" version="1.0.1k"/>
+    <affects base="1.0.1" version="1.0.1l"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <fixed base="1.0.2" version="1.0.2a" date="20150319"/>
+    <fixed base="1.0.1" version="1.0.1m" date="20150319"/>
+    <fixed base="1.0.0" version="1.0.0r" date="20150319"/>
+    <fixed base="0.9.8" version="0.9.8zf" date="20150319"/>
 
     <description>
-      A carefully crafted DTLS message can cause a segmentation fault in OpenSSL
-      due to a NULL pointer dereference. This could lead to a Denial Of Service
-      attack.
+ASN.1 structure reuse memory corruption.
+Reusing a structure in ASN.1 parsing may allow an attacker to cause
+memory corruption via an invalid write. Such reuse is and has been
+strongly discouraged and is believed to be rare.
     </description>
-    <advisory url="http://www.openssl.org/news/secadv_20150108.txt"/>
-    <reported source="Markus Stenberg of Cisco Systems, Inc."/>
+    <advisory url="http://www.openssl.org/news/secadv_20150319.txt"/>
+    <reported source="Emilia K?sper (OpenSSL development team)"/>
+  </issue>
+
+  <issue public="20150319">
+    <cve name="2015-0289"/>
+    <impact severity="Moderate"/>
+    <affects base="0.9.8" version="0.9.8"/>
+    <affects base="0.9.8" version="0.9.8a"/>
+    <affects base="0.9.8" version="0.9.8b"/>
+    <affects base="0.9.8" version="0.9.8c"/>
+    <affects base="0.9.8" version="0.9.8d"/>
+    <affects base="0.9.8" version="0.9.8e"/>
+    <affects base="0.9.8" version="0.9.8f"/>
+    <affects base="0.9.8" version="0.9.8g"/>
+    <affects base="0.9.8" version="0.9.8h"/>
+    <affects base="0.9.8" version="0.9.8i"/>
+    <affects base="0.9.8" version="0.9.8j"/>
+    <affects base="0.9.8" version="0.9.8k"/>
+    <affects base="0.9.8" version="0.9.8l"/>
+    <affects base="0.9.8" version="0.9.8m"/>
+    <affects base="0.9.8" version="0.9.8n"/>
+    <affects base="0.9.8" version="0.9.8o"/>
+    <affects base="0.9.8" version="0.9.8p"/>
+    <affects base="0.9.8" version="0.9.8q"/>
+    <affects base="0.9.8" version="0.9.8r"/>
+    <affects base="0.9.8" version="0.9.8s"/>
+    <affects base="0.9.8" version="0.9.8t"/>
+    <affects base="0.9.8" version="0.9.8u"/>
+    <affects base="0.9.8" version="0.9.8v"/>
+    <affects base="0.9.8" version="0.9.8w"/>
+    <affects base="0.9.8" version="0.9.8x"/>
+    <affects base="0.9.8" version="0.9.8y"/>
+    <affects base="0.9.8" version="0.9.8za"/>
+    <affects base="0.9.8" version="0.9.8zb"/>
+    <affects base="0.9.8" version="0.9.8zc"/>
+    <affects base="0.9.8" version="0.9.8zd"/>
+    <affects base="0.9.8" version="0.9.8ze"/>
+    <affects base="1.0.0" version="1.0.0"/>
+    <affects base="1.0.0" version="1.0.0a"/>
+    <affects base="1.0.0" version="1.0.0b"/>
+    <affects base="1.0.0" version="1.0.0c"/>
+    <affects base="1.0.0" version="1.0.0d"/>
+    <affects base="1.0.0" version="1.0.0e"/>
+    <affects base="1.0.0" version="1.0.0f"/>
+    <affects base="1.0.0" version="1.0.0g"/>
+    <affects base="1.0.0" version="1.0.0i"/>
+    <affects base="1.0.0" version="1.0.0j"/>
+    <affects base="1.0.0" version="1.0.0k"/>
+    <affects base="1.0.0" version="1.0.0l"/>
+    <affects base="1.0.0" version="1.0.0m"/>
+    <affects base="1.0.0" version="1.0.0n"/>
+    <affects base="1.0.0" version="1.0.0o"/>
+    <affects base="1.0.0" version="1.0.0p"/>
+    <affects base="1.0.0" version="1.0.0q"/>
+    <affects base="1.0.1" version="1.0.1"/>
+    <affects base="1.0.1" version="1.0.1a"/>
+    <affects base="1.0.1" version="1.0.1b"/>
+    <affects base="1.0.1" version="1.0.1c"/>
+    <affects base="1.0.1" version="1.0.1d"/>
+    <affects base="1.0.1" version="1.0.1e"/>
+    <affects base="1.0.1" version="1.0.1f"/>
+    <affects base="1.0.1" version="1.0.1g"/>
+    <affects base="1.0.1" version="1.0.1h"/>
+    <affects base="1.0.1" version="1.0.1i"/>
+    <affects base="1.0.1" version="1.0.1j"/>
+    <affects base="1.0.1" version="1.0.1k"/>
+    <affects base="1.0.1" version="1.0.1l"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <fixed base="1.0.2" version="1.0.2a" date="20150319"/>
+    <fixed base="1.0.1" version="1.0.1m" date="20150319"/>
+    <fixed base="1.0.0" version="1.0.0r" date="20150319"/>
+    <fixed base="0.9.8" version="0.9.8zf" date="20150319"/>
+
+    <description>
+PKCS#7 NULL pointer dereference.
+The PKCS#7 parsing code does not handle missing outer ContentInfo correctly.
+An attacker can craft malformed ASN.1-encoded PKCS#7 blobs with
+missing content and trigger a NULL pointer dereference on parsing.
+Applications that verify PKCS#7 signatures, decrypt PKCS#7 data or
+otherwise parse PKCS#7 structures from untrusted sources are
+affected. OpenSSL clients and servers are not affected.
+    </description>
+    <advisory url="http://www.openssl.org/news/secadv_20150319.txt"/>
+    <reported source="Michal Zalewski (Google)"/>
+  </issue>
+
+  <issue public="20150319">
+    <cve name="2015-0292"/>
+    <impact severity="Moderate"/>
+    <affects base="0.9.8" version="0.9.8"/>
+    <affects base="0.9.8" version="0.9.8a"/>
+    <affects base="0.9.8" version="0.9.8b"/>
+    <affects base="0.9.8" version="0.9.8c"/>
+    <affects base="0.9.8" version="0.9.8d"/>
+    <affects base="0.9.8" version="0.9.8e"/>
+    <affects base="0.9.8" version="0.9.8f"/>
+    <affects base="0.9.8" version="0.9.8g"/>
+    <affects base="0.9.8" version="0.9.8h"/>
+    <affects base="0.9.8" version="0.9.8i"/>
+    <affects base="0.9.8" version="0.9.8j"/>
+    <affects base="0.9.8" version="0.9.8k"/>
+    <affects base="0.9.8" version="0.9.8l"/>
+    <affects base="0.9.8" version="0.9.8m"/>
+    <affects base="0.9.8" version="0.9.8n"/>
+    <affects base="0.9.8" version="0.9.8o"/>
+    <affects base="0.9.8" version="0.9.8p"/>
+    <affects base="0.9.8" version="0.9.8q"/>
+    <affects base="0.9.8" version="0.9.8r"/>
+    <affects base="0.9.8" version="0.9.8s"/>
+    <affects base="0.9.8" version="0.9.8t"/>
+    <affects base="0.9.8" version="0.9.8u"/>
+    <affects base="0.9.8" version="0.9.8v"/>
+    <affects base="0.9.8" version="0.9.8w"/>
+    <affects base="0.9.8" version="0.9.8x"/>
+    <affects base="0.9.8" version="0.9.8y"/>
+    <affects base="1.0.0" version="1.0.0"/>
+    <affects base="1.0.0" version="1.0.0a"/>
+    <affects base="1.0.0" version="1.0.0b"/>
+    <affects base="1.0.0" version="1.0.0c"/>
+    <affects base="1.0.0" version="1.0.0d"/>
+    <affects base="1.0.0" version="1.0.0e"/>
+    <affects base="1.0.0" version="1.0.0f"/>
+    <affects base="1.0.0" version="1.0.0g"/>
+    <affects base="1.0.0" version="1.0.0i"/>
+    <affects base="1.0.0" version="1.0.0j"/>
+    <affects base="1.0.0" version="1.0.0k"/>
+    <affects base="1.0.0" version="1.0.0l"/>
+    <affects base="1.0.1" version="1.0.1"/>
+    <affects base="1.0.1" version="1.0.1a"/>
+    <affects base="1.0.1" version="1.0.1b"/>
+    <affects base="1.0.1" version="1.0.1c"/>
+    <affects base="1.0.1" version="1.0.1d"/>
+    <affects base="1.0.1" version="1.0.1e"/>
+    <affects base="1.0.1" version="1.0.1f"/>
+    <affects base="1.0.1" version="1.0.1g"/>
+    <fixed base="1.0.1" version="1.0.1h" date="20140605"/>
+    <fixed base="1.0.0" version="1.0.0m" date="20140605"/>
+    <fixed base="0.9.8" version="0.9.8za" date="20140605"/>
+
+    <description>
+A vulnerability existed in previous versions of OpenSSL related to the
+processing of base64 encoded data. Any code path that reads base64 data from an
+untrusted source could be affected (such as the PEM processing routines).
+Maliciously crafted base 64 data could trigger a segmenation fault or memory
+corruption. 
+    </description>
+    <advisory url="http://www.openssl.org/news/secadv_20150319.txt"/>
+    <reported source="Robert Dugal, also David Ramos"/>
+  </issue>
+
+  <issue public="20150319">
+    <cve name="2015-0293"/>
+    <impact severity="Moderate"/>
+    <affects base="0.9.8" version="0.9.8"/>
+    <affects base="0.9.8" version="0.9.8a"/>
+    <affects base="0.9.8" version="0.9.8b"/>
+    <affects base="0.9.8" version="0.9.8c"/>
+    <affects base="0.9.8" version="0.9.8d"/>
+    <affects base="0.9.8" version="0.9.8e"/>
+    <affects base="0.9.8" version="0.9.8f"/>
+    <affects base="0.9.8" version="0.9.8g"/>
+    <affects base="0.9.8" version="0.9.8h"/>
+    <affects base="0.9.8" version="0.9.8i"/>
+    <affects base="0.9.8" version="0.9.8j"/>
+    <affects base="0.9.8" version="0.9.8k"/>
+    <affects base="0.9.8" version="0.9.8l"/>
+    <affects base="0.9.8" version="0.9.8m"/>
+    <affects base="0.9.8" version="0.9.8n"/>
+    <affects base="0.9.8" version="0.9.8o"/>
+    <affects base="0.9.8" version="0.9.8p"/>
+    <affects base="0.9.8" version="0.9.8q"/>
+    <affects base="0.9.8" version="0.9.8r"/>
+    <affects base="0.9.8" version="0.9.8s"/>
+    <affects base="0.9.8" version="0.9.8t"/>
+    <affects base="0.9.8" version="0.9.8u"/>
+    <affects base="0.9.8" version="0.9.8v"/>
+    <affects base="0.9.8" version="0.9.8w"/>
+    <affects base="0.9.8" version="0.9.8x"/>
+    <affects base="0.9.8" version="0.9.8y"/>
+    <affects base="0.9.8" version="0.9.8za"/>
+    <affects base="0.9.8" version="0.9.8zb"/>
+    <affects base="0.9.8" version="0.9.8zc"/>
+    <affects base="0.9.8" version="0.9.8zd"/>
+    <affects base="0.9.8" version="0.9.8ze"/>
+    <affects base="1.0.0" version="1.0.0"/>
+    <affects base="1.0.0" version="1.0.0a"/>
+    <affects base="1.0.0" version="1.0.0b"/>
+    <affects base="1.0.0" version="1.0.0c"/>
+    <affects base="1.0.0" version="1.0.0d"/>
+    <affects base="1.0.0" version="1.0.0e"/>
+    <affects base="1.0.0" version="1.0.0f"/>
+    <affects base="1.0.0" version="1.0.0g"/>
+    <affects base="1.0.0" version="1.0.0i"/>
+    <affects base="1.0.0" version="1.0.0j"/>
+    <affects base="1.0.0" version="1.0.0k"/>
+    <affects base="1.0.0" version="1.0.0l"/>
+    <affects base="1.0.0" version="1.0.0m"/>
+    <affects base="1.0.0" version="1.0.0n"/>
+    <affects base="1.0.0" version="1.0.0o"/>
+    <affects base="1.0.0" version="1.0.0p"/>
+    <affects base="1.0.0" version="1.0.0q"/>
+    <affects base="1.0.1" version="1.0.1"/>
+    <affects base="1.0.1" version="1.0.1a"/>
+    <affects base="1.0.1" version="1.0.1b"/>
+    <affects base="1.0.1" version="1.0.1c"/>
+    <affects base="1.0.1" version="1.0.1d"/>
+    <affects base="1.0.1" version="1.0.1e"/>
+    <affects base="1.0.1" version="1.0.1f"/>
+    <affects base="1.0.1" version="1.0.1g"/>
+    <affects base="1.0.1" version="1.0.1h"/>
+    <affects base="1.0.1" version="1.0.1i"/>
+    <affects base="1.0.1" version="1.0.1j"/>
+    <affects base="1.0.1" version="1.0.1k"/>
+    <affects base="1.0.1" version="1.0.1l"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <fixed base="1.0.2" version="1.0.2a" date="20150319"/>
+    <fixed base="1.0.1" version="1.0.1m" date="20150319"/>
+    <fixed base="1.0.0" version="1.0.0r" date="20150319"/>
+    <fixed base="0.9.8" version="0.9.8zf" date="20150319"/>
+
+    <description>
+DoS via reachable assert in SSLv2 servers.
+A malicious client can trigger an OPENSSL_assert in
+servers that both support SSLv2 and enable export cipher suites by sending
+a specially crafted SSLv2 CLIENT-MASTER-KEY message.
+    </description>
+    <advisory url="http://www.openssl.org/news/secadv_20150319.txt"/>
+    <reported source="Sean Burford (Google) and Emilia K?sper (OpenSSL development team)"/>
+  </issue>
+
+  <issue public="20150319">
+    <impact severity="Moderate"/>
+    <cve name="2015-1787"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <fixed base="1.0.2" version="1.0.2a" date="20150319"/>
+
+    <description>
+Empty CKE with client auth and DHE.
+If client auth is used then a server can seg fault in the event of a DHE
+ciphersuite being selected and a zero length ClientKeyExchange message being
+sent by the client. This could be exploited in a DoS attack.
+    </description>
+    <advisory url="http://www.openssl.org/news/secadv_20150319.txt"/>
+    <reported source="Matt Caswell (OpenSSL development team)"/>
+  </issue>
+
+  <issue public="20150310">
+    <impact severity="Low"/>
+    <cve name="2015-0285"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <fixed base="1.0.2" version="1.0.2a" date="20150319"/>
+
+    <description>
+Under certain conditions an OpenSSL 1.0.2 client can complete a handshake with
+an unseeded PRNG. If the handshake succeeds then the client random that has been used will have
+been generated from a PRNG with insufficient entropy and therefore the output
+may be predictable.
+    </description>
+    <advisory url="http://www.openssl.org/news/secadv_20150319.txt"/>
+    <reported source="Matt Caswell (OpenSSL development team)"/>
+  </issue>
+
+  <issue public="20150319">
+    <impact severity="Low"/>
+    <cve name="2015-0209"/>
+    <affects base="0.9.8" version="0.9.8"/>
+    <affects base="0.9.8" version="0.9.8a"/>
+    <affects base="0.9.8" version="0.9.8b"/>
+    <affects base="0.9.8" version="0.9.8c"/>
+    <affects base="0.9.8" version="0.9.8d"/>
+    <affects base="0.9.8" version="0.9.8e"/>
+    <affects base="0.9.8" version="0.9.8f"/>
+    <affects base="0.9.8" version="0.9.8g"/>
+    <affects base="0.9.8" version="0.9.8h"/>
+    <affects base="0.9.8" version="0.9.8i"/>
+    <affects base="0.9.8" version="0.9.8j"/>
+    <affects base="0.9.8" version="0.9.8k"/>
+    <affects base="0.9.8" version="0.9.8l"/>
+    <affects base="0.9.8" version="0.9.8m"/>
+    <affects base="0.9.8" version="0.9.8n"/>
+    <affects base="0.9.8" version="0.9.8o"/>
+    <affects base="0.9.8" version="0.9.8p"/>
+    <affects base="0.9.8" version="0.9.8q"/>
+    <affects base="0.9.8" version="0.9.8r"/>
+    <affects base="0.9.8" version="0.9.8s"/>
+    <affects base="0.9.8" version="0.9.8t"/>
+    <affects base="0.9.8" version="0.9.8u"/>
+    <affects base="0.9.8" version="0.9.8v"/>
+    <affects base="0.9.8" version="0.9.8w"/>
+    <affects base="0.9.8" version="0.9.8x"/>
+    <affects base="0.9.8" version="0.9.8y"/>
+    <affects base="0.9.8" version="0.9.8za"/>
+    <affects base="0.9.8" version="0.9.8zb"/>
+    <affects base="0.9.8" version="0.9.8zc"/>
+    <affects base="0.9.8" version="0.9.8zd"/>
+    <affects base="0.9.8" version="0.9.8ze"/>
+    <affects base="1.0.0" version="1.0.0"/>
+    <affects base="1.0.0" version="1.0.0a"/>
+    <affects base="1.0.0" version="1.0.0b"/>
+    <affects base="1.0.0" version="1.0.0c"/>
+    <affects base="1.0.0" version="1.0.0d"/>
+    <affects base="1.0.0" version="1.0.0e"/>
+    <affects base="1.0.0" version="1.0.0f"/>
+    <affects base="1.0.0" version="1.0.0g"/>
+    <affects base="1.0.0" version="1.0.0i"/>
+    <affects base="1.0.0" version="1.0.0j"/>
+    <affects base="1.0.0" version="1.0.0k"/>
+    <affects base="1.0.0" version="1.0.0l"/>
+    <affects base="1.0.0" version="1.0.0m"/>
+    <affects base="1.0.0" version="1.0.0n"/>
+    <affects base="1.0.0" version="1.0.0o"/>
+    <affects base="1.0.0" version="1.0.0p"/>
+    <affects base="1.0.0" version="1.0.0q"/>
+    <affects base="1.0.1" version="1.0.1"/>
+    <affects base="1.0.1" version="1.0.1a"/>
+    <affects base="1.0.1" version="1.0.1b"/>
+    <affects base="1.0.1" version="1.0.1c"/>
+    <affects base="1.0.1" version="1.0.1d"/>
+    <affects base="1.0.1" version="1.0.1e"/>
+    <affects base="1.0.1" version="1.0.1f"/>
+    <affects base="1.0.1" version="1.0.1g"/>
+    <affects base="1.0.1" version="1.0.1h"/>
+    <affects base="1.0.1" version="1.0.1i"/>
+    <affects base="1.0.1" version="1.0.1j"/>
+    <affects base="1.0.1" version="1.0.1k"/>
+    <affects base="1.0.1" version="1.0.1l"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <fixed base="1.0.2" version="1.0.2a" date="20150319"/>
+    <fixed base="1.0.1" version="1.0.1m" date="20150319"/>
+    <fixed base="1.0.0" version="1.0.0r" date="20150319"/>
+    <fixed base="0.9.8" version="0.9.8zf" date="20150319"/>
+
+    <description>
+Use After Free following d2i_ECPrivatekey error.
+A malformed EC private key file consumed via the d2i_ECPrivateKey function could
+cause a use after free condition. This, in turn, could cause a double
+free in several private key parsing functions (such as d2i_PrivateKey
+or EVP_PKCS82PKEY) and could lead to a DoS attack or memory corruption
+for applications that receive EC private keys from untrusted
+sources. This scenario is considered rare.
+    </description>
+    <advisory url="http://www.openssl.org/news/secadv_20150319.txt"/>
+    <reported source="The BoringSSL project"/>
+  </issue>
+
+  <issue public="20150302">
+    <cve name="2015-0288"/>
+    <impact severity="Low"/>
+    <affects base="0.9.8" version="0.9.8"/>
+    <affects base="0.9.8" version="0.9.8a"/>
+    <affects base="0.9.8" version="0.9.8b"/>
+    <affects base="0.9.8" version="0.9.8c"/>
+    <affects base="0.9.8" version="0.9.8d"/>
+    <affects base="0.9.8" version="0.9.8e"/>
+    <affects base="0.9.8" version="0.9.8f"/>
+    <affects base="0.9.8" version="0.9.8g"/>
+    <affects base="0.9.8" version="0.9.8h"/>
+    <affects base="0.9.8" version="0.9.8i"/>
+    <affects base="0.9.8" version="0.9.8j"/>
+    <affects base="0.9.8" version="0.9.8k"/>
+    <affects base="0.9.8" version="0.9.8l"/>
+    <affects base="0.9.8" version="0.9.8m"/>
+    <affects base="0.9.8" version="0.9.8n"/>
+    <affects base="0.9.8" version="0.9.8o"/>
+    <affects base="0.9.8" version="0.9.8p"/>
+    <affects base="0.9.8" version="0.9.8q"/>
+    <affects base="0.9.8" version="0.9.8r"/>
+    <affects base="0.9.8" version="0.9.8s"/>
+    <affects base="0.9.8" version="0.9.8t"/>
+    <affects base="0.9.8" version="0.9.8u"/>
+    <affects base="0.9.8" version="0.9.8v"/>
+    <affects base="0.9.8" version="0.9.8w"/>
+    <affects base="0.9.8" version="0.9.8x"/>
+    <affects base="0.9.8" version="0.9.8y"/>
+    <affects base="0.9.8" version="0.9.8za"/>
+    <affects base="0.9.8" version="0.9.8zb"/>
+    <affects base="0.9.8" version="0.9.8zc"/>
+    <affects base="0.9.8" version="0.9.8zd"/>
+    <affects base="0.9.8" version="0.9.8ze"/>
+    <affects base="1.0.0" version="1.0.0"/>
+    <affects base="1.0.0" version="1.0.0a"/>
+    <affects base="1.0.0" version="1.0.0b"/>
+    <affects base="1.0.0" version="1.0.0c"/>
+    <affects base="1.0.0" version="1.0.0d"/>
+    <affects base="1.0.0" version="1.0.0e"/>
+    <affects base="1.0.0" version="1.0.0f"/>
+    <affects base="1.0.0" version="1.0.0g"/>
+    <affects base="1.0.0" version="1.0.0i"/>
+    <affects base="1.0.0" version="1.0.0j"/>
+    <affects base="1.0.0" version="1.0.0k"/>
+    <affects base="1.0.0" version="1.0.0l"/>
+    <affects base="1.0.0" version="1.0.0m"/>
+    <affects base="1.0.0" version="1.0.0n"/>
+    <affects base="1.0.0" version="1.0.0o"/>
+    <affects base="1.0.0" version="1.0.0p"/>
+    <affects base="1.0.0" version="1.0.0q"/>
+    <affects base="1.0.1" version="1.0.1"/>
+    <affects base="1.0.1" version="1.0.1a"/>
+    <affects base="1.0.1" version="1.0.1b"/>
+    <affects base="1.0.1" version="1.0.1c"/>
+    <affects base="1.0.1" version="1.0.1d"/>
+    <affects base="1.0.1" version="1.0.1e"/>
+    <affects base="1.0.1" version="1.0.1f"/>
+    <affects base="1.0.1" version="1.0.1g"/>
+    <affects base="1.0.1" version="1.0.1h"/>
+    <affects base="1.0.1" version="1.0.1i"/>
+    <affects base="1.0.1" version="1.0.1j"/>
+    <affects base="1.0.1" version="1.0.1k"/>
+    <affects base="1.0.1" version="1.0.1l"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <fixed base="1.0.2" version="1.0.2a" date="20150319"/>
+    <fixed base="1.0.1" version="1.0.1m" date="20150319"/>
+    <fixed base="1.0.0" version="1.0.0r" date="20150319"/>
+    <fixed base="0.9.8" version="0.9.8zf" date="20150319"/>
+
+    <description>
+X509_to_X509_REQ NULL pointer deref.
+The function X509_to_X509_REQ will crash with a NULL pointer dereference if
+the certificate key is invalid. This function is rarely used in practice.
+    </description>
+    <advisory url="http://www.openssl.org/news/secadv_20150319.txt"/>
+    <reported source="Brian Carpenter"/>
   </issue>
 
   <issue public="20150108">
@@ -120,8 +679,60 @@
 
   <issue public="20141021">
     <cve name="2014-3569"/>
+    <affects base="0.9.8" version="0.9.8"/>
+    <affects base="0.9.8" version="0.9.8a"/>
+    <affects base="0.9.8" version="0.9.8b"/>
+    <affects base="0.9.8" version="0.9.8c"/>
+    <affects base="0.9.8" version="0.9.8d"/>
+    <affects base="0.9.8" version="0.9.8e"/>
+    <affects base="0.9.8" version="0.9.8f"/>
+    <affects base="0.9.8" version="0.9.8g"/>
+    <affects base="0.9.8" version="0.9.8h"/>
+    <affects base="0.9.8" version="0.9.8i"/>
+    <affects base="0.9.8" version="0.9.8j"/>
+    <affects base="0.9.8" version="0.9.8k"/>
+    <affects base="0.9.8" version="0.9.8l"/>
+    <affects base="0.9.8" version="0.9.8m"/>
+    <affects base="0.9.8" version="0.9.8n"/>
+    <affects base="0.9.8" version="0.9.8o"/>
+    <affects base="0.9.8" version="0.9.8p"/>
+    <affects base="0.9.8" version="0.9.8q"/>
+    <affects base="0.9.8" version="0.9.8r"/>
+    <affects base="0.9.8" version="0.9.8s"/>
+    <affects base="0.9.8" version="0.9.8t"/>
+    <affects base="0.9.8" version="0.9.8u"/>
+    <affects base="0.9.8" version="0.9.8v"/>
+    <affects base="0.9.8" version="0.9.8w"/>
+    <affects base="0.9.8" version="0.9.8x"/>
+    <affects base="0.9.8" version="0.9.8y"/>
+    <affects base="0.9.8" version="0.9.8za"/>
+    <affects base="0.9.8" version="0.9.8zb"/>
     <affects base="0.9.8" version="0.9.8zc"/>
+    <affects base="1.0.0" version="1.0.0"/>
+    <affects base="1.0.0" version="1.0.0a"/>
+    <affects base="1.0.0" version="1.0.0b"/>
+    <affects base="1.0.0" version="1.0.0c"/>
+    <affects base="1.0.0" version="1.0.0d"/>
+    <affects base="1.0.0" version="1.0.0e"/>
+    <affects base="1.0.0" version="1.0.0f"/>
+    <affects base="1.0.0" version="1.0.0g"/>
+    <affects base="1.0.0" version="1.0.0i"/>
+    <affects base="1.0.0" version="1.0.0j"/>
+    <affects base="1.0.0" version="1.0.0k"/>
+    <affects base="1.0.0" version="1.0.0l"/>
+    <affects base="1.0.0" version="1.0.0m"/>
+    <affects base="1.0.0" version="1.0.0n"/>
     <affects base="1.0.0" version="1.0.0o"/>
+    <affects base="1.0.1" version="1.0.1"/>
+    <affects base="1.0.1" version="1.0.1a"/>
+    <affects base="1.0.1" version="1.0.1b"/>
+    <affects base="1.0.1" version="1.0.1c"/>
+    <affects base="1.0.1" version="1.0.1d"/>
+    <affects base="1.0.1" version="1.0.1e"/>
+    <affects base="1.0.1" version="1.0.1f"/>
+    <affects base="1.0.1" version="1.0.1g"/>
+    <affects base="1.0.1" version="1.0.1h"/>
+    <affects base="1.0.1" version="1.0.1i"/>
     <affects base="1.0.1" version="1.0.1j"/>
     <fixed base="1.0.1" version="1.0.1k" date="20150108"/>
     <fixed base="1.0.0" version="1.0.0p" date="20150108"/>

From matt at openssl.org  Thu Mar 19 13:59:30 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 19 Mar 2015 13:59:30 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1426773570.228217.11859.nullmailer@dev.openssl.org>

The branch master has been updated
       via  acaa6ccdfffc2e4e3fbeb40e932db2e1bfbb3c3c (commit)
      from  6c8d1f82eb0d6b290cca7daed4e0095b462b04af (commit)


- Log -----------------------------------------------------------------
commit acaa6ccdfffc2e4e3fbeb40e932db2e1bfbb3c3c
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 13:59:22 2015 +0000

    Add missing newsflash line

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

Summary of changes:
 news/newsflash.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/news/newsflash.txt b/news/newsflash.txt
index b596da0..889b480 100644
--- a/news/newsflash.txt
+++ b/news/newsflash.txt
@@ -1,4 +1,5 @@
 19-Mar-2015: <a href="ROOT/news/secadv_20150319.txt">Security Advisory</a>: twelve security fixes
+19-Mar-2015: OpenSSL 1.0.2a is now <a href="ROOT/source/">available</a>, including bug and security fixes
 19-Mar-2015: OpenSSL 1.0.1m is now <a href="ROOT/source/">available</a>, including bug and security fixes
 19-Mar-2015: OpenSSL 1.0.0r is now <a href="ROOT/source/">available</a>, including bug and security fixes
 19-Mar-2015: OpenSSL 0.9.8zf is now <a href="ROOT/source/">available</a>, including bug and security fixes

From matt at openssl.org  Thu Mar 19 14:03:36 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 19 Mar 2015 14:03:36 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426773816.263811.22026.nullmailer@dev.openssl.org>

The branch master has been updated
       via  5e5d53d341fd9a9b9cc0a58eb3690832ca7a511f (commit)
       via  367eab2f9f1d1131356118507d21534558863365 (commit)
       via  bdc234f3c362b211d9e9384da93f8a0ff212787e (commit)
       via  c225c3cf9bd67297fb0c297768d69cbc03fbdab7 (commit)
       via  e677e8d13595f7b3287f8feef7676feb301b0e8a (commit)
       via  d3cc5e610d1719a35cda52c9152134b490a8c944 (commit)
       via  34e3edbf3a10953cb407288101fd56a629af22f9 (commit)
       via  09f06923e636019c39c807cb59c481375e720556 (commit)
       via  8106d61c354430d6bbbd7f8e7840a39efc0f5829 (commit)
       via  e83ee04bb7de800cdb71d522fa562e99328003a3 (commit)
       via  1d2a18dc5a3b3363e17db5af8b6b0273856ac077 (commit)
      from  7ead0c89185c46378e3ed85c0012d083f4b3039b (commit)


- Log -----------------------------------------------------------------
commit 5e5d53d341fd9a9b9cc0a58eb3690832ca7a511f
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 10:16:32 2015 +0000

    Fix a failure to NULL a pointer freed on error.
    
    Reported by the LibreSSL project as a follow on to CVE-2015-0209
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 367eab2f9f1d1131356118507d21534558863365
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 18 10:10:01 2015 +0000

    Update NEWS
    
    Resync NEWS with the latest version from 1.0.2
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit bdc234f3c362b211d9e9384da93f8a0ff212787e
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 18 09:35:22 2015 +0000

    Update CHANGES
    
    Resync CHANGES with the latest version from 1.0.2.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit c225c3cf9bd67297fb0c297768d69cbc03fbdab7
Author: Emilia Kasper <emilia at openssl.org>
Date:   Fri Feb 27 16:52:23 2015 +0100

    PKCS#7: avoid NULL pointer dereferences with missing content
    
    In PKCS#7, the ASN.1 content component is optional.
    This typically applies to inner content (detached signatures),
    however we must also handle unexpected missing outer content
    correctly.
    
    This patch only addresses functions reachable from parsing,
    decryption and verification, and functions otherwise associated
    with reading potentially untrusted data.
    
    Correcting all low-level API calls requires further work.
    
    CVE-2015-0289
    
    Thanks to Michal Zalewski (Google) for reporting this issue.
    
    Reviewed-by: Steve Henson <steve at openssl.org>

commit e677e8d13595f7b3287f8feef7676feb301b0e8a
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 9 23:11:45 2015 +0000

    Fix ASN1_TYPE_cmp
    
    Fix segmentation violation when ASN1_TYPE_cmp is passed a boolean type. This
    can be triggered during certificate verification so could be a DoS attack
    against a client or a server enabling client authentication.
    
    CVE-2015-0286
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit d3cc5e610d1719a35cda52c9152134b490a8c944
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 10 16:38:32 2015 +0000

    Fix DHE Null CKE vulnerability
    
    If client auth is used then a server can seg fault in the event of a DHE
    cipher being used and a zero length ClientKeyExchange message being sent
    by the client. This could be exploited in a DoS attack.
    
    CVE-2015-1787
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 34e3edbf3a10953cb407288101fd56a629af22f9
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Mar 3 13:20:57 2015 +0000

    Fix for CVE-2015-0291
    
    If a client renegotiates using an invalid signature algorithms extension
    it will crash a server with a NULL pointer dereference.
    
    Thanks to David Ramos of Stanford University for reporting this bug.
    
    CVE-2015-0291
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

commit 09f06923e636019c39c807cb59c481375e720556
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 9 23:16:33 2015 +0000

    Reject invalid PSS parameters.
    
    Fix a bug where invalid PSS parameters are not rejected resulting in a
    NULL pointer exception. This can be triggered during certificate
    verification so could be a DoS attack against a client or a server
    enabling client authentication.
    
    Thanks to Brian Carpenter for reporting this issues.
    
    CVE-2015-0208
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

commit 8106d61c354430d6bbbd7f8e7840a39efc0f5829
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Feb 23 02:32:44 2015 +0000

    Free up ADB and CHOICE if already initialised.
    
    CVE-2015-0287
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Emilia K??sper <emilia at openssl.org>

commit e83ee04bb7de800cdb71d522fa562e99328003a3
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 9 16:09:04 2015 +0000

    Fix Seg fault in DTLSv1_listen
    
    The DTLSv1_listen function is intended to be stateless and processes
    the initial ClientHello from many peers. It is common for user code to
    loop over the call to DTLSv1_listen until a valid ClientHello is received
    with an associated cookie. A defect in the implementation of DTLSv1_listen
    means that state is preserved in the SSL object from one invokation to the
    next that can lead to a segmentation fault. Erorrs processing the initial
    ClientHello can trigger this scenario. An example of such an error could
    be that a DTLS1.0 only client is attempting to connect to a DTLS1.2 only
    server.
    
    CVE-2015-0207
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 1d2a18dc5a3b3363e17db5af8b6b0273856ac077
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 2 09:27:10 2015 +0000

    Multiblock corrupted pointer fix
    
    OpenSSL 1.0.2 introduced the "multiblock" performance improvement. This
    feature only applies on 64 bit x86 architecture platforms that support AES
    NI instructions. A defect in the implementation of "multiblock" can cause
    OpenSSL's internal write buffer to become incorrectly set to NULL when
    using non-blocking IO. Typically, when the user application is using a
    socket BIO for writing, this will only result in a failed connection.
    However if some other BIO is used then it is likely that a segmentation
    fault will be triggered, thus enabling a potential DoS attack.
    
    CVE-2015-0290
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 CHANGES                 | 496 +++++++++++++++++++++---------------------------
 NEWS                    | 117 ++++--------
 crypto/asn1/a_type.c    |   3 +
 crypto/asn1/tasn_dec.c  |  24 ++-
 crypto/asn1/x_x509.c    |  12 +-
 crypto/ec/ec_asn1.c     |   7 +-
 crypto/pkcs7/pk7_doit.c |  87 +++++++--
 crypto/pkcs7/pk7_lib.c  |   3 +
 crypto/rsa/rsa_ameth.c  |   3 +-
 ssl/d1_lib.c            |   3 +
 ssl/s3_pkt.c            |   2 +-
 ssl/s3_srvr.c           |  11 +-
 ssl/t1_lib.c            |  16 +-
 13 files changed, 389 insertions(+), 395 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8d6fcaf..5dd7d8d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -370,7 +370,170 @@
      whose return value is often ignored. 
      [Steve Henson]
 
- Changes between 1.0.1k and 1.0.2 [xx XXX xxxx]
+ Changes between 1.0.2 and 1.0.2a [xx XXX xxxx]
+
+  *) ClientHello sigalgs DoS fix
+
+     If a client connects to an OpenSSL 1.0.2 server and renegotiates with an
+     invalid signature algorithms extension a NULL pointer dereference will
+     occur. This can be exploited in a DoS attack against the server.
+
+     This issue was was reported to OpenSSL by David Ramos of Stanford
+     University.
+     (CVE-2015-0291)
+     [Stephen Henson and Matt Caswell]
+
+  *) Multiblock corrupted pointer fix
+
+     OpenSSL 1.0.2 introduced the "multiblock" performance improvement. This
+     feature only applies on 64 bit x86 architecture platforms that support AES
+     NI instructions. A defect in the implementation of "multiblock" can cause
+     OpenSSL's internal write buffer to become incorrectly set to NULL when
+     using non-blocking IO. Typically, when the user application is using a
+     socket BIO for writing, this will only result in a failed connection.
+     However if some other BIO is used then it is likely that a segmentation
+     fault will be triggered, thus enabling a potential DoS attack.
+
+     This issue was reported to OpenSSL by Daniel Danner and Rainer Mueller.
+     (CVE-2015-0290)
+     [Matt Caswell]
+
+  *) Segmentation fault in DTLSv1_listen fix
+
+     The DTLSv1_listen function is intended to be stateless and processes the
+     initial ClientHello from many peers. It is common for user code to loop
+     over the call to DTLSv1_listen until a valid ClientHello is received with
+     an associated cookie. A defect in the implementation of DTLSv1_listen means
+     that state is preserved in the SSL object from one invocation to the next
+     that can lead to a segmentation fault. Errors processing the initial
+     ClientHello can trigger this scenario. An example of such an error could be
+     that a DTLS1.0 only client is attempting to connect to a DTLS1.2 only
+     server.
+
+     This issue was reported to OpenSSL by Per Allansson.
+     (CVE-2015-0207)
+     [Matt Caswell]
+
+  *) Segmentation fault in ASN1_TYPE_cmp fix
+
+     The function ASN1_TYPE_cmp will crash with an invalid read if an attempt is
+     made to compare ASN.1 boolean types. Since ASN1_TYPE_cmp is used to check
+     certificate signature algorithm consistency this can be used to crash any
+     certificate verification operation and exploited in a DoS attack. Any
+     application which performs certificate verification is vulnerable including
+     OpenSSL clients and servers which enable client authentication.
+     (CVE-2015-0286)
+     [Stephen Henson]
+
+  *) Segmentation fault for invalid PSS parameters fix
+
+     The signature verification routines will crash with a NULL pointer
+     dereference if presented with an ASN.1 signature using the RSA PSS
+     algorithm and invalid parameters. Since these routines are used to verify
+     certificate signature algorithms this can be used to crash any
+     certificate verification operation and exploited in a DoS attack. Any
+     application which performs certificate verification is vulnerable including
+     OpenSSL clients and servers which enable client authentication.
+
+     This issue was was reported to OpenSSL by Brian Carpenter.
+     (CVE-2015-0208)
+     [Stephen Henson]
+
+  *) ASN.1 structure reuse memory corruption fix
+
+     Reusing a structure in ASN.1 parsing may allow an attacker to cause
+     memory corruption via an invalid write. Such reuse is and has been
+     strongly discouraged and is believed to be rare.
+
+     Applications that parse structures containing CHOICE or ANY DEFINED BY
+     components may be affected. Certificate parsing (d2i_X509 and related
+     functions) are however not affected. OpenSSL clients and servers are
+     not affected.
+     (CVE-2015-0287)
+     [Stephen Henson]
+
+  *) PKCS7 NULL pointer dereferences fix
+
+     The PKCS#7 parsing code does not handle missing outer ContentInfo
+     correctly. An attacker can craft malformed ASN.1-encoded PKCS#7 blobs with
+     missing content and trigger a NULL pointer dereference on parsing.
+
+     Applications that verify PKCS#7 signatures, decrypt PKCS#7 data or
+     otherwise parse PKCS#7 structures from untrusted sources are
+     affected. OpenSSL clients and servers are not affected.
+
+     This issue was reported to OpenSSL by Michal Zalewski (Google).
+     (CVE-2015-0289)
+     [Emilia K?sper]
+
+  *) DoS via reachable assert in SSLv2 servers fix
+
+     A malicious client can trigger an OPENSSL_assert (i.e., an abort) in
+     servers that both support SSLv2 and enable export cipher suites by sending
+     a specially crafted SSLv2 CLIENT-MASTER-KEY message.
+
+     This issue was discovered by Sean Burford (Google) and Emilia K?sper
+     (OpenSSL development team).
+     (CVE-2015-0293)
+     [Emilia K?sper]
+
+  *) Empty CKE with client auth and DHE fix
+
+     If client auth is used then a server can seg fault in the event of a DHE
+     ciphersuite being selected and a zero length ClientKeyExchange message
+     being sent by the client. This could be exploited in a DoS attack.
+     (CVE-2015-1787)
+     [Matt Caswell]
+
+  *) Handshake with unseeded PRNG fix
+
+     Under certain conditions an OpenSSL 1.0.2 client can complete a handshake
+     with an unseeded PRNG. The conditions are:
+     - The client is on a platform where the PRNG has not been seeded
+     automatically, and the user has not seeded manually
+     - A protocol specific client method version has been used (i.e. not
+     SSL_client_methodv23)
+     - A ciphersuite is used that does not require additional random data from
+     the PRNG beyond the initial ClientHello client random (e.g. PSK-RC4-SHA).
+
+     If the handshake succeeds then the client random that has been used will
+     have been generated from a PRNG with insufficient entropy and therefore the
+     output may be predictable.
+
+     For example using the following command with an unseeded openssl will
+     succeed on an unpatched platform:
+
+     openssl s_client -psk 1a2b3c4d -tls1_2 -cipher PSK-RC4-SHA
+     (CVE-2015-0285)
+     [Matt Caswell]
+
+  *) Use After Free following d2i_ECPrivatekey error fix
+
+     A malformed EC private key file consumed via the d2i_ECPrivateKey function
+     could cause a use after free condition. This, in turn, could cause a double
+     free in several private key parsing functions (such as d2i_PrivateKey
+     or EVP_PKCS82PKEY) and could lead to a DoS attack or memory corruption
+     for applications that receive EC private keys from untrusted
+     sources. This scenario is considered rare.
+
+     This issue was discovered by the BoringSSL project and fixed in their
+     commit 517073cd4b.
+     (CVE-2015-0209)
+     [Matt Caswell]
+
+  *) X509_to_X509_REQ NULL pointer deref fix
+
+     The function X509_to_X509_REQ will crash with a NULL pointer dereference if
+     the certificate key is invalid. This function is rarely used in practice.
+
+     This issue was discovered by Brian Carpenter.
+     (CVE-2015-0288)
+     [Stephen Henson]
+
+  *) Removed the export ciphers from the DEFAULT ciphers
+     [Kurt Roeckx]
+
+ Changes between 1.0.1l and 1.0.2 [22 Jan 2015]
 
   *) Facilitate "universal" ARM builds targeting range of ARM ISAs, e.g.
      ARMv5 through ARMv8, as opposite to "locking" it to single one.
@@ -700,7 +863,35 @@
      X509_CINF_set_modified, X509_CINF_get_issuer, X509_CINF_get_extensions and
      X509_CINF_get_signature were reverted post internal team review.
 
- Changes between 1.0.1j and 1.0.1k [xx XXX xxxx]
+ Changes between 1.0.1k and 1.0.1l [15 Jan 2015]
+
+  *) Build fixes for the Windows and OpenVMS platforms
+     [Matt Caswell and Richard Levitte]
+
+ Changes between 1.0.1j and 1.0.1k [8 Jan 2015]
+
+  *) Fix DTLS segmentation fault in dtls1_get_record. A carefully crafted DTLS
+     message can cause a segmentation fault in OpenSSL due to a NULL pointer
+     dereference. This could lead to a Denial Of Service attack. Thanks to
+     Markus Stenberg of Cisco Systems, Inc. for reporting this issue.
+     (CVE-2014-3571)
+     [Steve Henson]
+
+  *) Fix DTLS memory leak in dtls1_buffer_record. A memory leak can occur in the
+     dtls1_buffer_record function under certain conditions. In particular this
+     could occur if an attacker sent repeated DTLS records with the same
+     sequence number but for the next epoch. The memory leak could be exploited
+     by an attacker in a Denial of Service attack through memory exhaustion.
+     Thanks to Chris Mueller for reporting this issue.
+     (CVE-2015-0206)
+     [Matt Caswell]
+
+  *) Fix issue where no-ssl3 configuration sets method to NULL. When openssl is
+     built with the no-ssl3 option and a SSL v3 ClientHello is received the ssl
+     method would be set to NULL which could later result in a NULL pointer
+     dereference. Thanks to Frank Schmirler for reporting this issue.
+     (CVE-2014-3569)
+     [Kurt Roeckx]
 
   *) Abort handshake if server key exchange message is omitted for ephemeral
      ECDH ciphersuites.
@@ -719,6 +910,17 @@
      (CVE-2015-0204)
      [Steve Henson]
 
+  *) Fixed issue where DH client certificates are accepted without verification.
+     An OpenSSL server will accept a DH certificate for client authentication
+     without the certificate verify message. This effectively allows a client to
+     authenticate without the use of a private key. This only affects servers
+     which trust a client certificate authority which issues certificates
+     containing DH keys: these are extremely rare and hardly ever encountered.
+     Thanks for Karthikeyan Bhargavan of the PROSECCO team at INRIA or reporting
+     this issue.
+     (CVE-2015-0205)
+     [Steve Henson]
+
   *) Ensure that the session ID context of an SSL is updated when its
      SSL_CTX is updated via SSL_set_SSL_CTX.
 
@@ -763,6 +965,17 @@
      (CVE-2014-8275)
      [Steve Henson]
 
+   *) Correct Bignum squaring. Bignum squaring (BN_sqr) may produce incorrect
+      results on some platforms, including x86_64. This bug occurs at random
+      with a very low probability, and is not known to be exploitable in any
+      way, though its exact impact is difficult to determine. Thanks to Pieter
+      Wuille (Blockstream) who reported this issue and also suggested an initial
+      fix. Further analysis was conducted by the OpenSSL development team and
+      Adam Langley of Google. The final fix was developed by Andy Polyakov of
+      the OpenSSL core team.
+      (CVE-2014-3570)
+      [Andy Polyakov]
+
    *) Do not resume sessions on the server if the negotiated protocol
       version does not match the session's version. Resuming with a different
       version, while not strictly forbidden by the RFC, is of questionable
@@ -1419,63 +1632,6 @@
        Add command line options to s_client/s_server.
      [Steve Henson]
 
- Changes between 1.0.0j and 1.0.0k [5 Feb 2013]
-
-  *) Make the decoding of SSLv3, TLS and DTLS CBC records constant time.
-
-     This addresses the flaw in CBC record processing discovered by 
-     Nadhem Alfardan and Kenny Paterson. Details of this attack can be found
-     at: http://www.isg.rhul.ac.uk/tls/     
-
-     Thanks go to Nadhem Alfardan and Kenny Paterson of the Information
-     Security Group at Royal Holloway, University of London
-     (www.isg.rhul.ac.uk) for discovering this flaw and Adam Langley and
-     Emilia K?sper for the initial patch.
-     (CVE-2013-0169)
-     [Emilia K?sper, Adam Langley, Ben Laurie, Andy Polyakov, Steve Henson]
-
-  *) Return an error when checking OCSP signatures when key is NULL.
-     This fixes a DoS attack. (CVE-2013-0166)
-     [Steve Henson]
-
-  *) Call OCSP Stapling callback after ciphersuite has been chosen, so
-     the right response is stapled. Also change SSL_get_certificate()
-     so it returns the certificate actually sent.
-     See http://rt.openssl.org/Ticket/Display.html?id=2836.
-     (This is a backport)
-     [Rob Stradling <rob.stradling at comodo.com>]
-
-  *) Fix possible deadlock when decoding public keys.
-     [Steve Henson]
-
- Changes between 1.0.0i and 1.0.0j [10 May 2012]
-
-  [NB: OpenSSL 1.0.0i and later 1.0.0 patch levels were released after
-  OpenSSL 1.0.1.]
-
-  *) Sanity check record length before skipping explicit IV in DTLS
-     to fix DoS attack.
-
-     Thanks to Codenomicon for discovering this issue using Fuzz-o-Matic
-     fuzzing as a service testing platform.
-     (CVE-2012-2333)
-     [Steve Henson]
-
-  *) Initialise tkeylen properly when encrypting CMS messages.
-     Thanks to Solar Designer of Openwall for reporting this issue.
-     [Steve Henson]
-
- Changes between 1.0.0h and 1.0.0i [19 Apr 2012]
-
-  *) Check for potentially exploitable overflows in asn1_d2i_read_bio
-     BUF_mem_grow and BUF_mem_grow_clean. Refuse attempts to shrink buffer
-     in CRYPTO_realloc_clean.
-
-     Thanks to Tavis Ormandy, Google Security Team, for discovering this
-     issue and to Adam Langley <agl at chromium.org> for fixing it.
-     (CVE-2012-2110)
-     [Adam Langley (Google), Tavis Ormandy, Google Security Team]
-
  Changes between 1.0.0g and 1.0.0h [12 Mar 2012]
 
   *) Fix MMA (Bleichenbacher's attack on PKCS #1 v1.5 RSA padding) weakness
@@ -2466,228 +2622,6 @@
   *) Change 'Configure' script to enable Camellia by default.
      [NTT]
 
- Changes between 0.9.8x and 0.9.8y [5 Feb 2013]
-
-  *) Make the decoding of SSLv3, TLS and DTLS CBC records constant time.
-
-     This addresses the flaw in CBC record processing discovered by 
-     Nadhem Alfardan and Kenny Paterson. Details of this attack can be found
-     at: http://www.isg.rhul.ac.uk/tls/     
-
-     Thanks go to Nadhem Alfardan and Kenny Paterson of the Information
-     Security Group at Royal Holloway, University of London
-     (www.isg.rhul.ac.uk) for discovering this flaw and Adam Langley and
-     Emilia K?sper for the initial patch.
-     (CVE-2013-0169)
-     [Emilia K?sper, Adam Langley, Ben Laurie, Andy Polyakov, Steve Henson]
-
-  *) Return an error when checking OCSP signatures when key is NULL.
-     This fixes a DoS attack. (CVE-2013-0166)
-     [Steve Henson]
-
-  *) Call OCSP Stapling callback after ciphersuite has been chosen, so
-     the right response is stapled. Also change SSL_get_certificate()
-     so it returns the certificate actually sent.
-     See http://rt.openssl.org/Ticket/Display.html?id=2836.
-     (This is a backport)
-     [Rob Stradling <rob.stradling at comodo.com>]
-
-  *) Fix possible deadlock when decoding public keys.
-     [Steve Henson]
-
- Changes between 0.9.8w and 0.9.8x [10 May 2012]
-
-  *) Sanity check record length before skipping explicit IV in DTLS
-     to fix DoS attack.
-
-     Thanks to Codenomicon for discovering this issue using Fuzz-o-Matic
-     fuzzing as a service testing platform.
-     (CVE-2012-2333)
-     [Steve Henson]
-
-  *) Initialise tkeylen properly when encrypting CMS messages.
-     Thanks to Solar Designer of Openwall for reporting this issue.
-     [Steve Henson]
-
- Changes between 0.9.8v and 0.9.8w [23 Apr 2012]
-
-  *) The fix for CVE-2012-2110 did not take into account that the 
-     'len' argument to BUF_MEM_grow and BUF_MEM_grow_clean is an
-     int in OpenSSL 0.9.8, making it still vulnerable. Fix by 
-     rejecting negative len parameter. (CVE-2012-2131)
-     [Tomas Hoger <thoger at redhat.com>]
-
- Changes between 0.9.8u and 0.9.8v [19 Apr 2012]
-
-  *) Check for potentially exploitable overflows in asn1_d2i_read_bio
-     BUF_mem_grow and BUF_mem_grow_clean. Refuse attempts to shrink buffer
-     in CRYPTO_realloc_clean.
-
-     Thanks to Tavis Ormandy, Google Security Team, for discovering this
-     issue and to Adam Langley <agl at chromium.org> for fixing it.
-     (CVE-2012-2110)
-     [Adam Langley (Google), Tavis Ormandy, Google Security Team]
-
- Changes between 0.9.8t and 0.9.8u [12 Mar 2012]
-
-  *) Fix MMA (Bleichenbacher's attack on PKCS #1 v1.5 RSA padding) weakness
-     in CMS and PKCS7 code. When RSA decryption fails use a random key for
-     content decryption and always return the same error. Note: this attack
-     needs on average 2^20 messages so it only affects automated senders. The
-     old behaviour can be reenabled in the CMS code by setting the
-     CMS_DEBUG_DECRYPT flag: this is useful for debugging and testing where
-     an MMA defence is not necessary.
-     Thanks to Ivan Nestlerode <inestlerode at us.ibm.com> for discovering
-     this issue. (CVE-2012-0884)
-     [Steve Henson]
-
-  *) Fix CVE-2011-4619: make sure we really are receiving a 
-     client hello before rejecting multiple SGC restarts. Thanks to
-     Ivan Nestlerode <inestlerode at us.ibm.com> for discovering this bug.
-     [Steve Henson]
-
- Changes between 0.9.8s and 0.9.8t [18 Jan 2012]
-
-  *) Fix for DTLS DoS issue introduced by fix for CVE-2011-4109.
-     Thanks to Antonio Martin, Enterprise Secure Access Research and
-     Development, Cisco Systems, Inc. for discovering this bug and
-     preparing a fix. (CVE-2012-0050)
-     [Antonio Martin]
-
- Changes between 0.9.8r and 0.9.8s [4 Jan 2012]
-
-  *) Nadhem Alfardan and Kenny Paterson have discovered an extension
-     of the Vaudenay padding oracle attack on CBC mode encryption
-     which enables an efficient plaintext recovery attack against
-     the OpenSSL implementation of DTLS. Their attack exploits timing
-     differences arising during decryption processing. A research
-     paper describing this attack can be found at:
-                  http://www.isg.rhul.ac.uk/~kp/dtls.pdf
-     Thanks go to Nadhem Alfardan and Kenny Paterson of the Information
-     Security Group at Royal Holloway, University of London
-     (www.isg.rhul.ac.uk) for discovering this flaw and to Robin Seggelmann
-     <seggelmann at fh-muenster.de> and Michael Tuexen <tuexen at fh-muenster.de>
-     for preparing the fix. (CVE-2011-4108)
-     [Robin Seggelmann, Michael Tuexen]
-
-  *) Stop policy check failure freeing same buffer twice. (CVE-2011-4109)
-     [Ben Laurie, Kasper <ekasper at google.com>]
-
-  *) Clear bytes used for block padding of SSL 3.0 records.
-     (CVE-2011-4576)
-     [Adam Langley (Google)]
-
-  *) Only allow one SGC handshake restart for SSL/TLS. Thanks to George
-     Kadianakis <desnacked at gmail.com> for discovering this issue and
-     Adam Langley for preparing the fix. (CVE-2011-4619)
-     [Adam Langley (Google)]
- 
-  *) Prevent malformed RFC3779 data triggering an assertion failure.
-     Thanks to Andrew Chi, BBN Technologies, for discovering the flaw
-     and Rob Austein <sra at hactrn.net> for fixing it. (CVE-2011-4577)
-     [Rob Austein <sra at hactrn.net>]
-
-  *) Fix ssl_ciph.c set-up race.
-     [Adam Langley (Google)]
-
-  *) Fix spurious failures in ecdsatest.c.
-     [Emilia K?sper (Google)]
-
-  *) Fix the BIO_f_buffer() implementation (which was mixing different
-     interpretations of the '..._len' fields).
-     [Adam Langley (Google)]
-
-  *) Fix handling of BN_BLINDING: now BN_BLINDING_invert_ex (rather than
-     BN_BLINDING_invert_ex) calls BN_BLINDING_update, ensuring that concurrent
-     threads won't reuse the same blinding coefficients.
-
-     This also avoids the need to obtain the CRYPTO_LOCK_RSA_BLINDING
-     lock to call BN_BLINDING_invert_ex, and avoids one use of
-     BN_BLINDING_update for each BN_BLINDING structure (previously,
-     the last update always remained unused).
-     [Emilia K?sper (Google)]
-
-  *) Fix SSL memory handling for (EC)DH ciphersuites, in particular
-     for multi-threaded use of ECDH.
-     [Adam Langley (Google)]
-
-  *) Fix x509_name_ex_d2i memory leak on bad inputs.
-     [Bodo Moeller]
-
-  *) Add protection against ECDSA timing attacks as mentioned in the paper
-     by Billy Bob Brumley and Nicola Tuveri, see:
-
-	http://eprint.iacr.org/2011/232.pdf
-
-     [Billy Bob Brumley and Nicola Tuveri]
-
- Changes between 0.9.8q and 0.9.8r [8 Feb 2011]
-
-  *) Fix parsing of OCSP stapling ClientHello extension. CVE-2011-0014
-     [Neel Mehta, Adam Langley, Bodo Moeller (Google)]
-
-  *) Fix bug in string printing code: if *any* escaping is enabled we must
-     escape the escape character (backslash) or the resulting string is
-     ambiguous.
-     [Steve Henson]
-
- Changes between 0.9.8p and 0.9.8q [2 Dec 2010]
-
-  *) Disable code workaround for ancient and obsolete Netscape browsers
-     and servers: an attacker can use it in a ciphersuite downgrade attack.
-     Thanks to Martin Rex for discovering this bug. CVE-2010-4180
-     [Steve Henson]
-
-  *) Fixed J-PAKE implementation error, originally discovered by
-     Sebastien Martini, further info and confirmation from Stefan
-     Arentz and Feng Hao. Note that this fix is a security fix. CVE-2010-4252
-     [Ben Laurie]
-
- Changes between 0.9.8o and 0.9.8p [16 Nov 2010]
-
-  *) Fix extension code to avoid race conditions which can result in a buffer
-     overrun vulnerability: resumed sessions must not be modified as they can
-     be shared by multiple threads. CVE-2010-3864
-     [Steve Henson]
-
-  *) Fix for double free bug in ssl/s3_clnt.c CVE-2010-2939
-     [Steve Henson]
-
-  *) Don't reencode certificate when calculating signature: cache and use
-     the original encoding instead. This makes signature verification of
-     some broken encodings work correctly.
-     [Steve Henson]
-
-  *) ec2_GF2m_simple_mul bugfix: compute correct result if the output EC_POINT
-     is also one of the inputs.
-     [Emilia K?sper <emilia.kasper at esat.kuleuven.be> (Google)]
-
-  *) Don't repeatedly append PBE algorithms to table if they already exist.
-     Sort table on each new add. This effectively makes the table read only
-     after all algorithms are added and subsequent calls to PKCS12_pbe_add
-     etc are non-op.
-     [Steve Henson]
-
- Changes between 0.9.8n and 0.9.8o [01 Jun 2010]
-
-  [NB: OpenSSL 0.9.8o and later 0.9.8 patch levels were released after
-  OpenSSL 1.0.0.]
-
-  *) Correct a typo in the CMS ASN1 module which can result in invalid memory
-     access or freeing data twice (CVE-2010-0742)
-     [Steve Henson, Ronald Moesbergen <intercommit at gmail.com>]
-
-  *) Add SHA2 algorithms to SSL_library_init(). SHA2 is becoming far more
-     common in certificates and some applications which only call
-     SSL_library_init and not OpenSSL_add_all_algorithms() will fail.
-     [Steve Henson]
-
-  *) VMS fixes: 
-     Reduce copying into .apps and .test in makevms.com
-     Don't try to use blank CA certificate in CA.com
-     Allow use of C files from original directories in maketests.com
-     [Steven M. Schweda" <sms at antinode.info>]
-
  Changes between 0.9.8m and 0.9.8n [24 Mar 2010]
 
   *) When rejecting SSL/TLS records due to an incorrect version number, never
diff --git a/NEWS b/NEWS
index 1aa3ea7..cbf847a 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,23 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
-  Major changes between OpenSSL 1.0.1j and OpenSSL 1.0.2 [in beta]:
+  Major changes between OpenSSL 1.0.2 and OpenSSL 1.0.2a [under development]
+
+      o OpenSSL 1.0.2 ClientHello sigalgs DoS fix (CVE-2015-0291)
+      o Multiblock corrupted pointer fix (CVE-2015-0290)
+      o Segmentation fault in DTLSv1_listen fix (CVE-2015-0207)
+      o Segmentation fault in ASN1_TYPE_cmp fix (CVE-2015-0286)
+      o Segmentation fault for invalid PSS parameters fix (CVE-2015-0208)
+      o ASN.1 structure reuse memory corruption fix (CVE-2015-0287)
+      o PKCS7 NULL pointer dereferences fix (CVE-2015-0289)
+      o DoS via reachable assert in SSLv2 servers fix (CVE-2015-0293)
+      o Empty CKE with client auth and DHE fix (CVE-2015-1787)
+      o Handshake with unseeded PRNG fix (CVE-2015-0285)
+      o Use After Free following d2i_ECPrivatekey error fix (CVE-2015-0209)
+      o X509_to_X509_REQ NULL pointer deref fix (CVE-2015-0288)
+      o Removed the export ciphers from the DEFAULT ciphers
+
+  Major changes between OpenSSL 1.0.1l and OpenSSL 1.0.2 [22 Jan 2015]:
 
       o Suite B support for TLS 1.2 and DTLS 1.2
       o Support for DTLS 1.2
@@ -16,6 +32,21 @@
       o ALPN support.
       o CMS support for RSA-PSS, RSA-OAEP, ECDH and X9.42 DH.
 
+  Major changes between OpenSSL 1.0.1k and OpenSSL 1.0.1l [15 Jan 2015]
+
+      o Build fixes for the Windows and OpenVMS platforms
+
+  Major changes between OpenSSL 1.0.1j and OpenSSL 1.0.1k [8 Jan 2015]
+
+      o Fix for CVE-2014-3571
+      o Fix for CVE-2015-0206
+      o Fix for CVE-2014-3569
+      o Fix for CVE-2014-3572
+      o Fix for CVE-2015-0204
+      o Fix for CVE-2015-0205
+      o Fix for CVE-2014-8275
+      o Fix for CVE-2014-3570
+
   Major changes between OpenSSL 1.0.1i and OpenSSL 1.0.1j [15 Oct 2014]
 
       o Fix for CVE-2014-3513
@@ -39,6 +70,7 @@
 
       o Fix for CVE-2014-0224
       o Fix for CVE-2014-0221
+      o Fix for CVE-2014-0198
       o Fix for CVE-2014-0195
       o Fix for CVE-2014-3470
       o Fix for CVE-2010-5298
@@ -98,23 +130,6 @@
       o Preliminary FIPS capability for unvalidated 2.0 FIPS module.
       o SRP support.
 
-  Major changes between OpenSSL 1.0.0k and OpenSSL 1.0.0l [6 Jan 2014]
-
-      o Fix for DTLS retransmission bug CVE-2013-6450
-
-  Major changes between OpenSSL 1.0.0j and OpenSSL 1.0.0k [5 Feb 2013]:
-
-      o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169
-      o Fix OCSP bad key DoS attack CVE-2013-0166
-
-  Major changes between OpenSSL 1.0.0i and OpenSSL 1.0.0j [10 May 2012]:
-
-      o Fix DTLS record length checking bug CVE-2012-2333
-
-  Major changes between OpenSSL 1.0.0h and OpenSSL 1.0.0i [19 Apr 2012]:
-
-      o Fix for ASN1 overflow bug CVE-2012-2110
-
   Major changes between OpenSSL 1.0.0g and OpenSSL 1.0.0h [12 Mar 2012]:
 
       o Fix for CMS/PKCS#7 MMA CVE-2012-0884
@@ -187,72 +202,6 @@
       o Opaque PRF Input TLS extension support.
       o Updated time routines to avoid OS limitations.
 
-  Major changes between OpenSSL 0.9.8y and OpenSSL 0.9.8za [5 Jun 2014]:
-
-      o Fix for CVE-2014-0224
-      o Fix for CVE-2014-0221
-      o Fix for CVE-2014-0195
-      o Fix for CVE-2014-3470
-      o Fix for CVE-2014-0076
-      o Fix for CVE-2010-5298
-      o Fix to TLS alert handling.
-
-  Major changes between OpenSSL 0.9.8x and OpenSSL 0.9.8y [5 Feb 2013]:
-
-      o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169
-      o Fix OCSP bad key DoS attack CVE-2013-0166
-
-  Major changes between OpenSSL 0.9.8w and OpenSSL 0.9.8x [10 May 2012]:
-
-      o Fix DTLS record length checking bug CVE-2012-2333
-
-  Major changes between OpenSSL 0.9.8v and OpenSSL 0.9.8w [23 Apr 2012]:
-
-      o Fix for CVE-2012-2131 (corrected fix for 0.9.8 and CVE-2012-2110)
-
-  Major changes between OpenSSL 0.9.8u and OpenSSL 0.9.8v [19 Apr 2012]:
-
-      o Fix for ASN1 overflow bug CVE-2012-2110
-
-  Major changes between OpenSSL 0.9.8t and OpenSSL 0.9.8u [12 Mar 2012]:
-
-      o Fix for CMS/PKCS#7 MMA CVE-2012-0884
-      o Corrected fix for CVE-2011-4619
-      o Various DTLS fixes.
-
-  Major changes between OpenSSL 0.9.8s and OpenSSL 0.9.8t [18 Jan 2012]:
-
-      o Fix for DTLS DoS issue CVE-2012-0050
-
-  Major changes between OpenSSL 0.9.8r and OpenSSL 0.9.8s [4 Jan 2012]:
-
-      o Fix for DTLS plaintext recovery attack CVE-2011-4108
-      o Fix policy check double free error CVE-2011-4109
-      o Clear block padding bytes of SSL 3.0 records CVE-2011-4576
-      o Only allow one SGC handshake restart for SSL/TLS CVE-2011-4619
-      o Check for malformed RFC3779 data CVE-2011-4577
-
-  Major changes between OpenSSL 0.9.8q and OpenSSL 0.9.8r [8 Feb 2011]:
-
-      o Fix for security issue CVE-2011-0014
-
-  Major changes between OpenSSL 0.9.8p and OpenSSL 0.9.8q [2 Dec 2010]:
-
-      o Fix for security issue CVE-2010-4180
-      o Fix for CVE-2010-4252
-
-  Major changes between OpenSSL 0.9.8o and OpenSSL 0.9.8p [16 Nov 2010]:
-
-      o Fix for security issue CVE-2010-3864.
-
-  Major changes between OpenSSL 0.9.8n and OpenSSL 0.9.8o [1 Jun 2010]:
-
-      o Fix for security issue CVE-2010-0742.
-      o Various DTLS fixes.
-      o Recognise SHA2 certificates if only SSL algorithms added.
-      o Fix for no-rc4 compilation.
-      o Chil ENGINE unload workaround.
-
   Major changes between OpenSSL 0.9.8m and OpenSSL 0.9.8n [24 Mar 2010]:
 
       o CFB cipher definition fixes.
diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c
index 13ecfcd..e7ec49d 100644
--- a/crypto/asn1/a_type.c
+++ b/crypto/asn1/a_type.c
@@ -115,6 +115,9 @@ int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b)
     case V_ASN1_OBJECT:
         result = OBJ_cmp(a->value.object, b->value.object);
         break;
+    case V_ASN1_BOOLEAN:
+        result = a->value.boolean - b->value.boolean;
+        break;
     case V_ASN1_NULL:
         result = 0;             /* They do not have content. */
         break;
diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index abdeba4..3d62284 100644
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -303,9 +303,16 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
     case ASN1_ITYPE_CHOICE:
         if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL))
             goto auxerr;
-
-        /* Allocate structure */
-        if (!*pval && !ASN1_item_ex_new(pval, it)) {
+        if (*pval) {
+            /* Free up and zero CHOICE value if initialised */
+            i = asn1_get_choice_selector(pval, it);
+            if ((i >= 0) && (i < it->tcount)) {
+                tt = it->templates + i;
+                pchptr = asn1_get_field_ptr(pval, tt);
+                ASN1_template_free(pchptr, tt);
+                asn1_set_choice_selector(pval, -1, it);
+            }
+        } else if (!ASN1_item_ex_new(pval, it)) {
             ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ERR_R_NESTED_ASN1_ERROR);
             goto err;
         }
@@ -385,6 +392,17 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
         if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL))
             goto auxerr;
 
+        /* Free up and zero any ADB found */
+        for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) {
+            if (tt->flags & ASN1_TFLG_ADB_MASK) {
+                const ASN1_TEMPLATE *seqtt;
+                ASN1_VALUE **pseqval;
+                seqtt = asn1_do_adb(pval, tt, 1);
+                pseqval = asn1_get_field_ptr(pval, seqtt);
+                ASN1_template_free(pseqval, seqtt);
+            }
+        }
+
         /* Get each field entry */
         for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) {
             const ASN1_TEMPLATE *seqtt;
diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
index f487dbb..36f6ff4 100644
--- a/crypto/asn1/x_x509.c
+++ b/crypto/asn1/x_x509.c
@@ -168,8 +168,14 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
 {
     const unsigned char *q;
     X509 *ret;
+    int freeret = 0;
+
     /* Save start position */
     q = *pp;
+
+    if(!a || *a == NULL) {
+        freeret = 1;
+    }
     ret = d2i_X509(a, pp, length);
     /* If certificate unreadable then forget it */
     if (!ret)
@@ -182,7 +188,11 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
         goto err;
     return ret;
  err:
-    X509_free(ret);
+    if(freeret) {
+        X509_free(ret);
+        if (a)
+            *a = NULL;
+    }
     return NULL;
 }
 
diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index 6ff94a3..b4b0e9f 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -1226,16 +1226,19 @@ EC_KEY *d2i_ECParameters(EC_KEY **a, const unsigned char **in, long len)
             ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_MALLOC_FAILURE);
             return NULL;
         }
-        if (a)
-            *a = ret;
     } else
         ret = *a;
 
     if (!d2i_ECPKParameters(&ret->group, in, len)) {
         ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_EC_LIB);
+        if (a == NULL || *a != ret)
+             EC_KEY_free(ret);
         return NULL;
     }
 
+    if (a)
+        *a = ret;
+
     return ret;
 }
 
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index f61d63b..25ac2df 100644
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -261,6 +261,25 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
     PKCS7_RECIP_INFO *ri = NULL;
     ASN1_OCTET_STRING *os = NULL;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAINIT, PKCS7_R_INVALID_NULL_POINTER);
+        return NULL;
+    }
+    /*
+     * The content field in the PKCS7 ContentInfo is optional, but that really
+     * only applies to inner content (precisely, detached signatures).
+     *
+     * When reading content, missing outer content is therefore treated as an
+     * error.
+     *
+     * When creating content, PKCS7_content_new() must be called before
+     * calling this method, so a NULL p7->d is always an error.
+     */
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAINIT, PKCS7_R_NO_CONTENT);
+        return NULL;
+    }
+
     i = OBJ_obj2nid(p7->type);
     p7->state = PKCS7_S_HEADER;
 
@@ -411,6 +430,16 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
     unsigned char *ek = NULL, *tkey = NULL;
     int eklen = 0, tkeylen = 0;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATADECODE, PKCS7_R_INVALID_NULL_POINTER);
+        return NULL;
+    }
+
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATADECODE, PKCS7_R_NO_CONTENT);
+        return NULL;
+    }
+
     i = OBJ_obj2nid(p7->type);
     p7->state = PKCS7_S_HEADER;
 
@@ -683,6 +712,16 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
     STACK_OF(PKCS7_SIGNER_INFO) *si_sk = NULL;
     ASN1_OCTET_STRING *os = NULL;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_INVALID_NULL_POINTER);
+        return 0;
+    }
+
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_NO_CONTENT);
+        return 0;
+    }
+
     EVP_MD_CTX_init(&ctx_tmp);
     i = OBJ_obj2nid(p7->type);
     p7->state = PKCS7_S_HEADER;
@@ -722,6 +761,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         /* If detached data then the content is excluded */
         if (PKCS7_type_is_data(p7->d.sign->contents) && p7->detached) {
             M_ASN1_OCTET_STRING_free(os);
+            os = NULL;
             p7->d.sign->contents->d.data = NULL;
         }
         break;
@@ -731,6 +771,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         /* If detached data then the content is excluded */
         if (PKCS7_type_is_data(p7->d.digest->contents) && p7->detached) {
             M_ASN1_OCTET_STRING_free(os);
+            os = NULL;
             p7->d.digest->contents->d.data = NULL;
         }
         break;
@@ -796,22 +837,30 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
     }
 
-    if (!PKCS7_is_detached(p7) && !(os->flags & ASN1_STRING_FLAG_NDEF)) {
-        char *cont;
-        long contlen;
-        btmp = BIO_find_type(bio, BIO_TYPE_MEM);
-        if (btmp == NULL) {
-            PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_UNABLE_TO_FIND_MEM_BIO);
-            goto err;
-        }
-        contlen = BIO_get_mem_data(btmp, &cont);
+    if (!PKCS7_is_detached(p7)) {
         /*
-         * Mark the BIO read only then we can use its copy of the data
-         * instead of making an extra copy.
+         * NOTE(emilia): I think we only reach os == NULL here because detached
+         * digested data support is broken.
          */
-        BIO_set_flags(btmp, BIO_FLAGS_MEM_RDONLY);
-        BIO_set_mem_eof_return(btmp, 0);
-        ASN1_STRING_set0(os, (unsigned char *)cont, contlen);
+        if (os == NULL)
+            goto err;
+        if (!(os->flags & ASN1_STRING_FLAG_NDEF)) {
+            char *cont;
+            long contlen;
+            btmp = BIO_find_type(bio, BIO_TYPE_MEM);
+            if (btmp == NULL) {
+                PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_UNABLE_TO_FIND_MEM_BIO);
+                goto err;
+            }
+            contlen = BIO_get_mem_data(btmp, &cont);
+            /*
+             * Mark the BIO read only then we can use its copy of the data
+             * instead of making an extra copy.
+             */
+            BIO_set_flags(btmp, BIO_FLAGS_MEM_RDONLY);
+            BIO_set_mem_eof_return(btmp, 0);
+            ASN1_STRING_set0(os, (unsigned char *)cont, contlen);
+        }
     }
     ret = 1;
  err:
@@ -886,6 +935,16 @@ int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio,
     STACK_OF(X509) *cert;
     X509 *x509;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAVERIFY, PKCS7_R_INVALID_NULL_POINTER);
+        return 0;
+    }
+
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAVERIFY, PKCS7_R_NO_CONTENT);
+        return 0;
+    }
+
     if (PKCS7_type_is_signed(p7)) {
         cert = p7->d.sign->cert;
     } else if (PKCS7_type_is_signedAndEnveloped(p7)) {
diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index c773812..0c5fcaa 100644
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -70,6 +70,7 @@ long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
     nid = OBJ_obj2nid(p7->type);
 
     switch (cmd) {
+    /* NOTE(emilia): does not support detached digested data. */
     case PKCS7_OP_SET_DETACHED_SIGNATURE:
         if (nid == NID_pkcs7_signed) {
             ret = p7->detached = (int)larg;
@@ -444,6 +445,8 @@ int PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md)
 
 STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7)
 {
+    if (p7 == NULL || p7->d.ptr == NULL)
+        return NULL;
     if (PKCS7_type_is_signed(p7)) {
         return (p7->d.sign->signer_info);
     } else if (PKCS7_type_is_signedAndEnveloped(p7)) {
diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
index 5e8701a..6f4c104 100644
--- a/crypto/rsa/rsa_ameth.c
+++ b/crypto/rsa/rsa_ameth.c
@@ -703,9 +703,10 @@ static int rsa_item_verify(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,
         RSAerr(RSA_F_RSA_ITEM_VERIFY, RSA_R_UNSUPPORTED_SIGNATURE_TYPE);
         return -1;
     }
-    if (rsa_pss_to_ctx(ctx, NULL, sigalg, pkey))
+    if (rsa_pss_to_ctx(ctx, NULL, sigalg, pkey) > 0) {
         /* Carry on */
         return 2;
+    }
     return -1;
 }
 
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index 626cecb..e9a2fc5 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -546,6 +546,9 @@ int dtls1_listen(SSL *s, struct sockaddr *client)
 {
     int ret;
 
+    /* Ensure there is no state left over from a previous invocation */
+    SSL_clear(s);
+
     SSL_set_options(s, SSL_OP_COOKIE_EXCHANGE);
     s->d1->listen = 1;
 
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 66fa9d1..cf02e49 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -804,7 +804,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
 
             i = ssl3_write_pending(s, type, &buf[tot], nw);
             if (i <= 0) {
-                if (i < 0) {
+                if (i < 0 && (!s->wbio || !BIO_should_retry(s->wbio))) {
                     OPENSSL_free(wb->buf);
                     wb->buf = NULL;
                 }
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index e5346b6..f8c7e37 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -2233,10 +2233,17 @@ int ssl3_get_client_key_exchange(SSL *s)
     if (alg_k & (SSL_kDHE | SSL_kDHr | SSL_kDHd)) {
         int idx = -1;
         EVP_PKEY *skey = NULL;
-        if (n)
+        if (n > 1) {
             n2s(p, i);
-        else
+        } else {
+            if (alg_k & SSL_kDHE) {
+                al = SSL_AD_HANDSHAKE_FAILURE;
+                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                       SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG);
+                goto f_err;
+            }
             i = 0;
+        }
         if (n && n != i + 2) {
             if (!(s->options & SSL_OP_SSLEAY_080_CLIENT_DH_BUG)) {
                 SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index b6e878a..8b75dba 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -2693,6 +2693,7 @@ int tls1_set_server_sigalgs(SSL *s)
     if (s->cert->shared_sigalgs) {
         OPENSSL_free(s->cert->shared_sigalgs);
         s->cert->shared_sigalgs = NULL;
+        s->cert->shared_sigalgslen = 0;
     }
     /* Clear certificate digests and validity flags */
     for (i = 0; i < SSL_PKEY_NUM; i++) {
@@ -3396,6 +3397,7 @@ static int tls1_set_shared_sigalgs(SSL *s)
     if (c->shared_sigalgs) {
         OPENSSL_free(c->shared_sigalgs);
         c->shared_sigalgs = NULL;
+        c->shared_sigalgslen = 0;
     }
     /* If client use client signature algorithms if not NULL */
     if (!s->server && c->client_sigalgs && !is_suiteb) {
@@ -3418,12 +3420,14 @@ static int tls1_set_shared_sigalgs(SSL *s)
         preflen = c->peer_sigalgslen;
     }
     nmatch = tls12_shared_sigalgs(s, NULL, pref, preflen, allow, allowlen);
-    if (!nmatch)
-        return 1;
-    salgs = OPENSSL_malloc(nmatch * sizeof(TLS_SIGALGS));
-    if (!salgs)
-        return 0;
-    nmatch = tls12_shared_sigalgs(s, salgs, pref, preflen, allow, allowlen);
+    if (nmatch) {
+        salgs = OPENSSL_malloc(nmatch * sizeof(TLS_SIGALGS));
+        if (!salgs)
+            return 0;
+        nmatch = tls12_shared_sigalgs(s, salgs, pref, preflen, allow, allowlen);
+    } else {
+        salgs = NULL;
+    }
     c->shared_sigalgs = salgs;
     c->shared_sigalgslen = nmatch;
     return 1;

From matt at openssl.org  Thu Mar 19 14:04:05 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 19 Mar 2015 14:04:05 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1426773845.975739.24660.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  0d6d10d97d67a30fcfec029a0c90d1ae30c68b0b (commit)
       via  3df69d3aefde7671053d4e3c242b228e5d79c83f (commit)
       via  921095d4d3780623bfb0e2115026ceb6b6ef5a67 (commit)
       via  5cc6509dae697f0e74aaba73e1635f269a9c5e61 (commit)
       via  18029a3d0739284cadb309ea0fd498379b0bcfdb (commit)
       via  7b22e8d01f8e84b794fc62ada4c9de8ab2021879 (commit)
       via  da947c9758791f25cc48c1a0ba323d567afd5f03 (commit)
       via  128b271c8d01eb761d42eae407085fe2e74cddea (commit)
       via  a8b1e52ff45e1dac1c1b1636042dc8008888a7cd (commit)
       via  d6e903d188a541ff2ccc8f3cbe795d312a5a92e5 (commit)
       via  86f8fb0e344d62454f8daf3e15236b2b59210756 (commit)
       via  c0334c2c92dd1bc3ad8138ba6e74006c3631b0f9 (commit)
       via  c3c7fb07dc975dc3c9de0eddb7d8fd79fc9c67c1 (commit)
       via  b19d8143212ae5fbc9cebfd51c01f802fabccd33 (commit)
       via  76343947ada960b6269090638f5391068daee88d (commit)
       via  4b22cce3812052fe64fc3f6d58d8cc884e3cb834 (commit)
       via  b717b083073b6cacc0a5e2397b661678aff7ae7f (commit)
       via  819418110b6fff4a7b96f01a5d68f71df3e3b736 (commit)
       via  77c77f0a1b9f15b869ca3342186dfbedd1119d0e (commit)
      from  8b84495380098592ef7bb2fa9209ccb87803bf1d (commit)


- Log -----------------------------------------------------------------
commit 0d6d10d97d67a30fcfec029a0c90d1ae30c68b0b
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 13:34:56 2015 +0000

    Prepare for 1.0.2b-dev
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 3df69d3aefde7671053d4e3c242b228e5d79c83f
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 13:31:16 2015 +0000

    Prepare for 1.0.2a release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 921095d4d3780623bfb0e2115026ceb6b6ef5a67
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 13:31:16 2015 +0000

    make update
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 5cc6509dae697f0e74aaba73e1635f269a9c5e61
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 11:35:33 2015 +0000

    Fix unsigned/signed warnings
    
    Fix some unsigned/signed warnings introduced as part of the fix
    for CVE-2015-0293
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 18029a3d0739284cadb309ea0fd498379b0bcfdb
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 10:16:32 2015 +0000

    Fix a failure to NULL a pointer freed on error.
    
    Reported by the LibreSSL project as a follow on to CVE-2015-0209
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 7b22e8d01f8e84b794fc62ada4c9de8ab2021879
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 17 16:50:16 2015 +0000

    Update NEWS file
    
    Update the NEWS file with the latest entries from CHANGES ready for the
    release.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit da947c9758791f25cc48c1a0ba323d567afd5f03
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 17 16:36:37 2015 +0000

    Update CHANGES for release
    
    Update CHANGES file with all the latest fixes ready for the release.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 128b271c8d01eb761d42eae407085fe2e74cddea
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 17 16:44:44 2015 +0000

    Fix discrepancy in NEWS file
    
    There was a discrepancy between the 1.0.2 version of NEWS and the 1.0.1
    version. This fixes it.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit a8b1e52ff45e1dac1c1b1636042dc8008888a7cd
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 17 15:58:40 2015 +0000

    Fix CHANGES discrepancies
    
    There were some discrepancies in the CHANGES file between the 1.0.1 version
    and 1.0.2. This corrects it.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit d6e903d188a541ff2ccc8f3cbe795d312a5a92e5
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 18 09:48:03 2015 +0000

    Remove overlapping CHANGES/NEWS entries
    
    Remove entries from CHANGES and NEWS from letter releases that occur *after*
    the next point release. Without this we get duplicate entries for the same
    issue appearing multiple times.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 86f8fb0e344d62454f8daf3e15236b2b59210756
Author: Emilia Kasper <emilia at openssl.org>
Date:   Wed Mar 4 09:05:02 2015 -0800

    Fix reachable assert in SSLv2 servers.
    
    This assert is reachable for servers that support SSLv2 and export ciphers.
    Therefore, such servers can be DoSed by sending a specially crafted
    SSLv2 CLIENT-MASTER-KEY.
    
    Also fix s2_srvr.c to error out early if the key lengths are malformed.
    These lengths are sent unencrypted, so this does not introduce an oracle.
    
    CVE-2015-0293
    
    This issue was discovered by Sean Burford (Google) and Emilia K??sper of
    the OpenSSL development team.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

commit c0334c2c92dd1bc3ad8138ba6e74006c3631b0f9
Author: Emilia Kasper <emilia at openssl.org>
Date:   Fri Feb 27 16:52:23 2015 +0100

    PKCS#7: avoid NULL pointer dereferences with missing content
    
    In PKCS#7, the ASN.1 content component is optional.
    This typically applies to inner content (detached signatures),
    however we must also handle unexpected missing outer content
    correctly.
    
    This patch only addresses functions reachable from parsing,
    decryption and verification, and functions otherwise associated
    with reading potentially untrusted data.
    
    Correcting all low-level API calls requires further work.
    
    CVE-2015-0289
    
    Thanks to Michal Zalewski (Google) for reporting this issue.
    
    Reviewed-by: Steve Henson <steve at openssl.org>

commit c3c7fb07dc975dc3c9de0eddb7d8fd79fc9c67c1
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 9 23:11:45 2015 +0000

    Fix ASN1_TYPE_cmp
    
    Fix segmentation violation when ASN1_TYPE_cmp is passed a boolean type. This
    can be triggered during certificate verification so could be a DoS attack
    against a client or a server enabling client authentication.
    
    CVE-2015-0286
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit b19d8143212ae5fbc9cebfd51c01f802fabccd33
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 10 16:38:32 2015 +0000

    Fix DHE Null CKE vulnerability
    
    If client auth is used then a server can seg fault in the event of a DHE
    cipher being used and a zero length ClientKeyExchange message being sent
    by the client. This could be exploited in a DoS attack.
    
    CVE-2015-1787
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 76343947ada960b6269090638f5391068daee88d
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Mar 3 13:20:57 2015 +0000

    Fix for CVE-2015-0291
    
    If a client renegotiates using an invalid signature algorithms extension
    it will crash a server with a NULL pointer dereference.
    
    Thanks to David Ramos of Stanford University for reporting this bug.
    
    CVE-2015-0291
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    
    Conflicts:
    	ssl/t1_lib.c

commit 4b22cce3812052fe64fc3f6d58d8cc884e3cb834
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 9 23:16:33 2015 +0000

    Reject invalid PSS parameters.
    
    Fix a bug where invalid PSS parameters are not rejected resulting in a
    NULL pointer exception. This can be triggered during certificate
    verification so could be a DoS attack against a client or a server
    enabling client authentication.
    
    Thanks to Brian Carpenter for reporting this issues.
    
    CVE-2015-0208
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

commit b717b083073b6cacc0a5e2397b661678aff7ae7f
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Feb 23 02:32:44 2015 +0000

    Free up ADB and CHOICE if already initialised.
    
    CVE-2015-0287
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Emilia K??sper <emilia at openssl.org>

commit 819418110b6fff4a7b96f01a5d68f71df3e3b736
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 9 16:09:04 2015 +0000

    Fix Seg fault in DTLSv1_listen
    
    The DTLSv1_listen function is intended to be stateless and processes
    the initial ClientHello from many peers. It is common for user code to
    loop over the call to DTLSv1_listen until a valid ClientHello is received
    with an associated cookie. A defect in the implementation of DTLSv1_listen
    means that state is preserved in the SSL object from one invokation to the
    next that can lead to a segmentation fault. Erorrs processing the initial
    ClientHello can trigger this scenario. An example of such an error could
    be that a DTLS1.0 only client is attempting to connect to a DTLS1.2 only
    server.
    
    CVE-2015-0207
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 77c77f0a1b9f15b869ca3342186dfbedd1119d0e
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 2 09:27:10 2015 +0000

    Multiblock corrupted pointer fix
    
    OpenSSL 1.0.2 introduced the "multiblock" performance improvement. This
    feature only applies on 64 bit x86 architecture platforms that support AES
    NI instructions. A defect in the implementation of "multiblock" can cause
    OpenSSL's internal write buffer to become incorrectly set to NULL when
    using non-blocking IO. Typically, when the user application is using a
    socket BIO for writing, this will only result in a failed connection.
    However if some other BIO is used then it is likely that a segmentation
    fault will be triggered, thus enabling a potential DoS attack.
    
    CVE-2015-0290
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 CHANGES                 | 529 +++++++++++++++++++-----------------------------
 NEWS                    |  88 ++------
 README                  |   2 +-
 crypto/asn1/a_type.c    |   3 +
 crypto/asn1/tasn_dec.c  |  24 ++-
 crypto/asn1/x_x509.c    |  12 +-
 crypto/bio/bio.h        |   1 +
 crypto/bio/bio_err.c    |   3 +-
 crypto/ec/ec_asn1.c     |   7 +-
 crypto/opensslv.h       |   6 +-
 crypto/pkcs7/pk7_doit.c |  87 ++++++--
 crypto/pkcs7/pk7_lib.c  |   3 +
 crypto/rsa/rsa_ameth.c  |   3 +-
 openssl.spec            |   2 +-
 ssl/d1_lib.c            |   3 +
 ssl/s2_lib.c            |   2 +-
 ssl/s2_srvr.c           |  60 ++++--
 ssl/s3_pkt.c            |   2 +-
 ssl/s3_srvr.c           |  11 +-
 ssl/t1_lib.c            |  16 +-
 20 files changed, 418 insertions(+), 446 deletions(-)

diff --git a/CHANGES b/CHANGES
index 11d93b6..4723703 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,51 +2,174 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.0.2 and 1.0.2a [xx XXX xxxx]
+ Changes between 1.0.2a and 1.0.2b [xx XXX xxxx]
 
-  *) Removed the export ciphers from the DEFAULT ciphers
-     [Kurt Roeckx]
+  *)
 
- Changes between 1.0.1l and 1.0.2 [22 Jan 2015]
+ Changes between 1.0.2 and 1.0.2a [19 Mar 2015]
 
-  *) SRTP Memory Leak.
+  *) ClientHello sigalgs DoS fix
 
-     A flaw in the DTLS SRTP extension parsing code allows an attacker, who
-     sends a carefully crafted handshake message, to cause OpenSSL to fail
-     to free up to 64k of memory causing a memory leak. This could be
-     exploited in a Denial Of Service attack. This issue affects OpenSSL
-     1.0.1 server implementations for both SSL/TLS and DTLS regardless of
-     whether SRTP is used or configured. Implementations of OpenSSL that
-     have been compiled with OPENSSL_NO_SRTP defined are not affected.
+     If a client connects to an OpenSSL 1.0.2 server and renegotiates with an
+     invalid signature algorithms extension a NULL pointer dereference will
+     occur. This can be exploited in a DoS attack against the server.
 
-     The fix was developed by the OpenSSL team.
-     (CVE-2014-3513)
-     [OpenSSL team]
+     This issue was was reported to OpenSSL by David Ramos of Stanford
+     University.
+     (CVE-2015-0291)
+     [Stephen Henson and Matt Caswell]
 
-  *) Session Ticket Memory Leak.
+  *) Multiblock corrupted pointer fix
 
-     When an OpenSSL SSL/TLS/DTLS server receives a session ticket the
-     integrity of that ticket is first verified. In the event of a session
-     ticket integrity check failing, OpenSSL will fail to free memory
-     causing a memory leak. By sending a large number of invalid session
-     tickets an attacker could exploit this issue in a Denial Of Service
-     attack.
-     (CVE-2014-3567)
-     [Steve Henson]
+     OpenSSL 1.0.2 introduced the "multiblock" performance improvement. This
+     feature only applies on 64 bit x86 architecture platforms that support AES
+     NI instructions. A defect in the implementation of "multiblock" can cause
+     OpenSSL's internal write buffer to become incorrectly set to NULL when
+     using non-blocking IO. Typically, when the user application is using a
+     socket BIO for writing, this will only result in a failed connection.
+     However if some other BIO is used then it is likely that a segmentation
+     fault will be triggered, thus enabling a potential DoS attack.
 
-  *) Build option no-ssl3 is incomplete.
+     This issue was reported to OpenSSL by Daniel Danner and Rainer Mueller.
+     (CVE-2015-0290)
+     [Matt Caswell]
 
-     When OpenSSL is configured with "no-ssl3" as a build option, servers
-     could accept and complete a SSL 3.0 handshake, and clients could be
-     configured to send them.
-     (CVE-2014-3568)
-     [Akamai and the OpenSSL team]
+  *) Segmentation fault in DTLSv1_listen fix
 
-  *) Add support for TLS_FALLBACK_SCSV.
-     Client applications doing fallback retries should call
-     SSL_set_mode(s, SSL_MODE_SEND_FALLBACK_SCSV).
-     (CVE-2014-3566)
-     [Adam Langley, Bodo Moeller]
+     The DTLSv1_listen function is intended to be stateless and processes the
+     initial ClientHello from many peers. It is common for user code to loop
+     over the call to DTLSv1_listen until a valid ClientHello is received with
+     an associated cookie. A defect in the implementation of DTLSv1_listen means
+     that state is preserved in the SSL object from one invocation to the next
+     that can lead to a segmentation fault. Errors processing the initial
+     ClientHello can trigger this scenario. An example of such an error could be
+     that a DTLS1.0 only client is attempting to connect to a DTLS1.2 only
+     server.
+
+     This issue was reported to OpenSSL by Per Allansson.
+     (CVE-2015-0207)
+     [Matt Caswell]
+
+  *) Segmentation fault in ASN1_TYPE_cmp fix
+
+     The function ASN1_TYPE_cmp will crash with an invalid read if an attempt is
+     made to compare ASN.1 boolean types. Since ASN1_TYPE_cmp is used to check
+     certificate signature algorithm consistency this can be used to crash any
+     certificate verification operation and exploited in a DoS attack. Any
+     application which performs certificate verification is vulnerable including
+     OpenSSL clients and servers which enable client authentication.
+     (CVE-2015-0286)
+     [Stephen Henson]
+
+  *) Segmentation fault for invalid PSS parameters fix
+
+     The signature verification routines will crash with a NULL pointer
+     dereference if presented with an ASN.1 signature using the RSA PSS
+     algorithm and invalid parameters. Since these routines are used to verify
+     certificate signature algorithms this can be used to crash any
+     certificate verification operation and exploited in a DoS attack. Any
+     application which performs certificate verification is vulnerable including
+     OpenSSL clients and servers which enable client authentication.
+
+     This issue was was reported to OpenSSL by Brian Carpenter.
+     (CVE-2015-0208)
+     [Stephen Henson]
+
+  *) ASN.1 structure reuse memory corruption fix
+
+     Reusing a structure in ASN.1 parsing may allow an attacker to cause
+     memory corruption via an invalid write. Such reuse is and has been
+     strongly discouraged and is believed to be rare.
+
+     Applications that parse structures containing CHOICE or ANY DEFINED BY
+     components may be affected. Certificate parsing (d2i_X509 and related
+     functions) are however not affected. OpenSSL clients and servers are
+     not affected.
+     (CVE-2015-0287)
+     [Stephen Henson]
+
+  *) PKCS7 NULL pointer dereferences fix
+
+     The PKCS#7 parsing code does not handle missing outer ContentInfo
+     correctly. An attacker can craft malformed ASN.1-encoded PKCS#7 blobs with
+     missing content and trigger a NULL pointer dereference on parsing.
+
+     Applications that verify PKCS#7 signatures, decrypt PKCS#7 data or
+     otherwise parse PKCS#7 structures from untrusted sources are
+     affected. OpenSSL clients and servers are not affected.
+
+     This issue was reported to OpenSSL by Michal Zalewski (Google).
+     (CVE-2015-0289)
+     [Emilia K?sper]
+
+  *) DoS via reachable assert in SSLv2 servers fix
+
+     A malicious client can trigger an OPENSSL_assert (i.e., an abort) in
+     servers that both support SSLv2 and enable export cipher suites by sending
+     a specially crafted SSLv2 CLIENT-MASTER-KEY message.
+
+     This issue was discovered by Sean Burford (Google) and Emilia K?sper
+     (OpenSSL development team).
+     (CVE-2015-0293)
+     [Emilia K?sper]
+
+  *) Empty CKE with client auth and DHE fix
+
+     If client auth is used then a server can seg fault in the event of a DHE
+     ciphersuite being selected and a zero length ClientKeyExchange message
+     being sent by the client. This could be exploited in a DoS attack.
+     (CVE-2015-1787)
+     [Matt Caswell]
+
+  *) Handshake with unseeded PRNG fix
+
+     Under certain conditions an OpenSSL 1.0.2 client can complete a handshake
+     with an unseeded PRNG. The conditions are:
+     - The client is on a platform where the PRNG has not been seeded
+     automatically, and the user has not seeded manually
+     - A protocol specific client method version has been used (i.e. not
+     SSL_client_methodv23)
+     - A ciphersuite is used that does not require additional random data from
+     the PRNG beyond the initial ClientHello client random (e.g. PSK-RC4-SHA).
+
+     If the handshake succeeds then the client random that has been used will
+     have been generated from a PRNG with insufficient entropy and therefore the
+     output may be predictable.
+
+     For example using the following command with an unseeded openssl will
+     succeed on an unpatched platform:
+
+     openssl s_client -psk 1a2b3c4d -tls1_2 -cipher PSK-RC4-SHA
+     (CVE-2015-0285)
+     [Matt Caswell]
+
+  *) Use After Free following d2i_ECPrivatekey error fix
+
+     A malformed EC private key file consumed via the d2i_ECPrivateKey function
+     could cause a use after free condition. This, in turn, could cause a double
+     free in several private key parsing functions (such as d2i_PrivateKey
+     or EVP_PKCS82PKEY) and could lead to a DoS attack or memory corruption
+     for applications that receive EC private keys from untrusted
+     sources. This scenario is considered rare.
+
+     This issue was discovered by the BoringSSL project and fixed in their
+     commit 517073cd4b.
+     (CVE-2015-0209)
+     [Matt Caswell]
+
+  *) X509_to_X509_REQ NULL pointer deref fix
+
+     The function X509_to_X509_REQ will crash with a NULL pointer dereference if
+     the certificate key is invalid. This function is rarely used in practice.
+
+     This issue was discovered by Brian Carpenter.
+     (CVE-2015-0288)
+     [Stephen Henson]
+
+  *) Removed the export ciphers from the DEFAULT ciphers
+     [Kurt Roeckx]
+
+ Changes between 1.0.1l and 1.0.2 [22 Jan 2015]
 
   *) Facilitate "universal" ARM builds targeting range of ARM ISAs, e.g.
      ARMv5 through ARMv8, as opposite to "locking" it to single one.
@@ -383,6 +506,29 @@
 
  Changes between 1.0.1j and 1.0.1k [8 Jan 2015]
 
+  *) Fix DTLS segmentation fault in dtls1_get_record. A carefully crafted DTLS
+     message can cause a segmentation fault in OpenSSL due to a NULL pointer
+     dereference. This could lead to a Denial Of Service attack. Thanks to
+     Markus Stenberg of Cisco Systems, Inc. for reporting this issue.
+     (CVE-2014-3571)
+     [Steve Henson]
+
+  *) Fix DTLS memory leak in dtls1_buffer_record. A memory leak can occur in the
+     dtls1_buffer_record function under certain conditions. In particular this
+     could occur if an attacker sent repeated DTLS records with the same
+     sequence number but for the next epoch. The memory leak could be exploited
+     by an attacker in a Denial of Service attack through memory exhaustion.
+     Thanks to Chris Mueller for reporting this issue.
+     (CVE-2015-0206)
+     [Matt Caswell]
+
+  *) Fix issue where no-ssl3 configuration sets method to NULL. When openssl is
+     built with the no-ssl3 option and a SSL v3 ClientHello is received the ssl
+     method would be set to NULL which could later result in a NULL pointer
+     dereference. Thanks to Frank Schmirler for reporting this issue.
+     (CVE-2014-3569)
+     [Kurt Roeckx]
+
   *) Abort handshake if server key exchange message is omitted for ephemeral
      ECDH ciphersuites.
 
@@ -400,6 +546,17 @@
      (CVE-2015-0204)
      [Steve Henson]
 
+  *) Fixed issue where DH client certificates are accepted without verification.
+     An OpenSSL server will accept a DH certificate for client authentication
+     without the certificate verify message. This effectively allows a client to
+     authenticate without the use of a private key. This only affects servers
+     which trust a client certificate authority which issues certificates
+     containing DH keys: these are extremely rare and hardly ever encountered.
+     Thanks for Karthikeyan Bhargavan of the PROSECCO team at INRIA or reporting
+     this issue.
+     (CVE-2015-0205)
+     [Steve Henson]
+
   *) Ensure that the session ID context of an SSL is updated when its
      SSL_CTX is updated via SSL_set_SSL_CTX.
 
@@ -444,6 +601,17 @@
      (CVE-2014-8275)
      [Steve Henson]
 
+   *) Correct Bignum squaring. Bignum squaring (BN_sqr) may produce incorrect
+      results on some platforms, including x86_64. This bug occurs at random
+      with a very low probability, and is not known to be exploitable in any
+      way, though its exact impact is difficult to determine. Thanks to Pieter
+      Wuille (Blockstream) who reported this issue and also suggested an initial
+      fix. Further analysis was conducted by the OpenSSL development team and
+      Adam Langley of Google. The final fix was developed by Andy Polyakov of
+      the OpenSSL core team.
+      (CVE-2014-3570)
+      [Andy Polyakov]
+
    *) Do not resume sessions on the server if the negotiated protocol
       version does not match the session's version. Resuming with a different
       version, while not strictly forbidden by the RFC, is of questionable
@@ -603,18 +771,6 @@
      bogus results, with non-infinity inputs mapped to infinity too.)
      [Bodo Moeller]
 
- Changes between 1.0.1i and 1.0.1j [xx XXX xxxx]
-
-  *) Add additional DigestInfo checks.
- 
-     Reencode DigestInto in DER and check against the original when
-     verifying RSA signature: this will reject any improperly encoded
-     DigestInfo structures.
-
-     Note: this is a precautionary measure and no attacks are currently known.
-
-     [Steve Henson]
-
  Changes between 1.0.1g and 1.0.1h [5 Jun 2014]
 
   *) Fix for SSL/TLS MITM flaw. An attacker using a carefully crafted
@@ -1112,63 +1268,6 @@
        Add command line options to s_client/s_server.
      [Steve Henson]
 
- Changes between 1.0.0j and 1.0.0k [5 Feb 2013]
-
-  *) Make the decoding of SSLv3, TLS and DTLS CBC records constant time.
-
-     This addresses the flaw in CBC record processing discovered by 
-     Nadhem Alfardan and Kenny Paterson. Details of this attack can be found
-     at: http://www.isg.rhul.ac.uk/tls/     
-
-     Thanks go to Nadhem Alfardan and Kenny Paterson of the Information
-     Security Group at Royal Holloway, University of London
-     (www.isg.rhul.ac.uk) for discovering this flaw and Adam Langley and
-     Emilia K?sper for the initial patch.
-     (CVE-2013-0169)
-     [Emilia K?sper, Adam Langley, Ben Laurie, Andy Polyakov, Steve Henson]
-
-  *) Return an error when checking OCSP signatures when key is NULL.
-     This fixes a DoS attack. (CVE-2013-0166)
-     [Steve Henson]
-
-  *) Call OCSP Stapling callback after ciphersuite has been chosen, so
-     the right response is stapled. Also change SSL_get_certificate()
-     so it returns the certificate actually sent.
-     See http://rt.openssl.org/Ticket/Display.html?id=2836.
-     (This is a backport)
-     [Rob Stradling <rob.stradling at comodo.com>]
-
-  *) Fix possible deadlock when decoding public keys.
-     [Steve Henson]
-
- Changes between 1.0.0i and 1.0.0j [10 May 2012]
-
-  [NB: OpenSSL 1.0.0i and later 1.0.0 patch levels were released after
-  OpenSSL 1.0.1.]
-
-  *) Sanity check record length before skipping explicit IV in DTLS
-     to fix DoS attack.
-
-     Thanks to Codenomicon for discovering this issue using Fuzz-o-Matic
-     fuzzing as a service testing platform.
-     (CVE-2012-2333)
-     [Steve Henson]
-
-  *) Initialise tkeylen properly when encrypting CMS messages.
-     Thanks to Solar Designer of Openwall for reporting this issue.
-     [Steve Henson]
-
- Changes between 1.0.0h and 1.0.0i [19 Apr 2012]
-
-  *) Check for potentially exploitable overflows in asn1_d2i_read_bio
-     BUF_mem_grow and BUF_mem_grow_clean. Refuse attempts to shrink buffer
-     in CRYPTO_realloc_clean.
-
-     Thanks to Tavis Ormandy, Google Security Team, for discovering this
-     issue and to Adam Langley <agl at chromium.org> for fixing it.
-     (CVE-2012-2110)
-     [Adam Langley (Google), Tavis Ormandy, Google Security Team]
-
  Changes between 1.0.0g and 1.0.0h [12 Mar 2012]
 
   *) Fix MMA (Bleichenbacher's attack on PKCS #1 v1.5 RSA padding) weakness
@@ -2159,228 +2258,6 @@
   *) Change 'Configure' script to enable Camellia by default.
      [NTT]
 
- Changes between 0.9.8x and 0.9.8y [5 Feb 2013]
-
-  *) Make the decoding of SSLv3, TLS and DTLS CBC records constant time.
-
-     This addresses the flaw in CBC record processing discovered by 
-     Nadhem Alfardan and Kenny Paterson. Details of this attack can be found
-     at: http://www.isg.rhul.ac.uk/tls/     
-
-     Thanks go to Nadhem Alfardan and Kenny Paterson of the Information
-     Security Group at Royal Holloway, University of London
-     (www.isg.rhul.ac.uk) for discovering this flaw and Adam Langley and
-     Emilia K?sper for the initial patch.
-     (CVE-2013-0169)
-     [Emilia K?sper, Adam Langley, Ben Laurie, Andy Polyakov, Steve Henson]
-
-  *) Return an error when checking OCSP signatures when key is NULL.
-     This fixes a DoS attack. (CVE-2013-0166)
-     [Steve Henson]
-
-  *) Call OCSP Stapling callback after ciphersuite has been chosen, so
-     the right response is stapled. Also change SSL_get_certificate()
-     so it returns the certificate actually sent.
-     See http://rt.openssl.org/Ticket/Display.html?id=2836.
-     (This is a backport)
-     [Rob Stradling <rob.stradling at comodo.com>]
-
-  *) Fix possible deadlock when decoding public keys.
-     [Steve Henson]
-
- Changes between 0.9.8w and 0.9.8x [10 May 2012]
-
-  *) Sanity check record length before skipping explicit IV in DTLS
-     to fix DoS attack.
-
-     Thanks to Codenomicon for discovering this issue using Fuzz-o-Matic
-     fuzzing as a service testing platform.
-     (CVE-2012-2333)
-     [Steve Henson]
-
-  *) Initialise tkeylen properly when encrypting CMS messages.
-     Thanks to Solar Designer of Openwall for reporting this issue.
-     [Steve Henson]
-
- Changes between 0.9.8v and 0.9.8w [23 Apr 2012]
-
-  *) The fix for CVE-2012-2110 did not take into account that the 
-     'len' argument to BUF_MEM_grow and BUF_MEM_grow_clean is an
-     int in OpenSSL 0.9.8, making it still vulnerable. Fix by 
-     rejecting negative len parameter. (CVE-2012-2131)
-     [Tomas Hoger <thoger at redhat.com>]
-
- Changes between 0.9.8u and 0.9.8v [19 Apr 2012]
-
-  *) Check for potentially exploitable overflows in asn1_d2i_read_bio
-     BUF_mem_grow and BUF_mem_grow_clean. Refuse attempts to shrink buffer
-     in CRYPTO_realloc_clean.
-
-     Thanks to Tavis Ormandy, Google Security Team, for discovering this
-     issue and to Adam Langley <agl at chromium.org> for fixing it.
-     (CVE-2012-2110)
-     [Adam Langley (Google), Tavis Ormandy, Google Security Team]
-
- Changes between 0.9.8t and 0.9.8u [12 Mar 2012]
-
-  *) Fix MMA (Bleichenbacher's attack on PKCS #1 v1.5 RSA padding) weakness
-     in CMS and PKCS7 code. When RSA decryption fails use a random key for
-     content decryption and always return the same error. Note: this attack
-     needs on average 2^20 messages so it only affects automated senders. The
-     old behaviour can be reenabled in the CMS code by setting the
-     CMS_DEBUG_DECRYPT flag: this is useful for debugging and testing where
-     an MMA defence is not necessary.
-     Thanks to Ivan Nestlerode <inestlerode at us.ibm.com> for discovering
-     this issue. (CVE-2012-0884)
-     [Steve Henson]
-
-  *) Fix CVE-2011-4619: make sure we really are receiving a 
-     client hello before rejecting multiple SGC restarts. Thanks to
-     Ivan Nestlerode <inestlerode at us.ibm.com> for discovering this bug.
-     [Steve Henson]
-
- Changes between 0.9.8s and 0.9.8t [18 Jan 2012]
-
-  *) Fix for DTLS DoS issue introduced by fix for CVE-2011-4109.
-     Thanks to Antonio Martin, Enterprise Secure Access Research and
-     Development, Cisco Systems, Inc. for discovering this bug and
-     preparing a fix. (CVE-2012-0050)
-     [Antonio Martin]
-
- Changes between 0.9.8r and 0.9.8s [4 Jan 2012]
-
-  *) Nadhem Alfardan and Kenny Paterson have discovered an extension
-     of the Vaudenay padding oracle attack on CBC mode encryption
-     which enables an efficient plaintext recovery attack against
-     the OpenSSL implementation of DTLS. Their attack exploits timing
-     differences arising during decryption processing. A research
-     paper describing this attack can be found at:
-                  http://www.isg.rhul.ac.uk/~kp/dtls.pdf
-     Thanks go to Nadhem Alfardan and Kenny Paterson of the Information
-     Security Group at Royal Holloway, University of London
-     (www.isg.rhul.ac.uk) for discovering this flaw and to Robin Seggelmann
-     <seggelmann at fh-muenster.de> and Michael Tuexen <tuexen at fh-muenster.de>
-     for preparing the fix. (CVE-2011-4108)
-     [Robin Seggelmann, Michael Tuexen]
-
-  *) Stop policy check failure freeing same buffer twice. (CVE-2011-4109)
-     [Ben Laurie, Kasper <ekasper at google.com>]
-
-  *) Clear bytes used for block padding of SSL 3.0 records.
-     (CVE-2011-4576)
-     [Adam Langley (Google)]
-
-  *) Only allow one SGC handshake restart for SSL/TLS. Thanks to George
-     Kadianakis <desnacked at gmail.com> for discovering this issue and
-     Adam Langley for preparing the fix. (CVE-2011-4619)
-     [Adam Langley (Google)]
- 
-  *) Prevent malformed RFC3779 data triggering an assertion failure.
-     Thanks to Andrew Chi, BBN Technologies, for discovering the flaw
-     and Rob Austein <sra at hactrn.net> for fixing it. (CVE-2011-4577)
-     [Rob Austein <sra at hactrn.net>]
-
-  *) Fix ssl_ciph.c set-up race.
-     [Adam Langley (Google)]
-
-  *) Fix spurious failures in ecdsatest.c.
-     [Emilia K?sper (Google)]
-
-  *) Fix the BIO_f_buffer() implementation (which was mixing different
-     interpretations of the '..._len' fields).
-     [Adam Langley (Google)]
-
-  *) Fix handling of BN_BLINDING: now BN_BLINDING_invert_ex (rather than
-     BN_BLINDING_invert_ex) calls BN_BLINDING_update, ensuring that concurrent
-     threads won't reuse the same blinding coefficients.
-
-     This also avoids the need to obtain the CRYPTO_LOCK_RSA_BLINDING
-     lock to call BN_BLINDING_invert_ex, and avoids one use of
-     BN_BLINDING_update for each BN_BLINDING structure (previously,
-     the last update always remained unused).
-     [Emilia K?sper (Google)]
-
-  *) Fix SSL memory handling for (EC)DH ciphersuites, in particular
-     for multi-threaded use of ECDH.
-     [Adam Langley (Google)]
-
-  *) Fix x509_name_ex_d2i memory leak on bad inputs.
-     [Bodo Moeller]
-
-  *) Add protection against ECDSA timing attacks as mentioned in the paper
-     by Billy Bob Brumley and Nicola Tuveri, see:
-
-	http://eprint.iacr.org/2011/232.pdf
-
-     [Billy Bob Brumley and Nicola Tuveri]
-
- Changes between 0.9.8q and 0.9.8r [8 Feb 2011]
-
-  *) Fix parsing of OCSP stapling ClientHello extension. CVE-2011-0014
-     [Neel Mehta, Adam Langley, Bodo Moeller (Google)]
-
-  *) Fix bug in string printing code: if *any* escaping is enabled we must
-     escape the escape character (backslash) or the resulting string is
-     ambiguous.
-     [Steve Henson]
-
- Changes between 0.9.8p and 0.9.8q [2 Dec 2010]
-
-  *) Disable code workaround for ancient and obsolete Netscape browsers
-     and servers: an attacker can use it in a ciphersuite downgrade attack.
-     Thanks to Martin Rex for discovering this bug. CVE-2010-4180
-     [Steve Henson]
-
-  *) Fixed J-PAKE implementation error, originally discovered by
-     Sebastien Martini, further info and confirmation from Stefan
-     Arentz and Feng Hao. Note that this fix is a security fix. CVE-2010-4252
-     [Ben Laurie]
-
- Changes between 0.9.8o and 0.9.8p [16 Nov 2010]
-
-  *) Fix extension code to avoid race conditions which can result in a buffer
-     overrun vulnerability: resumed sessions must not be modified as they can
-     be shared by multiple threads. CVE-2010-3864
-     [Steve Henson]
-
-  *) Fix for double free bug in ssl/s3_clnt.c CVE-2010-2939
-     [Steve Henson]
-
-  *) Don't reencode certificate when calculating signature: cache and use
-     the original encoding instead. This makes signature verification of
-     some broken encodings work correctly.
-     [Steve Henson]
-
-  *) ec2_GF2m_simple_mul bugfix: compute correct result if the output EC_POINT
-     is also one of the inputs.
-     [Emilia K?sper <emilia.kasper at esat.kuleuven.be> (Google)]
-
-  *) Don't repeatedly append PBE algorithms to table if they already exist.
-     Sort table on each new add. This effectively makes the table read only
-     after all algorithms are added and subsequent calls to PKCS12_pbe_add
-     etc are non-op.
-     [Steve Henson]
-
- Changes between 0.9.8n and 0.9.8o [01 Jun 2010]
-
-  [NB: OpenSSL 0.9.8o and later 0.9.8 patch levels were released after
-  OpenSSL 1.0.0.]
-
-  *) Correct a typo in the CMS ASN1 module which can result in invalid memory
-     access or freeing data twice (CVE-2010-0742)
-     [Steve Henson, Ronald Moesbergen <intercommit at gmail.com>]
-
-  *) Add SHA2 algorithms to SSL_library_init(). SHA2 is becoming far more
-     common in certificates and some applications which only call
-     SSL_library_init and not OpenSSL_add_all_algorithms() will fail.
-     [Steve Henson]
-
-  *) VMS fixes: 
-     Reduce copying into .apps and .test in makevms.com
-     Don't try to use blank CA certificate in CA.com
-     Allow use of C files from original directories in maketests.com
-     [Steven M. Schweda" <sms at antinode.info>]
-
  Changes between 0.9.8m and 0.9.8n [24 Mar 2010]
 
   *) When rejecting SSL/TLS records due to an incorrect version number, never
diff --git a/NEWS b/NEWS
index 41e5bdb..6eefc32 100644
--- a/NEWS
+++ b/NEWS
@@ -5,10 +5,26 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
-  Major changes between OpenSSL 1.0.2 and OpenSSL 1.0.2a [under development]
+  Major changes between OpenSSL 1.0.2a and OpenSSL 1.0.2b [under development]
 
       o
 
+  Major changes between OpenSSL 1.0.2 and OpenSSL 1.0.2a [19 Mar 2015]
+
+      o OpenSSL 1.0.2 ClientHello sigalgs DoS fix (CVE-2015-0291)
+      o Multiblock corrupted pointer fix (CVE-2015-0290)
+      o Segmentation fault in DTLSv1_listen fix (CVE-2015-0207)
+      o Segmentation fault in ASN1_TYPE_cmp fix (CVE-2015-0286)
+      o Segmentation fault for invalid PSS parameters fix (CVE-2015-0208)
+      o ASN.1 structure reuse memory corruption fix (CVE-2015-0287)
+      o PKCS7 NULL pointer dereferences fix (CVE-2015-0289)
+      o DoS via reachable assert in SSLv2 servers fix (CVE-2015-0293)
+      o Empty CKE with client auth and DHE fix (CVE-2015-1787)
+      o Handshake with unseeded PRNG fix (CVE-2015-0285)
+      o Use After Free following d2i_ECPrivatekey error fix (CVE-2015-0209)
+      o X509_to_X509_REQ NULL pointer deref fix (CVE-2015-0288)
+      o Removed the export ciphers from the DEFAULT ciphers
+
   Major changes between OpenSSL 1.0.1l and OpenSSL 1.0.2 [22 Jan 2015]:
 
       o Suite B support for TLS 1.2 and DTLS 1.2
@@ -58,6 +74,7 @@
 
       o Fix for CVE-2014-0224
       o Fix for CVE-2014-0221
+      o Fix for CVE-2014-0198
       o Fix for CVE-2014-0195
       o Fix for CVE-2014-3470
       o Fix for CVE-2010-5298
@@ -117,19 +134,6 @@
       o Preliminary FIPS capability for unvalidated 2.0 FIPS module.
       o SRP support.
 
-  Major changes between OpenSSL 1.0.0j and OpenSSL 1.0.0k [5 Feb 2013]:
-
-      o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169
-      o Fix OCSP bad key DoS attack CVE-2013-0166
-
-  Major changes between OpenSSL 1.0.0i and OpenSSL 1.0.0j [10 May 2012]:
-
-      o Fix DTLS record length checking bug CVE-2012-2333
-
-  Major changes between OpenSSL 1.0.0h and OpenSSL 1.0.0i [19 Apr 2012]:
-
-      o Fix for ASN1 overflow bug CVE-2012-2110
-
   Major changes between OpenSSL 1.0.0g and OpenSSL 1.0.0h [12 Mar 2012]:
 
       o Fix for CMS/PKCS#7 MMA CVE-2012-0884
@@ -202,62 +206,6 @@
       o Opaque PRF Input TLS extension support.
       o Updated time routines to avoid OS limitations.
 
-  Major changes between OpenSSL 0.9.8x and OpenSSL 0.9.8y [5 Feb 2013]:
-
-      o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169
-      o Fix OCSP bad key DoS attack CVE-2013-0166
-
-  Major changes between OpenSSL 0.9.8w and OpenSSL 0.9.8x [10 May 2012]:
-
-      o Fix DTLS record length checking bug CVE-2012-2333
-
-  Major changes between OpenSSL 0.9.8v and OpenSSL 0.9.8w [23 Apr 2012]:
-
-      o Fix for CVE-2012-2131 (corrected fix for 0.9.8 and CVE-2012-2110)
-
-  Major changes between OpenSSL 0.9.8u and OpenSSL 0.9.8v [19 Apr 2012]:
-
-      o Fix for ASN1 overflow bug CVE-2012-2110
-
-  Major changes between OpenSSL 0.9.8t and OpenSSL 0.9.8u [12 Mar 2012]:
-
-      o Fix for CMS/PKCS#7 MMA CVE-2012-0884
-      o Corrected fix for CVE-2011-4619
-      o Various DTLS fixes.
-
-  Major changes between OpenSSL 0.9.8s and OpenSSL 0.9.8t [18 Jan 2012]:
-
-      o Fix for DTLS DoS issue CVE-2012-0050
-
-  Major changes between OpenSSL 0.9.8r and OpenSSL 0.9.8s [4 Jan 2012]:
-
-      o Fix for DTLS plaintext recovery attack CVE-2011-4108
-      o Fix policy check double free error CVE-2011-4109
-      o Clear block padding bytes of SSL 3.0 records CVE-2011-4576
-      o Only allow one SGC handshake restart for SSL/TLS CVE-2011-4619
-      o Check for malformed RFC3779 data CVE-2011-4577
-
-  Major changes between OpenSSL 0.9.8q and OpenSSL 0.9.8r [8 Feb 2011]:
-
-      o Fix for security issue CVE-2011-0014
-
-  Major changes between OpenSSL 0.9.8p and OpenSSL 0.9.8q [2 Dec 2010]:
-
-      o Fix for security issue CVE-2010-4180
-      o Fix for CVE-2010-4252
-
-  Major changes between OpenSSL 0.9.8o and OpenSSL 0.9.8p [16 Nov 2010]:
-
-      o Fix for security issue CVE-2010-3864.
-
-  Major changes between OpenSSL 0.9.8n and OpenSSL 0.9.8o [1 Jun 2010]:
-
-      o Fix for security issue CVE-2010-0742.
-      o Various DTLS fixes.
-      o Recognise SHA2 certificates if only SSL algorithms added.
-      o Fix for no-rc4 compilation.
-      o Chil ENGINE unload workaround.
-
   Major changes between OpenSSL 0.9.8m and OpenSSL 0.9.8n [24 Mar 2010]:
 
       o CFB cipher definition fixes.
diff --git a/README b/README
index 89b7ac3..ad27d98 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.2a-dev
+ OpenSSL 1.0.2b-dev
 
  Copyright (c) 1998-2011 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c
index 4a36aff..af79530 100644
--- a/crypto/asn1/a_type.c
+++ b/crypto/asn1/a_type.c
@@ -119,6 +119,9 @@ int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b)
     case V_ASN1_OBJECT:
         result = OBJ_cmp(a->value.object, b->value.object);
         break;
+    case V_ASN1_BOOLEAN:
+        result = a->value.boolean - b->value.boolean;
+        break;
     case V_ASN1_NULL:
         result = 0;             /* They do not have content. */
         break;
diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index 4595664..7fd336a 100644
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -304,9 +304,16 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
     case ASN1_ITYPE_CHOICE:
         if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL))
             goto auxerr;
-
-        /* Allocate structure */
-        if (!*pval && !ASN1_item_ex_new(pval, it)) {
+        if (*pval) {
+            /* Free up and zero CHOICE value if initialised */
+            i = asn1_get_choice_selector(pval, it);
+            if ((i >= 0) && (i < it->tcount)) {
+                tt = it->templates + i;
+                pchptr = asn1_get_field_ptr(pval, tt);
+                ASN1_template_free(pchptr, tt);
+                asn1_set_choice_selector(pval, -1, it);
+            }
+        } else if (!ASN1_item_ex_new(pval, it)) {
             ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ERR_R_NESTED_ASN1_ERROR);
             goto err;
         }
@@ -386,6 +393,17 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
         if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL))
             goto auxerr;
 
+        /* Free up and zero any ADB found */
+        for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) {
+            if (tt->flags & ASN1_TFLG_ADB_MASK) {
+                const ASN1_TEMPLATE *seqtt;
+                ASN1_VALUE **pseqval;
+                seqtt = asn1_do_adb(pval, tt, 1);
+                pseqval = asn1_get_field_ptr(pval, seqtt);
+                ASN1_template_free(pseqval, seqtt);
+            }
+        }
+
         /* Get each field entry */
         for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) {
             const ASN1_TEMPLATE *seqtt;
diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
index cd838e0..55319ac 100644
--- a/crypto/asn1/x_x509.c
+++ b/crypto/asn1/x_x509.c
@@ -172,8 +172,14 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
 {
     const unsigned char *q;
     X509 *ret;
+    int freeret = 0;
+
     /* Save start position */
     q = *pp;
+
+    if(!a || *a == NULL) {
+        freeret = 1;
+    }
     ret = d2i_X509(a, pp, length);
     /* If certificate unreadable then forget it */
     if (!ret)
@@ -186,7 +192,11 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
         goto err;
     return ret;
  err:
-    X509_free(ret);
+    if(freeret) {
+        X509_free(ret);
+        if (a)
+            *a = NULL;
+    }
     return NULL;
 }
 
diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index 60083bf..7878fb1 100644
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -833,6 +833,7 @@ void ERR_load_BIO_strings(void);
 # define BIO_F_CONN_CTRL                                  127
 # define BIO_F_CONN_STATE                                 115
 # define BIO_F_DGRAM_SCTP_READ                            132
+# define BIO_F_DGRAM_SCTP_WRITE                           133
 # define BIO_F_FILE_CTRL                                  116
 # define BIO_F_FILE_READ                                  130
 # define BIO_F_LINEBUFFER_CTRL                            129
diff --git a/crypto/bio/bio_err.c b/crypto/bio/bio_err.c
index e8d3027..d9007aa 100644
--- a/crypto/bio/bio_err.c
+++ b/crypto/bio/bio_err.c
@@ -1,6 +1,6 @@
 /* crypto/bio/bio_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2015 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -96,6 +96,7 @@ static ERR_STRING_DATA BIO_str_functs[] = {
     {ERR_FUNC(BIO_F_CONN_CTRL), "CONN_CTRL"},
     {ERR_FUNC(BIO_F_CONN_STATE), "CONN_STATE"},
     {ERR_FUNC(BIO_F_DGRAM_SCTP_READ), "DGRAM_SCTP_READ"},
+    {ERR_FUNC(BIO_F_DGRAM_SCTP_WRITE), "DGRAM_SCTP_WRITE"},
     {ERR_FUNC(BIO_F_FILE_CTRL), "FILE_CTRL"},
     {ERR_FUNC(BIO_F_FILE_READ), "FILE_READ"},
     {ERR_FUNC(BIO_F_LINEBUFFER_CTRL), "LINEBUFFER_CTRL"},
diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index 6ff94a3..b4b0e9f 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -1226,16 +1226,19 @@ EC_KEY *d2i_ECParameters(EC_KEY **a, const unsigned char **in, long len)
             ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_MALLOC_FAILURE);
             return NULL;
         }
-        if (a)
-            *a = ret;
     } else
         ret = *a;
 
     if (!d2i_ECPKParameters(&ret->group, in, len)) {
         ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_EC_LIB);
+        if (a == NULL || *a != ret)
+             EC_KEY_free(ret);
         return NULL;
     }
 
+    if (a)
+        *a = ret;
+
     return ret;
 }
 
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index f0a9432..654f72d 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -30,11 +30,11 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x10002010L
+# define OPENSSL_VERSION_NUMBER  0x10002020L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2a-fips-dev xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2b-fips-dev xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2a-dev xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2b-dev xx XXX xxxx"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index dd6f675..31a1b98 100644
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -261,6 +261,25 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
     PKCS7_RECIP_INFO *ri = NULL;
     ASN1_OCTET_STRING *os = NULL;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAINIT, PKCS7_R_INVALID_NULL_POINTER);
+        return NULL;
+    }
+    /*
+     * The content field in the PKCS7 ContentInfo is optional, but that really
+     * only applies to inner content (precisely, detached signatures).
+     *
+     * When reading content, missing outer content is therefore treated as an
+     * error.
+     *
+     * When creating content, PKCS7_content_new() must be called before
+     * calling this method, so a NULL p7->d is always an error.
+     */
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAINIT, PKCS7_R_NO_CONTENT);
+        return NULL;
+    }
+
     i = OBJ_obj2nid(p7->type);
     p7->state = PKCS7_S_HEADER;
 
@@ -411,6 +430,16 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
     unsigned char *ek = NULL, *tkey = NULL;
     int eklen = 0, tkeylen = 0;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATADECODE, PKCS7_R_INVALID_NULL_POINTER);
+        return NULL;
+    }
+
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATADECODE, PKCS7_R_NO_CONTENT);
+        return NULL;
+    }
+
     i = OBJ_obj2nid(p7->type);
     p7->state = PKCS7_S_HEADER;
 
@@ -707,6 +736,16 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
     STACK_OF(PKCS7_SIGNER_INFO) *si_sk = NULL;
     ASN1_OCTET_STRING *os = NULL;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_INVALID_NULL_POINTER);
+        return 0;
+    }
+
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_NO_CONTENT);
+        return 0;
+    }
+
     EVP_MD_CTX_init(&ctx_tmp);
     i = OBJ_obj2nid(p7->type);
     p7->state = PKCS7_S_HEADER;
@@ -746,6 +785,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         /* If detached data then the content is excluded */
         if (PKCS7_type_is_data(p7->d.sign->contents) && p7->detached) {
             M_ASN1_OCTET_STRING_free(os);
+            os = NULL;
             p7->d.sign->contents->d.data = NULL;
         }
         break;
@@ -755,6 +795,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         /* If detached data then the content is excluded */
         if (PKCS7_type_is_data(p7->d.digest->contents) && p7->detached) {
             M_ASN1_OCTET_STRING_free(os);
+            os = NULL;
             p7->d.digest->contents->d.data = NULL;
         }
         break;
@@ -820,22 +861,30 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
     }
 
-    if (!PKCS7_is_detached(p7) && !(os->flags & ASN1_STRING_FLAG_NDEF)) {
-        char *cont;
-        long contlen;
-        btmp = BIO_find_type(bio, BIO_TYPE_MEM);
-        if (btmp == NULL) {
-            PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_UNABLE_TO_FIND_MEM_BIO);
-            goto err;
-        }
-        contlen = BIO_get_mem_data(btmp, &cont);
+    if (!PKCS7_is_detached(p7)) {
         /*
-         * Mark the BIO read only then we can use its copy of the data
-         * instead of making an extra copy.
+         * NOTE(emilia): I think we only reach os == NULL here because detached
+         * digested data support is broken.
          */
-        BIO_set_flags(btmp, BIO_FLAGS_MEM_RDONLY);
-        BIO_set_mem_eof_return(btmp, 0);
-        ASN1_STRING_set0(os, (unsigned char *)cont, contlen);
+        if (os == NULL)
+            goto err;
+        if (!(os->flags & ASN1_STRING_FLAG_NDEF)) {
+            char *cont;
+            long contlen;
+            btmp = BIO_find_type(bio, BIO_TYPE_MEM);
+            if (btmp == NULL) {
+                PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_UNABLE_TO_FIND_MEM_BIO);
+                goto err;
+            }
+            contlen = BIO_get_mem_data(btmp, &cont);
+            /*
+             * Mark the BIO read only then we can use its copy of the data
+             * instead of making an extra copy.
+             */
+            BIO_set_flags(btmp, BIO_FLAGS_MEM_RDONLY);
+            BIO_set_mem_eof_return(btmp, 0);
+            ASN1_STRING_set0(os, (unsigned char *)cont, contlen);
+        }
     }
     ret = 1;
  err:
@@ -910,6 +959,16 @@ int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio,
     STACK_OF(X509) *cert;
     X509 *x509;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAVERIFY, PKCS7_R_INVALID_NULL_POINTER);
+        return 0;
+    }
+
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAVERIFY, PKCS7_R_NO_CONTENT);
+        return 0;
+    }
+
     if (PKCS7_type_is_signed(p7)) {
         cert = p7->d.sign->cert;
     } else if (PKCS7_type_is_signedAndEnveloped(p7)) {
diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index c773812..0c5fcaa 100644
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -70,6 +70,7 @@ long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
     nid = OBJ_obj2nid(p7->type);
 
     switch (cmd) {
+    /* NOTE(emilia): does not support detached digested data. */
     case PKCS7_OP_SET_DETACHED_SIGNATURE:
         if (nid == NID_pkcs7_signed) {
             ret = p7->detached = (int)larg;
@@ -444,6 +445,8 @@ int PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md)
 
 STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7)
 {
+    if (p7 == NULL || p7->d.ptr == NULL)
+        return NULL;
     if (PKCS7_type_is_signed(p7)) {
         return (p7->d.sign->signer_info);
     } else if (PKCS7_type_is_signedAndEnveloped(p7)) {
diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
index c7106a3..ca3922e 100644
--- a/crypto/rsa/rsa_ameth.c
+++ b/crypto/rsa/rsa_ameth.c
@@ -698,9 +698,10 @@ static int rsa_item_verify(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,
         RSAerr(RSA_F_RSA_ITEM_VERIFY, RSA_R_UNSUPPORTED_SIGNATURE_TYPE);
         return -1;
     }
-    if (rsa_pss_to_ctx(ctx, NULL, sigalg, pkey))
+    if (rsa_pss_to_ctx(ctx, NULL, sigalg, pkey) > 0) {
         /* Carry on */
         return 2;
+    }
     return -1;
 }
 
diff --git a/openssl.spec b/openssl.spec
index 909f2bf..01f0617 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -6,7 +6,7 @@ Release: 1
 
 Summary: Secure Sockets Layer and cryptography libraries and tools
 Name: openssl
-Version: 1.0.2a
+Version: 1.0.2b
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index 1f10054..ee78921 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -543,6 +543,9 @@ int dtls1_listen(SSL *s, struct sockaddr *client)
 {
     int ret;
 
+    /* Ensure there is no state left over from a previous invocation */
+    SSL_clear(s);
+
     SSL_set_options(s, SSL_OP_COOKIE_EXCHANGE);
     s->d1->listen = 1;
 
diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c
index f8a9439..d55b93f 100644
--- a/ssl/s2_lib.c
+++ b/ssl/s2_lib.c
@@ -493,7 +493,7 @@ int ssl2_generate_key_material(SSL *s)
 
         OPENSSL_assert(s->session->master_key_length >= 0
                        && s->session->master_key_length
-                       < (int)sizeof(s->session->master_key));
+                       <= (int)sizeof(s->session->master_key));
         EVP_DigestUpdate(&ctx, s->session->master_key,
                          s->session->master_key_length);
         EVP_DigestUpdate(&ctx, &c, 1);
diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c
index daba6dd..19bb48c 100644
--- a/ssl/s2_srvr.c
+++ b/ssl/s2_srvr.c
@@ -371,7 +371,8 @@ int ssl2_accept(SSL *s)
 
 static int get_client_master_key(SSL *s)
 {
-    int is_export, i, n, keya, ek;
+    int is_export, i, n, keya;
+    unsigned int ek;
     unsigned long len;
     unsigned char *p;
     const SSL_CIPHER *cp;
@@ -454,11 +455,6 @@ static int get_client_master_key(SSL *s)
         SSLerr(SSL_F_GET_CLIENT_MASTER_KEY, SSL_R_NO_PRIVATEKEY);
         return (-1);
     }
-    i = ssl_rsa_private_decrypt(s->cert, s->s2->tmp.enc,
-                                &(p[s->s2->tmp.clear]),
-                                &(p[s->s2->tmp.clear]),
-                                (s->s2->ssl2_rollback) ? RSA_SSLV23_PADDING :
-                                RSA_PKCS1_PADDING);
 
     is_export = SSL_C_IS_EXPORT(s->session->cipher);
 
@@ -475,23 +471,61 @@ static int get_client_master_key(SSL *s)
     } else
         ek = 5;
 
+    /*
+     * The format of the CLIENT-MASTER-KEY message is
+     * 1 byte message type
+     * 3 bytes cipher
+     * 2-byte clear key length (stored in s->s2->tmp.clear)
+     * 2-byte encrypted key length (stored in s->s2->tmp.enc)
+     * 2-byte key args length (IV etc)
+     * clear key
+     * encrypted key
+     * key args
+     *
+     * If the cipher is an export cipher, then the encrypted key bytes
+     * are a fixed portion of the total key (5 or 8 bytes). The size of
+     * this portion is in |ek|. If the cipher is not an export cipher,
+     * then the entire key material is encrypted (i.e., clear key length
+     * must be zero).
+     */
+    if ((!is_export && s->s2->tmp.clear != 0) ||
+        (is_export && s->s2->tmp.clear + ek != (unsigned int)EVP_CIPHER_key_length(c))) {
+        ssl2_return_error(s, SSL2_PE_UNDEFINED_ERROR);
+        SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_BAD_LENGTH);
+        return -1;
+    }
+    /*
+     * The encrypted blob must decrypt to the encrypted portion of the key.
+     * Decryption can't be expanding, so if we don't have enough encrypted
+     * bytes to fit the key in the buffer, stop now.
+     */
+    if ((is_export && s->s2->tmp.enc < ek) ||
+        (!is_export && s->s2->tmp.enc < (unsigned int)EVP_CIPHER_key_length(c))) {
+        ssl2_return_error(s,SSL2_PE_UNDEFINED_ERROR);
+        SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_LENGTH_TOO_SHORT);
+        return -1;
+    }
+
+    i = ssl_rsa_private_decrypt(s->cert, s->s2->tmp.enc,
+                                &(p[s->s2->tmp.clear]),
+                                &(p[s->s2->tmp.clear]),
+                                (s->s2->ssl2_rollback) ? RSA_SSLV23_PADDING :
+                                RSA_PKCS1_PADDING);
+
     /* bad decrypt */
 # if 1
     /*
      * If a bad decrypt, continue with protocol but with a random master
      * secret (Bleichenbacher attack)
      */
-    if ((i < 0) || ((!is_export && (i != EVP_CIPHER_key_length(c)))
-                    || (is_export && ((i != ek)
-                                      || (s->s2->tmp.clear +
-                                          (unsigned int)i != (unsigned int)
-                                          EVP_CIPHER_key_length(c)))))) {
+    if ((i < 0) || ((!is_export && i != EVP_CIPHER_key_length(c))
+                    || (is_export && i != (int)ek))) {
         ERR_clear_error();
         if (is_export)
             i = ek;
         else
             i = EVP_CIPHER_key_length(c);
-        if (RAND_pseudo_bytes(p, i) <= 0)
+        if (RAND_pseudo_bytes(&p[s->s2->tmp.clear], i) <= 0)
             return 0;
     }
 # else
@@ -513,7 +547,7 @@ static int get_client_master_key(SSL *s)
 # endif
 
     if (is_export)
-        i += s->s2->tmp.clear;
+        i = EVP_CIPHER_key_length(c);
 
     if (i > SSL_MAX_MASTER_KEY_LENGTH) {
         ssl2_return_error(s, SSL2_PE_UNDEFINED_ERROR);
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 4e6a41b..221ae03 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -785,7 +785,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
 
             i = ssl3_write_pending(s, type, &buf[tot], nw);
             if (i <= 0) {
-                if (i < 0) {
+                if (i < 0 && (!s->wbio || !BIO_should_retry(s->wbio))) {
                     OPENSSL_free(wb->buf);
                     wb->buf = NULL;
                 }
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 9e6ab01..c016139 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -2251,10 +2251,17 @@ int ssl3_get_client_key_exchange(SSL *s)
     if (alg_k & (SSL_kEDH | SSL_kDHr | SSL_kDHd)) {
         int idx = -1;
         EVP_PKEY *skey = NULL;
-        if (n)
+        if (n > 1) {
             n2s(p, i);
-        else
+        } else {
+            if (alg_k & SSL_kDHE) {
+                al = SSL_AD_HANDSHAKE_FAILURE;
+                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                       SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG);
+                goto f_err;
+            }
             i = 0;
+        }
         if (n && n != i + 2) {
             if (!(s->options & SSL_OP_SSLEAY_080_CLIENT_DH_BUG)) {
                 SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 6e991e0..d85d26e 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -2967,6 +2967,7 @@ int tls1_set_server_sigalgs(SSL *s)
     if (s->cert->shared_sigalgs) {
         OPENSSL_free(s->cert->shared_sigalgs);
         s->cert->shared_sigalgs = NULL;
+        s->cert->shared_sigalgslen = 0;
     }
     /* Clear certificate digests and validity flags */
     for (i = 0; i < SSL_PKEY_NUM; i++) {
@@ -3620,6 +3621,7 @@ static int tls1_set_shared_sigalgs(SSL *s)
     if (c->shared_sigalgs) {
         OPENSSL_free(c->shared_sigalgs);
         c->shared_sigalgs = NULL;
+        c->shared_sigalgslen = 0;
     }
     /* If client use client signature algorithms if not NULL */
     if (!s->server && c->client_sigalgs && !is_suiteb) {
@@ -3642,12 +3644,14 @@ static int tls1_set_shared_sigalgs(SSL *s)
         preflen = c->peer_sigalgslen;
     }
     nmatch = tls12_do_shared_sigalgs(NULL, pref, preflen, allow, allowlen);
-    if (!nmatch)
-        return 1;
-    salgs = OPENSSL_malloc(nmatch * sizeof(TLS_SIGALGS));
-    if (!salgs)
-        return 0;
-    nmatch = tls12_do_shared_sigalgs(salgs, pref, preflen, allow, allowlen);
+    if (nmatch) {
+        salgs = OPENSSL_malloc(nmatch * sizeof(TLS_SIGALGS));
+        if (!salgs)
+            return 0;
+        nmatch = tls12_do_shared_sigalgs(salgs, pref, preflen, allow, allowlen);
+    } else {
+        salgs = NULL;
+    }
     c->shared_sigalgs = salgs;
     c->shared_sigalgslen = nmatch;
     return 1;

From matt at openssl.org  Thu Mar 19 14:04:46 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 19 Mar 2015 14:04:46 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1426773886.352596.28636.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  a6a704f448364b0840adefdcd922527b36232804 (commit)
       via  506c1068801fdeef5cb00f2053854bf56150fb6d (commit)
       via  686d82a7a22a37a1a9aefa8b4f36ca049921af0b (commit)
       via  8ca79fcbf45ea2ed505679be20e1a8a4c3df07cf (commit)
       via  a4517be9e348634ac64f9cf093131e13e8c03e38 (commit)
       via  6e24e1cdd20d568ca11a95943f34c6031c60a1df (commit)
       via  ffc69bd9421068db6161b8201a9a1f3ceaf908d7 (commit)
       via  82123b5e9415d336a0d15efcaae1b52683fa00e7 (commit)
       via  cd56a08d4e1dcae6a0ad8a5b39512fb80ccd1b73 (commit)
       via  e2acb69c760f681b070a20defe5510272492a7e8 (commit)
       via  c982285ab63adeb473197d54d246d120bf60778b (commit)
       via  b485d976340d3ca080060c3c7dee9102e2200762 (commit)
      from  636c42d747deb5cab78b66566e5feb4ffd61d15d (commit)


- Log -----------------------------------------------------------------
commit a6a704f448364b0840adefdcd922527b36232804
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 13:41:07 2015 +0000

    Prepare for 1.0.1n-dev
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 506c1068801fdeef5cb00f2053854bf56150fb6d
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 13:38:37 2015 +0000

    Prepare for 1.0.1m release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 686d82a7a22a37a1a9aefa8b4f36ca049921af0b
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 13:38:37 2015 +0000

    make update
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 8ca79fcbf45ea2ed505679be20e1a8a4c3df07cf
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 11:35:33 2015 +0000

    Fix unsigned/signed warnings
    
    Fix some unsigned/signed warnings introduced as part of the fix
    for CVE-2015-0293
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit a4517be9e348634ac64f9cf093131e13e8c03e38
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 10:16:32 2015 +0000

    Fix a failure to NULL a pointer freed on error.
    
    Reported by the LibreSSL project as a follow on to CVE-2015-0209
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 6e24e1cdd20d568ca11a95943f34c6031c60a1df
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 17 17:01:09 2015 +0000

    Update NEWS file
    
    Update the NEWS file with the latest entries from CHANGES ready for the
    release.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit ffc69bd9421068db6161b8201a9a1f3ceaf908d7
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 17 16:56:27 2015 +0000

    Update CHANGES for release
    
    Update CHANGES fiel with all the latest fixes ready for the release.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 82123b5e9415d336a0d15efcaae1b52683fa00e7
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 18 09:48:03 2015 +0000

    Remove overlapping CHANGES/NEWS entries
    
    Remove entries from CHANGES and NEWS from letter releases that occur *after*
    the next point release. Without this we get duplicate entries for the same
    issue appearing multiple times.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit cd56a08d4e1dcae6a0ad8a5b39512fb80ccd1b73
Author: Emilia Kasper <emilia at openssl.org>
Date:   Wed Mar 4 09:05:02 2015 -0800

    Fix reachable assert in SSLv2 servers.
    
    This assert is reachable for servers that support SSLv2 and export ciphers.
    Therefore, such servers can be DoSed by sending a specially crafted
    SSLv2 CLIENT-MASTER-KEY.
    
    Also fix s2_srvr.c to error out early if the key lengths are malformed.
    These lengths are sent unencrypted, so this does not introduce an oracle.
    
    CVE-2015-0293
    
    This issue was discovered by Sean Burford (Google) and Emilia K??sper of
    the OpenSSL development team.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

commit e2acb69c760f681b070a20defe5510272492a7e8
Author: Emilia Kasper <emilia at openssl.org>
Date:   Fri Feb 27 16:52:23 2015 +0100

    PKCS#7: avoid NULL pointer dereferences with missing content
    
    In PKCS#7, the ASN.1 content component is optional.
    This typically applies to inner content (detached signatures),
    however we must also handle unexpected missing outer content
    correctly.
    
    This patch only addresses functions reachable from parsing,
    decryption and verification, and functions otherwise associated
    with reading potentially untrusted data.
    
    Correcting all low-level API calls requires further work.
    
    CVE-2015-0289
    
    Thanks to Michal Zalewski (Google) for reporting this issue.
    
    Reviewed-by: Steve Henson <steve at openssl.org>

commit c982285ab63adeb473197d54d246d120bf60778b
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 9 23:11:45 2015 +0000

    Fix ASN1_TYPE_cmp
    
    Fix segmentation violation when ASN1_TYPE_cmp is passed a boolean type. This
    can be triggered during certificate verification so could be a DoS attack
    against a client or a server enabling client authentication.
    
    CVE-2015-0286
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit b485d976340d3ca080060c3c7dee9102e2200762
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Feb 23 02:32:44 2015 +0000

    Free up ADB and CHOICE if already initialised.
    
    CVE-2015-0287
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Emilia K??sper <emilia at openssl.org>

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

Summary of changes:
 CHANGES                  | 357 ++++++++++-------------------------------------
 NEWS                     |  81 ++---------
 README                   |   2 +-
 crypto/asn1/a_type.c     |   3 +
 crypto/asn1/tasn_dec.c   |  24 +++-
 crypto/asn1/x_x509.c     |  12 +-
 crypto/bio/bio.h         |   1 +
 crypto/bio/bio_err.c     |   1 +
 crypto/ec/ec_asn1.c      |   7 +-
 crypto/opensslv.h        |   6 +-
 crypto/pkcs7/pk7_doit.c  |  87 ++++++++++--
 crypto/pkcs7/pk7_lib.c   |   3 +
 crypto/stack/safestack.h |   1 -
 openssl.spec             |   2 +-
 ssl/s2_lib.c             |   2 +-
 ssl/s2_srvr.c            |  60 ++++++--
 16 files changed, 259 insertions(+), 390 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0bb2587..11bdbbd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,83 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.0.1l and 1.0.1m [xx XXX xxxx]
+ Changes between 1.0.1m and 1.0.1n [xx XXX xxxx]
+
+  *)
+
+ Changes between 1.0.1l and 1.0.1m [19 Mar 2015]
+
+  *) Segmentation fault in ASN1_TYPE_cmp fix
+
+     The function ASN1_TYPE_cmp will crash with an invalid read if an attempt is
+     made to compare ASN.1 boolean types. Since ASN1_TYPE_cmp is used to check
+     certificate signature algorithm consistency this can be used to crash any
+     certificate verification operation and exploited in a DoS attack. Any
+     application which performs certificate verification is vulnerable including
+     OpenSSL clients and servers which enable client authentication.
+     (CVE-2015-0286)
+     [Stephen Henson]
+
+  *) ASN.1 structure reuse memory corruption fix
+
+     Reusing a structure in ASN.1 parsing may allow an attacker to cause
+     memory corruption via an invalid write. Such reuse is and has been
+     strongly discouraged and is believed to be rare.
+
+     Applications that parse structures containing CHOICE or ANY DEFINED BY
+     components may be affected. Certificate parsing (d2i_X509 and related
+     functions) are however not affected. OpenSSL clients and servers are
+     not affected.
+     (CVE-2015-0287)
+     [Stephen Henson]
+
+  *) PKCS7 NULL pointer dereferences fix
+
+     The PKCS#7 parsing code does not handle missing outer ContentInfo
+     correctly. An attacker can craft malformed ASN.1-encoded PKCS#7 blobs with
+     missing content and trigger a NULL pointer dereference on parsing.
+
+     Applications that verify PKCS#7 signatures, decrypt PKCS#7 data or
+     otherwise parse PKCS#7 structures from untrusted sources are
+     affected. OpenSSL clients and servers are not affected.
+
+     This issue was reported to OpenSSL by Michal Zalewski (Google).
+     (CVE-2015-0289)
+     [Emilia K?sper]
+
+  *) DoS via reachable assert in SSLv2 servers fix
+
+     A malicious client can trigger an OPENSSL_assert (i.e., an abort) in
+     servers that both support SSLv2 and enable export cipher suites by sending
+     a specially crafted SSLv2 CLIENT-MASTER-KEY message.
+
+     This issue was discovered by Sean Burford (Google) and Emilia K?sper
+     (OpenSSL development team).
+     (CVE-2015-0293)
+     [Emilia K?sper]
+
+  *) Use After Free following d2i_ECPrivatekey error fix
+
+     A malformed EC private key file consumed via the d2i_ECPrivateKey function
+     could cause a use after free condition. This, in turn, could cause a double
+     free in several private key parsing functions (such as d2i_PrivateKey
+     or EVP_PKCS82PKEY) and could lead to a DoS attack or memory corruption
+     for applications that receive EC private keys from untrusted
+     sources. This scenario is considered rare.
+
+     This issue was discovered by the BoringSSL project and fixed in their
+     commit 517073cd4b.
+     (CVE-2015-0209)
+     [Matt Caswell]
+
+  *) X509_to_X509_REQ NULL pointer deref fix
+
+     The function X509_to_X509_REQ will crash with a NULL pointer dereference if
+     the certificate key is invalid. This function is rarely used in practice.
+
+     This issue was discovered by Brian Carpenter.
+     (CVE-2015-0288)
+     [Stephen Henson]
 
   *) Removed the export ciphers from the DEFAULT ciphers
      [Kurt Roeckx]
@@ -776,63 +852,6 @@
        Add command line options to s_client/s_server.
      [Steve Henson]
 
- Changes between 1.0.0j and 1.0.0k [5 Feb 2013]
-
-  *) Make the decoding of SSLv3, TLS and DTLS CBC records constant time.
-
-     This addresses the flaw in CBC record processing discovered by 
-     Nadhem Alfardan and Kenny Paterson. Details of this attack can be found
-     at: http://www.isg.rhul.ac.uk/tls/     
-
-     Thanks go to Nadhem Alfardan and Kenny Paterson of the Information
-     Security Group at Royal Holloway, University of London
-     (www.isg.rhul.ac.uk) for discovering this flaw and Adam Langley and
-     Emilia K?sper for the initial patch.
-     (CVE-2013-0169)
-     [Emilia K?sper, Adam Langley, Ben Laurie, Andy Polyakov, Steve Henson]
-
-  *) Return an error when checking OCSP signatures when key is NULL.
-     This fixes a DoS attack. (CVE-2013-0166)
-     [Steve Henson]
-
-  *) Call OCSP Stapling callback after ciphersuite has been chosen, so
-     the right response is stapled. Also change SSL_get_certificate()
-     so it returns the certificate actually sent.
-     See http://rt.openssl.org/Ticket/Display.html?id=2836.
-     (This is a backport)
-     [Rob Stradling <rob.stradling at comodo.com>]
-
-  *) Fix possible deadlock when decoding public keys.
-     [Steve Henson]
-
- Changes between 1.0.0i and 1.0.0j [10 May 2012]
-
-  [NB: OpenSSL 1.0.0i and later 1.0.0 patch levels were released after
-  OpenSSL 1.0.1.]
-
-  *) Sanity check record length before skipping explicit IV in DTLS
-     to fix DoS attack.
-
-     Thanks to Codenomicon for discovering this issue using Fuzz-o-Matic
-     fuzzing as a service testing platform.
-     (CVE-2012-2333)
-     [Steve Henson]
-
-  *) Initialise tkeylen properly when encrypting CMS messages.
-     Thanks to Solar Designer of Openwall for reporting this issue.
-     [Steve Henson]
-
- Changes between 1.0.0h and 1.0.0i [19 Apr 2012]
-
-  *) Check for potentially exploitable overflows in asn1_d2i_read_bio
-     BUF_mem_grow and BUF_mem_grow_clean. Refuse attempts to shrink buffer
-     in CRYPTO_realloc_clean.
-
-     Thanks to Tavis Ormandy, Google Security Team, for discovering this
-     issue and to Adam Langley <agl at chromium.org> for fixing it.
-     (CVE-2012-2110)
-     [Adam Langley (Google), Tavis Ormandy, Google Security Team]
-
  Changes between 1.0.0g and 1.0.0h [12 Mar 2012]
 
   *) Fix MMA (Bleichenbacher's attack on PKCS #1 v1.5 RSA padding) weakness
@@ -1823,228 +1842,6 @@
   *) Change 'Configure' script to enable Camellia by default.
      [NTT]
 
- Changes between 0.9.8x and 0.9.8y [5 Feb 2013]
-
-  *) Make the decoding of SSLv3, TLS and DTLS CBC records constant time.
-
-     This addresses the flaw in CBC record processing discovered by 
-     Nadhem Alfardan and Kenny Paterson. Details of this attack can be found
-     at: http://www.isg.rhul.ac.uk/tls/     
-
-     Thanks go to Nadhem Alfardan and Kenny Paterson of the Information
-     Security Group at Royal Holloway, University of London
-     (www.isg.rhul.ac.uk) for discovering this flaw and Adam Langley and
-     Emilia K?sper for the initial patch.
-     (CVE-2013-0169)
-     [Emilia K?sper, Adam Langley, Ben Laurie, Andy Polyakov, Steve Henson]
-
-  *) Return an error when checking OCSP signatures when key is NULL.
-     This fixes a DoS attack. (CVE-2013-0166)
-     [Steve Henson]
-
-  *) Call OCSP Stapling callback after ciphersuite has been chosen, so
-     the right response is stapled. Also change SSL_get_certificate()
-     so it returns the certificate actually sent.
-     See http://rt.openssl.org/Ticket/Display.html?id=2836.
-     (This is a backport)
-     [Rob Stradling <rob.stradling at comodo.com>]
-
-  *) Fix possible deadlock when decoding public keys.
-     [Steve Henson]
-
- Changes between 0.9.8w and 0.9.8x [10 May 2012]
-
-  *) Sanity check record length before skipping explicit IV in DTLS
-     to fix DoS attack.
-
-     Thanks to Codenomicon for discovering this issue using Fuzz-o-Matic
-     fuzzing as a service testing platform.
-     (CVE-2012-2333)
-     [Steve Henson]
-
-  *) Initialise tkeylen properly when encrypting CMS messages.
-     Thanks to Solar Designer of Openwall for reporting this issue.
-     [Steve Henson]
-
- Changes between 0.9.8v and 0.9.8w [23 Apr 2012]
-
-  *) The fix for CVE-2012-2110 did not take into account that the 
-     'len' argument to BUF_MEM_grow and BUF_MEM_grow_clean is an
-     int in OpenSSL 0.9.8, making it still vulnerable. Fix by 
-     rejecting negative len parameter. (CVE-2012-2131)
-     [Tomas Hoger <thoger at redhat.com>]
-
- Changes between 0.9.8u and 0.9.8v [19 Apr 2012]
-
-  *) Check for potentially exploitable overflows in asn1_d2i_read_bio
-     BUF_mem_grow and BUF_mem_grow_clean. Refuse attempts to shrink buffer
-     in CRYPTO_realloc_clean.
-
-     Thanks to Tavis Ormandy, Google Security Team, for discovering this
-     issue and to Adam Langley <agl at chromium.org> for fixing it.
-     (CVE-2012-2110)
-     [Adam Langley (Google), Tavis Ormandy, Google Security Team]
-
- Changes between 0.9.8t and 0.9.8u [12 Mar 2012]
-
-  *) Fix MMA (Bleichenbacher's attack on PKCS #1 v1.5 RSA padding) weakness
-     in CMS and PKCS7 code. When RSA decryption fails use a random key for
-     content decryption and always return the same error. Note: this attack
-     needs on average 2^20 messages so it only affects automated senders. The
-     old behaviour can be reenabled in the CMS code by setting the
-     CMS_DEBUG_DECRYPT flag: this is useful for debugging and testing where
-     an MMA defence is not necessary.
-     Thanks to Ivan Nestlerode <inestlerode at us.ibm.com> for discovering
-     this issue. (CVE-2012-0884)
-     [Steve Henson]
-
-  *) Fix CVE-2011-4619: make sure we really are receiving a 
-     client hello before rejecting multiple SGC restarts. Thanks to
-     Ivan Nestlerode <inestlerode at us.ibm.com> for discovering this bug.
-     [Steve Henson]
-
- Changes between 0.9.8s and 0.9.8t [18 Jan 2012]
-
-  *) Fix for DTLS DoS issue introduced by fix for CVE-2011-4109.
-     Thanks to Antonio Martin, Enterprise Secure Access Research and
-     Development, Cisco Systems, Inc. for discovering this bug and
-     preparing a fix. (CVE-2012-0050)
-     [Antonio Martin]
-
- Changes between 0.9.8r and 0.9.8s [4 Jan 2012]
-
-  *) Nadhem Alfardan and Kenny Paterson have discovered an extension
-     of the Vaudenay padding oracle attack on CBC mode encryption
-     which enables an efficient plaintext recovery attack against
-     the OpenSSL implementation of DTLS. Their attack exploits timing
-     differences arising during decryption processing. A research
-     paper describing this attack can be found at:
-                  http://www.isg.rhul.ac.uk/~kp/dtls.pdf
-     Thanks go to Nadhem Alfardan and Kenny Paterson of the Information
-     Security Group at Royal Holloway, University of London
-     (www.isg.rhul.ac.uk) for discovering this flaw and to Robin Seggelmann
-     <seggelmann at fh-muenster.de> and Michael Tuexen <tuexen at fh-muenster.de>
-     for preparing the fix. (CVE-2011-4108)
-     [Robin Seggelmann, Michael Tuexen]
-
-  *) Stop policy check failure freeing same buffer twice. (CVE-2011-4109)
-     [Ben Laurie, Kasper <ekasper at google.com>]
-
-  *) Clear bytes used for block padding of SSL 3.0 records.
-     (CVE-2011-4576)
-     [Adam Langley (Google)]
-
-  *) Only allow one SGC handshake restart for SSL/TLS. Thanks to George
-     Kadianakis <desnacked at gmail.com> for discovering this issue and
-     Adam Langley for preparing the fix. (CVE-2011-4619)
-     [Adam Langley (Google)]
- 
-  *) Prevent malformed RFC3779 data triggering an assertion failure.
-     Thanks to Andrew Chi, BBN Technologies, for discovering the flaw
-     and Rob Austein <sra at hactrn.net> for fixing it. (CVE-2011-4577)
-     [Rob Austein <sra at hactrn.net>]
-
-  *) Fix ssl_ciph.c set-up race.
-     [Adam Langley (Google)]
-
-  *) Fix spurious failures in ecdsatest.c.
-     [Emilia K?sper (Google)]
-
-  *) Fix the BIO_f_buffer() implementation (which was mixing different
-     interpretations of the '..._len' fields).
-     [Adam Langley (Google)]
-
-  *) Fix handling of BN_BLINDING: now BN_BLINDING_invert_ex (rather than
-     BN_BLINDING_invert_ex) calls BN_BLINDING_update, ensuring that concurrent
-     threads won't reuse the same blinding coefficients.
-
-     This also avoids the need to obtain the CRYPTO_LOCK_RSA_BLINDING
-     lock to call BN_BLINDING_invert_ex, and avoids one use of
-     BN_BLINDING_update for each BN_BLINDING structure (previously,
-     the last update always remained unused).
-     [Emilia K?sper (Google)]
-
-  *) Fix SSL memory handling for (EC)DH ciphersuites, in particular
-     for multi-threaded use of ECDH.
-     [Adam Langley (Google)]
-
-  *) Fix x509_name_ex_d2i memory leak on bad inputs.
-     [Bodo Moeller]
-
-  *) Add protection against ECDSA timing attacks as mentioned in the paper
-     by Billy Bob Brumley and Nicola Tuveri, see:
-
-	http://eprint.iacr.org/2011/232.pdf
-
-     [Billy Bob Brumley and Nicola Tuveri]
-
- Changes between 0.9.8q and 0.9.8r [8 Feb 2011]
-
-  *) Fix parsing of OCSP stapling ClientHello extension. CVE-2011-0014
-     [Neel Mehta, Adam Langley, Bodo Moeller (Google)]
-
-  *) Fix bug in string printing code: if *any* escaping is enabled we must
-     escape the escape character (backslash) or the resulting string is
-     ambiguous.
-     [Steve Henson]
-
- Changes between 0.9.8p and 0.9.8q [2 Dec 2010]
-
-  *) Disable code workaround for ancient and obsolete Netscape browsers
-     and servers: an attacker can use it in a ciphersuite downgrade attack.
-     Thanks to Martin Rex for discovering this bug. CVE-2010-4180
-     [Steve Henson]
-
-  *) Fixed J-PAKE implementation error, originally discovered by
-     Sebastien Martini, further info and confirmation from Stefan
-     Arentz and Feng Hao. Note that this fix is a security fix. CVE-2010-4252
-     [Ben Laurie]
-
- Changes between 0.9.8o and 0.9.8p [16 Nov 2010]
-
-  *) Fix extension code to avoid race conditions which can result in a buffer
-     overrun vulnerability: resumed sessions must not be modified as they can
-     be shared by multiple threads. CVE-2010-3864
-     [Steve Henson]
-
-  *) Fix for double free bug in ssl/s3_clnt.c CVE-2010-2939
-     [Steve Henson]
-
-  *) Don't reencode certificate when calculating signature: cache and use
-     the original encoding instead. This makes signature verification of
-     some broken encodings work correctly.
-     [Steve Henson]
-
-  *) ec2_GF2m_simple_mul bugfix: compute correct result if the output EC_POINT
-     is also one of the inputs.
-     [Emilia K?sper <emilia.kasper at esat.kuleuven.be> (Google)]
-
-  *) Don't repeatedly append PBE algorithms to table if they already exist.
-     Sort table on each new add. This effectively makes the table read only
-     after all algorithms are added and subsequent calls to PKCS12_pbe_add
-     etc are non-op.
-     [Steve Henson]
-
- Changes between 0.9.8n and 0.9.8o [01 Jun 2010]
-
-  [NB: OpenSSL 0.9.8o and later 0.9.8 patch levels were released after
-  OpenSSL 1.0.0.]
-
-  *) Correct a typo in the CMS ASN1 module which can result in invalid memory
-     access or freeing data twice (CVE-2010-0742)
-     [Steve Henson, Ronald Moesbergen <intercommit at gmail.com>]
-
-  *) Add SHA2 algorithms to SSL_library_init(). SHA2 is becoming far more
-     common in certificates and some applications which only call
-     SSL_library_init and not OpenSSL_add_all_algorithms() will fail.
-     [Steve Henson]
-
-  *) VMS fixes: 
-     Reduce copying into .apps and .test in makevms.com
-     Don't try to use blank CA certificate in CA.com
-     Allow use of C files from original directories in maketests.com
-     [Steven M. Schweda" <sms at antinode.info>]
-
  Changes between 0.9.8m and 0.9.8n [24 Mar 2010]
 
   *) When rejecting SSL/TLS records due to an incorrect version number, never
diff --git a/NEWS b/NEWS
index e17516e..aa72ab0 100644
--- a/NEWS
+++ b/NEWS
@@ -5,10 +5,20 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
-  Major changes between OpenSSL 1.0.1l and OpenSSL 1.0.1m [under development]
+  Major changes between OpenSSL 1.0.1m and OpenSSL 1.0.1n [under development]
 
       o
 
+  Major changes between OpenSSL 1.0.1l and OpenSSL 1.0.1m [19 Mar 2015]
+
+      o Segmentation fault in ASN1_TYPE_cmp fix (CVE-2015-0286)
+      o ASN.1 structure reuse memory corruption fix (CVE-2015-0287)
+      o PKCS7 NULL pointer dereferences fix (CVE-2015-0289)
+      o DoS via reachable assert in SSLv2 servers fix (CVE-2015-0293)
+      o Use After Free following d2i_ECPrivatekey error fix (CVE-2015-0209)
+      o X509_to_X509_REQ NULL pointer deref fix (CVE-2015-0288)
+      o Removed the export ciphers from the DEFAULT ciphers
+
   Major changes between OpenSSL 1.0.1k and OpenSSL 1.0.1l [15 Jan 2015]
 
       o Build fixes for the Windows and OpenVMS platforms
@@ -107,19 +117,6 @@
       o Preliminary FIPS capability for unvalidated 2.0 FIPS module.
       o SRP support.
 
-  Major changes between OpenSSL 1.0.0j and OpenSSL 1.0.0k [5 Feb 2013]:
-
-      o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169
-      o Fix OCSP bad key DoS attack CVE-2013-0166
-
-  Major changes between OpenSSL 1.0.0i and OpenSSL 1.0.0j [10 May 2012]:
-
-      o Fix DTLS record length checking bug CVE-2012-2333
-
-  Major changes between OpenSSL 1.0.0h and OpenSSL 1.0.0i [19 Apr 2012]:
-
-      o Fix for ASN1 overflow bug CVE-2012-2110
-
   Major changes between OpenSSL 1.0.0g and OpenSSL 1.0.0h [12 Mar 2012]:
 
       o Fix for CMS/PKCS#7 MMA CVE-2012-0884
@@ -192,62 +189,6 @@
       o Opaque PRF Input TLS extension support.
       o Updated time routines to avoid OS limitations.
 
-  Major changes between OpenSSL 0.9.8x and OpenSSL 0.9.8y [5 Feb 2013]:
-
-      o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169
-      o Fix OCSP bad key DoS attack CVE-2013-0166
-
-  Major changes between OpenSSL 0.9.8w and OpenSSL 0.9.8x [10 May 2012]:
-
-      o Fix DTLS record length checking bug CVE-2012-2333
-
-  Major changes between OpenSSL 0.9.8v and OpenSSL 0.9.8w [23 Apr 2012]:
-
-      o Fix for CVE-2012-2131 (corrected fix for 0.9.8 and CVE-2012-2110)
-
-  Major changes between OpenSSL 0.9.8u and OpenSSL 0.9.8v [19 Apr 2012]:
-
-      o Fix for ASN1 overflow bug CVE-2012-2110
-
-  Major changes between OpenSSL 0.9.8t and OpenSSL 0.9.8u [12 Mar 2012]:
-
-      o Fix for CMS/PKCS#7 MMA CVE-2012-0884
-      o Corrected fix for CVE-2011-4619
-      o Various DTLS fixes.
-
-  Major changes between OpenSSL 0.9.8s and OpenSSL 0.9.8t [18 Jan 2012]:
-
-      o Fix for DTLS DoS issue CVE-2012-0050
-
-  Major changes between OpenSSL 0.9.8r and OpenSSL 0.9.8s [4 Jan 2012]:
-
-      o Fix for DTLS plaintext recovery attack CVE-2011-4108
-      o Fix policy check double free error CVE-2011-4109
-      o Clear block padding bytes of SSL 3.0 records CVE-2011-4576
-      o Only allow one SGC handshake restart for SSL/TLS CVE-2011-4619
-      o Check for malformed RFC3779 data CVE-2011-4577
-
-  Major changes between OpenSSL 0.9.8q and OpenSSL 0.9.8r [8 Feb 2011]:
-
-      o Fix for security issue CVE-2011-0014
-
-  Major changes between OpenSSL 0.9.8p and OpenSSL 0.9.8q [2 Dec 2010]:
-
-      o Fix for security issue CVE-2010-4180
-      o Fix for CVE-2010-4252
-
-  Major changes between OpenSSL 0.9.8o and OpenSSL 0.9.8p [16 Nov 2010]:
-
-      o Fix for security issue CVE-2010-3864.
-
-  Major changes between OpenSSL 0.9.8n and OpenSSL 0.9.8o [1 Jun 2010]:
-
-      o Fix for security issue CVE-2010-0742.
-      o Various DTLS fixes.
-      o Recognise SHA2 certificates if only SSL algorithms added.
-      o Fix for no-rc4 compilation.
-      o Chil ENGINE unload workaround.
-
   Major changes between OpenSSL 0.9.8m and OpenSSL 0.9.8n [24 Mar 2010]:
 
       o CFB cipher definition fixes.
diff --git a/README b/README
index 3c1d767..caddc93 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.1m-dev
+ OpenSSL 1.0.1n-dev
 
  Copyright (c) 1998-2011 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c
index 4a36aff..af79530 100644
--- a/crypto/asn1/a_type.c
+++ b/crypto/asn1/a_type.c
@@ -119,6 +119,9 @@ int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b)
     case V_ASN1_OBJECT:
         result = OBJ_cmp(a->value.object, b->value.object);
         break;
+    case V_ASN1_BOOLEAN:
+        result = a->value.boolean - b->value.boolean;
+        break;
     case V_ASN1_NULL:
         result = 0;             /* They do not have content. */
         break;
diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index 4595664..7fd336a 100644
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -304,9 +304,16 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
     case ASN1_ITYPE_CHOICE:
         if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL))
             goto auxerr;
-
-        /* Allocate structure */
-        if (!*pval && !ASN1_item_ex_new(pval, it)) {
+        if (*pval) {
+            /* Free up and zero CHOICE value if initialised */
+            i = asn1_get_choice_selector(pval, it);
+            if ((i >= 0) && (i < it->tcount)) {
+                tt = it->templates + i;
+                pchptr = asn1_get_field_ptr(pval, tt);
+                ASN1_template_free(pchptr, tt);
+                asn1_set_choice_selector(pval, -1, it);
+            }
+        } else if (!ASN1_item_ex_new(pval, it)) {
             ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ERR_R_NESTED_ASN1_ERROR);
             goto err;
         }
@@ -386,6 +393,17 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
         if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL))
             goto auxerr;
 
+        /* Free up and zero any ADB found */
+        for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) {
+            if (tt->flags & ASN1_TFLG_ADB_MASK) {
+                const ASN1_TEMPLATE *seqtt;
+                ASN1_VALUE **pseqval;
+                seqtt = asn1_do_adb(pval, tt, 1);
+                pseqval = asn1_get_field_ptr(pval, seqtt);
+                ASN1_template_free(pseqval, seqtt);
+            }
+        }
+
         /* Get each field entry */
         for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) {
             const ASN1_TEMPLATE *seqtt;
diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
index 2644d5f..d51b76e 100644
--- a/crypto/asn1/x_x509.c
+++ b/crypto/asn1/x_x509.c
@@ -172,8 +172,14 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
 {
     const unsigned char *q;
     X509 *ret;
+    int freeret = 0;
+
     /* Save start position */
     q = *pp;
+
+    if(!a || *a == NULL) {
+        freeret = 1;
+    }
     ret = d2i_X509(a, pp, length);
     /* If certificate unreadable then forget it */
     if (!ret)
@@ -186,7 +192,11 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
         goto err;
     return ret;
  err:
-    X509_free(ret);
+    if(freeret) {
+        X509_free(ret);
+        if (a)
+            *a = NULL;
+    }
     return NULL;
 }
 
diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index 81f13c7..be9cd0e 100644
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -829,6 +829,7 @@ void ERR_load_BIO_strings(void);
 # define BIO_F_CONN_CTRL                                  127
 # define BIO_F_CONN_STATE                                 115
 # define BIO_F_DGRAM_SCTP_READ                            132
+# define BIO_F_DGRAM_SCTP_WRITE                           133
 # define BIO_F_FILE_CTRL                                  116
 # define BIO_F_FILE_READ                                  130
 # define BIO_F_LINEBUFFER_CTRL                            129
diff --git a/crypto/bio/bio_err.c b/crypto/bio/bio_err.c
index e8d3027..6dd6162 100644
--- a/crypto/bio/bio_err.c
+++ b/crypto/bio/bio_err.c
@@ -96,6 +96,7 @@ static ERR_STRING_DATA BIO_str_functs[] = {
     {ERR_FUNC(BIO_F_CONN_CTRL), "CONN_CTRL"},
     {ERR_FUNC(BIO_F_CONN_STATE), "CONN_STATE"},
     {ERR_FUNC(BIO_F_DGRAM_SCTP_READ), "DGRAM_SCTP_READ"},
+    {ERR_FUNC(BIO_F_DGRAM_SCTP_WRITE), "DGRAM_SCTP_WRITE"},
     {ERR_FUNC(BIO_F_FILE_CTRL), "FILE_CTRL"},
     {ERR_FUNC(BIO_F_FILE_READ), "FILE_READ"},
     {ERR_FUNC(BIO_F_LINEBUFFER_CTRL), "LINEBUFFER_CTRL"},
diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index 6ff94a3..b4b0e9f 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -1226,16 +1226,19 @@ EC_KEY *d2i_ECParameters(EC_KEY **a, const unsigned char **in, long len)
             ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_MALLOC_FAILURE);
             return NULL;
         }
-        if (a)
-            *a = ret;
     } else
         ret = *a;
 
     if (!d2i_ECPKParameters(&ret->group, in, len)) {
         ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_EC_LIB);
+        if (a == NULL || *a != ret)
+             EC_KEY_free(ret);
         return NULL;
     }
 
+    if (a)
+        *a = ret;
+
     return ret;
 }
 
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index dbb6a57..d40d5da 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -30,11 +30,11 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x100010d0L
+# define OPENSSL_VERSION_NUMBER  0x100010e0L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1m-fips-dev xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1n-fips-dev xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1m-dev xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1n-dev xx XXX xxxx"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index dd6f675..31a1b98 100644
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -261,6 +261,25 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
     PKCS7_RECIP_INFO *ri = NULL;
     ASN1_OCTET_STRING *os = NULL;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAINIT, PKCS7_R_INVALID_NULL_POINTER);
+        return NULL;
+    }
+    /*
+     * The content field in the PKCS7 ContentInfo is optional, but that really
+     * only applies to inner content (precisely, detached signatures).
+     *
+     * When reading content, missing outer content is therefore treated as an
+     * error.
+     *
+     * When creating content, PKCS7_content_new() must be called before
+     * calling this method, so a NULL p7->d is always an error.
+     */
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAINIT, PKCS7_R_NO_CONTENT);
+        return NULL;
+    }
+
     i = OBJ_obj2nid(p7->type);
     p7->state = PKCS7_S_HEADER;
 
@@ -411,6 +430,16 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
     unsigned char *ek = NULL, *tkey = NULL;
     int eklen = 0, tkeylen = 0;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATADECODE, PKCS7_R_INVALID_NULL_POINTER);
+        return NULL;
+    }
+
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATADECODE, PKCS7_R_NO_CONTENT);
+        return NULL;
+    }
+
     i = OBJ_obj2nid(p7->type);
     p7->state = PKCS7_S_HEADER;
 
@@ -707,6 +736,16 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
     STACK_OF(PKCS7_SIGNER_INFO) *si_sk = NULL;
     ASN1_OCTET_STRING *os = NULL;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_INVALID_NULL_POINTER);
+        return 0;
+    }
+
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_NO_CONTENT);
+        return 0;
+    }
+
     EVP_MD_CTX_init(&ctx_tmp);
     i = OBJ_obj2nid(p7->type);
     p7->state = PKCS7_S_HEADER;
@@ -746,6 +785,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         /* If detached data then the content is excluded */
         if (PKCS7_type_is_data(p7->d.sign->contents) && p7->detached) {
             M_ASN1_OCTET_STRING_free(os);
+            os = NULL;
             p7->d.sign->contents->d.data = NULL;
         }
         break;
@@ -755,6 +795,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         /* If detached data then the content is excluded */
         if (PKCS7_type_is_data(p7->d.digest->contents) && p7->detached) {
             M_ASN1_OCTET_STRING_free(os);
+            os = NULL;
             p7->d.digest->contents->d.data = NULL;
         }
         break;
@@ -820,22 +861,30 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
     }
 
-    if (!PKCS7_is_detached(p7) && !(os->flags & ASN1_STRING_FLAG_NDEF)) {
-        char *cont;
-        long contlen;
-        btmp = BIO_find_type(bio, BIO_TYPE_MEM);
-        if (btmp == NULL) {
-            PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_UNABLE_TO_FIND_MEM_BIO);
-            goto err;
-        }
-        contlen = BIO_get_mem_data(btmp, &cont);
+    if (!PKCS7_is_detached(p7)) {
         /*
-         * Mark the BIO read only then we can use its copy of the data
-         * instead of making an extra copy.
+         * NOTE(emilia): I think we only reach os == NULL here because detached
+         * digested data support is broken.
          */
-        BIO_set_flags(btmp, BIO_FLAGS_MEM_RDONLY);
-        BIO_set_mem_eof_return(btmp, 0);
-        ASN1_STRING_set0(os, (unsigned char *)cont, contlen);
+        if (os == NULL)
+            goto err;
+        if (!(os->flags & ASN1_STRING_FLAG_NDEF)) {
+            char *cont;
+            long contlen;
+            btmp = BIO_find_type(bio, BIO_TYPE_MEM);
+            if (btmp == NULL) {
+                PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_UNABLE_TO_FIND_MEM_BIO);
+                goto err;
+            }
+            contlen = BIO_get_mem_data(btmp, &cont);
+            /*
+             * Mark the BIO read only then we can use its copy of the data
+             * instead of making an extra copy.
+             */
+            BIO_set_flags(btmp, BIO_FLAGS_MEM_RDONLY);
+            BIO_set_mem_eof_return(btmp, 0);
+            ASN1_STRING_set0(os, (unsigned char *)cont, contlen);
+        }
     }
     ret = 1;
  err:
@@ -910,6 +959,16 @@ int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio,
     STACK_OF(X509) *cert;
     X509 *x509;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAVERIFY, PKCS7_R_INVALID_NULL_POINTER);
+        return 0;
+    }
+
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAVERIFY, PKCS7_R_NO_CONTENT);
+        return 0;
+    }
+
     if (PKCS7_type_is_signed(p7)) {
         cert = p7->d.sign->cert;
     } else if (PKCS7_type_is_signedAndEnveloped(p7)) {
diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index c773812..0c5fcaa 100644
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -70,6 +70,7 @@ long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
     nid = OBJ_obj2nid(p7->type);
 
     switch (cmd) {
+    /* NOTE(emilia): does not support detached digested data. */
     case PKCS7_OP_SET_DETACHED_SIGNATURE:
         if (nid == NID_pkcs7_signed) {
             ret = p7->detached = (int)larg;
@@ -444,6 +445,8 @@ int PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md)
 
 STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7)
 {
+    if (p7 == NULL || p7->d.ptr == NULL)
+        return NULL;
     if (PKCS7_type_is_signed(p7)) {
         return (p7->d.sign->signer_info);
     } else if (PKCS7_type_is_signedAndEnveloped(p7)) {
diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h
index 0af8952..519649b 100644
--- a/crypto/stack/safestack.h
+++ b/crypto/stack/safestack.h
@@ -2530,7 +2530,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 # define lh_SSL_SESSION_stats_bio(lh,out) \
   LHM_lh_stats_bio(SSL_SESSION,lh,out)
 # define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh)
-/* End of util/mkstack.pl block, you may now edit :-) */
 #ifdef  __cplusplus
 }
 #endif
diff --git a/openssl.spec b/openssl.spec
index 40ac462..71e907e 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -7,7 +7,7 @@ Release: 1
 Summary: Secure Sockets Layer and cryptography libraries and tools
 Name: openssl
 #Version: %{libmaj}.%{libmin}.%{librel}
-Version: 1.0.1m
+Version: 1.0.1n
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries
diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c
index 1f5d7c9..7e3674a 100644
--- a/ssl/s2_lib.c
+++ b/ssl/s2_lib.c
@@ -496,7 +496,7 @@ int ssl2_generate_key_material(SSL *s)
 
         OPENSSL_assert(s->session->master_key_length >= 0
                        && s->session->master_key_length
-                       < (int)sizeof(s->session->master_key));
+                       <= (int)sizeof(s->session->master_key));
         EVP_DigestUpdate(&ctx, s->session->master_key,
                          s->session->master_key_length);
         EVP_DigestUpdate(&ctx, &c, 1);
diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c
index daba6dd..19bb48c 100644
--- a/ssl/s2_srvr.c
+++ b/ssl/s2_srvr.c
@@ -371,7 +371,8 @@ int ssl2_accept(SSL *s)
 
 static int get_client_master_key(SSL *s)
 {
-    int is_export, i, n, keya, ek;
+    int is_export, i, n, keya;
+    unsigned int ek;
     unsigned long len;
     unsigned char *p;
     const SSL_CIPHER *cp;
@@ -454,11 +455,6 @@ static int get_client_master_key(SSL *s)
         SSLerr(SSL_F_GET_CLIENT_MASTER_KEY, SSL_R_NO_PRIVATEKEY);
         return (-1);
     }
-    i = ssl_rsa_private_decrypt(s->cert, s->s2->tmp.enc,
-                                &(p[s->s2->tmp.clear]),
-                                &(p[s->s2->tmp.clear]),
-                                (s->s2->ssl2_rollback) ? RSA_SSLV23_PADDING :
-                                RSA_PKCS1_PADDING);
 
     is_export = SSL_C_IS_EXPORT(s->session->cipher);
 
@@ -475,23 +471,61 @@ static int get_client_master_key(SSL *s)
     } else
         ek = 5;
 
+    /*
+     * The format of the CLIENT-MASTER-KEY message is
+     * 1 byte message type
+     * 3 bytes cipher
+     * 2-byte clear key length (stored in s->s2->tmp.clear)
+     * 2-byte encrypted key length (stored in s->s2->tmp.enc)
+     * 2-byte key args length (IV etc)
+     * clear key
+     * encrypted key
+     * key args
+     *
+     * If the cipher is an export cipher, then the encrypted key bytes
+     * are a fixed portion of the total key (5 or 8 bytes). The size of
+     * this portion is in |ek|. If the cipher is not an export cipher,
+     * then the entire key material is encrypted (i.e., clear key length
+     * must be zero).
+     */
+    if ((!is_export && s->s2->tmp.clear != 0) ||
+        (is_export && s->s2->tmp.clear + ek != (unsigned int)EVP_CIPHER_key_length(c))) {
+        ssl2_return_error(s, SSL2_PE_UNDEFINED_ERROR);
+        SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_BAD_LENGTH);
+        return -1;
+    }
+    /*
+     * The encrypted blob must decrypt to the encrypted portion of the key.
+     * Decryption can't be expanding, so if we don't have enough encrypted
+     * bytes to fit the key in the buffer, stop now.
+     */
+    if ((is_export && s->s2->tmp.enc < ek) ||
+        (!is_export && s->s2->tmp.enc < (unsigned int)EVP_CIPHER_key_length(c))) {
+        ssl2_return_error(s,SSL2_PE_UNDEFINED_ERROR);
+        SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_LENGTH_TOO_SHORT);
+        return -1;
+    }
+
+    i = ssl_rsa_private_decrypt(s->cert, s->s2->tmp.enc,
+                                &(p[s->s2->tmp.clear]),
+                                &(p[s->s2->tmp.clear]),
+                                (s->s2->ssl2_rollback) ? RSA_SSLV23_PADDING :
+                                RSA_PKCS1_PADDING);
+
     /* bad decrypt */
 # if 1
     /*
      * If a bad decrypt, continue with protocol but with a random master
      * secret (Bleichenbacher attack)
      */
-    if ((i < 0) || ((!is_export && (i != EVP_CIPHER_key_length(c)))
-                    || (is_export && ((i != ek)
-                                      || (s->s2->tmp.clear +
-                                          (unsigned int)i != (unsigned int)
-                                          EVP_CIPHER_key_length(c)))))) {
+    if ((i < 0) || ((!is_export && i != EVP_CIPHER_key_length(c))
+                    || (is_export && i != (int)ek))) {
         ERR_clear_error();
         if (is_export)
             i = ek;
         else
             i = EVP_CIPHER_key_length(c);
-        if (RAND_pseudo_bytes(p, i) <= 0)
+        if (RAND_pseudo_bytes(&p[s->s2->tmp.clear], i) <= 0)
             return 0;
     }
 # else
@@ -513,7 +547,7 @@ static int get_client_master_key(SSL *s)
 # endif
 
     if (is_export)
-        i += s->s2->tmp.clear;
+        i = EVP_CIPHER_key_length(c);
 
     if (i > SSL_MAX_MASTER_KEY_LENGTH) {
         ssl2_return_error(s, SSL2_PE_UNDEFINED_ERROR);

From matt at openssl.org  Thu Mar 19 14:05:41 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 19 Mar 2015 14:05:41 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_0-stable update
Message-ID: <1426773941.180361.30681.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_0-stable has been updated
       via  06cf4418cf45253afe401fd4270effd439103dca (commit)
       via  81741de632c9952d8b25afd15a280ff6424931b3 (commit)
       via  f2f2f64deeac648c46cbdc8f5c86efb153a186c4 (commit)
       via  34fc239378c456d5078cd66c5541a814cd114e78 (commit)
       via  dfc3e9698b755e179e8ae8e3cef7ff4e07cfd500 (commit)
       via  ab1c3627b71c43c6bd8259119ac871093651f8a2 (commit)
       via  c30465847b1e493f43a53c6b0d000b1101e40384 (commit)
       via  66e20354cbe6ed1e697d2cd41c38d421b294f1fd (commit)
       via  1a08063abfc8d3527fbdce4c650da65a79035e3d (commit)
       via  9104dc42558665e851e240e4e12030bef459787c (commit)
       via  02758836731658381580e282ff403ba07d87b2f8 (commit)
       via  7746ff501c65968203f376e46bd1eeb93efb0f64 (commit)
      from  765db5f9e5a6e1ab2d215012036a84aec62de332 (commit)


- Log -----------------------------------------------------------------
commit 06cf4418cf45253afe401fd4270effd439103dca
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 13:45:41 2015 +0000

    Prepare for 1.0.0s-dev
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 81741de632c9952d8b25afd15a280ff6424931b3
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 13:43:00 2015 +0000

    Prepare for 1.0.0r release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit f2f2f64deeac648c46cbdc8f5c86efb153a186c4
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 13:43:00 2015 +0000

    make update
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 34fc239378c456d5078cd66c5541a814cd114e78
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 11:35:33 2015 +0000

    Fix unsigned/signed warnings
    
    Fix some unsigned/signed warnings introduced as part of the fix
    for CVE-2015-0293
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit dfc3e9698b755e179e8ae8e3cef7ff4e07cfd500
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 10:16:32 2015 +0000

    Fix a failure to NULL a pointer freed on error.
    
    Reported by the LibreSSL project as a follow on to CVE-2015-0209
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit ab1c3627b71c43c6bd8259119ac871093651f8a2
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 17 17:01:09 2015 +0000

    Update NEWS file
    
    Update the NEWS file with the latest entries from CHANGES ready for the
    release.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit c30465847b1e493f43a53c6b0d000b1101e40384
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 17 16:56:27 2015 +0000

    Update CHANGES for release
    
    Update CHANGES fiel with all the latest fixes ready for the release.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 66e20354cbe6ed1e697d2cd41c38d421b294f1fd
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 18 10:04:06 2015 +0000

    Remove overlapping CHANGES/NEWS entries
    
    Remove entries from CHANGES and NEWS from letter releases that occur *after*
    the next point release. Without this we get duplicate entries for the same
    issue appearing multiple times.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 1a08063abfc8d3527fbdce4c650da65a79035e3d
Author: Emilia Kasper <emilia at openssl.org>
Date:   Wed Mar 4 09:05:02 2015 -0800

    Fix reachable assert in SSLv2 servers.
    
    This assert is reachable for servers that support SSLv2 and export ciphers.
    Therefore, such servers can be DoSed by sending a specially crafted
    SSLv2 CLIENT-MASTER-KEY.
    
    Also fix s2_srvr.c to error out early if the key lengths are malformed.
    These lengths are sent unencrypted, so this does not introduce an oracle.
    
    CVE-2015-0293
    
    This issue was discovered by Sean Burford (Google) and Emilia K??sper of
    the OpenSSL development team.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

commit 9104dc42558665e851e240e4e12030bef459787c
Author: Emilia Kasper <emilia at openssl.org>
Date:   Fri Feb 27 16:52:23 2015 +0100

    PKCS#7: avoid NULL pointer dereferences with missing content
    
    In PKCS#7, the ASN.1 content component is optional.
    This typically applies to inner content (detached signatures),
    however we must also handle unexpected missing outer content
    correctly.
    
    This patch only addresses functions reachable from parsing,
    decryption and verification, and functions otherwise associated
    with reading potentially untrusted data.
    
    Correcting all low-level API calls requires further work.
    
    CVE-2015-0289
    
    Thanks to Michal Zalewski (Google) for reporting this issue.
    
    Reviewed-by: Steve Henson <steve at openssl.org>

commit 02758836731658381580e282ff403ba07d87b2f8
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 9 23:11:45 2015 +0000

    Fix ASN1_TYPE_cmp
    
    Fix segmentation violation when ASN1_TYPE_cmp is passed a boolean type. This
    can be triggered during certificate verification so could be a DoS attack
    against a client or a server enabling client authentication.
    
    CVE-2015-0286
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 7746ff501c65968203f376e46bd1eeb93efb0f64
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Feb 23 02:32:44 2015 +0000

    Free up ADB and CHOICE if already initialised.
    
    CVE-2015-0287
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Emilia K??sper <emilia at openssl.org>

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

Summary of changes:
 CHANGES                  | 300 ++++++++++++-----------------------------------
 NEWS                     |  68 ++---------
 README                   |   2 +-
 crypto/asn1/a_type.c     |   3 +
 crypto/asn1/tasn_dec.c   |  24 +++-
 crypto/asn1/x_x509.c     |  12 +-
 crypto/ec/ec_asn1.c      |   7 +-
 crypto/opensslv.h        |   6 +-
 crypto/pkcs7/pk7_doit.c  |  87 +++++++++++---
 crypto/pkcs7/pk7_lib.c   |   3 +
 crypto/stack/safestack.h |   1 -
 openssl.spec             |   2 +-
 ssl/s2_lib.c             |   2 +-
 ssl/s2_srvr.c            |  60 ++++++++--
 14 files changed, 257 insertions(+), 320 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3e146ab..7660a24 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,83 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.0.0q and 1.0.0r [xx XXX xxxx]
+ Changes between 1.0.0r and 1.0.0s [xx XXX xxxx]
+
+  *)
+
+ Changes between 1.0.0q and 1.0.0r [19 Mar 2015]
+
+  *) Segmentation fault in ASN1_TYPE_cmp fix
+
+     The function ASN1_TYPE_cmp will crash with an invalid read if an attempt is
+     made to compare ASN.1 boolean types. Since ASN1_TYPE_cmp is used to check
+     certificate signature algorithm consistency this can be used to crash any
+     certificate verification operation and exploited in a DoS attack. Any
+     application which performs certificate verification is vulnerable including
+     OpenSSL clients and servers which enable client authentication.
+     (CVE-2015-0286)
+     [Stephen Henson]
+
+  *) ASN.1 structure reuse memory corruption fix
+
+     Reusing a structure in ASN.1 parsing may allow an attacker to cause
+     memory corruption via an invalid write. Such reuse is and has been
+     strongly discouraged and is believed to be rare.
+
+     Applications that parse structures containing CHOICE or ANY DEFINED BY
+     components may be affected. Certificate parsing (d2i_X509 and related
+     functions) are however not affected. OpenSSL clients and servers are
+     not affected.
+     (CVE-2015-0287)
+     [Stephen Henson]
+
+  *) PKCS7 NULL pointer dereferences fix
+
+     The PKCS#7 parsing code does not handle missing outer ContentInfo
+     correctly. An attacker can craft malformed ASN.1-encoded PKCS#7 blobs with
+     missing content and trigger a NULL pointer dereference on parsing.
+
+     Applications that verify PKCS#7 signatures, decrypt PKCS#7 data or
+     otherwise parse PKCS#7 structures from untrusted sources are
+     affected. OpenSSL clients and servers are not affected.
+
+     This issue was reported to OpenSSL by Michal Zalewski (Google).
+     (CVE-2015-0289)
+     [Emilia K?sper]
+
+  *) DoS via reachable assert in SSLv2 servers fix
+
+     A malicious client can trigger an OPENSSL_assert (i.e., an abort) in
+     servers that both support SSLv2 and enable export cipher suites by sending
+     a specially crafted SSLv2 CLIENT-MASTER-KEY message.
+
+     This issue was discovered by Sean Burford (Google) and Emilia K?sper
+     (OpenSSL development team).
+     (CVE-2015-0293)
+     [Emilia K?sper]
+
+  *) Use After Free following d2i_ECPrivatekey error fix
+
+     A malformed EC private key file consumed via the d2i_ECPrivateKey function
+     could cause a use after free condition. This, in turn, could cause a double
+     free in several private key parsing functions (such as d2i_PrivateKey
+     or EVP_PKCS82PKEY) and could lead to a DoS attack or memory corruption
+     for applications that receive EC private keys from untrusted
+     sources. This scenario is considered rare.
+
+     This issue was discovered by the BoringSSL project and fixed in their
+     commit 517073cd4b.
+     (CVE-2015-0209)
+     [Matt Caswell]
+
+  *) X509_to_X509_REQ NULL pointer deref fix
+
+     The function X509_to_X509_REQ will crash with a NULL pointer dereference if
+     the certificate key is invalid. This function is rarely used in practice.
+
+     This issue was discovered by Brian Carpenter.
+     (CVE-2015-0288)
+     [Stephen Henson]
 
   *) Removed the export ciphers from the DEFAULT ciphers
      [Kurt Roeckx]
@@ -1321,228 +1397,6 @@
   *) Change 'Configure' script to enable Camellia by default.
      [NTT]
 
- Changes between 0.9.8x and 0.9.8y [5 Feb 2013]
-
-  *) Make the decoding of SSLv3, TLS and DTLS CBC records constant time.
-
-     This addresses the flaw in CBC record processing discovered by 
-     Nadhem Alfardan and Kenny Paterson. Details of this attack can be found
-     at: http://www.isg.rhul.ac.uk/tls/     
-
-     Thanks go to Nadhem Alfardan and Kenny Paterson of the Information
-     Security Group at Royal Holloway, University of London
-     (www.isg.rhul.ac.uk) for discovering this flaw and Adam Langley and
-     Emilia K?sper for the initial patch.
-     (CVE-2013-0169)
-     [Emilia K?sper, Adam Langley, Ben Laurie, Andy Polyakov, Steve Henson]
-
-  *) Return an error when checking OCSP signatures when key is NULL.
-     This fixes a DoS attack. (CVE-2013-0166)
-     [Steve Henson]
-
-  *) Call OCSP Stapling callback after ciphersuite has been chosen, so
-     the right response is stapled. Also change SSL_get_certificate()
-     so it returns the certificate actually sent.
-     See http://rt.openssl.org/Ticket/Display.html?id=2836.
-     (This is a backport)
-     [Rob Stradling <rob.stradling at comodo.com>]
-
-  *) Fix possible deadlock when decoding public keys.
-     [Steve Henson]
-
- Changes between 0.9.8w and 0.9.8x [10 May 2012]
-
-  *) Sanity check record length before skipping explicit IV in DTLS
-     to fix DoS attack.
-
-     Thanks to Codenomicon for discovering this issue using Fuzz-o-Matic
-     fuzzing as a service testing platform.
-     (CVE-2012-2333)
-     [Steve Henson]
-
-  *) Initialise tkeylen properly when encrypting CMS messages.
-     Thanks to Solar Designer of Openwall for reporting this issue.
-     [Steve Henson]
-
- Changes between 0.9.8v and 0.9.8w [23 Apr 2012]
-
-  *) The fix for CVE-2012-2110 did not take into account that the 
-     'len' argument to BUF_MEM_grow and BUF_MEM_grow_clean is an
-     int in OpenSSL 0.9.8, making it still vulnerable. Fix by 
-     rejecting negative len parameter. (CVE-2012-2131)
-     [Tomas Hoger <thoger at redhat.com>]
-
- Changes between 0.9.8u and 0.9.8v [19 Apr 2012]
-
-  *) Check for potentially exploitable overflows in asn1_d2i_read_bio
-     BUF_mem_grow and BUF_mem_grow_clean. Refuse attempts to shrink buffer
-     in CRYPTO_realloc_clean.
-
-     Thanks to Tavis Ormandy, Google Security Team, for discovering this
-     issue and to Adam Langley <agl at chromium.org> for fixing it.
-     (CVE-2012-2110)
-     [Adam Langley (Google), Tavis Ormandy, Google Security Team]
-
- Changes between 0.9.8t and 0.9.8u [12 Mar 2012]
-
-  *) Fix MMA (Bleichenbacher's attack on PKCS #1 v1.5 RSA padding) weakness
-     in CMS and PKCS7 code. When RSA decryption fails use a random key for
-     content decryption and always return the same error. Note: this attack
-     needs on average 2^20 messages so it only affects automated senders. The
-     old behaviour can be reenabled in the CMS code by setting the
-     CMS_DEBUG_DECRYPT flag: this is useful for debugging and testing where
-     an MMA defence is not necessary.
-     Thanks to Ivan Nestlerode <inestlerode at us.ibm.com> for discovering
-     this issue. (CVE-2012-0884)
-     [Steve Henson]
-
-  *) Fix CVE-2011-4619: make sure we really are receiving a 
-     client hello before rejecting multiple SGC restarts. Thanks to
-     Ivan Nestlerode <inestlerode at us.ibm.com> for discovering this bug.
-     [Steve Henson]
-
- Changes between 0.9.8s and 0.9.8t [18 Jan 2012]
-
-  *) Fix for DTLS DoS issue introduced by fix for CVE-2011-4109.
-     Thanks to Antonio Martin, Enterprise Secure Access Research and
-     Development, Cisco Systems, Inc. for discovering this bug and
-     preparing a fix. (CVE-2012-0050)
-     [Antonio Martin]
-
- Changes between 0.9.8r and 0.9.8s [4 Jan 2012]
-
-  *) Nadhem Alfardan and Kenny Paterson have discovered an extension
-     of the Vaudenay padding oracle attack on CBC mode encryption
-     which enables an efficient plaintext recovery attack against
-     the OpenSSL implementation of DTLS. Their attack exploits timing
-     differences arising during decryption processing. A research
-     paper describing this attack can be found at:
-                  http://www.isg.rhul.ac.uk/~kp/dtls.pdf
-     Thanks go to Nadhem Alfardan and Kenny Paterson of the Information
-     Security Group at Royal Holloway, University of London
-     (www.isg.rhul.ac.uk) for discovering this flaw and to Robin Seggelmann
-     <seggelmann at fh-muenster.de> and Michael Tuexen <tuexen at fh-muenster.de>
-     for preparing the fix. (CVE-2011-4108)
-     [Robin Seggelmann, Michael Tuexen]
-
-  *) Stop policy check failure freeing same buffer twice. (CVE-2011-4109)
-     [Ben Laurie, Kasper <ekasper at google.com>]
-
-  *) Clear bytes used for block padding of SSL 3.0 records.
-     (CVE-2011-4576)
-     [Adam Langley (Google)]
-
-  *) Only allow one SGC handshake restart for SSL/TLS. Thanks to George
-     Kadianakis <desnacked at gmail.com> for discovering this issue and
-     Adam Langley for preparing the fix. (CVE-2011-4619)
-     [Adam Langley (Google)]
- 
-  *) Prevent malformed RFC3779 data triggering an assertion failure.
-     Thanks to Andrew Chi, BBN Technologies, for discovering the flaw
-     and Rob Austein <sra at hactrn.net> for fixing it. (CVE-2011-4577)
-     [Rob Austein <sra at hactrn.net>]
-
-  *) Fix ssl_ciph.c set-up race.
-     [Adam Langley (Google)]
-
-  *) Fix spurious failures in ecdsatest.c.
-     [Emilia K?sper (Google)]
-
-  *) Fix the BIO_f_buffer() implementation (which was mixing different
-     interpretations of the '..._len' fields).
-     [Adam Langley (Google)]
-
-  *) Fix handling of BN_BLINDING: now BN_BLINDING_invert_ex (rather than
-     BN_BLINDING_invert_ex) calls BN_BLINDING_update, ensuring that concurrent
-     threads won't reuse the same blinding coefficients.
-
-     This also avoids the need to obtain the CRYPTO_LOCK_RSA_BLINDING
-     lock to call BN_BLINDING_invert_ex, and avoids one use of
-     BN_BLINDING_update for each BN_BLINDING structure (previously,
-     the last update always remained unused).
-     [Emilia K?sper (Google)]
-
-  *) Fix SSL memory handling for (EC)DH ciphersuites, in particular
-     for multi-threaded use of ECDH.
-     [Adam Langley (Google)]
-
-  *) Fix x509_name_ex_d2i memory leak on bad inputs.
-     [Bodo Moeller]
-
-  *) Add protection against ECDSA timing attacks as mentioned in the paper
-     by Billy Bob Brumley and Nicola Tuveri, see:
-
-	http://eprint.iacr.org/2011/232.pdf
-
-     [Billy Bob Brumley and Nicola Tuveri]
-
- Changes between 0.9.8q and 0.9.8r [8 Feb 2011]
-
-  *) Fix parsing of OCSP stapling ClientHello extension. CVE-2011-0014
-     [Neel Mehta, Adam Langley, Bodo Moeller (Google)]
-
-  *) Fix bug in string printing code: if *any* escaping is enabled we must
-     escape the escape character (backslash) or the resulting string is
-     ambiguous.
-     [Steve Henson]
-
- Changes between 0.9.8p and 0.9.8q [2 Dec 2010]
-
-  *) Disable code workaround for ancient and obsolete Netscape browsers
-     and servers: an attacker can use it in a ciphersuite downgrade attack.
-     Thanks to Martin Rex for discovering this bug. CVE-2010-4180
-     [Steve Henson]
-
-  *) Fixed J-PAKE implementation error, originally discovered by
-     Sebastien Martini, further info and confirmation from Stefan
-     Arentz and Feng Hao. Note that this fix is a security fix. CVE-2010-4252
-     [Ben Laurie]
-
- Changes between 0.9.8o and 0.9.8p [16 Nov 2010]
-
-  *) Fix extension code to avoid race conditions which can result in a buffer
-     overrun vulnerability: resumed sessions must not be modified as they can
-     be shared by multiple threads. CVE-2010-3864
-     [Steve Henson]
-
-  *) Fix for double free bug in ssl/s3_clnt.c CVE-2010-2939
-     [Steve Henson]
-
-  *) Don't reencode certificate when calculating signature: cache and use
-     the original encoding instead. This makes signature verification of
-     some broken encodings work correctly.
-     [Steve Henson]
-
-  *) ec2_GF2m_simple_mul bugfix: compute correct result if the output EC_POINT
-     is also one of the inputs.
-     [Emilia K?sper <emilia.kasper at esat.kuleuven.be> (Google)]
-
-  *) Don't repeatedly append PBE algorithms to table if they already exist.
-     Sort table on each new add. This effectively makes the table read only
-     after all algorithms are added and subsequent calls to PKCS12_pbe_add
-     etc are non-op.
-     [Steve Henson]
-
- Changes between 0.9.8n and 0.9.8o [01 Jun 2010]
-
-  [NB: OpenSSL 0.9.8o and later 0.9.8 patch levels were released after
-  OpenSSL 1.0.0.]
-
-  *) Correct a typo in the CMS ASN1 module which can result in invalid memory
-     access or freeing data twice (CVE-2010-0742)
-     [Steve Henson, Ronald Moesbergen <intercommit at gmail.com>]
-
-  *) Add SHA2 algorithms to SSL_library_init(). SHA2 is becoming far more
-     common in certificates and some applications which only call
-     SSL_library_init and not OpenSSL_add_all_algorithms() will fail.
-     [Steve Henson]
-
-  *) VMS fixes: 
-     Reduce copying into .apps and .test in makevms.com
-     Don't try to use blank CA certificate in CA.com
-     Allow use of C files from original directories in maketests.com
-     [Steven M. Schweda" <sms at antinode.info>]
-
  Changes between 0.9.8m and 0.9.8n [24 Mar 2010]
 
   *) When rejecting SSL/TLS records due to an incorrect version number, never
diff --git a/NEWS b/NEWS
index 448b24a..e87b07f 100644
--- a/NEWS
+++ b/NEWS
@@ -5,10 +5,20 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
-  Major changes between OpenSSL 1.0.0q and OpenSSL 1.0.0r [under development]
+  Major changes between OpenSSL 1.0.0r and OpenSSL 1.0.0s [under development]
 
       o
 
+  Major changes between OpenSSL 1.0.0q and OpenSSL 1.0.0r [19 Mar 2015]
+
+      o Segmentation fault in ASN1_TYPE_cmp fix (CVE-2015-0286)
+      o ASN.1 structure reuse memory corruption fix (CVE-2015-0287)
+      o PKCS7 NULL pointer dereferences fix (CVE-2015-0289)
+      o DoS via reachable assert in SSLv2 servers fix (CVE-2015-0293)
+      o Use After Free following d2i_ECPrivatekey error fix (CVE-2015-0209)
+      o X509_to_X509_REQ NULL pointer deref fix (CVE-2015-0288)
+      o Removed the export ciphers from the DEFAULT ciphers
+
   Major changes between OpenSSL 1.0.0p and OpenSSL 1.0.0q [15 Jan 2015]
 
       o Build fixes for the Windows and OpenVMS platforms
@@ -146,62 +156,6 @@
       o Opaque PRF Input TLS extension support.
       o Updated time routines to avoid OS limitations.
 
-  Major changes between OpenSSL 0.9.8x and OpenSSL 0.9.8y [5 Feb 2013]:
-
-      o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169
-      o Fix OCSP bad key DoS attack CVE-2013-0166
-
-  Major changes between OpenSSL 0.9.8w and OpenSSL 0.9.8x [10 May 2012]:
-
-      o Fix DTLS record length checking bug CVE-2012-2333
-
-  Major changes between OpenSSL 0.9.8v and OpenSSL 0.9.8w [23 Apr 2012]:
-
-      o Fix for CVE-2012-2131 (corrected fix for 0.9.8 and CVE-2012-2110)
-
-  Major changes between OpenSSL 0.9.8u and OpenSSL 0.9.8v [19 Apr 2012]:
-
-      o Fix for ASN1 overflow bug CVE-2012-2110
-
-  Major changes between OpenSSL 0.9.8t and OpenSSL 0.9.8u [12 Mar 2012]:
-
-      o Fix for CMS/PKCS#7 MMA CVE-2012-0884
-      o Corrected fix for CVE-2011-4619
-      o Various DTLS fixes.
-
-  Major changes between OpenSSL 0.9.8s and OpenSSL 0.9.8t [18 Jan 2012]:
-
-      o Fix for DTLS DoS issue CVE-2012-0050
-
-  Major changes between OpenSSL 0.9.8r and OpenSSL 0.9.8s [4 Jan 2012]:
-
-      o Fix for DTLS plaintext recovery attack CVE-2011-4108
-      o Fix policy check double free error CVE-2011-4109
-      o Clear block padding bytes of SSL 3.0 records CVE-2011-4576
-      o Only allow one SGC handshake restart for SSL/TLS CVE-2011-4619
-      o Check for malformed RFC3779 data CVE-2011-4577
-
-  Major changes between OpenSSL 0.9.8q and OpenSSL 0.9.8r [8 Feb 2011]:
-
-      o Fix for security issue CVE-2011-0014
-
-  Major changes between OpenSSL 0.9.8p and OpenSSL 0.9.8q [2 Dec 2010]:
-
-      o Fix for security issue CVE-2010-4180
-      o Fix for CVE-2010-4252
-
-  Major changes between OpenSSL 0.9.8o and OpenSSL 0.9.8p [16 Nov 2010]:
-
-      o Fix for security issue CVE-2010-3864.
-
-  Major changes between OpenSSL 0.9.8n and OpenSSL 0.9.8o [1 Jun 2010]:
-
-      o Fix for security issue CVE-2010-0742.
-      o Various DTLS fixes.
-      o Recognise SHA2 certificates if only SSL algorithms added.
-      o Fix for no-rc4 compilation.
-      o Chil ENGINE unload workaround.
-
   Major changes between OpenSSL 0.9.8m and OpenSSL 0.9.8n [24 Mar 2010]:
 
       o CFB cipher definition fixes.
diff --git a/README b/README
index 4f67e9e..6a9fb12 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.0r-dev
+ OpenSSL 1.0.0s-dev
 
  Copyright (c) 1998-2011 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c
index 4a36aff..af79530 100644
--- a/crypto/asn1/a_type.c
+++ b/crypto/asn1/a_type.c
@@ -119,6 +119,9 @@ int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b)
     case V_ASN1_OBJECT:
         result = OBJ_cmp(a->value.object, b->value.object);
         break;
+    case V_ASN1_BOOLEAN:
+        result = a->value.boolean - b->value.boolean;
+        break;
     case V_ASN1_NULL:
         result = 0;             /* They do not have content. */
         break;
diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index 4595664..7fd336a 100644
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -304,9 +304,16 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
     case ASN1_ITYPE_CHOICE:
         if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL))
             goto auxerr;
-
-        /* Allocate structure */
-        if (!*pval && !ASN1_item_ex_new(pval, it)) {
+        if (*pval) {
+            /* Free up and zero CHOICE value if initialised */
+            i = asn1_get_choice_selector(pval, it);
+            if ((i >= 0) && (i < it->tcount)) {
+                tt = it->templates + i;
+                pchptr = asn1_get_field_ptr(pval, tt);
+                ASN1_template_free(pchptr, tt);
+                asn1_set_choice_selector(pval, -1, it);
+            }
+        } else if (!ASN1_item_ex_new(pval, it)) {
             ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ERR_R_NESTED_ASN1_ERROR);
             goto err;
         }
@@ -386,6 +393,17 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
         if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL))
             goto auxerr;
 
+        /* Free up and zero any ADB found */
+        for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) {
+            if (tt->flags & ASN1_TFLG_ADB_MASK) {
+                const ASN1_TEMPLATE *seqtt;
+                ASN1_VALUE **pseqval;
+                seqtt = asn1_do_adb(pval, tt, 1);
+                pseqval = asn1_get_field_ptr(pval, seqtt);
+                ASN1_template_free(pseqval, seqtt);
+            }
+        }
+
         /* Get each field entry */
         for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) {
             const ASN1_TEMPLATE *seqtt;
diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
index 2644d5f..d51b76e 100644
--- a/crypto/asn1/x_x509.c
+++ b/crypto/asn1/x_x509.c
@@ -172,8 +172,14 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
 {
     const unsigned char *q;
     X509 *ret;
+    int freeret = 0;
+
     /* Save start position */
     q = *pp;
+
+    if(!a || *a == NULL) {
+        freeret = 1;
+    }
     ret = d2i_X509(a, pp, length);
     /* If certificate unreadable then forget it */
     if (!ret)
@@ -186,7 +192,11 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
         goto err;
     return ret;
  err:
-    X509_free(ret);
+    if(freeret) {
+        X509_free(ret);
+        if (a)
+            *a = NULL;
+    }
     return NULL;
 }
 
diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index 6907436..f14011c 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -1213,16 +1213,19 @@ EC_KEY *d2i_ECParameters(EC_KEY **a, const unsigned char **in, long len)
             ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_MALLOC_FAILURE);
             return NULL;
         }
-        if (a)
-            *a = ret;
     } else
         ret = *a;
 
     if (!d2i_ECPKParameters(&ret->group, in, len)) {
         ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_EC_LIB);
+        if (a == NULL || *a != ret)
+             EC_KEY_free(ret);
         return NULL;
     }
 
+    if (a)
+        *a = ret;
+
     return ret;
 }
 
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 5faedaa..b5a8d27 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -26,11 +26,11 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x10000120L
+# define OPENSSL_VERSION_NUMBER  0x10000130L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.0r-fips-dev xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.0s-fips-dev xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.0r-dev xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.0s-dev xx XXX xxxx"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index cfa0144..22cfb6c 100644
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -261,6 +261,25 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
     PKCS7_RECIP_INFO *ri = NULL;
     ASN1_OCTET_STRING *os = NULL;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAINIT, PKCS7_R_INVALID_NULL_POINTER);
+        return NULL;
+    }
+    /*
+     * The content field in the PKCS7 ContentInfo is optional, but that really
+     * only applies to inner content (precisely, detached signatures).
+     *
+     * When reading content, missing outer content is therefore treated as an
+     * error.
+     *
+     * When creating content, PKCS7_content_new() must be called before
+     * calling this method, so a NULL p7->d is always an error.
+     */
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAINIT, PKCS7_R_NO_CONTENT);
+        return NULL;
+    }
+
     i = OBJ_obj2nid(p7->type);
     p7->state = PKCS7_S_HEADER;
 
@@ -411,6 +430,16 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
     unsigned char *ek = NULL, *tkey = NULL;
     int eklen = 0, tkeylen = 0;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATADECODE, PKCS7_R_INVALID_NULL_POINTER);
+        return NULL;
+    }
+
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATADECODE, PKCS7_R_NO_CONTENT);
+        return NULL;
+    }
+
     i = OBJ_obj2nid(p7->type);
     p7->state = PKCS7_S_HEADER;
 
@@ -704,6 +733,16 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
     STACK_OF(PKCS7_SIGNER_INFO) *si_sk = NULL;
     ASN1_OCTET_STRING *os = NULL;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_INVALID_NULL_POINTER);
+        return 0;
+    }
+
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_NO_CONTENT);
+        return 0;
+    }
+
     EVP_MD_CTX_init(&ctx_tmp);
     i = OBJ_obj2nid(p7->type);
     p7->state = PKCS7_S_HEADER;
@@ -743,6 +782,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         /* If detached data then the content is excluded */
         if (PKCS7_type_is_data(p7->d.sign->contents) && p7->detached) {
             M_ASN1_OCTET_STRING_free(os);
+            os = NULL;
             p7->d.sign->contents->d.data = NULL;
         }
         break;
@@ -752,6 +792,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         /* If detached data then the content is excluded */
         if (PKCS7_type_is_data(p7->d.digest->contents) && p7->detached) {
             M_ASN1_OCTET_STRING_free(os);
+            os = NULL;
             p7->d.digest->contents->d.data = NULL;
         }
         break;
@@ -815,22 +856,30 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
     }
 
-    if (!PKCS7_is_detached(p7) && !(os->flags & ASN1_STRING_FLAG_NDEF)) {
-        char *cont;
-        long contlen;
-        btmp = BIO_find_type(bio, BIO_TYPE_MEM);
-        if (btmp == NULL) {
-            PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_UNABLE_TO_FIND_MEM_BIO);
-            goto err;
-        }
-        contlen = BIO_get_mem_data(btmp, &cont);
+    if (!PKCS7_is_detached(p7)) {
         /*
-         * Mark the BIO read only then we can use its copy of the data
-         * instead of making an extra copy.
+         * NOTE(emilia): I think we only reach os == NULL here because detached
+         * digested data support is broken.
          */
-        BIO_set_flags(btmp, BIO_FLAGS_MEM_RDONLY);
-        BIO_set_mem_eof_return(btmp, 0);
-        ASN1_STRING_set0(os, (unsigned char *)cont, contlen);
+        if (os == NULL)
+            goto err;
+        if (!(os->flags & ASN1_STRING_FLAG_NDEF)) {
+            char *cont;
+            long contlen;
+            btmp = BIO_find_type(bio, BIO_TYPE_MEM);
+            if (btmp == NULL) {
+                PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_UNABLE_TO_FIND_MEM_BIO);
+                goto err;
+            }
+            contlen = BIO_get_mem_data(btmp, &cont);
+            /*
+             * Mark the BIO read only then we can use its copy of the data
+             * instead of making an extra copy.
+             */
+            BIO_set_flags(btmp, BIO_FLAGS_MEM_RDONLY);
+            BIO_set_mem_eof_return(btmp, 0);
+            ASN1_STRING_set0(os, (unsigned char *)cont, contlen);
+        }
     }
     ret = 1;
  err:
@@ -905,6 +954,16 @@ int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio,
     STACK_OF(X509) *cert;
     X509 *x509;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAVERIFY, PKCS7_R_INVALID_NULL_POINTER);
+        return 0;
+    }
+
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAVERIFY, PKCS7_R_NO_CONTENT);
+        return 0;
+    }
+
     if (PKCS7_type_is_signed(p7)) {
         cert = p7->d.sign->cert;
     } else if (PKCS7_type_is_signedAndEnveloped(p7)) {
diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index c773812..0c5fcaa 100644
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -70,6 +70,7 @@ long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
     nid = OBJ_obj2nid(p7->type);
 
     switch (cmd) {
+    /* NOTE(emilia): does not support detached digested data. */
     case PKCS7_OP_SET_DETACHED_SIGNATURE:
         if (nid == NID_pkcs7_signed) {
             ret = p7->detached = (int)larg;
@@ -444,6 +445,8 @@ int PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md)
 
 STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7)
 {
+    if (p7 == NULL || p7->d.ptr == NULL)
+        return NULL;
     if (PKCS7_type_is_signed(p7)) {
         return (p7->d.sign->signer_info);
     } else if (PKCS7_type_is_signedAndEnveloped(p7)) {
diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h
index bd3648d..71fb03a 100644
--- a/crypto/stack/safestack.h
+++ b/crypto/stack/safestack.h
@@ -2442,5 +2442,4 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 # define lh_SSL_SESSION_stats_bio(lh,out) \
   LHM_lh_stats_bio(SSL_SESSION,lh,out)
 # define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh)
-/* End of util/mkstack.pl block, you may now edit :-) */
 #endif                          /* !defined HEADER_SAFESTACK_H */
diff --git a/openssl.spec b/openssl.spec
index 272ed98..a85f0fe 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -6,7 +6,7 @@ Release: 1
 
 Summary: Secure Sockets Layer and cryptography libraries and tools
 Name: openssl
-Version: 1.0.0r
+Version: 1.0.0s
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries
diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c
index 1f5d7c9..7e3674a 100644
--- a/ssl/s2_lib.c
+++ b/ssl/s2_lib.c
@@ -496,7 +496,7 @@ int ssl2_generate_key_material(SSL *s)
 
         OPENSSL_assert(s->session->master_key_length >= 0
                        && s->session->master_key_length
-                       < (int)sizeof(s->session->master_key));
+                       <= (int)sizeof(s->session->master_key));
         EVP_DigestUpdate(&ctx, s->session->master_key,
                          s->session->master_key_length);
         EVP_DigestUpdate(&ctx, &c, 1);
diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c
index 1fc9778..681faf0 100644
--- a/ssl/s2_srvr.c
+++ b/ssl/s2_srvr.c
@@ -371,7 +371,8 @@ int ssl2_accept(SSL *s)
 
 static int get_client_master_key(SSL *s)
 {
-    int is_export, i, n, keya, ek;
+    int is_export, i, n, keya;
+    unsigned int ek;
     unsigned long len;
     unsigned char *p;
     const SSL_CIPHER *cp;
@@ -454,11 +455,6 @@ static int get_client_master_key(SSL *s)
         SSLerr(SSL_F_GET_CLIENT_MASTER_KEY, SSL_R_NO_PRIVATEKEY);
         return (-1);
     }
-    i = ssl_rsa_private_decrypt(s->cert, s->s2->tmp.enc,
-                                &(p[s->s2->tmp.clear]),
-                                &(p[s->s2->tmp.clear]),
-                                (s->s2->ssl2_rollback) ? RSA_SSLV23_PADDING :
-                                RSA_PKCS1_PADDING);
 
     is_export = SSL_C_IS_EXPORT(s->session->cipher);
 
@@ -475,23 +471,61 @@ static int get_client_master_key(SSL *s)
     } else
         ek = 5;
 
+    /*
+     * The format of the CLIENT-MASTER-KEY message is
+     * 1 byte message type
+     * 3 bytes cipher
+     * 2-byte clear key length (stored in s->s2->tmp.clear)
+     * 2-byte encrypted key length (stored in s->s2->tmp.enc)
+     * 2-byte key args length (IV etc)
+     * clear key
+     * encrypted key
+     * key args
+     *
+     * If the cipher is an export cipher, then the encrypted key bytes
+     * are a fixed portion of the total key (5 or 8 bytes). The size of
+     * this portion is in |ek|. If the cipher is not an export cipher,
+     * then the entire key material is encrypted (i.e., clear key length
+     * must be zero).
+     */
+    if ((!is_export && s->s2->tmp.clear != 0) ||
+        (is_export && s->s2->tmp.clear + ek != (unsigned int)EVP_CIPHER_key_length(c))) {
+        ssl2_return_error(s, SSL2_PE_UNDEFINED_ERROR);
+        SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_BAD_LENGTH);
+        return -1;
+    }
+    /*
+     * The encrypted blob must decrypt to the encrypted portion of the key.
+     * Decryption can't be expanding, so if we don't have enough encrypted
+     * bytes to fit the key in the buffer, stop now.
+     */
+    if ((is_export && s->s2->tmp.enc < ek) ||
+        (!is_export && s->s2->tmp.enc < (unsigned int)EVP_CIPHER_key_length(c))) {
+        ssl2_return_error(s,SSL2_PE_UNDEFINED_ERROR);
+        SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_LENGTH_TOO_SHORT);
+        return -1;
+    }
+
+    i = ssl_rsa_private_decrypt(s->cert, s->s2->tmp.enc,
+                                &(p[s->s2->tmp.clear]),
+                                &(p[s->s2->tmp.clear]),
+                                (s->s2->ssl2_rollback) ? RSA_SSLV23_PADDING :
+                                RSA_PKCS1_PADDING);
+
     /* bad decrypt */
 # if 1
     /*
      * If a bad decrypt, continue with protocol but with a random master
      * secret (Bleichenbacher attack)
      */
-    if ((i < 0) || ((!is_export && (i != EVP_CIPHER_key_length(c)))
-                    || (is_export && ((i != ek)
-                                      || (s->s2->tmp.clear +
-                                          (unsigned int)i != (unsigned int)
-                                          EVP_CIPHER_key_length(c)))))) {
+    if ((i < 0) || ((!is_export && i != EVP_CIPHER_key_length(c))
+                    || (is_export && i != (int)ek))) {
         ERR_clear_error();
         if (is_export)
             i = ek;
         else
             i = EVP_CIPHER_key_length(c);
-        if (RAND_pseudo_bytes(p, i) <= 0)
+        if (RAND_pseudo_bytes(&p[s->s2->tmp.clear], i) <= 0)
             return 0;
     }
 # else
@@ -513,7 +547,7 @@ static int get_client_master_key(SSL *s)
 # endif
 
     if (is_export)
-        i += s->s2->tmp.clear;
+        i = EVP_CIPHER_key_length(c);
 
     if (i > SSL_MAX_MASTER_KEY_LENGTH) {
         ssl2_return_error(s, SSL2_PE_UNDEFINED_ERROR);

From matt at openssl.org  Thu Mar 19 14:05:55 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 19 Mar 2015 14:05:55 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_0_9_8-stable update
Message-ID: <1426773955.266825.31048.nullmailer@dev.openssl.org>

The branch OpenSSL_0_9_8-stable has been updated
       via  79cc5417a4099c3e61c806a918665570e9aa3c57 (commit)
       via  db8334be06a6573203f29d12f00f45ed69a987cc (commit)
       via  fcc5e899aa942f9d1c72924f867e844c95fd9aae (commit)
       via  b78c9e4a2b3503e06fdee6272427f142d860ed47 (commit)
       via  c380bff888bfd5e48c4b24250ba1996b0fd1a5e3 (commit)
       via  6655ac4e4505b6e791984d7f942bbe33bccc8ead (commit)
       via  c7395fb9997efe924de62ec4d5c7b92aad510869 (commit)
       via  d53f9203652b5f254f3eb5beb2759dbd37f51dae (commit)
       via  65c588c140c5c1c349d69abfea1b92c52fe35d0b (commit)
       via  544e3e3b69d080ee87721bd03c37b4d450384fb9 (commit)
       via  497d0b00dca876beb6c81f2ea6d7160897434c2e (commit)
       via  674341f1b0548e36a6cc49917334f5cbd09aaa2c (commit)
      from  c58f4f73bdb66355b77cd8749afd5deba3d954c1 (commit)


- Log -----------------------------------------------------------------
commit 79cc5417a4099c3e61c806a918665570e9aa3c57
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 13:50:06 2015 +0000

    Prepare for 0.9.8zg-dev
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit db8334be06a6573203f29d12f00f45ed69a987cc
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 13:47:27 2015 +0000

    Prepare for 0.9.8zf release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit fcc5e899aa942f9d1c72924f867e844c95fd9aae
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 13:47:27 2015 +0000

    make update
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit b78c9e4a2b3503e06fdee6272427f142d860ed47
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 11:35:33 2015 +0000

    Fix unsigned/signed warnings
    
    Fix some unsigned/signed warnings introduced as part of the fix
    for CVE-2015-0293
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit c380bff888bfd5e48c4b24250ba1996b0fd1a5e3
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 19 10:16:32 2015 +0000

    Fix a failure to NULL a pointer freed on error.
    
    Reported by the LibreSSL project as a follow on to CVE-2015-0209
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 6655ac4e4505b6e791984d7f942bbe33bccc8ead
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Mar 18 12:06:56 2015 +0100

    VMS build fix
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit c7395fb9997efe924de62ec4d5c7b92aad510869
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 17 17:01:09 2015 +0000

    Update NEWS file
    
    Update the NEWS file with the latest entries from CHANGES ready for the
    release.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit d53f9203652b5f254f3eb5beb2759dbd37f51dae
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 17 16:56:27 2015 +0000

    Update CHANGES for release
    
    Update CHANGES fiel with all the latest fixes ready for the release.
    
    Conflicts:
    	CHANGES
    
    Conflicts:
    	CHANGES
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 65c588c140c5c1c349d69abfea1b92c52fe35d0b
Author: Emilia Kasper <emilia at openssl.org>
Date:   Wed Mar 4 09:05:02 2015 -0800

    Fix reachable assert in SSLv2 servers.
    
    This assert is reachable for servers that support SSLv2 and export ciphers.
    Therefore, such servers can be DoSed by sending a specially crafted
    SSLv2 CLIENT-MASTER-KEY.
    
    Also fix s2_srvr.c to error out early if the key lengths are malformed.
    These lengths are sent unencrypted, so this does not introduce an oracle.
    
    CVE-2015-0293
    
    This issue was discovered by Sean Burford (Google) and Emilia K??sper of
    the OpenSSL development team.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

commit 544e3e3b69d080ee87721bd03c37b4d450384fb9
Author: Emilia Kasper <emilia at openssl.org>
Date:   Fri Feb 27 16:52:23 2015 +0100

    PKCS#7: avoid NULL pointer dereferences with missing content
    
    In PKCS#7, the ASN.1 content component is optional.
    This typically applies to inner content (detached signatures),
    however we must also handle unexpected missing outer content
    correctly.
    
    This patch only addresses functions reachable from parsing,
    decryption and verification, and functions otherwise associated
    with reading potentially untrusted data.
    
    Correcting all low-level API calls requires further work.
    
    CVE-2015-0289
    
    Thanks to Michal Zalewski (Google) for reporting this issue.
    
    Reviewed-by: Steve Henson <steve at openssl.org>
    
    Conflicts:
    	crypto/pkcs7/pk7_doit.c

commit 497d0b00dca876beb6c81f2ea6d7160897434c2e
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 9 23:11:45 2015 +0000

    Fix ASN1_TYPE_cmp
    
    Fix segmentation violation when ASN1_TYPE_cmp is passed a boolean type. This
    can be triggered during certificate verification so could be a DoS attack
    against a client or a server enabling client authentication.
    
    CVE-2015-0286
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 674341f1b0548e36a6cc49917334f5cbd09aaa2c
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Feb 23 02:32:44 2015 +0000

    Free up ADB and CHOICE if already initialised.
    
    CVE-2015-0287
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Emilia K??sper <emilia at openssl.org>

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

Summary of changes:
 CHANGES                  | 78 +++++++++++++++++++++++++++++++++++++++++++++++-
 NEWS                     | 12 +++++++-
 README                   |  2 +-
 crypto/asn1/a_type.c     |  3 ++
 crypto/asn1/tasn_dec.c   | 24 +++++++++++++--
 crypto/asn1/x_x509.c     | 12 +++++++-
 crypto/ec/ec_asn1.c      |  7 +++--
 crypto/opensslv.h        |  6 ++--
 crypto/pkcs7/pk7_doit.c  | 57 +++++++++++++++++++++++++++++++++++
 crypto/pkcs7/pk7_lib.c   |  3 ++
 crypto/stack/safestack.h |  1 -
 crypto/symhacks.h        |  7 +++++
 openssl.spec             |  2 +-
 ssl/s2_lib.c             |  2 +-
 ssl/s2_srvr.c            | 60 +++++++++++++++++++++++++++++--------
 ssl/ssl-lib.com          | 12 ++++----
 16 files changed, 254 insertions(+), 34 deletions(-)

diff --git a/CHANGES b/CHANGES
index c2a3931..c1bb2af 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,83 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 0.9.8ze and 0.9.8zf [xx XXX xxxx]
+ Changes between 0.9.8zf and 0.9.8zg [xx XXX xxxx]
+
+  *)
+
+ Changes between 0.9.8ze and 0.9.8zf [19 Mar 2015]
+
+  *) Segmentation fault in ASN1_TYPE_cmp fix
+
+     The function ASN1_TYPE_cmp will crash with an invalid read if an attempt is
+     made to compare ASN.1 boolean types. Since ASN1_TYPE_cmp is used to check
+     certificate signature algorithm consistency this can be used to crash any
+     certificate verification operation and exploited in a DoS attack. Any
+     application which performs certificate verification is vulnerable including
+     OpenSSL clients and servers which enable client authentication.
+     (CVE-2015-0286)
+     [Stephen Henson]
+
+  *) ASN.1 structure reuse memory corruption fix
+
+     Reusing a structure in ASN.1 parsing may allow an attacker to cause
+     memory corruption via an invalid write. Such reuse is and has been
+     strongly discouraged and is believed to be rare.
+
+     Applications that parse structures containing CHOICE or ANY DEFINED BY
+     components may be affected. Certificate parsing (d2i_X509 and related
+     functions) are however not affected. OpenSSL clients and servers are
+     not affected.
+     (CVE-2015-0287)
+     [Stephen Henson]
+
+  *) PKCS7 NULL pointer dereferences fix
+
+     The PKCS#7 parsing code does not handle missing outer ContentInfo
+     correctly. An attacker can craft malformed ASN.1-encoded PKCS#7 blobs with
+     missing content and trigger a NULL pointer dereference on parsing.
+
+     Applications that verify PKCS#7 signatures, decrypt PKCS#7 data or
+     otherwise parse PKCS#7 structures from untrusted sources are
+     affected. OpenSSL clients and servers are not affected.
+
+     This issue was reported to OpenSSL by Michal Zalewski (Google).
+     (CVE-2015-0289)
+     [Emilia K?sper]
+
+  *) DoS via reachable assert in SSLv2 servers fix
+
+     A malicious client can trigger an OPENSSL_assert (i.e., an abort) in
+     servers that both support SSLv2 and enable export cipher suites by sending
+     a specially crafted SSLv2 CLIENT-MASTER-KEY message.
+
+     This issue was discovered by Sean Burford (Google) and Emilia K?sper
+     (OpenSSL development team).
+     (CVE-2015-0293)
+     [Emilia K?sper]
+
+  *) Use After Free following d2i_ECPrivatekey error fix
+
+     A malformed EC private key file consumed via the d2i_ECPrivateKey function
+     could cause a use after free condition. This, in turn, could cause a double
+     free in several private key parsing functions (such as d2i_PrivateKey
+     or EVP_PKCS82PKEY) and could lead to a DoS attack or memory corruption
+     for applications that receive EC private keys from untrusted
+     sources. This scenario is considered rare.
+
+     This issue was discovered by the BoringSSL project and fixed in their
+     commit 517073cd4b.
+     (CVE-2015-0209)
+     [Matt Caswell]
+
+  *) X509_to_X509_REQ NULL pointer deref fix
+
+     The function X509_to_X509_REQ will crash with a NULL pointer dereference if
+     the certificate key is invalid. This function is rarely used in practice.
+
+     This issue was discovered by Brian Carpenter.
+     (CVE-2015-0288)
+     [Stephen Henson]
 
   *) Removed the export and SSLv2 ciphers from the DEFAULT ciphers
      [Kurt Roeckx]
diff --git a/NEWS b/NEWS
index 9ebc70a..0422981 100644
--- a/NEWS
+++ b/NEWS
@@ -5,10 +5,20 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
-  Major changes between OpenSSL 0.9.8ze and OpenSSL 0.9.8zf [under development]
+  Major changes between OpenSSL 0.9.8zf and OpenSSL 0.9.8zg [under development]
 
       o
 
+  Major changes between OpenSSL 0.9.8ze and OpenSSL 0.9.8zf [19 Mar 2015]
+
+      o Segmentation fault in ASN1_TYPE_cmp fix (CVE-2015-0286)
+      o ASN.1 structure reuse memory corruption fix (CVE-2015-0287)
+      o PKCS7 NULL pointer dereferences fix (CVE-2015-0289)
+      o DoS via reachable assert in SSLv2 servers fix (CVE-2015-0293)
+      o Use After Free following d2i_ECPrivatekey error fix (CVE-2015-0209)
+      o X509_to_X509_REQ NULL pointer deref fix (CVE-2015-0288)
+      o Removed the export ciphers from the DEFAULT ciphers
+
   Major changes between OpenSSL 0.9.8zd and OpenSSL 0.9.8ze [15 Jan 2015]
 
       o Build fixes for the Windows and OpenVMS platforms
diff --git a/README b/README
index ee01e57..b4c4a21 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 0.9.8zf-dev
+ OpenSSL 0.9.8zg-dev
 
  Copyright (c) 1998-2011 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c
index 00367ad..69a5cf6 100644
--- a/crypto/asn1/a_type.c
+++ b/crypto/asn1/a_type.c
@@ -116,6 +116,9 @@ int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b)
     case V_ASN1_OBJECT:
         result = OBJ_cmp(a->value.object, b->value.object);
         break;
+    case V_ASN1_BOOLEAN:
+        result = a->value.boolean - b->value.boolean;
+        break;
     case V_ASN1_NULL:
         result = 0;             /* They do not have content. */
         break;
diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index 2ed81cc..6e4a325 100644
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -302,9 +302,16 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
     case ASN1_ITYPE_CHOICE:
         if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it))
             goto auxerr;
-
-        /* Allocate structure */
-        if (!*pval && !ASN1_item_ex_new(pval, it)) {
+        if (*pval) {
+            /* Free up and zero CHOICE value if initialised */
+            i = asn1_get_choice_selector(pval, it);
+            if ((i >= 0) && (i < it->tcount)) {
+                tt = it->templates + i;
+                pchptr = asn1_get_field_ptr(pval, tt);
+                ASN1_template_free(pchptr, tt);
+                asn1_set_choice_selector(pval, -1, it);
+            }
+        } else if (!ASN1_item_ex_new(pval, it)) {
             ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ERR_R_NESTED_ASN1_ERROR);
             goto err;
         }
@@ -384,6 +391,17 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
         if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it))
             goto auxerr;
 
+        /* Free up and zero any ADB found */
+        for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) {
+            if (tt->flags & ASN1_TFLG_ADB_MASK) {
+                const ASN1_TEMPLATE *seqtt;
+                ASN1_VALUE **pseqval;
+                seqtt = asn1_do_adb(pval, tt, 1);
+                pseqval = asn1_get_field_ptr(pval, seqtt);
+                ASN1_template_free(pseqval, seqtt);
+            }
+        }
+
         /* Get each field entry */
         for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) {
             const ASN1_TEMPLATE *seqtt;
diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
index 018a18b..d6958f6 100644
--- a/crypto/asn1/x_x509.c
+++ b/crypto/asn1/x_x509.c
@@ -179,8 +179,14 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
 {
     const unsigned char *q;
     X509 *ret;
+    int freeret = 0;
+
     /* Save start position */
     q = *pp;
+
+    if(!a || *a == NULL) {
+        freeret = 1;
+    }
     ret = d2i_X509(a, pp, length);
     /* If certificate unreadable then forget it */
     if (!ret)
@@ -193,7 +199,11 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
         goto err;
     return ret;
  err:
-    X509_free(ret);
+    if(freeret) {
+        X509_free(ret);
+        if (a)
+            *a = NULL;
+    }
     return NULL;
 }
 
diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index d3e8316..4ca2545 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -1196,16 +1196,19 @@ EC_KEY *d2i_ECParameters(EC_KEY **a, const unsigned char **in, long len)
             ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_MALLOC_FAILURE);
             return NULL;
         }
-        if (a)
-            *a = ret;
     } else
         ret = *a;
 
     if (!d2i_ECPKParameters(&ret->group, in, len)) {
         ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_EC_LIB);
+        if (a == NULL || *a != ret)
+             EC_KEY_free(ret);
         return NULL;
     }
 
+    if (a)
+        *a = ret;
+
     return ret;
 }
 
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 0c749bb..fa12139 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -26,11 +26,11 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x009081f0L
+# define OPENSSL_VERSION_NUMBER  0x00908200L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 0.9.8zf-fips-dev xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 0.9.8zg-fips-dev xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 0.9.8zf-dev xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 0.9.8zg-dev xx XXX xxxx"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index ba5b824..db134dd 100644
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -147,6 +147,25 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
     EVP_PKEY *pkey;
     ASN1_OCTET_STRING *os = NULL;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAINIT, PKCS7_R_INVALID_NULL_POINTER);
+        return NULL;
+    }
+    /*
+     * The content field in the PKCS7 ContentInfo is optional, but that really
+     * only applies to inner content (precisely, detached signatures).
+     *
+     * When reading content, missing outer content is therefore treated as an
+     * error.
+     *
+     * When creating content, PKCS7_content_new() must be called before
+     * calling this method, so a NULL p7->d is always an error.
+     */
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAINIT, PKCS7_R_NO_CONTENT);
+        return NULL;
+    }
+
     i = OBJ_obj2nid(p7->type);
     p7->state = PKCS7_S_HEADER;
 
@@ -325,6 +344,16 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
     STACK_OF(PKCS7_RECIP_INFO) *rsk = NULL;
     PKCS7_RECIP_INFO *ri = NULL;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATADECODE, PKCS7_R_INVALID_NULL_POINTER);
+        return NULL;
+    }
+
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATADECODE, PKCS7_R_NO_CONTENT);
+        return NULL;
+    }
+
     i = OBJ_obj2nid(p7->type);
     p7->state = PKCS7_S_HEADER;
 
@@ -607,6 +636,16 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
     STACK_OF(PKCS7_SIGNER_INFO) *si_sk = NULL;
     ASN1_OCTET_STRING *os = NULL;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_INVALID_NULL_POINTER);
+        return 0;
+    }
+
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_NO_CONTENT);
+        return 0;
+    }
+
     EVP_MD_CTX_init(&ctx_tmp);
     i = OBJ_obj2nid(p7->type);
     p7->state = PKCS7_S_HEADER;
@@ -635,6 +674,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         /* If detached data then the content is excluded */
         if (PKCS7_type_is_data(p7->d.sign->contents) && p7->detached) {
             M_ASN1_OCTET_STRING_free(os);
+            os = NULL;
             p7->d.sign->contents->d.data = NULL;
         }
         break;
@@ -644,6 +684,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         /* If detached data then the content is excluded */
         if (PKCS7_type_is_data(p7->d.digest->contents) && p7->detached) {
             M_ASN1_OCTET_STRING_free(os);
+            os = NULL;
             p7->d.digest->contents->d.data = NULL;
         }
         break;
@@ -767,6 +808,12 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
     }
 
     if (!PKCS7_is_detached(p7)) {
+        /*
+         * NOTE(emilia): I think we only reach os == NULL here because detached
+         * digested data support is broken.
+         */
+        if (os == NULL)
+            goto err;
         btmp = BIO_find_type(bio, BIO_TYPE_MEM);
         if (btmp == NULL) {
             PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_UNABLE_TO_FIND_MEM_BIO);
@@ -803,6 +850,16 @@ int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio,
     STACK_OF(X509) *cert;
     X509 *x509;
 
+    if (p7 == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAVERIFY, PKCS7_R_INVALID_NULL_POINTER);
+        return 0;
+    }
+
+    if (p7->d.ptr == NULL) {
+        PKCS7err(PKCS7_F_PKCS7_DATAVERIFY, PKCS7_R_NO_CONTENT);
+        return 0;
+    }
+
     if (PKCS7_type_is_signed(p7)) {
         cert = p7->d.sign->cert;
     } else if (PKCS7_type_is_signedAndEnveloped(p7)) {
diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index 7d19126..c2ad3ec 100644
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -69,6 +69,7 @@ long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
     nid = OBJ_obj2nid(p7->type);
 
     switch (cmd) {
+    /* NOTE(emilia): does not support detached digested data. */
     case PKCS7_OP_SET_DETACHED_SIGNATURE:
         if (nid == NID_pkcs7_signed) {
             ret = p7->detached = (int)larg;
@@ -464,6 +465,8 @@ int PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md)
 
 STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7)
 {
+    if (p7 == NULL || p7->d.ptr == NULL)
+        return NULL;
     if (PKCS7_type_is_signed(p7)) {
         return (p7->d.sign->signer_info);
     } else if (PKCS7_type_is_signedAndEnveloped(p7)) {
diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h
index 9f36191..334ce9e 100644
--- a/crypto/stack/safestack.h
+++ b/crypto/stack/safestack.h
@@ -1988,6 +1988,5 @@ STACK_OF(type) \
 
 # define PKCS12_decrypt_d2i_PKCS7(algor, d2i_func, free_func, pass, passlen, oct, seq) \
         SKM_PKCS12_decrypt_d2i(PKCS7, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
-/* End of util/mkstack.pl block, you may now edit :-) */
 
 #endif                          /* !defined HEADER_SAFESTACK_H */
diff --git a/crypto/symhacks.h b/crypto/symhacks.h
index 99d4b54..b8a6ddf 100644
--- a/crypto/symhacks.h
+++ b/crypto/symhacks.h
@@ -197,6 +197,13 @@
 #  undef ssl_parse_serverhello_renegotiate_ext
 #  define ssl_parse_serverhello_renegotiate_ext   ssl_parse_serverhello_reneg_ext
 
+#  undef ssl3_cbc_record_digest_supported
+#  define ssl3_cbc_record_digest_supported        ssl3_cbc_record_digest_support
+#  undef ssl_check_clienthello_tlsext_late
+#  define ssl_check_clienthello_tlsext_late       ssl_check_clihello_tlsext_late
+#  undef ssl_check_clienthello_tlsext_early
+#  define ssl_check_clienthello_tlsext_early      ssl_check_clihello_tlsext_early
+
 /* Hack some long ENGINE names */
 #  undef ENGINE_get_default_BN_mod_exp_crt
 #  define ENGINE_get_default_BN_mod_exp_crt       ENGINE_get_def_BN_mod_exp_crt
diff --git a/openssl.spec b/openssl.spec
index 934e5b3..ff48b84 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -6,7 +6,7 @@ Release: 1
 
 Summary: Secure Sockets Layer and cryptography libraries and tools
 Name: openssl
-Version: 0.9.8zf
+Version: 0.9.8zg
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries
diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c
index b717771..4386ac5 100644
--- a/ssl/s2_lib.c
+++ b/ssl/s2_lib.c
@@ -417,7 +417,7 @@ int ssl2_generate_key_material(SSL *s)
 
         OPENSSL_assert(s->session->master_key_length >= 0
                        && s->session->master_key_length
-                       < (int)sizeof(s->session->master_key));
+                       <= (int)sizeof(s->session->master_key));
         EVP_DigestUpdate(&ctx, s->session->master_key,
                          s->session->master_key_length);
         EVP_DigestUpdate(&ctx, &c, 1);
diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c
index a1f82d2..ba8c8e8 100644
--- a/ssl/s2_srvr.c
+++ b/ssl/s2_srvr.c
@@ -369,7 +369,8 @@ int ssl2_accept(SSL *s)
 
 static int get_client_master_key(SSL *s)
 {
-    int is_export, i, n, keya, ek;
+    int is_export, i, n, keya;
+    unsigned int ek;
     unsigned long len;
     unsigned char *p;
     SSL_CIPHER *cp;
@@ -452,11 +453,6 @@ static int get_client_master_key(SSL *s)
         SSLerr(SSL_F_GET_CLIENT_MASTER_KEY, SSL_R_NO_PRIVATEKEY);
         return (-1);
     }
-    i = ssl_rsa_private_decrypt(s->cert, s->s2->tmp.enc,
-                                &(p[s->s2->tmp.clear]),
-                                &(p[s->s2->tmp.clear]),
-                                (s->s2->ssl2_rollback) ? RSA_SSLV23_PADDING :
-                                RSA_PKCS1_PADDING);
 
     is_export = SSL_C_IS_EXPORT(s->session->cipher);
 
@@ -473,23 +469,61 @@ static int get_client_master_key(SSL *s)
     } else
         ek = 5;
 
+    /*
+     * The format of the CLIENT-MASTER-KEY message is
+     * 1 byte message type
+     * 3 bytes cipher
+     * 2-byte clear key length (stored in s->s2->tmp.clear)
+     * 2-byte encrypted key length (stored in s->s2->tmp.enc)
+     * 2-byte key args length (IV etc)
+     * clear key
+     * encrypted key
+     * key args
+     *
+     * If the cipher is an export cipher, then the encrypted key bytes
+     * are a fixed portion of the total key (5 or 8 bytes). The size of
+     * this portion is in |ek|. If the cipher is not an export cipher,
+     * then the entire key material is encrypted (i.e., clear key length
+     * must be zero).
+     */
+    if ((!is_export && s->s2->tmp.clear != 0) ||
+        (is_export && s->s2->tmp.clear + ek != (unsigned int)EVP_CIPHER_key_length(c))) {
+        ssl2_return_error(s, SSL2_PE_UNDEFINED_ERROR);
+        SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_BAD_LENGTH);
+        return -1;
+    }
+    /*
+     * The encrypted blob must decrypt to the encrypted portion of the key.
+     * Decryption can't be expanding, so if we don't have enough encrypted
+     * bytes to fit the key in the buffer, stop now.
+     */
+    if ((is_export && s->s2->tmp.enc < ek) ||
+        (!is_export && s->s2->tmp.enc < (unsigned int)EVP_CIPHER_key_length(c))) {
+        ssl2_return_error(s,SSL2_PE_UNDEFINED_ERROR);
+        SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_LENGTH_TOO_SHORT);
+        return -1;
+    }
+
+    i = ssl_rsa_private_decrypt(s->cert, s->s2->tmp.enc,
+                                &(p[s->s2->tmp.clear]),
+                                &(p[s->s2->tmp.clear]),
+                                (s->s2->ssl2_rollback) ? RSA_SSLV23_PADDING :
+                                RSA_PKCS1_PADDING);
+
     /* bad decrypt */
 # if 1
     /*
      * If a bad decrypt, continue with protocol but with a random master
      * secret (Bleichenbacher attack)
      */
-    if ((i < 0) || ((!is_export && (i != EVP_CIPHER_key_length(c)))
-                    || (is_export && ((i != ek)
-                                      || (s->s2->tmp.clear +
-                                          (unsigned int)i != (unsigned int)
-                                          EVP_CIPHER_key_length(c)))))) {
+    if ((i < 0) || ((!is_export && i != EVP_CIPHER_key_length(c))
+                    || (is_export && i != (int)ek))) {
         ERR_clear_error();
         if (is_export)
             i = ek;
         else
             i = EVP_CIPHER_key_length(c);
-        if (RAND_pseudo_bytes(p, i) <= 0)
+        if (RAND_pseudo_bytes(&p[s->s2->tmp.clear], i) <= 0)
             return 0;
     }
 # else
@@ -511,7 +545,7 @@ static int get_client_master_key(SSL *s)
 # endif
 
     if (is_export)
-        i += s->s2->tmp.clear;
+        i = EVP_CIPHER_key_length(c);
 
     if (i > SSL_MAX_MASTER_KEY_LENGTH) {
         ssl2_return_error(s, SSL2_PE_UNDEFINED_ERROR);
diff --git a/ssl/ssl-lib.com b/ssl/ssl-lib.com
index 85ab2f6..38efbb0 100644
--- a/ssl/ssl-lib.com
+++ b/ssl/ssl-lib.com
@@ -171,11 +171,11 @@ $ ENDIF
 $!
 $! Define The Different SSL "library" Files.
 $!
-$ LIB_SSL = "s2_meth,s2_srvr,s2_clnt,s2_lib,s2_enc,s2_pkt,"+ -
-	    "s3_meth,s3_srvr,s3_clnt,s3_lib,s3_enc,s3_pkt,s3_both,"+ -
-	    "s23_meth,s23_srvr,s23_clnt,s23_lib,s23_pkt,"+ -
-	    "t1_meth,t1_srvr,t1_clnt,t1_lib,t1_enc,"+ -
-	    "d1_meth,d1_srvr,d1_clnt,d1_lib,d1_pkt,"+ -
+$ LIB_SSL = "s2_meth,  s2_srvr, s2_clnt, s2_lib, s2_enc, s2_pkt,"+ -
+	    "s3_meth,  s3_srvr, s3_clnt, s3_lib, s3_enc, s3_pkt,s3_both,s3_cbc,"+ -
+	    "s23_meth,s23_srvr,s23_clnt,s23_lib,        s23_pkt,"+ -
+	    "t1_meth,  t1_srvr, t1_clnt, t1_lib, t1_enc,"+ -
+	    "d1_meth,  d1_srvr, d1_clnt, d1_lib,         d1_pkt,"+ -
 	    "d1_both,d1_enc,"+ -
 	    "ssl_lib,ssl_err2,ssl_cert,ssl_sess,"+ -
 	    "ssl_ciph,ssl_stat,ssl_rsa,"+ -
@@ -196,7 +196,7 @@ $ NEXT_FILE:
 $!
 $! O.K, Extract The File Name From The File List.
 $!
-$ FILE_NAME = F$ELEMENT(FILE_COUNTER,",",LIB_SSL)
+$ FILE_NAME = F$EDIT(F$ELEMENT(FILE_COUNTER,",",LIB_SSL),"COLLAPSE")
 $!
 $! Check To See If We Are At The End Of The File List.
 $!

From matt at openssl.org  Thu Mar 19 14:06:57 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 19 Mar 2015 14:06:57 +0000
Subject: [openssl-commits] [openssl]  OpenSSL-fips-2_0_2 create
Message-ID: <1426774017.699323.31722.nullmailer@dev.openssl.org>

The annotated tag OpenSSL-fips-2_0_2 has been created
        at  4449ebc05d847784cbb6111e44e1a75b06bdc4ad (tag)
   tagging  2d183e4c44b1d18fe515739ec72c76d471a4b669 (commit)
 tagged by  Dr. Stephen Henson
        on  Wed Apr 10 15:16:58 2013 +0100

- Log -----------------------------------------------------------------
OpenSSL FIPS 2.0.2 release tag

Andy Polyakov (1380):
      crypto/bn/asm/mips3.s is obsolete. I'm moving it to crypto/bn/asm/obsolete     in order to replace it with a new version.
      crypto/bn/asm/mips3.s is moved to crypto/bn/asm/obsolete/
      MIPS III/IV assembler module is reimplemented.
      Get rid of redundant multiplications in bn_div_words.
      - performance retunes, v8plus bn_*_comba routines are reimplemented;     - support for GNU assembler (read SPARC Linux);
      GNU assembler (read SPARC Linux) support added.
      Added support for SPARC Linux.
      Minor MD5 tune-up for WIN32 on Intel.
      SGI IRIX config updates.
      SPARC Solaris config updates.
      when invoking bn_*_comba[48] result->top wasn't always set correctly.
      Bignum division tune-up. Idea is to move multiplications in front of     loop body and replace 'em with addition/subtraction.
      Extra i386+gcc bn_div.c tune-up featuring inline division and saving     the remainder left in %edx. Here is the resulting performance improvement     matrix (improvement as a result of this *and* previous tune-up committed     two days ago). The results were obtained by profiling the "div" part of     the crypto/bn/bnspeed.c.
      Minor MIPS III/IV tune-up.
      md32_common.h update and accompanying MD5 update.
      RIPEMD160 shape-up. Major news are that it's operational on all platforms     now and I'm putting it back to 'make test' later today.
      RIPEMD160 shape-up Intel assembler companion. Cycle counter benchmarks     went down from 1050 to 921 cycles on Pentium II. I haven't checked the     figures on Pentium yet.
      RIPEMD160 shape-up. Final touch.
      SHA clean-up and (LP64) tune-up.
      SHA clean-up Intel assembler companion.
      Initial support for MacOS.
      RC4 tune-up.
      RC4 tune-up featuring 30-40% performance improvement on most RISC     platforms. See crypto/rc4/rc4_enc.c for further details.
      RC4 tune-up featuring 30-40% performance improvement on most RISC     platforms. See crypto/rc4/rc4_enc.c for further details.
      MacOS updates.
      Initial support for MacOS is now available
      Late break-in patch for MacOS support.
      Even more late break-in MacOS tidbits...
      Even more late break-in MacOS tidbits (last for today)...
      Minor documentation update.
      Makefile clean-ups, crypto/bn/asm/alpha.s compiles on Alpha Linux.
      MacOS updates. Initial support for GUSI (MacOS socket implementation)     is added.
      Enhanced support for Alpha Linux. See CHANGES for details.
      Alpha Linux update companion.
      Metrowerks for Motorola tune-up.
      Rhapsody 5.5 (a.k.a. MacOS X) compiler bug workaround. At the very least     passes 'make test' now:-)
      Further work on MacOS port. See INSTALL.MacOS for details.
      Support for "multiply high" instruction, see BN_UMULT_HIGH comment in     crypto/bn/bn_lcl.h for further details. It should be noted that for     the moment of this writing the code was tested only on Alpha. If     compiled with DEC C the C implementation exhibits 12% performance     improvement over the crypto/bn/asm/alpha.s (on EV56 box running     AlphaLinux). GNU C is (unfortunately) 8% behind the assembler     implementation. But it's OpenVMS Alpha users who *may* benefit most     as 'apps/openssl speed rsa' exhibits 6 (six) times performance     improvement over the original VMS bignum implementation. Where "*may*"     means "as soon as code is enabled though #define SIXTY_FOUR_BIT and     crypto/bn/asm/vms.mar is skipped."
      New xcbc_ok test vector is required after the parity bits in cbc2_key     were fixed up. The catch is that in the DESX test the cbc2_key is used     as whitening key where *all* 64 bits are significant.
      Support for MacOS X (Rhapsody) is added. Also get rid of volatile     qualifier in asm definitions as it prevents compiler from moving     the instruction(s) during optimization pass.
      HP-UX tune-up: new unified configs, HP C compiler bug workaround.
      test_mont was exercising 100-bit multiplication modulus X*I-bit, where     X is 5120 on 32-bit and 151552 on 64-bit architectures and I varies     from 0 to 4. As result the test was *unreasonably* slow and virtually     impossible to complete on 64-bit architectures (e.g. IRIX bc couldn't     even swallow such long lines).
      New NO_INLINE_ASM macro. Primary target for the moment is Solaris x86     which can't stand GNU C assembler templates.
      Avoid GNU C assembler templates under Solaris x86.
      Move CAST_S_tables to read-only segment.
      Move initial key to read-only segment.
      Move primes to read-only segment.
      There're two (incompatible) ways to write multi-threaded programs under     IRIX, one is to call sproc(2) when every thread does get own pid and     POSIX threads when all the threads share same pid.
      Linux is almost the only one where getpid() == thread-id. IRIX is     another one, but only if you stick to sproc(2).
      BN_div_recp fix. I've ran divtest for 10 mins and it didn't exhibit a     single fault:-) Needless to mention that bnbug.c posted couple of days     ago passes as well...
      Statement that it fails only on 32-bit architectures isn't true.
      MacOS tidbits. Add new files to the project, update config.
      IRIX6* tests passed.
      More tests passed.
      MacOS pseudo-random entropy collector.
      GCC 2.95.2 from IRIX 6.5 -mabi=64 compiler bug workaround:-(
      MT-support for IRIX 6.x and Alpha-Linux
      Compaq C warns that "the expression 'p=scan_esc(p)' modifies the variable     'p' more than once without an intervening sequence point.  This behavior     is undefined." What it essentially complains about is 'p=p+=1'. Now it's     changed to 'p=p+1'...
      The IRIX fix. Asm recap and corresponding declation.
      Assembler support for IA-64. See the source code commentary for further     details (performance numbers and accompanying discussions:-). Note that     the code is not engaged in ./Configure yet. I'll add it later this week     along with updates for .spec file.
      Get rid of RAW dependency warnings.
      Get rid of "possible WAW dependency" warnings.
      This fixes "Spurious test failures on IRIX?" reported in April. Apparently     I was wrong in conclusions about when addition starts overflowing in combaX     routines.
      Missing line 0.9.6b release and IA-64 patch advertisement:-)
      Support for 64-bit Solaris build with GCC 3.0 and later. It should be     explicitely noted that 64-bit SPARCv9 ABI is not officially supported     by GCC 3.0 (support is scheduled for 3.1 release), but it appears to     work, at the very least 'make test' passes...
      Typo in stty command lines.
      Support for Intel and HP-UXi assemblers.
      Enhanced support for IA-64 Linux and HP-UX (as well as better support for     HP-UX in common in ./config). Note that for the moment of this writing     none of 64-bit platforms pass bntest. I'm committing this anyway as it's     too frustrating to patch snapshots over and over while 0.9.6 is known to     work.
      Just a "get to know your system" bit.
      linux64-sparcv9 support finally debugged and tested.
      Workaround for GCC-ia64 compiler bug.
      BN_sqr test failure entry.
      IA-32 assembler modules (primarily DES) PIC-ification. Idea is to keep     shared libraries shared.
      DES PIC-ification. Windows companion.
      x86_64 performance patch.
      New DETECT_GNU_LD procedure.
      Solaris shared build fix-ups. See RT#238,239 for details.
      As you might have noticed I tried to change for . prefix, because it's     the one to be used to denote local labels in single function scope.     Problem is that SHA uses same label set across functions, therefore I     have to switch back to $ prefix.
      Ooops! No ROTATE on some platforms after x86_64 performance patch...
      DES PIC-ification. "Cygwin" companion. Problem was that preprocessor macro     is not expanded if prepended with a $-sign.
      Always forget this one...
      'a=b c=$a; echo $c' doesn't necessarily prints "b", '' vs. "", $s in     Makefiles... I suppose it wasn't tested very much...
      Make "perl des-586.pl a.out" work, see RT#402
      Fix for RT#405, Solaris refuses to invoke preprocessor if egrep returns 1.     Linux for example doesn't exhibit this behaviour, but I add "exit 0" to all     potentially affected rules, just to be on the safe side.
      Better wording?
      Fix for "shift count too large" when compiling for hpux-parisc2 and     irix-mips. The bug was introduced with accelerated support for x86_64.     My fault! Fixed now.
      FAQ addenum as discussed in RT#417.
      UltraSPARC performance "tune-up."
      I can't confirm the claim being removed and nobody seems to speak up for it.
      It probably belongs in PROBLEMS, but it's more likely to be a FAQ.
      My English is definitely not good as my assembly skills:-) And it looks like     titles can't be multi-line...
      I implemented this when troubleshooting performance problem on SPARC Solaris.     As there is an apparent interest for optimization for footprint, I figured     that this can eventually become useful.
      Very old submission (from 2000) of UltraSPARC assembler DES implementation.     It was not accepted because code is not PIC, too UltraSPARC-specific when     it doesn't have to and 32-bit only. I'm committing the original version     mostly for reference purposes. 64, PIC, blended CPU tune-up follows shortly.     Obtained from: http://inet.uni2.dk/~svolaf/des.htm
      UltraSPARC assembler DES implementation tune-up. The code can be     compiled for any SPARC CPU (UltraSPARC performance is *not* affected),     can be compiled for 64-bit ABI and is position-independent.
      Complete integration of SPARC assembler DES implementation. Tested on Solaris     only. I'll keep my eyes open for Linux and OpenBSD targets.
      Support for Intel compiler. More details will be provided in closing note     for RT#17 as snapshot becomes available for download.
      HP/UX 11i make gets upset by this line containing nothing but a Tab
      pa-risc2.s was not PIC, see RT#426. I strip call to fprintf as it's     never called anyway (it's a debugging assertion). If pa-risc2W.s is     PIC remains to be seen...
      Support for ILP32 on HPUX-IA64.
      Unified targets for ELF assembler modules. Tested on Linux, Solaris and     FreeBSD. Goal is to extend support even to SCO5, UnixWare/OpenUnix...
      Redundant now as it's moved to ./Makefile.org.
      Oops! I've toasted Cygwin! Fixed now.
      GAS can't stand stub, which is stb's synonym.
      Another GAS fix-up and some commentary...
      Fix a typo.
      Finalizing asm support for UnixWare, SCO, OpenUnix... Note that I've     replaced #if logic around bn_sub_part_words in bn_mul.c. I rely upon     OPENSSL_BN_ASM_PART_WORDS being added by ./Configure script. Would it     still work on non-Unix platforms?
      At least OpenBSD implements PIC in the same way ELF does.
      Avoid unnecessary pollution of object module name table. Cygwin shared     build workaround (DJGPP swallows it too). One probably should do same     as with ELF calling it COFF, but I'm very short in COFF platforms, so     I just go for easy ad-hoc solution. I'll take care of merge to 0.9.7     later.
      Just an extra comment.
      OpenBSD FAQ update. Apparently gas from binutils-2.x makes it impossible to     use gcc -fPIC ... on OpenBSD-i386. Alternative solution is provided.
      Minor FAQ update
      Fix for AIX shared build, see RT#463.
      Caldera/SCO targets erroneously limit themselves to 386. See RT#464.
      -lresolv is not present on SCO Unix, RT#460.
      SCO target missed .so suffix.
      Oops! Missed closing quote... Didn't have time to verify before a snapshot     was cut...
      This is an *initial* tune-up. This update puts Itanium2 back on par with     Itanium. I mean if overall performance improvement over C version was X     for Itanium, it's X even for Itanium2.
      Suggestion was to change ${MACHINE} to i586 in lines in question. Well,     "whatever" doesn't the same (avoids 386 being passed to ./Configure),     consistent with other elder SCO targets and denotes that we probably     shouldn't care much about every out-of-date platform.
      The patch speaks for itself.
      Workaround for lame compiler bug introduced in "CPU pack" for MSVC6SP5.
      Provide "dummy" &main::picmeup even in Windows perlasm modules.
      ./config failed to correctly detect if gcc uses 64-bit ABI on HP-UX.     PR: 772
      hpux64-parisc2-gcc target added. Once it is verified, ./config should     be modified to choose it instead of hpux64-parisc-gcc, which should     then be removed. hpux64-parisc-cc is removed already now as redundant     [in case you wonder, 64-bit HP-UX ABI *implies* PA-RISC2.0].
      SHA-1 assembler tune-up for Intel P4
      Get rid of bogus warning when compiling with Sun vendor compiler.
      Fix declaration inconsistency in ecparam.c.
      Even though C specification explicitly says that constant type "stretches"     automatically to accomodate the value, some compilers fail to do so. Most     notably 0x0123456789ABCDEF should come out as long long in 32-bit context,     but HP compiler truncates it to 32-bit value. Which in turn breaks GF(2^m)     arithmetics in hpux-parisc2-cc build. Therefore this fix...
      CFB DES sync-up with FIPS branch.
      #undef _POSIX_C_SOURCE in ui_openssl.c ruined IRIX builds. Comment on why     _POSIX_C_SOURCE needed in first place.
      HP/UX PA-RISC 2 targets update.
      Typo in PA-RISC 2 rules in crypto/bn/Makefile.ssl
      Typo in crypto/bn/asm/x86_64.c, bn_div_words().     PR: 821
      IRIX 6.x shared build fix-up.
      This is essentially Intel 32-bit compiler tune-up. To start with all     available compiler versions generated bogus machine code trying to     compile new crypto/des/cfb_enc.c. Secondly, 8th version defines     __GNUC__ macro, but fails to compile *some* inline assembler correctly.     Note that all versions of icc implement MSC-like _lrot[rl] intrinsic,     which is used now instead of offensive asm. Finally, unnecessary linker     dependencies are eliminated. Most notably dependency from libirc.a     caused trouble at application start-up, if libcrypto.so is linked with     -Bsymbolic (which it is).
      Improved PowerPC support. Proper ./config support for ppc targets,     especially for AIX. But most important BIGNUM assembler implementation     submitted by IBM.
      Oops! Typo in ./config...
      Support for IA-32 SSE2 instruction set.
      SSE2 accelerated bn_mul_add_words. Code is currently disabled till proper     config and run-time support is added.     PR: 788     Submitted by: <dean at arctic.org>     Reviewed by: <appro>
      SSE2 SHA512_Transform implementation. No, it's not used anywhere yet and     is subject to change as C implementation is added...
      SHA-224/-256/-384/-512 implementation. This is just sheer code commit.     Makefile modifications, make test, etc. will appear later...
      CHANGES to mention improved PowerPC platform support.
      size_t-fication of message digest APIs. We should size_t-fy more APIs...
      Make reservations for FIPS code in HEAD branch, so that the moment FIPS     comes in we have required macros in place.
      Final API adaptation. Final, "all openssl" performance numbers [not mixture     of different implementations]. Real-life performance improvement is rated     at 2-3x, not 6x as preliminary announced.
      Stress collector/padding function.
      SHA-256/-512 update. A bug fix, SHA-512 tune-up for AMD64, hook for SSE2     code, Makefile update.
      While size_t-fying let's not forget to update documentation:-)
      SHA-256/-512 test and benchmark.
      Framework for glueing BIO layer and Win32 compiler run-time. Goal is to     make it possible to produce for a unified binary build, which can be     used with a variety of Win32 compilers.
      Documentation note for Win32 glue between BIO layer and compiler run-time.
      SHA-224 test vectors added.
      Attempt to unify hpux-shared rules. More adjustments might be required     after more tests...
      Eliminate compiler warnings and throw in performance table.
      Make sure we return 0 if test passed.
      Unified hpux-shared rule. Verified with both 32- and 64-bit builds and     both vendor and GNU compilers. ./engine shared build are still busted.     I mean always were...
      hpux-shared rules to cover even for GNU ld.
      gcc -Wcast-qual clean-up.
      Typo in linux-ppc64 target.
      Kill unused macro and reimplement it for that single context it can     actually be used, namely x86* platforms [because they don't bomb on     unaligned access]. This resulted in 30-40% [depending on message     length] improvement for SHA-256 compiled with gcc and running on P4.     In the lack of assembler implementation I give the compiler all the     help it can possibly get:-)
      Final SHA-256/-512 touches. Extra md_len field in SHA[256|512]_CTX     reserves for truncated hash function output mode and makes SHA224     thread-safe. Next stop is integration with EVP and we're done...
      Typo in commentary section.
      Make sha-256/-512 naming in speed.c consistent with their names as they     will appear at EVP leyer.
      objects.txt update for SHA-224/-256/-384/-512. SHA-224 ids still appear     "draft," but we have to start somewhere...
      EVP bindings to new SHA algorithms.
      Extend HMAC_MAX_MD_CBLOCK to accomodate SHA-512.
      Mention new SHA algorithms in CHANGES. This completes the integration.
      Working on HP-UX shared support...
      32-bit PA-RISC requires -Bsymbolic when linking libcrypto.sl. Without     this flag RAND_poll ends up in end-less loop calling RAND_add. But     don't ask me why...
      Minimal work-around for ./engine shared builds. "Minimal" means that I     think that proper Makefile clean-up is required.
      SHA fails to compile on x86_64 if compiled with custom flags, without     recommended -DMD32_REG_T=int in particular.     PR: 893     Submitted by: Michal Ludvig <michal-list at logix.cz>
      New scalable bn_mul_add_words loop, which provides up to >20% overall     performance improvement. Make module more gcc friendly and clarify     copyright issues for division routine.
      New SHA algorithms  assembler implementation for IA-64. Note that despite     module name both SHA-256 and SHA-512 are supported.
      AES assembler implementation for IA-64. Note that there is no anchor from     C code yet...
      Minor (+12% on P4) performance tweak for sha512_block_sse2.
      RC4 tune-up for AMD64. Performance improvement of 2.22x is measured for     linux-x86_64 target.
      Integration of RC4 AMD64 module.
      IA-64 is intolerant to misaligned access. It was a problem on Win64 as     we were mislead by _MSC_VER macro, which is defined by *all* Windows     Microsoft compilers.
      Add licensing terms.
      Add anchors for AES, SHA-256/-512 assembler modules and SSE2 code pathes.     I also used this opportunity to clean up some out-of-date targets and     re-group targets by OS.
      Type in Configure and TABLE update.
      Anchor AES and SHA-256/-512 assembler from C.
      Make rand_win.c UNICODE savvy.
      All SIXTY_FOUR_BIT platforms (mind the difference between SIXTY_FOUR_BIT and     SIXTY_FOUR_BIT_LONG) were failing to pass 'cd test; make test_bn'.
      Run SHA-256/-512 tests through EVP...
      EVP_Digest is size_t-fied, clean up test programs accordingly.
      #include <limits.h> is required at least on HP-UX and IRIX. And what's     with HP-UX offering 14 for NAME_MAX?
      WinCE should always be compiled as UNICODE, even debugging version...
      Adapt rc4-amd64.pl for Win64/AMD64 assembler.
      Win64 placeholder targets. This is merely naming suggestion. As we know     Win64 comes in two flavors, IA-64/Itanium and AMD64/Opteron. The     suggestion is to refer to former as WIN64I and latter - WIN64A
      VC-NT was taken away by mistake, putting it back...
      Various IA-64 assembler fix-ups.
      Build-n-link new IA-64 modules on Linux and HP-UX.
      TABLE update.
      Minor HP-UX make update. IA-64-based HP-UX favor .so extension for shared     libraries. Old .sl extension works just fine, but it .so which is default.
      Typos and due casts. As for the latter. It's "safe" to cast as below,     because "wrong" casts will either be optimized away or never performed.
      Some compilers are just too whiny. DEC C doesn't like long long...
      Some compilers are just too whiny. Nothing makes Microsoft compiler     stop complaining about loss of precision, but explicit cast.
      Make SHA-256/-512 optional. Note that no-sha switches off *all* SHA.
      'apps/openssl dgst -help' update and minor apps/speed.c update.
      Minor 64-bit md32_common.h update and minor unsignification of digests.
      Stricter boundary condition check in HMAC_Init_ex.
      Make bio_ok.c 64-bit savvy.
      Typos, typos...
      Make bio_ok.c Microsoft compiler savvy.
      Zero key-length for HMAC is apparently OK.
      Add framework for yet another assembler module dubbed "cpuid." Idea     is to have a placeholder to small routines, which can be written only     in assembler. In IA-32 case this includes processor capability     identification and access to Time-Stamp Counter. As discussed earlier     OPENSSL_ia32cap is introduced to control recently added SSE2 code     pathes (see docs/crypto/OPENSSL_ia32cap.pod). For the moment the     code is operational on ELF platforms only. I haven't checked it yet,     but I have all reasons to believe that Windows build should fail to     link too. I'll be looking into it shortly...
      This is so to say "damage control" for jumbo "cpuid" patch, see     http://cvs.openssl.org/chngview?cn=12493. Now all platform should     be operational, while SSE2 code pathes get engaged on ELF platforms     only.
      DLLEntryPoint is a collective name, not what linker looks for. However,     if we explicitly intruct the linker to set entry point, then we become     obliged to initialize run-time library. Instead we can pick name run-time     will call and such name is DllMain. Note that this applies to both     "native" Win32 environment and Cygwin:-)
      Deprecate cpp and gaswin targets. New coff fills in for gaswin, but cpp is     going out...
      Clean-up GAS targets: get rid of "cpp" stuff and replace it with "purified"     COFF and a.out targets [similar to ELF targets]. You might notice some     rudementary support for shared mingw builds under cygwin. It works (it     produces cryptoeay32.dll and ssleay32.dll with everything exported by     name), but it's primarily for testing/debugging purposes, at least for     now...
      OpenBSD fix-up for new a.out targets. OpenBSD .s.o rule is busted...
      Cygwin fix-up for shared build.
      VIA C3 processor extends IA-32 instruction set with instuctions     performing AES encryption in hardware, as well as one accessing     hardware RNG. As you surely imagine this engine access this     extended instruction set. Well, only AES for the moment, support     for RNG is to be added later on...     PR: 889     Submitted by: Michal Ludvig <michal at logix.cz>
      Minor clean-up to make Microsoft compiler shut up.
      Avoid a.out name table pollition.
      If they ask for 386, keep it as 386 as possible...
      Padlock engine update to fix a typo in MSC assembler and to address     potential corruption problem if user manages to inter-leave aligined     and misaligned requests [as well as some MSC-specific tweaks].
      Make aes_ctr.c 64-bit savvy.
      Minor VIA Padlock engine update: eliminate -Wunused warning when *not*     compiling the engine and inline memcpy in performance critical pathes.
      crypto/perlasm update primarily to unify Netware modules. Once it's verified     x86*_nw.pl will be deleted. In addition this update implements initseg     on several additional [in addition to ELF] platforms. Functions registered     with initseg are supposed to be called prior main().
      Fix compiler warnings in crypto/evp/bio_ok.c as pointed out by Geoff.
      OPENSSL_ia32cap final touches. Note that OPENSSL_ia32cap is no longer a     symbol, but a macro expanded as (*(OPENSSL_ia32cap_loc())). The latter     is the only one to be exported to application.
      Proper support for OpenBSD-i386 shared build, including assember modules!     "Proper" means "compiles and passes test." Versioning is broken (I think).
      TABLE OpenBSD-i386 update
      x86 assembler updates: more instructions, new OPENSSL_instrument_halt     [for DJGPP]...
      Make VIA Padlock engine more platform friendly and eliminate compiler     warning.
      sha256_block advances the input pointer double as fast sometimes. Fix the     bug and test that it's actually gone.     PR: 950
      SHA1 asm Pentium tune-up. Performance loss is not as bad anymore.
      Fix Solaris 10_x86 shared build. -Bsymbolic is required to avoid     "remaining relocations" in assembler modules. The latter seems to     be new behaviour, elder as/ld managed to resolve this relocations     as internal. It's possible to address this problem differently,     but I settle for -Bsymbolic...     PR: 546
      As was shown by Marc Bevand reordering of couple of load operations     results in even higher performance gain of 3.3x:-) At least on     Opteron...
      RC4 tune-up for Intel P4 core, both 32- and 64-bit ones. As it's     apparently impossible to compose blended code with would perform     satisfactory on all x86 and x86_64 cores, an extra RC4_CHAR     code-path is introduced and P4 core is detected at run-time. This     way we keep original performance on non-P4 implementations and     turbo-charge P4 performance by factor of 2.8x (on 32-bit core).
      linux-x86_64 didn't link after EM64T RC4 tune-up...
      RC4 IA-64 assembler implementation.
      Engage RC4 IA-64 assembler module.
      Summarize recent RC4 tune-ups.
      perlasm/x86[ms|nasm] update to accomodate updated RC4 assembler module.
      Final touches to rc4/asm/rc4-596.pl, +52% better performance on AMD core.
      sha1_block_asm_data_order can't hash if message crosses 2GB boundary.
      Add 0.9.7 specific comments to RC4 assembler modules.
      I've introduced a bug to i386 RC4 assembler, which would emerge with     certain mix of calls to RC4 routine not covered by rc4test.c.     It's fixed now. In addition this patch inadvertently fixes minor     performance problem: in 0.9.7 context P4 was performing 12% slower     than the original implementation...
      Fix rc4-ia64.S to pass more exhaustive regression tests.
      Extend RC4 test.
      SHA1 assembler for IA-64.
      Engage SHA1 IA64 assembler on IA64 platforms.
      Solaris x86 perlasm update.
      Refine PowerPC platform support.
      AES x86 assembler implementation.
      Eliminate copies of TeN and TdN, use those found in assembler module.
      x86 perlasm update to accomodate aes-586.pl.
      Engage AES x86 assembler module on ELF platforms.
      Engage AES x86 assembler module for COFF and a.out targets.
      Eliminate redundant memcpy of IV material. Performance improvement varies     from platform to platform and can be as large as 20%.
      Remove yet another redundant memcpy. Not at least performance critical,     essentially cosmetic modification...
      Remove CPU detect for IRIX targets. Performance gain is less than 1%,     it makes more sense to strive for broader binary compatibility...
      As new major IRIX release is highly unlikely to appear [and break following],     I change from -notall to -none synonym in irix rules to improve backward     compatibility with IRIX 5.x.     PR: 987
      Minor cygwin update.     PR: 949
      Oops-kind typos in aes-ia64.S...
      AES-CFB[18] 2x optimization. Well, I bet nobody cares about AES-CFB1     performance, but anyway...
      Minor AES x86 assembler tune-up.
      Commentary update for AES IA-64 assembler module.
      Remove naming conflict between variable and label.
      Fix Win32 test-suit.
      Make whiny compilers stop complaining about missing prototype.
      Borrow #include <string[s].h> from e_os.h.
      DJGPP update.     PR: 989     Submitted by: Doug Kaufman
      Permit "monolithic" AES assembler implementations, i.e. such which would     replace *whole* aes_core.c, not only AES_[de|en]crypt routines.
      DJGPP documentation note update.
      FAQ update to mention no-sha0 as possible workaround for Tru64 compiler bug.     Well, no-options seem to be busted in HEAD currently, which should/will be     fixed one way or another (see PR#989 for a possible alternative).
      O_NOFOLLOW is not appropriate when opening /dev/* entries on Solaris.     PR: 998
      Fix an "oops" typo! Well, it was a debugging left-over...
      "Monolithic" x86 assembler replacement for aes_core.c. Up to +15% better     performance on recent microarchitectures.
      Rely on e_os.h to appropriately define str[n]casecmp in non-POSIX     environments.
      INSTALL.DJGPP sync.     PR: 989
      Don't zap AES CBC IV, when decrypting truncated content in place.
      Reserve for AES CBC assembler implementation...
      Fix a typo in a.out assembler modules.
      Throw in AES CBC assembler, up to +40% on aes-128-cbc benchmark.
      Bug-fix in CBC encrypt tail processing and commentary section update.
      linux-parisc update.     PR: 990     Submitted by: Mike Frysinger <vapier at gentoo.org>
      linux-arm target update.     PR: 991
      Improve ECB performance (48+14*rounds -> 18+13*rounds) and reserve for     hand-coded zero-copy AES_cbc_encrypt.
      Default to AES u32 being unsinged int and not long. This improves cache     locality on 64-bit platforms (and fixes IA64 assembler-empowered build:-).     The choice is guarded by newly introduced AES_LONG macro, which needs     to be defined only on 16-bit platforms which we don't support (not that     I know of). Meaning that one could as well skip long option altogether.
      Fold a bunch of linux and *BSD targets into [linux|BSD]-generic[32|64].     Idea is to provide unified "fall-down" case for all rare platforms out     there. ./config is free to enable some optimizations, such as endianness     specification, specific -mcpu flags...
      ./Configure to respect $thread_cflag variable.
      FreeBSD 5 refuses to #include <malloc.h>. Fix compiler warning after     http://cvs.openssl.org/chngview?cn=12843.
      Please BSD make...
      Respect the fact that most interactive shells don't restore stty settings     and make it work in non-interactive mode...
      Address run-time linker problems: LD_PRELOAD issue on multi-ABI platforms     and SafeDllSearchMode in Windows.
      Shut whiny make's up.
      Drop redundant -lc from a number of rules in Makefile.shared. It's     perfectly safe [compiler driver adds it] and in some situation even     perfectly appropriate [mixing -pthread and -lc on FreeBSD can have     lethal effect on apps/openssl]. I'd say we should get rid of more,     but I remove those I can test myself...
      Mention no-sse2 option in INSTALL note.
      Make util/shlib_wrap.sh [Open]BSD-friendly.
      Make Makefile.shared BSD make-friendly, remove more redundant -lc, set up     OBJECT_MODE for AIX.
      Reliable BSD-x86-elf detection in ./config.
      This patch was "ignited" by OpenBSD 3>=4 support. They've switched to ELF     and GNU binutils, but kept BSD make... And I took the opportunity to     unify other targets to this common least denominator...
      Remove unused assembler modules.
      Avoid re-build avalanches with HP-UX make.
      Cygwin to use DSO_FLFCN and mingw to use DSO_WIN32.
      Make bn/asm/x86_64-gcc.c gcc4 savvy. +r is likely to be initially     introduced for a reason [like bug in initial gcc port], but proposed     =&r is treated correctly by senior 3.2, so we can assume it's safe now.     PR: 1031
      Some non-GNU compilers (such as Sun C) define __i386.
      Solaris x86 linker erroneously pads .init segment with zeros instead of     nops, which causes SEGV at startup. So I don't align anymore.
      Extend Solaris x86 support to amd64.
      +45% RC4 performance boost on Intel EM64T core. Unrolled loop providing     further +35% will follow...
      Harmonize cygwin/mingw and VC targets.
      Implement OPENSSL_showfatal and make it Win32 GUI and service aware     [meaning that it will detect in which context application is running     and either write message to stderr, post a dialog or log an event].
      Recognize MSYS/MINGW environment.
      Minor cryptlib.c update: compiler warnings in OPENSSL_showfatal and     OPENSSL_stderr stub.
      Parameterize do_solaris rules in Makefile.shared.
      Introduce OPENSSL_NONPIC_relocated to denote relocated DLLs.
      Fix typos.
      Zap OPENSSL_EXTERN on symbols, which are not meant to be local to DLL.
      Final(?) touches to mingw shared support.
      Addenum to http://cvs.openssl.org/chngview?cn=13054.
      More cover-ups, removing OPENSSL_GLOBAL/EXTERNS. We can remove more...
      Final touch to mingw shared.
      Fix for bug emerged in openvpn conext.
      Prototype mnemonics in padlock_verify_context for better portability     [read support for Solaris assembler].
      Mitigate cache-timing attack in CBC mode. This is done by implementing     compressed tables (2x compression factor) and by pre-fetching them into     processor cache prior every CBC en-/decryption pass. One can argue why     just CBC? Well, it's commonly used mode in real-life applications and     API allows us to amortize the prefetch costs for larger data chunks...
      Throw in x86_64 AT&T to MASM assembler converter to facilitate development     of dual-ABI Unix/Win64 modules.
      Avoid aliasing between stack frames and S-boxes. Compress prefetch code.
      Avoid L1 cache aliasing even between key and S-boxes.
      Pointer to BN_MONT_CTX could be used uninitialized.
      Fold rules in test/Makefiles [from stable].
      Allow for ./config no-sha0 [from stable].
      Cygwin/mingw sync with stable.
      Remove false positives and resolve some of remaining ones.
      x86_64 assembler translator update.
      Rename amd64 modules to x86_64 and update RC4 implementation.
      Cpuid modules updates.
      Commentary update.
      Cygwin doesn't expose Win32 [not "officially"].
      Throw in md5-x86_64 assembler.
      Engage md5-x86_64 assembler module.
      Cvs missed adapted module itself, here it goes...
      x86_64 assembler translator update.
      Commentary update motivating code update in 0.9.7.
      Fix constants.     PR: 1059
      x86_64 assembler translator update.
      Eliminate "statement with no effect" warning when OPENSSL_assert macro     is used with constant assertion.
      Allow for 64-bit cache-line alignments in code segment.
      Comply with optimization manual (no data should share cache-line with code).
      Fool-proofing Makefiles
      +20% performance improvement of P4-specific RC4_CHAR loop.
      Consolidate BUILDENV [idea is to keep all variables in one place].
      Simplify shared rules, link run-path into applications only.
      Make Makefile.shared quiet again.
      Further BUILDENV clean-up, 'make depend' is operational again.
      Further BUILDENV refinement, further fool-proofing of Makefiles and     [most importantly] put back dependencies accidentaly eliminated in     check-in #13342.
      Improve shell portability of new rules in Makefile.shared.
      Move cryptlib.h prior bio.h. Actually it makes sense to include cryptlib.h     first everywhere in crypto and skip stdio.h and string.h [because it     includes them].
      Disclaim 16-bit support.
      OPENSSL_Applink update.
      mdc2test is not built by default anymore.
      Keep disclaming 16-bit support.
      Engage Applink for VC builds.
      Engage Applink in mingw. Note that application-side module is not     compiled into *our* aplpications. That's because mingw is always     consistent with itself. Having library-side code linked into .dll     makes it possible to deploy the .dll with user-code compiled with     another compiler [which is pretty much the whole point behind Applink].
      Don't emit SSE2 instructions unless were asked to.     PR: 1073
      FAQ update to mention Applink.
      FAQ to mention no-sse2.
      Move _WIN32_WINNT definition from command line to e_os.h. The change is     inspired by VC6 failure report. In addition abstain from taking screen     snapshots when running in NT service context.
      Default to no-sse2 on selected platforms.
      Still SEGV trouble in .init segment under Solaris x86...
      OPENSSL_NO_SHA512 to mask even SHA512_CTX declaration. This is done to     make no-sha512 more effective on platforms, which don't support 64-bit     integer type of *any* kind.
      Be more consistent with OPENSSL_NO_SHA256.
      Platform update from 8-stable.
      Platform update from 8-stable.
      Fix typo in ./config.
      Missing sparcv8.o rule.     PR: 1082
      Mention more GCC bugs in ./PROBLEMS.
      "Show" more respect to no-sha* config options.     PR: 1086
      PSS update [from 0.9.7].
      Fix inconsistensy between 8 and HEAD.
      ./PROBLEMS to mention workarounds for ULTRIX build problems.     PR: 1092
      Unify BSDi target.
      New function, DSO_pathbyaddr, to find pathname for loaded shared object     by an address within it. Tested on Linux, Solaris, IRIX, Tru64, Darwin,     HP-UX, Win32, few BSD flavors...
      Change mention of Makefile.ssl to Makefile.
      FAQ to mention no-sha512 as option for compilers without support for 64-bit     integer type.
      Allow BIO_s_file to open and sequentially access files larger than 2GB on     affected platforms.     PR: 973
      "Liberate" dtls from BN dependency. Fix bug in replay/update.
      Allow for dso load by explicit path on HP-UX.
      Eliminate gcc -pedantic warnings.
      Handle wrap-arounds and revive missing assignment.
      Solaris x86_64 /usr/ccs/bin/as support.
      Refine ELF detection on BSD platforms.
      Fix typo in ssl/d1_pkt.c.
      Solaris-specific Makefile.shared update from 098.
      TABLE was out-of-sync.
      no-asm didn't prevent make from compiling assembler modules.
      Jumbo Makfiles update.
      HP-UX specific updates to Makefile.org and Makefile.shared.
      Rename mips3.o to bn-mips3.o [it's better in long run] and adjust the     rule to accomodate gcc4, which no longer support SGI as.
      Typo in bn-mips3 rule.
      Missed -c in IRIX rules.
      Darwin specific update for Configure and Makefile.shared.
      Replace emms with finit in x86cpuid.
      Omit padding in RC4_KEY on IA-64. The idea behind padding was to reserve     room for aligning of the key schedule itself [specific alignment is     required for future performance improvements], but OpenSSH "abuses"     our API by making copies and restoring RC4_KEY, thus ruining the     alignment and making it impossible to recover the key schedule.     PR: 1114
      Minimum requirement for Solaris x86 was always Pentium. Reflect this in     Configure line. TABLE update accomodates other recent ./Configure changes...
      Minor (final?) Makefiles polish.
      Unify some SCO targets.
      Fix typos in apps/apps.c
      Eliminate dependency on UNICODE macro.
      Mention hpux64-ia64-cc blowfish failure in PROBLEMS.
      A report suggests that there're nasm version, which defaults to 16-bit     segmenting...
      Replace _int64 with __int64, which is more widely accepted among Win32     compiler vendors.
      AES_cbc_encrypt to allow end-user to retain small blocks performance by     aligning the key schedule in a specific manner.
      Typos in commentary section.
      Pedantic polish to aes-586.pl:-)
      Decimal printout of a BN is wrong on PPC, it's sparse with very few     significant digits. As soon it verifies elsewhere it goes to 0.9.8 and     0.9.7.
      More elegant solution to "sparse decimal printout on PPC" problem.
      Trap condition should be 64-bit when it's due.
      Fix bugs in bug-fix to x509/by_dir.c.     PR: 1131
      Pull up Win64 support from 0.9.8.
      CHANGES and TABLE sync with 0.9.8.
      Latest Intel compiler means every word in "if copying [with memcpy] takes     place between objects that overlap, the behavior is undefined." It's hard     to comprehend, but it reportedly manages to be case.
      AES x86_64 assembler implementation.
      complementary x86_64-xlate.pl update.
      Commentary section update.
      ~15% better AES x86_64 assembler.
      Fix unwind directives in IA-64 assembler modules. This helps symbolic     debugging and doesn't affect functionality.
      Unrolled RC4 IA-64 loop gives 40% improvement over current assembler     implementation [as predicted].
      This update implements following improvements.
      Switch to new RC4 IA-64 module.
      Retire original rc4-ia64.S.
      MD5 IA-64 assembler implementation. Original copy for reference purposes.
      This update gets endianness-neutrality right and adds second required     entry point, md5_block_asm_data_order.
      Engage MD5 assembler module.
      Fix bug [SHA1 IA-64 being disabled] introduced with Stratus VOS update.     PR: 1130
      Perl stylistic/cosmetic update for aes-x86_64.pl.
      Typo in version number.
      Pedantic polish to rc4-ia64.pl.
      Syncronize BSD-ia64 with other IA64-based platforms.
      Pedantic polish to md5-ia64.S.
      Pedantic polish to aes-ia64 and sha512-ia64.
      SHA-256/-512 x86_64 assembler module.
      Engage SHA-256/-512 x86_64 assembler module.
      Eliminate gcc warning in dso_win32.c.
      Pull up mkdef.pl from 0.9.8.
      Unify VC-32.pl and VC-CE.pl scripts and update INSTALL.W32.
      Commentary section update in sha512-x86_64.pl.
      Fix #if _MSC_VER clause in aes_locl.h
      Eliminate dependency on 3rd party wcedefs.mak.
      Implement complementary LoadLibraryA shim under WCE.
      Type in OSF1 platform name.
      Eliminate bogus #if WCEPLATFORM!=MS_HPC_PRO [which by the way unconditionally     invalidated the whole clause] and replace it with #if _WIN32_WCE>=210.
      Stick to -DWCE_PLATFORM_$wceplatf, as that's what is apparently set by     Visual Studio IDE.
      Optimize for space on embedded WCE.
      Keep disclaiming 16-bit support.
      WCE-specific fix for cryptlib.c.
      WCE-specific update for VC-32.pl.
      Abstain from GUI calls in rand_win.c in NT service context.
      PIC-ify SPARC assembler in alternative manner to eliminate dependency on     OPENSSL_PIC macro.
      WCE update, mostly typos.
      3-4 times better RSA/DSA performance on WIN64A target. Well, on AMD64 CPU,     EMT64T will hardly exhibit better performance...
      Final(?) WinCE update.
      Add support for more recent WCE SDK.
      Suppress "deprecated" warnings introduced in VC8.
      Fix Intel assembler warnings.
      Mention wcecompat update INSTALL.WCE.
      Fix typo in WCE section in VC-32.pl
      Pedantic polish to WCE-specific #if clause in ectest.c
      Eliminate reference to removed platform line.
      bswapl usage should be masked by I386_ONLY.     PR: 1195
      Oops-type typo.     PR: 1195
      Missing space in VC-32.pl.
      Another missing space in VC-32.pl [from 0.9.8].
      Mention BN_sqr failure on x86 platforms in ./RPOBLEMS.     PR: 1176 [and others]
      Proper solution to nasm compilation problems in Borland context.
      BC-32.pl updates.
      Refine AIX support.     PR: 1198
      MD5 x86_64 assembler update.
      Fix typo: "powepc" vs "powerpc." G-r-r-r-r.     PR: 1198
      IA-32 BN tune-up. Performance imrpovement varies with platform and     keylength, this time larger improvement for shorter keys, and reaches     15%. Both SSE2 and IALU code pathes are improved.
      "Overload" SunOS 4.x memcmp, which ruins ASN1_OBJECT table lookups.     PR: 1196     Submitted by: Russel Ruby
      Latest MSVCR80 doesn't tolerate unsupported signal numbers, throwing     fatal exceptions.
      Broaden compatibility among Windows SDK versions. Elder versions don't have     ULONG_PTR, so we replace it with equally wide SIZE_T.
      Fix SunOS 4 building issue.     PR: 1196
      Fix missing applink call.
      Fix typo.
      Add reference implementation for bn_[mul|sqr]_mont, new candidates for     assembler implementation.
      Reserve for SMALL_FOOTPRINT bn_asm.c. Currently OPENSSL_SMALL_FOOTPRINT     is defined on Windows CE targets.
      Fix typo in exptest.c.
      Zap DES_UNROLL when SMALL_FOOTPRINT is in effect.
      Fix typo in INSTALL.WCE.
      Mention "no-dso doesn't remove -ldl" in PROBLEMS.     PR: 1160
      Leave the decision to call/implement bn_sqr_mont to assembler developer.
      Refine logic in bn_mont.c and eliminate redundant BN_CTX pulls.
      Throw in Montgomery multiplication assembler for x86_64.
      x86_64-mont.pl readability improvement.
      Throw in bn/asm/x86-mont.pl Montgomery multiplication "teaser".
      Add timestamp to x86-mont.pl.
      Broaden compatibility amount Win32 headers even further [some don't have     SIZE_T].
      Fix bug in SMALL_FOOTPRINT path and clarify comment.
      Make sure x86-mont.pl returns zero even if compiled with no-sse2.
      Flip saved argument block and tp [required for non-SSE2 path].
      Yet another "teaser" Montgomery multiply module, for UltraSPARC. It's not     integrated yet, but it's tested and benchmarked [see commentary section     for further details].
      util/pl/OS2-EMX.pl sync.
      Add rudimentary aix64-gcc target.
      Change bn_mul_mont declaration and BN_MONT_CTX. Update CHANGES.
      Add support for 32-bit ABI to sparcv9a-mont.pl module.
      Eliminate gcc warning in bn_mont.c.
      bn_asm.c update.
      Integrate sparcv9a-mont.pl into UltraSPARC builds.
      Clarify binary compatibility with HAL/Fujitsu SPARC64 family.
      Move DES_SPtrans to where it really belongs, dec_enc to be specific.
      Eliminate ~3.5KB of duplicate code in des-586.pl and reserve for folded     loop option, which can give further 3KB code reduction.
      Fix typos in macos x targets.
      Eliminate false preprocessor dependencies introduced with VOS support.
      +20% SHA512 performance improvement on x86.
      Fix install problems on MacOS X and HP-UX.     PR: 1218,1185
      Add -install_name in link_a.darwin rule.     PR: 1218
      Make pshufw optional and update performance table in sha512-sse2.pl     [as per http://cvs.openssl.org/chngview?cn=14551].
      Disable BIO_s_fd on CE and disable fd:N as password passing option on     all _WIN32 [see commentary for clarification].
      Reserve for OPENSSL_NO_POSIX_IO macro which is to eliminate references     to open/read/write/close. First OPENSSL_NO_POSIX_IO target would be     Windows CE.
      Mask libcrypto references to stat with OPENSSL_NO_POSIX_IO.
      Get rid of arcane reference to _fmode in apps/apps.h. Binary open is     handles properly by bss_file.c, which renders _fmode redundant.
      Make cygwin work in directories mounted with 'text' attribute.
      Engage OPENSSL_NO_POSIX_IO on Windows CE.
      Eliminate dependency on read/write/stat in apps under _WIN32.
      Eliminate remaining calls to stat in apps/apps.c and unify WIN32_rename for     all Windows targets.
      Eliminate crypto/tmdiff.[ch].
      Collect timing procedures in apps/apps.c. It's a bit cruel patch, as it     temporarily[!] removes support for couple of esoteric platforms [well,     Netware, vxWorks and VMS].
      Fix newly introduced typos and warnings in ./apps.
      x86_64-xlate.pl commentary section update.
      The typos never stop. Fix one in apps/apps.c.
      Keep removing references to tmdiff.
      Revive app_tminterval for VMS.
      Revive app_tminterval for vxworks.
      Revive app_tminterval for Netware.
      First draft for WCE PortSDK support. Once again! It's *draft* which requires     more work, i.e. more modifications are due...
      Eliminate VC compiler warning.
      Address MASM-specific problems introduced with     http://cvs.openssl.org/chngview?cn=14547.
      Move declaration for optional bn_mul_mont to bn_lcl.h in order to hide     it from mkdef.pl.
      One of Win64 rules lacked bufferoverflowu.lib.
      Improve cross-compiler portability of applink.c module and mention     CRYPTO_malloc_init in FAQ.
      Tidying up WinCE support.
      Minor perlasm clean-up.
      AIX -blibpath is not accumulative, one apparently has to specify even     self-obvious /usr/lib:/lib.     PR: 1239
      Mention PROBLEMS in FAQ.
      Avoid end-less loop when libcrypto.a is manually deleted, but 'make clean'     was not executed. It doesn't excuse user from running 'make clean', it     simply avoids process table exhaustion.     PR: 1236     Submitted by: Michael Richardson
      Throw in comment so that one doesn't get tempted to optimize it away.
      Attempt to resolve sporadic SEGV crashes in bn_sub_words in OpenSSH. I'm     baffled why it crashes and does it sporadically...
      Apply "better safe than sorry" approach after addressing sporadic SEGV in     bn_sub_words to the rest of the sparcv8plus.S.
      Keep shutting up VC8.     PR: 1243
      Whirlpool hash implementation. The fact that subdirectory and .h file are     called whrlpool is not a typo, but a way to keep the names shorter than     8 characters. Remaining TODO list comprises adding OID, EVP, corresponding     flag to apps/openssl dgst, benchmark, engage assembler...
      Add missing Makefile and fix couple of typos in commentary.
      Remove development leftover from whrlpool/asm/wp-mmx.pl.
      Add Whirlpool OID.
      Fix typos in wp-mmx.pl.
      Adapt Whirlpool API for EVP.
      Add Whirlpool to EVP.
      Mention Whirlpool in dgst -help.
      Whirlpool for x86_64.
      x86cpuid.pl update.
      Couple other benchmark comparisons for wp-x86_64.pl.
      Fix typos in wp-mmx.pl.
      Support for indirect calls in x86 assembler modules.
      Initial draft for AES for UltraSPARC assembler.
      Revoke the option to share AES S-boxes between C and assembler. It wastes     space, but gives total flexibility [back].
      Engage AES for UltraSPARC in sparcv9 targets.
      Minor aes-sparcv9.pl optimization.
      Allow for bn(64,32) on LP64 platforms.
      Switch 64-bit sparcv9 platforms from bn(64,64) to bn(64,32). This doesn't     have impact on performance, because amount of multiplications does not     increase with this switch, not on sparcv9 that is. On the contrary, it     actually improves performance, because it spares a load of instructions     used to chase carries. Not to mention that BN assembler modules can be     shared more freely between 32- and 64-bit builts.
      Add IALU-only bn_mul_mont for SPARCv9. See commentary section for details.
      sparccpuid module update.
      To exclude contention for shared FPU on T1, trade 3% of DES performance.
      Eliminate warning induced by http://cvs.openssl.org/chngview?cn=14690 and     keep disclaiming narrower than 32-bit support.
      We all make typos:-) Fix just introduced ones in bn.h
      Mention bn(64,64) to bn(64,32) switch on 64-bit SPARCv9 targets in CHANGES.
      Allow for warning-free passing of -Wl options on config command line. One     possible usage is to pass -Wl,-z,-noexecstack on Linux to ensure the stack     is marked non-executable. Well, -Wa,--noexecstack works fine too...
      Make room for Whirlpool assembler in Configure.
      Engage Whirlpool assembler and mention Whirlpool in CHANGES.
      Make framework for Whirlpool assembler flexible.
      Unify sparcv9 assembler naming and build rules among 32- and 64-bit builds.     Engage run-time switch between bn_mul_mont_fpu and bn_mul_mont_int.
      Fix typos in osf1 shared rules.     PR: 1248     Submitted by: Nikola Milutinovic
      Make bio.h resistant to gnu-ish __attribute__ redefenitions.     PR: 1252
      Put back OPENSSL_SYS_MSDOS definition to revive DJGPP built.     PR: 1247
      Missing CFLAG in couple of depend: targets.     PR: 1247     Submitted by: Doug Kaufman
      Keep disclaiming 16-bit platform support. For now remove WIN16 references     from .h files...
      Typo in sparcv8cap.c.
      Eliminate possible mapping leak.
      As SPARCV9 CPU flavor is [expected to be] detected at run-time, we can     afford to relax SPARCV9/8+ compiler command line and produce "unversal"     binaries as we used to.
      Lower PADLOCK_CHUNK till value, which doesn't affect the benchmark results.     Well, it's even contrary, 512 was observed to *improve* performance by 5%.     Excuse ourselves from treating C7 specially.
      Minor sparcv9 clean-ups.
      Fix CFB and OFB modes in eng_padlock.c. Engine was consistent with itself,     but not interoperable with the rest of the world. test_padlock script is     added mostly for reference.
      Add DSO_global_lookup_func implementation. See commentary in dso_lib.c     for further details.
      Oops! Remove junk...
      Fix mapping "leak" in newly introduced win32_globallookup.
      util/mkerr.pl update to address various mkerr.pl problems [such as failure     to handle multi-line comments and endless loop while parsing overloaded     gnu-ish __attribute__].
      "Relax" prototype and rename DSO_global_lookup_func to DSO_global_lookup.
      Make b_sock.c IPv6 savvy.
      Typo in win32_globallookup.
      ./util update, which covers various issues, but most importantly mkerr.pl     and mkdef.pl spinning in endless loop.
      Fix typo and purify logic in b_sock.c
      Compile Windows with winsock2.h. But note that we still link with wsock32!     This works because wsock32 commonly loads ws2_32 anyway and we [intend to]     check upon presense of winsock2-specific API at run-time.
      Refine login in b_sock.c.
      SHA-1 for x86_64.
      Yet another "teaser" Montgomery multiplication module, for PowerPC.
      SHA1 for PowerPC.
      Typo in linux-ppc line.
      PPC assembler distiller update.
      Minor PPC assembler updates.
      Futher minor PPC assembler update.
      Tiny up hpux targets.
      Tune up AES CFB. Performance improvement varies from 10% to 50% from     platform to platform. Its absolute value is within few percents     marginal from that of ECB.
      Minor sha1-ppc.pl update.
      Add sha512-ppc.pl module.
      Minor ppc-xlate.pl update.
      Correct logical error in STRICT_ALIGNMENT check and remove copy of     eay licence, as module is practically rewritten from scratch [well,     even original submission was obviously "almost, but not quite,     entirely unlike" any other eay *_cfb.c module, not to mention new     functions].
      Reimplement AES_ofb128_encrypt.
      Sync aes.h with http://cvs.openssl.org/chngview?cn=15336.
      Fix obvious typo.
      Mitigate cache-collision timing attack on last round.
      Mitigate the hazard of cache-collision timing attack on last round. Well,     prefetch could have been moved closer to Td4 references. Something for     later consideration...
      Mitigate the hazard of cache-collision timing attack on last round. The     only chance for T[ed]4 to get evicted in this module is when its cache     "overlaps" with last 128 bits of key schedule.
      Prepare playground for AES experimental code.
      Typos(?) in HEAD/crypto/evp/p_lib.c.
      Unsigned vs signed comparison warning.
      Fix compiler warnings.
      Add option for "compact" rounds to aes_x86core.c. "Compact" rounds are     those referencing compact, 256-byte, S-boxes.
      Reimplement outer rounds as "compact" in x86 assembler. This has rather     strong impact on decrypt performance, 20-25%. One probably should consider     switching between slower and faster routines depending on how much data     we were asked to process.
      Next generation aes-586.pl featuring AES_[en|de]crypt, accessing exclusively     256 byte S-box. AES_cbc_encrypt needs further work as it should also use     slow routines when processing smaller amount of data.
      perlasm/x86unix.pl update.
      Engage assembler in solaris64-x86_64-cc.
      Real Bourne shell doesn't interpret ==, but =.
      Switch to compact S-box when generating AES key schedule.
      Switch to compact S-box when generating AES key schedule.
      Agressively prefetch S-box in SSE codepatch, relax alignment requirement,     check for SSE bit instead of MMX, as pshufw was introduces in PIII, minor     optimization, typos...
      Revised AES_cbc_encrypt in x86 assembler module.
      +20% tune-up for Power5.
      Fix bug in x86unix.pl introduced in latest update.     PR: 1380
      Fix bug in aes-586.pl.
      Rewrite sha1-586.pl.
      Improve 386 portability of aes-586.pl.
      Remove x86ms.pl and reimplement x86*.pl.
      As x86ms.pl is out, remove do_masm.bat and mention to it in INSTALL.W32.
      Race condition in ms/uplink.c.     PR: 1382
      Build error on non-unix.     PR: 1390
      Re-implement md32_common.h [make it simpler!] and eliminate code rendered     redundant as result.
      Linking errors on IA64 and typo in aes-ia64.S.
      Support for .asciz directive in perlasm modules.
      Synchronize SHA1 assembler with md32_common.h update.
      VIA-specific Montgomery multiplication routine.
      Further synchronizations with md32_common.h update.
      bn/asm/ppc.pl to use ppc-xlate.pl.
      Further synchronizations with md32_common.h update, consistent naming     for low-level SHA block routines.
      Typo in perlasm/x86asm.pl.
      Fix bug in big-endian path and optimize it for size.
      Temporary fix for sha256 IA64 assembler.
      Gcc over-optimizes PadLock AES CFB codepath, tell it not to.
      Avoid application relink on every make invocation.
      Align data payload for better performance.
      Rudimentary support for cross-compiling.
      Make c_rehash more platform neutral and make it work in mixed environment,     such as MSYS with "native" Win32 perl.
      Allow for mingw cross-compile configuration.
      Switch Win32/64 targets to Winsock2. Updates to ISNTALL.W32 cover even     recent mingw modifications.
      Fix mingw warnings.
      OPENSSL_ia32cap.pod update.
      Yet another mingw warning.
      Harmonize dll naming in mingw builds.
      Further mingw build procedure updates.
      Minor portability update to c_rehash.
      sha512-ppc.pl mutli-thread safety fix.
      Non-SSE2 path to bn_mul_mont. But it's disabled, because it currently     doesn't give performance improvement.
      This is "informational" commit. Its mere purpose is to expose "modulo     factor" in inner loops.
      Modulo-schedule loops in sparcv9a-mont.pl. Overall improvement factor     over 0.9.8 is up to 3x on USI&II cores and up to 80% - on USIII&IV.
      Minor optimizations based on intruction level profiler feedback.
      Clarify HAL SPARC64 support situation in sparcv9a-mont.pl.
      Camellia portability fixes.
      Fix bugs in Camellia CBC routine.
      Improve Camellia code readability.
      Eliminate redundant variable in Camellia CBC routine.
      Montgomery multiplication routine for Alpha.
      Minor, +10%, tune-up for x86_64-mont.pl.
      alpha-mont.pl: gcc portability fix and make-rule.
      Engage alpha-mont module. Actually verified on Tru64 only.
      Eliminate 64-bit alignment limitation in sparcv9a-mont.
      x86-mont.pl sse2 tune-up and integer-only squaring procedure.
      Make sha.h more "portable."
      Oops! New prototype code creeped through...
      Fix for "strange errors" exposed by ccgost engine. The fix is     two extra insructions in sqradd loop at line #503.
      Minor performance improvements to x86-mont.pl.
      Move eng_padlock.c to ./engines.
      Allow opensslwrap.sh to access engines from build tree.
      Minor clean-up in crypto/engine.
      Minor clean-up in crypto/bn/asm.
      Montgomery multiplication for MIPS III/IV. Not engaged.
      #include <stddef.h> in digest headers.
      opensslwrap.sh to respect $OPENSSL_ENGINES.
      Montgomery multiplication for ARMv4.
      Make armv4t-mont module backward binary compatible with armv4 and rename it     accordingly.
      SHA1 for ARMv4 and Thumb.
      Minor optimization for sha1-armv4 module.
      AES for ARMv4.
      Minor touch to aes-armv4.pl.
      Minimize aes_core.c footprint when AES_[en|de]crypt is implemented in     assembler.
      sparcv9a-mont was modified to handle 32-bit aligned input, but check     for 64-bit alignment was not removed.
      nasm fixes.
      Various PowerPC config updates.
      Remove obsolete comment.
      Two extra instructions in RC4 character loop give 80% performance     improvement on Core2. I still need to detect Core2 and choose this     path...
      link warnings caused by nasm modules.
      Fixes for aix-shared rules.
      aix[64]-cc config lines update.
      Allow shared builds for aix[64]-gcc targets.
      Reserve for assembler implementation of RC4_set_key and implement x86 one.
      Update x86cpuid.pl to correctly detect shared cache and to support new     RC4_set_key.
      RC4_set_key for x86_64 and Core2 optimization.     PR: 1447
      Reimplement rc4-586.pl, relicense rc4-x86_64.pl.
      s390x assembler pack.
      Engage s390x assembler modules.
      s390x optimizations.
      Bug in apps/dgst.c.
      Typo in s390x_asm.
      Typo in commit #16187.
      rll does not seem to be available on legacy s390.
      Revert irrelevant changes from commit #16191.
      Fix s390x bugs and correct performance coefficients.
      Fine reading of manual suggests that km can return non-normal completion code.
      Fix bug introduced in cn#16195.
      SHA for sparcv9.
      Engage SHA for sparcv9.
      Detect UltraSPARC T1 in ./config.
      Commentary updates to SHA for sparcv9.
      Mention Core2 in sha1-x86_64.
      Make sha*-ia64 modules alignment neutral.
      As all assembler modules are alignment neutral, allow C to pass unaligned     content.
      x86_64 assembler updates.
      Profiling revealed that OPENSSL_cleanse consumes *more* CPU time than     sha1_block_data_order when hashing short messages. Move OPENSSL_cleanse     to "cpuid" assembler module and gain 2x.
      Add alphacpuid.s
      Fix linking error after adding alphacpuid.s.
      Throw in ppccpuid module.
      Initial draft of AES for PPC.
      sparccpuid.s update.
      ppc-xlate.pl update.
      x86cpuid fixes.     PR: 1526
      Typo in x509_txt.c.
      --enable-auto-image-base in cygwin build.     PR: 1517     Submitted by: vinschen at redhat.com
      Typo in aes-ppc.pl.
      Padlock engine fails to compile with -O0 -fPIC.
      OPENSSL_IMPLEMENT_GLOBAL caused more grief than it's worth (it's used twice     in legacy code). I'd rather just remove it along with legacy interface,     but it's probably not as appropriate as I'd like. Reimplement the macro.
      SHA256 for ARMv4.
      AES_set_[en|de]crypt_key for s390x.
      s390x gas can't handle .align 128.
      AES_set_[en|de]crypt_key for ARMv4.
      Eliminate conditional final subtraction in Montgomery multiplication.
      Commentary updates and minor optimization for bn_mont.c.
      Privatize BN_*_no_branch.
      Eliminate conditional final subtraction in Montgomery assembler modules.
      SPARC Solaris and Linux assemblers treat .align directive differently.     PR: 1547
      Make some shortcuts in sparcv9cap.c. Trouble is that di_walk_node result     is inconsistent among CPU generations.
      Typo in Linux part of sparcv9cap.c     PR: 1532
      bn_asm for s390x.
      Optimize OPENSSL_cleanse.
      CHANGES update from 098-stable.
      Typo in x86_64-mont.pl.     PR: 1549
      Flush output in x86_64cpuid.pl.
      Latest bn_mont.c modification broke ECDSA test. I've got math wrong, which     is fixed now.
      Fix build problem on Tru64.
      Typo in str_lib.c     PR: 1177
      bn_mul_recursive doesn't handle all cases correctly, which results in     BN_mul failures at certain key-length mixes.     PR: 1427
      EVP_*_cfb1 was broken.     PR: 1318
      Add _x86_64_AES_[en|de]crypt_compact.
      Various minor updates to AES assembler modules.
      gas -g doesn't tolerate unpadded .bytes in code segment.
      shlib_wrap.sh update.
      _x86_64_AES_[en|de]crypt_compact: size optimization and aggressive     T[ed]4 prefetch.
      Minor optimization in AES_set_encryption_key for x86_64.
      Lppc_AES_[en|de]crypt_compact: size optimization.
      Complete synchronization of aes-x86_64 with aes-586.
      x86*cpuid update.
      md32_common.h update.
      Allow for option to skip hardware support.
      Configure update from 098.
      x86 perlasm updates.
      ia64cpuid update.
      AES for IA64 update.
      Respect ISO aliasing rules.     PR: 1296
      Make ppccpuid AIX friendly.
      As for inline vs. __inline. The original code implies that most compilers     understand inline, while WIN32 ones insist on __inline. Well, there are     other compilers that insist on __inline. At the same time it turned out     that most compilers understand both __inline and inline. I could find     only one that doesn't understand __inline, Sun C. In other words it seems     that __inline as preferred choice provides better coverage...
      Make preprocessor logic more fail-safe.
      Buglet fixes and minor optimization in aes-x86_86 assembler.
      Typo in ppccpuid.pl.
      Proper support for shared build under MacOS X.
      MacOS X update.
      Typos in ./config.     PR: 1563
      Workaround MSVC6 compiler bug.
      Make x86_64 modules work under Win64/x64.
      IRIX and Tru64 platform updates.
      shlib_wrap update, IRIX section.
      shlib_wrap commentary update.
      Make room for Camellia assembler.
      Make naming more consistent.
      Improve cache locality in linux64-sparcv9.
      aes_ige suffered SIGBUS on RISC platforms.
      Add darwin64-x86_64-cc target.
      Unify RC4 settings among darwin platforms.
      Compress and more aggressively constify ec_curve.c [the latter is     achieved by minimizing link relocations].
      Offer darwin64-x86_64-cc as option.
      Constify seed and md2.
      Add sha512_block implementation optimized for small register bank.     On x86 it gives same performance, while code size shrinks >10 times.
      SHA256/512 for x86.
      SHA512 for ARMv4.
      Commentary updates.
      More Intel cc fix-ups.
      Engage new x86 assembler modules.
      Remove sha512-sse2.pl.
      Make bn2dec work on "SIXTY_FOUR_BIT" platforms.     PR: 1456
      BSD run-time linkers apparently demand RPATH on .so objects.     PR: 1381
      Minor fix in link_[oa].hpux.
      It's inappropraite to override application signal, nor is it appropriate     to shut down Winsock unless we know it won't be used [and we never do].     PR: 1439
      Minor sha[256|512]-586 performance tweaks.
      Remove pq_compat.h.
      Mention SHA2 in openssl.pod.     PR: 1575
      Mention aes in enc.pod.     PR: 1529
      Remove excessive whitespaces from bio.h
      Minimize stack utilization in probable_prime.
      Eliminate redundant make rule.
      Wire DES weak_keys to read-only segment.
      Constify obj_dat.[ch], as well as minimize linker relocations.
      Wire RC4 key_table to read-only segment.
      Minor formatting fixes in crypto/sha/asm.
      Addenum to "Constify obj_dat.[ch]."
      Fix indentation in d1_both.c.
      Clarify commentary in sha512-sparcv9.pl.
      Make sha512-armv4.pl byte-order neutral.
      10% performance tweak in 64-bit mode.
      ARMv4 assembler pack.
      Minor ARMv4 update.
      Move -march=armv4t to ./config.
      Yet another ARM update. It appears to be more appropriate to make     developers responsible for -march choice.
      Switch to RFC-compliant version encoding in DTLS.
      DTLS RFC4347 requires client to use rame random field in reply to     HelloVerifyRequest.
      DTLS RFC4347 says HelloVerifyRequest resets Finished MAC.
      Make ChangeCipherSpec compliant with DTLS RFC4347.
      Basic idea behind explicit IV is to make it unpredictable for attacker.     Until now it was xor between CBC residue and 1st block from last datagram,     or in other words still predictable.
      Oops! This was erroneously left out commit #16632.
      Switch to bn-s390x (it's faster on keys longer than 512 bits) and mention     s390x assembler pack in CHANAGES.
      Prohibit RC4 in DTLS.
      Make it possible to link VC static lib with either /MT or /MD application.     PR: 1230
      Addendum to commit #16651.
      size_t-fy crypto/buffer.
      Addendum to commit #16654.
      Make DTLS1 record layer MAC calculation RFC compliant.
      Respect cookie length set by app_gen_cookie_cb.
      Synchronize CHANGES between 0.9.8 and HEAD.
      DTLS fixes from 0.9.8-stable.
      Fix warnings in d1_both.c [from 0.9.8-stable].
      Bunch of constifications.
      Make ssl compile [from 098-stable, bug is masked by default].
      Don't let DTLS ChangeCipherSpec increment handshake sequence number.     PR: 1587
      Commit #16325 fixed one thing but broke DH with certain moduli.
      Combat [bogus] relocations in some assember modules.
      Synchronize x86nasm.pl with x86unix.pl.
      Structure symbol decorations, optimize label handling...
      Some assembler are allergic to lea reg,BYTE PTR[...].
      gmp engine was non-operational.
      x86 perlasm overhaul.
      Disable support for Metrowerks assembler. Assembler itself is broken,     specifically it incorrectly encodes EA offsets between 128 and 255.
      Mac OS X x86 assembler support.
      Engage x86 assembler in Mac OS X build.
      Source readability fix, which incidentally works around XLC compiler bug.
      ppc-xlate.pl update.
      New Montgomery multiplication module, ppc64-mont.pl. Reference, non-optimized     implementation. This is essentially informational commit.
      This is also informational commit exposing loop modulo scheduling "factor."
      Final (for this commit series) optimized version and with commentary section.
      perlasm/x86*.pl updates.
      NASM has recently changed name of win32 pre-compiled binary.     PR: 1627
      x86gas.pl update.
      Last dso_dlfcn.c check-in said "Use Dl_info only on systems where it is     known to exist. It does not exist on AIX 4.3.3, AIX 5.1, SCO 5, or Cygwin"     and disabled it on banch of systems it's known to exists, such as FreeBSD,     Solaris, 64-bit HP-UX, MacOS X. Get it straight.
      Make AES_T[ed] private to aes-586 module.
      Make aes-x86_64 work with debug Win64 build.
      engine/ccgost Win32 portability fixes.
      Compensate for BSDi shell bug.
      Cygwin compatibility fix to apps/ocsp.c.
      Fix unsigned/signed warnings in ssl.
      Automate assembler support in mk1mf even further.
      Unify x86 perlasm make rules.
      rc4-x86_64 portability fix.
      Make all x86_64 modules independent on current working directory.
      Allow to specify filename on sha1-ia64.pl command line.
      Automate assembler support for Win64 targets (more work is needed).
      Unify ppc assembler make rules.
      crypto/rc5/Makefile was erroneously omitted from last perlasm unification.     Also remove obsolete and now misleading comments.
      rc5/asm/rc5-586.pl was erroneously omitted from last perlasm unification.
      ppc64-mont optimization.
      Micro-profiling assisted "optimization" for Power6. Essentially it's so     to say educational commit. Reordering instructions doesn't improve     performance much, rather exhibits Power6 limitations.
      Ad-hockery for Platform SDK ml64.
      Support for NASM>=2 in Win64/x64 build.
      Make x86_64-mont.pl work with debug Win64 build.
      Fix fast reduction on NIST curves (as well BN_NIST_ADD_ONE macro).     PR: 1593
      Do BN_nist_mod_384 by the book, as cheating doesn't work. Other functions     will be revised too.     PR: 1593
      Clarifying comment.
      Fix remaining BN_nist_mod_*.     PR: 1593
      Resolve __DECC warning and keep disclaiming support for 16-bit platforms.
      Takanori Yanagisawa has shown how to correctly use pre-computed values.     So in a sense this commit reverts few latest ones fixing bugs in original     code and improving it, most notably adding 64-bit support [though not in     BN_nist_mod_224 yet].     PR: 1593
      Compensate inline assembler in sha512.c for gcc 2.7.2 compiler bug.     PR: 1667
      Add 64-bit support to BN_nist_mod_244 and engage BN_nist_mod_* on 64-bit     platforms.
      Depict future Win64/x64 development.
      Reaffirm that NASM is the only supported assembler for Win32 build.
      x86nasm.pl update: use pre-defined macros and allow for /safeseh link.
      x86masm.pl cosmetics.
      des-596.pl update: short-circuit reference to DES_SPtrans.
      x86_64cpuid.pl cosmetics: harmonize $dir treatment with other modules.
      x86masm.pl: harmonize functions' alignment.
      Remove junk argument to function_begin in sha/asm/*-586.pl.     PR: 1681
      mem_dbg.c: avoid compiler warnings.     PR: 1693     Submitted by: Stefan Neis
      x86_64-xlate.pl: implement indirect jump/calls, support for Win64 SEH.
      perlasm update: implement dataseg directive.
      Split ms/uplink.pl to corresponding platform versions.
      sha1-armv4-large.pl performance improvement. On PXA255 it gives +10% on     8KB block, +60% on 1KB, +160% on 256B...
      sha1-armv4-large cosmetics.
      AIX build updates.
      DTLS didn't handle alerts correctly.     PR: 1632
      dtls1_write_bytes consumers expect amount of bytes written per call, not     overall.     PR: 1604
      Winsock handles SO_RCVTIMEO in unique manner...     PR: 1648
      Fix yesterday typos in bss_dgram.c.
      Fix EC_KEY_check_key.
      Remove redundant BN_ucmp, fix boundary condition in BN_nist_mod_224 and     reimplement BN_nist_mod_521.
      Optimize bn_correct_top.
      Fix argument order in BN_nnmod call and implement rigorous boundary     condition check.
      x86_64-xlate.pl update: refine SEH support.
      Camellia update. Quoting camellia.c:
      Harmonize Camellia API with version 1.x.
      Fix crash in BN_rshift.     PR: 1663
      Minor clean-up in bn_lib.c: constification and optimization.
      ec2_mult.c readability update.
      Fix typo in ./config.
      .cvsignore update: ignore all flavors of shared objects.
      randfile.c: .rnd can become orphaned on VMS.
      size_t-fy AES, Camellia and RC4.
      size_t-fy EVP_CIPHER. Note that being size_t-fied it doesn't require     underlying cipher to be size_t-fied, it allows for size_t, signed and     unsigned long. It maintains source and even binary compatibility.
      Fix warnings after commit#17578.
      Fix SHA512 and optimize BN for mingw64.
      Fix bss_log.c on Windows.
      Minor perlasm updates.
      Add initial support for mingw64.     PR: 1693     Submitted by: Alon Bar-Lev
      Revert commit #17603, it should have been part of #17617.
      x86_64-xlate.pl to support MacOS X and mingw64.
      x86_64 assembler pack to comply with updated styling x86_64-xlate.pl rules.
      Update make rules for x86_64 assembler pack.
      Configure update: clean-ups and most notably engage x86_64 assembler     on MacOS X.
      x86_64-xlate.pl update, engage x86_64 assembler in mingw64.
      Add Camellia assembler x86 and x86_64 modules.
      no-asm didn't exclude Camellia assembler.
      Bring C bn_mul_mont template closer to assembler.
      SEED to support OPENSSL_SMALL_FOOTPRINT: ~2x size decrease on x86.
      128-bit block cipher modes consolidation. As consolidated functions     rely on indirect call to block functions, they are not as fast as     non-consolidated routines. However, performance loss(*) is within     measurement error and consolidation advantages are considered to     outweigh it.
      SEGV in AES_cbc_encrypt in aes-x86_64 assembler module.     PR: 1801     Submitted by: Huang Ying
      perlasm/x86* update: support for 3 and 4 argument instructions.
      x86_64-xlate.pl: fix masm hexadecimal constants.
      x86_64 assembler pack: add support for Win64 SEH.
      cmll-x86_64.pl: bug fix and size optimization of Win64 SEH section.
      make depend to work with cross-gcc, compensate for msys glitch.     PR: 1753     Submitted by: Alon Bar-Lev
      This _WIN32-specific patch makes it possible to "wrap" OpenSSL in another     .DLL, in particular static build. The issue has been discussed in RT#1230     and later on openssl-dev, and mutually exclusive approaches were suggested.     This completes compromise solution suggested in RT#1230.     PR: 1230
      Incidentally http://cvs.openssl.org/chngview?cn=17710 also made it possible     to build the library without -D_CRT_NONSTDC_NO_DEPRECATE. This commit     expands it even to apps catalog and actually omits the macro in question     from Configure.
      Optimize #undef DES_UNROLL for size.
      cmll-x86_64.pl: Win64 SEH section to handle pushf/popf in CBC routine.
      Optimize CAST for size on 64-bit platforms. For reference, CAST_LONG being     unsigned long must be attributed to 16-bit support. As we don't support     16-bit platoforms anymore, there is no reason to waste twice required     space on CAST S-boxes (16KB vs. 8KB) or key schedule.
      crypto/modes: make modes.h selfsufficient and rename block_f to block128_t.
      Engage crypto/modes.
      Patch the omission from prvious commit #17716.
      Windows-specific addenum to "engage crypto/modes" commit #17716.
      Revisit RT#1801 and complete fix.
      cmll-x86_64.pl: fix bug in cbc tail processing and comply with Win64 ABI spec.
      Add modes/cts128.c, Ciphertext Stealing implementation.
      x86_64-xlate.pl: support for binary constants, such as 0b1010101.
      Fix "possible loss of data" Win64 compiler warnings.
      bn_lib.c: [re-]fix Win64 compiler warning.
      Styling update to makefiles: $() to denote make substitutions and $${} -     shell ones.
      Styling update to makefiles: eliminate redundant pipes.
      Makefile.shared: improve portability of commit#17753.
      Add UltraSPARC VIS-powered SHA1 block procedure.
      Reserve for "multilib" suffix, the one allowing to perform multi-ABI     installations. It's not enabled in Makefiles yet.
      s390x assembler pack update.
      sha1-sparcv9a.pl: fix bug in commentary section.
      linux-s390x failed link after assembler pack update.
      s390x-mont.pl: optimize prologue.
      RC4 for s390x.
      rc4-s390x.pl: allow for older assembler and optimize character loop.
      Make SPARC assembler Pirify-friendly (Purify can't cope with certain     PIC constructs).
      Excuse myself from integrating sha1-sparcv9a.pl into build system, but     make it Purify-friendly...
      Make SPARC assembler modules *really* Purify-friendly.
      aes-390x.pl: commentary update.
      Camellia update: make it respect NO_[INLINE_]ASM and typo in assembler.
      Expand OPENSS_ia32cap to 64 bits.
      Handle push/pop %rbx in epi/prologue (this is Win64 SEH thing).
      AESNI perlasm update.
      Addenum to commit#18074: Expand OPENSSL_ia32cap to 64 bits.
      Engage nasm optimizations in Win64 build.
      Improve readability of bio/b_sock.c
      Minor shaX-s390x.pl update.
      e_padlock: add support for x86_64 gcc.
      Intel AES-NI engine.
      aesni-x86.pl: fix typos.
      aesni-x86.pl: fix another typo and add test script.
      Update test/test_padlock script.
      v3_alt.c: otherName parsing fix.
      AES-NI engine jumbo update.
      aesni-x86_64.pl: resolve LNK1223 error.
      eng_aesni.c: fix assembler declarations.
      ec_mult.c: fix C4334 win64 compiler warning.
      cryptlib.c: eliminate dependency on _strtoui64, older Windows CRT don't have it.
      Engage cmll-x86_64.pl in Win64 build and make it compile correctly.
      eng_aesni.c: win32 fix.
      Make CAPI engine UNICODE aware (it didn't work on Win64).
      Make it possible to compile CAPI engine under mingw64.
      Avoid double dialogs in OpenSSLDie on Windows.
      libeay.num: add ENGINE_load_aesni.
      cryptlib.c: refine logic in OpenSSLDie (addenum to commit#18118).
      e_padlock.c: fix typo (missing #endif) and switch to __builtin_alloca     (with introduction of 64-bit support alloca must be  declared and there     is no standard way of doing that, switching to __bultin_alloca is     considered appropriate because code explicitly targets gcc anyway).
      x86_64-xlate.pl: small commentary update.
      x86_64cpuid.pl: refine shared cache detection logic.
      x86cpuid.pl: sync OPENSSL_ia32_cpuid with x86_64cpuid.pl.
      x86[_64]cpuid.pl: further refine shared cache detection.
      sha1-x86* assembler update: F_40_59 and Atom-specific optimizations.
      cmll-x86_64.pl: small buglet in CBC subroutine.     PR: 2035
      Combat gcc 4.4.1 aliasing rules.
      aesni-x86.pl: eliminate development comments.
      b_sock.c: fix compiler warning.
      bss_dgram.c: more elegant solution to PR#2069. Use socklen_t heuristic     from b_sock.c, don't assume that caller always passes pointer to buffer     large enough to hold sockaddr_storage.     PR: 2069
      x86masm.pl: eliminate linker "multiple sections found with different     attributes" warning.
      x86_64-xlate.pl: new gas requires sign extention in lea instruction.     This resolves md5-x86_64.pl and sha1-x86_64.pl bugs, but without modifying     the code.     PR: 2094,2095
      sha512.c: there apparently is ILP32 PowerPC platform, where it is safe to     inline 64-bit assembler instructions. Normally it's inappropriate, because     signalling doesn't preserve upper halves of general purpose registers.     Meaning that it's only safe if signals are blocked for the time "wide"     code executes.     PR: 1998
      SHA1 assembler show off: minor performance updates and new modules for     forgotten CPUs.
      Add sha512-parisc.pl.
      OPENSSL_ia32cap.pod update.
      util/pl/VC-32.pl: bufferoverflowu.lib only when actually needed and     eliminate duplicate code.     PR: 2086
      cms-test.pl: use EXE_EXT.     PR: 2107
      bss_dgram.c: re-fix BIO_CTRL_DGRAM_GET_PEER.     PR: 2110
      ppc64-mont.pl: adapt for 32-bit and engage for all builds.
      ppccap.c: tidy up.     ppc64-mont.pl: missing predicate in commentary.
      Switch to new uplink assembler.
      Throw in more PA-RISC assembler.
      Update sha512-parisc.pl and add make rules.
      PA-RISC assembler: missing symbol and typos.
      Deploy multilib config-line parameter. It was added in February to allow     for kind of installation suggested in ticket #2003 from August. What it     effectively does now, is arrange pre-configured default $libdir value.     Note that it also fixes ENGINESDIR, i.e. harmonizes it with install path.
      ppccap.c: fix compiler warning and perform sanity check outside signal masking.     ppc64-mont.pl: clarify comment and fix spelling.
      Adapt mingw config for newer mingw environment. Note modified conditional     compilation in e_capi.c.     PR: 2113
      b_sock.c: correct indirect calls on WinSock platforms.     PR: 2130     Submitted by: Eugeny Gostyukhin
      Add Montgomery multiplication module for IA-64.
      ppc64-mont.pl: commentary update.
      Fix compilation on older Linux. Linux didn't always have sockaddr_storage,     not to mention that first sockaddr_storage had __ss_family, not ss_family.     In other words it makes more sense to avoid sockaddr_storage...
      sendto is reportedly picky about destination socket address length.     PR: 2114     Submitted by: Robin Seggelmann
      http://cvs.openssl.org/chngview?cn=19053 made me wonder if bind() and     connect() are as finicky as sendto() when it comes to socket address     length. As it turned out they are, therefore the fix. Note that you     can't reproduce the problem on Linux, it was failing on Solaris,     FreeBSD, most likely on more...
      ia64-mont.pl: addp4 is not needed when referring to stack (this is 32-bit     HP-UX thing).
      ia64-mont.pl: add shorter vector support ("shorter" refers to 512 bits and     less).
      bn_lcl.h: add MIPS III-specific BN_UMULT_LOHI as alternative to porting     crypto/bn/asm/mips3.s from IRIX. Performance improvement is not as     impressive as with complete assembler, but still... it's almost 2.5x     [on R5000].
      Minor updates to ppccap.c and ppccpuid.pl.
      apps/speed.c: limit loop counters to 2^31 in order to avoid overflows     in performance calculations. For the moment there is only one code     fast enough to suffer from this: Intel AES-NI engine.     PR: 2096
      s390x assembler update: add support for run-time facility detection.
      rand_win.c: handle GetTickCount wrap-around.
      x86_64-xlate.pl: refine sign extension logic when handling lea.     PR: 2094,2095
      Enable PA-RISC assembler in Configure (feedback from PA-RISC 2.0 is still     needed).
      rand_win.c: fix time limit logic.
      OPENSSL_cleanse to accept zero length parameter [matching C implementation].
      pariscid.pl: OPENSSL_cleanse to compile on PA-RISC 2.0W and to accept zero     length parameter.
      ia64cpuid.S: OPENSSL_cleanse to accept zero length parameter.
      parisc-mont.pl: PA-RISC 2.0 code path optimization based on intruction-     level profiling data resulted in almost 50% performance improvement.     PA-RISC 1.1 is also reordered in same manner, mostly to be consistent,     as no gain was observed, not on PA-7100LC.
      Add assigned OIDs, as well as "anonymous" ones for AES counter mode.
      Add AES counter mode to EVP.
      Reserve for option to implement AES counter in assembler.
      Fix s390x-specific HOST_l2c|c2l.
      ppccap.c: portability fix.
      Initial version of Galois Counter Mode implementation. Interface is still     subject to change...
      gcm128.c: add option for streamed GHASH, simple benchmark, minor naming     change.
      Add GHASH x86 assembler.
      Add GHASH x86_64 assembler.
      ghash-ia64.pl: new file, GHASH for Itanium.     ghash-x86_64.pl: minimize stack frame usage.     ghash-x86.pl: modulo-scheduling MMX loop in respect to input vector     results in up to 10% performance improvement.
      Fix UPLINK typo.
      e_capi.c: fix typo.
      GHASH assembler: new ghash-sparcv9.pl module and saner descriptions.
      bss_file.c: fix MSC 6.0 warning.
      rand_win.c: fix logical bug in readscreen.
      dso_dlfcn.c: fix compile failure on Tru64.
      ARMv4 assembler: fix compilation failure. Fix is actually unconfirmed, but     I can't think of any other cause for failure
      cryptlib.c: allow application to override OPENSSL_isservice.     PR: 2194
      alpha-mont.pl: comply with stack alignment requirements.
      sparccpuid.S: some assembler is allergic to apostrophes in comments.
      sha1-alpha.pl: engage it in build.
      Add ghash-alpha.pl assembler module.
      ctr129.c: fix typo, simplify ctr128_inc and fix "n=0" bug.
      sha1-alpha.pl: addenum till commit #19547.
      perlasm/x86*: add support to SSE>2 and pclmulqdq. x86_64-xlate.pl provides     correct solution to problem addressed in committ #19244.
      AESNI engine: add counter mode.
      cts128.c: add support for NIST "Ciphertext Stealing" proposal.
      gcm128.c: commentary and formatting updates.
      AESNI engine: update test_aesni.
      aes-ppc.pl: 10% performance improvement on Power6.
      [co]fb128.c: fix "n=0" bug.
      gcm128.c and assembler modules: change argument order for gcm_ghash_4bit.     ghash-x86*.pl: fix performance numbers for Core2, as it turned out     previous ones were "tainted" by variable clock frequency.
      x86_64cpuid.pl: ml64 is allergic to db on label line.
      md5-ia64.S: fix assembler warning.
      bss_file.c: reserve for option to encode file name with UTF-8.
      Take gcm128.c and ghash assembler modules into the build loop.
      Add ghash-parisc.pl.
      bss_file.c: refine UTF-8 logic on Windows.
      Add ghash-armv4.pl.
      "Jumbo" update for crypto/modes:     - introduce common modes_lcl.h;     - ctr128.c: implement additional CRYPTO_ctr128_encrypt_ctr32 interface;     - gcm128.c: add omitted ARM initialization, remove ctx.ctr;
      Revert previous Linux-specific/centric commit#19629. If it really has to     be done, it's definitely not the way to do it. So far answer to the     question was to ./config -Wa,--noexecstack (adopted by RedHat).
      x86_64-xlate.pl: refine some regexp's and add support for OWORD/QWORD PTR.
      x86asm.pl: consistency imrovements.
      GCM "jumbo" update:     - gcm128.c: support for Intel PCLMULQDQ, readability improvements;     - asm/ghash-x86.pl: splitted vanilla, MMX, PCLMULQDQ subroutines;     - asm/ghash-x86_64.pl: add PCLMULQDQ implementations.
      ghash-x86[_64].pl: add due credit.
      rc4-x86_64.pl: "Westmere" optimization.
      gcm128.c: commentary update.
      ghash-x86.pl: MMX optimization (+20-40%) and commentary update.
      gcm128.c: P.-M. Hager has tipped about possibility to fold reductions     in gcm_ghash_4bit. Taking the idea a step further I've added extra     256+16 bytes of per-key storage, so that one can speak about 3rd variant     in addition to "256B" and "4KB": "528B" one. Commonly it should be     ~50% faster than "256B" implementation or ~25% slower than "4KB" one.
      Configure: update mingw config-lines.
      x86_64-xlate.pl: refine mingw support and regexps, update commentary.
      VC-32.pl: unconditionally generate symbols.pdb.
      x86 perlasm: add support for 16-bit values.
      ghash-x86.pl: "528B" variant of gcm_ghash_4bit_mmx gives 20-40%     improvement.
      ghash-x86.pl: commentary updates.
      ghash-x86_64.pl: "528B" variant delivers further >30% improvement.
      VC-32.pl: fix /Fd name generation.     PR: 2284
      SPARCv9 assembler pack: refine CPU detection on Linux, fix for "unaligned     opcodes detected in executable segment" error.
      crypto/sparc*: eliminate _sparcv9_rdwrasi.
      ghash-sparcv9.pl: fix Makefile rule and add performance data for T1.
      ghash-armv4.pl: excuse myself from implementing "528B" flavour.
      sparcv9cap.c: reiterate CPU detection logic.
      PROBLEMS: MacOS X is not necessarily a problem anymore.
      rand_nw.c: compensate for gcc bug (using %edx instead of %eax at -O3).     PR: 2296
      crypto/*/Makefile: unify "catch-all" assembler make rules and harmonize     ARM assembler modules.
      armv4-mont.pl: addenum to previous commit#19749.
      Harmonize s390x assembler modules with "catch-all" rules from commit#19749.
      Rework framework for assembler support for AES counter mode and add     AES_ctr32_encrypt to aes-s390x.pl.
      gcm128.c: API modification and readability improvements,     add ghash benchmark to apps/speed.c.
      INSTALL.W32: mention _OPENSSL_isservice().     PR: 2194
      Configure: fix aes_ctr.o regexp.
      ARM assembler pack: reschedule instructions for dual-issue pipeline.     Modest improvement coefficients mean that code already had some     parallelism and there was not very much room for improvement. Special     thanks to Ted Krovetz for benchmarking the code with such patience.
      sha1-armv4-large.pl: add performance data for Cortex A8 core.
      aes-s390x.pl: revisit buffer allocation and add performance data.
      Makefile.shared: update link_o.dawrin rule.     PR: 2306
      Makefile.shared: debugging line slipped through in previous commit.
      Configure: suppress $multilib with non-system $prefix.     PR: 2307
      Makefile.shared: link_o.darwin comment update.
      aesni-x86[_64].pl: fine-tune, add CCM subroutine, add performance data.
      perlasm/x86asm.pl: move aesni and pclmulqdq opcodes to aesni-x86.pl and     ghash-x86.pl.
      aesni-x86_64.pl: fix typos.
      perlasm/x86_64-xlate.pl: extend SSE>2 to ml64.
      aes-x86_64.pl: remove redundant instructions.
      eng_aesni.c: switch to CRYPTO_ctr128_encrypt_ctr32.
      modes/Makefile: update clean rule.
      ghash-ia64.pl: excuse myself from implementing "528B" variant.
      rc4-s390x.pl: harmonize build rule with other similar rules.
      sha1-alpha.pl: commentary update.
      ms/: update do_win64*.bat and remove redundant mingw32.bat.
      Replace alphacpuid.s with alphacpuid.pl to ensure it makes to release tar-balls.     PR: 2309
      aes-x86_64.pl: commit#19797 was overzealous, partially reverse.
      alphacpuid.pl: fix brown-bag bug.
      md32_common.h: modify MD32_REG_T pre-processing logic [triggered by clang].
      gcm128.c: add CRYPTO_gcm128_[en|de]crypt_ctr32.
      rc5_locl.h: make inline assembler clang-friendly.
      sha1-armv4-large.pl: reschedule instructions for dual-issue pipeline.
      crypto/modes/Makefile: fix typo in ghash-parisc.s rule.
      Makefile.share: fix brown-bag typo in link_o.darwin.
      gcm128.c: fix typo in CRYPTO_gcm128_encrypt_ctr32 name.
      engine/Makefile: harmonize engine install rule for .dylib extension on MacOS X.     PR: 2319
      util/cygwin.sh: maintainer's update.
      sparcv9cap.c: disengange Solaris-specific CPU detection routine in favour     of unified procedure relying on SIGILL.     PR: 2321
      ghash-ia64.pl: 50% performance improvement of gcm_ghash_4bit.
      modes/asm/ghash-*.pl: switch to [more reproducible] performance results     collected with 'apps/openssl speed ghash'.
      Add ghash-s390x.pl.
      crypto/bn/asm/s390x.S: drop redundant instructions.
      crypto/ppc[cpuid|cap]: call CPU detection once and detect AltiVec.
      Configure: remove redundant -DMD32_REG_T=int.
      sha1-armv4-large.pl: more readable input pickup.
      Alpha assembler pack: adapt for Linux.     PR: 2335
      VC-32.pl: default to nasm if neither nasm or nasmw is is found at the moment.     PR: 2338
      s390x assembler pack: extend OPENSSL_s390xcap_P to 128 bits.
      ghash-s390x.pl: reschedule instructions for better performance.
      sha1-mips.pl, mips-mont.pl: unify MIPS assembler modules in respect to     ABI and binutils.
      Add unified mips.pl, which will replace mips3.s.
      MIPS assembler pack: enable it in Configure, add SHA2 module, fix make rules,     update commentary...
      sha512-mips.pl: add missing byte swap for little-endians.
      x86_64-xlate.pl: fix LNK4078 and LNK4210 link warnings.     PR 2356
      sha512-mips.pl: fix "little-endian" typos.
      Add aes-mips.pl assembler module.
      sha512-mips.pl: add missing 64-bit byte swap.
      Configure: update mips[32|64]_asm lines.
      s390x.S: fix typo in bn_mul_words.     PR: 2380
      INSTALL.W32: document trouble with symlinks under MSYS.     PR: 2377
      s390x assembler pack: adapt for -m31 build, see commentary in Configure     for more details.
      TABLE update.
      Configure: make -mno-cygwin optional on mingw platforms.     PR: 2381
      bss_file.c: refine UTF8 logic.     PR: 2382
      apps/x590.c: harmonize usage of STDout and out_err.     PR: 2323
      e_capi.c: change from ANSI to TCHAR domain. This makes it compilable on     Windows CE/Mobile, yet keeps it normal Windows loop.     PR: 2350
      e_capi.c: rearrange #include-s to improve portability.     PR: 2394
      gcm128.c: fix bug in OPENSSL_SMALL_FOOTPRINT decrypt.     PR: 2432     Submitted by: Michael Heyman
      gcm128.c: allow multiple calls to CRYPTO_gcm128_aad.
      gcm128.c: add boundary condition checks.
      ccm128.c: initial draft.
      ccm128.c: initialize ctx->block (what I was smoking?).
      xts128.c: initial draft.
      x86gas.pl: make data_short work on legacy systems.
      gcm128.c: make it work with no-sse2.
      Configure: engage assembler in Android target.
      dso_dlfcn.c: make it work on Tru64 4.0.     PR: 2316
      s390x assembler pack: tune-up and support for new z196 hardware.
      xts128.c: minor optimization.
      ghash-x86.pl: optimize for Sandy Bridge.
      ia64-mont.pl: optimize short-key performance.
      gcm128.c: tidy up, minor optimization, rearrange gcm128_context.
      ARM assembler pack: profiler-assisted optimizations and NEON support.
      ARM assembler pack: add missing arm_arch.h.
      gcm128.c: fix shadow warnings.
      ccm128.c: minor optimization and bugfix in CRYPTO_ccm128_[en|de]crypt.
      Multiple assembler packs: add experimental memory bus instrumentation.
      ccm128.c: fix STRICT_ALIGNMENT another bug in CRYPTO_ccm128_decrypt.
      perlasm/x86[nm]asm.pl: make OPENSSL_instrument_bus[2] compile.
      ccm128.c: fix Win32 compiler warning.
      perlasm/x86gas.pl: make OPENSSL_instrument_bus[2] compile.
      xts128.c: minor optimization and clarified prototype.
      xts128.c: fix bug introduced in commit#20704. Bug affected encryption of     vectors whose lenght was not multiples of 16 bytes.
      ccm128.c: add CRYPTO_ccm128_[en|de]crypt_ccm64 and minor optimization.
      gcm128.c: minor optimization.
      bn_gf2m.c: optimized BN_GF2m_mod_inv delivers sometimes 2x of ECDSA sign.     Exact improvement coefficients vary from one benchmark and platform to     another, e.g. it performs 70%-33% better on ARM, hereafter less for     longer keys, and 100%-90% better on x86_64.
      xts128.c: minor optimizaton.
      ARM assembler pack. Add bn_GF2m_mul_2x2 implementation (see source code     for details and performance data).
      ARM assembler pack: engage newly introduced armv4-gf2m module.
      x86 assembler pack: add bn_GF2m_mul_2x2 implementations (see x86-gf2m.pl for     details and performance data).
      IA-64 assembler pack: fix typos and make it work on HP-UX.
      Optimized bn_nist.c. Performance improvement varies from one benchmark     and platform to another. It was measured to deliver 20-30% better     performance on x86 platforms and 30-40% on x86_64, on nistp384 benchmark.
      fips_canister.c: initial support for cross-compiling. "Initial" refers     to the two-entry list of verified platforms in #ifndef     FIPS_REF_POINT_IS_SAFE_TO_CROSS_COMPILE pre-processor section.
      fips_canister.c: fix typo.
      fips_canister.c: pick more neutral macro name.
      bn_nist.c: fix shadowing warnings.
      x86_64-xlate.pl: allow "base-less" effective address, add palignr, move     pclmulqdq.
      x86_64 assembler pack: add x86_64-gf2m module.
      x86gas.pl: add palignr and move pclmulqdq.
      cms-test.pl: make it work with not-so-latest perl.
      ppc-xlate.pl: get linux64 declaration right.
      x86[_64]cpuid.pl: handle new extensions.
      e_padlock.c: make it compile on MacOS X.
      x86_64cpuid.pl: allow shared build to work without -Bsymbolic.     PR: 2466
      x86_64-xlate.pl: add inter-register movq and make x86_64-gfm.s compile on     Solaris, MacOS X, elderly gas...
      x86gas.pl: don't omit .comm OPENSSL_ia32cap_P on MacOS X.
      aesni-x86_64.pl: make it compile on MacOS X.
      ec_cvt.c: avoid EC_GFp_nist_method on platforms with bn_mul_mont [see     commentary for details].
      ec_cvt.c: ARM comparison results were wrong, clarify the background.
      ppccap.c: addenum to recent EC optimizations.
      x86_64-gf2m.pl: add Win64 SEH.
      aesni-x86[_64].pl: optimize for Sandy Bridge and add XTS mode.
      spacrv9cap.c: addenum to recent EC optimizations.
      rc4-586.pl: 50% improvement on Core2 and 80% on Westmere.
      e_padlock.c: last x86_64 commit didn't work with some optimizers.
      rc4-586.pl: optimize unused code path.
      e_padlock.c: fix typo.
      x86_64cpuid.pl: get AVX masking right.
      rc4-586.pl: optimize even further...
      rc4-x86_64.pl: major optimization for contemporary Intel CPUs.
      PPC assembler pack: adhere closer to ABI specs, add PowerOpen traceback data.
      x86[_64]cpuid.pl: harmonize usage of reserved bits #20 and #30.
      rc4-x86_64.pl: RC4_options fix-up.
      rc4-x86_64.pl: fix due credit.
      aes-ppc.pl: handle unaligned data on page boundaries.
      sha1-586|x86_64.pl: add SSSE3 and AVX code paths.
      x86cpuid.pl: last commit broke platforms with perl with 64-bit integer.
      sha1-586|x86_64.pl: minor portability fix.
      Various mingw64 fixes.
      aesni-x86[_64].pl: relax alignment requirement.
      e_aes.c: integrate AESNI directly into EVP.
      e_aes.c: fix aes_cfb1_cipher.
      e_aes.c: fix typo.
      x86[_64]cpuid.pl: add function accessing rdrand instruction.
      x86_64cpuid.pl: fix typo.
      e_aes.c: move AES-NI run-time switch and implement the switch for remaining modes.
      rc4_skey.c: remove dead/redundant code (it's never compiled) and     misleading/obsolete comment.
      Minor x86_64 perlasm update.
      rc4-x86_64.pl: commentary update.
      s390x assembler pack: add s390x-gf2m.pl and harmonize AES_xts_[en|de]crypt.
      Configure: clean up linux32-s390x line.
      crypto/bn/Makefile: fix typo.
      md5-x86_86.pl: remove redundant instructions.
      rc4-586.pl: add Atom performance results.
      crypto/sha/asm/sha[1|512]-mips.pl: minor updates.
      crypto/whrlpool/wp_block.c: harmonize OPENSSL_ia32cap_P.
      crypto/aes/Makefile: make it work on IRIX.
      x86_64-xlate.pl: masm-specific update.
      sha1-x86_64.pl: fix win64-specific typos and add masm support.
      s390x-gf2m.pl: commentary update (final performance numbers turned to be     higher).
      sha1-x86_64.pl: nasm 2.07 screws up labels if AVX path is compiled.
      x86_64-xlate.pl: sha1 and md5 warnings made it to nasm 2.09, extend gnu     assembler workaround to all assemblers.
      x86_64-mont.pl: add squaring procedure and improve RSA sign performance     by up to 38% (4096-bit benchmark on Core2).
      evp.h: add flag to distinguish AEAD ciphers and pair of control codes...
      ssl/t1_enc.c: initial support for AEAD ciphers.
      ssl/ssl_ciph.c: allow to switch to predefined "composite" cipher/mac     combos that can be implemented as AEAD ciphers.
      perlasm/cbc.pl: fix tail processing bug.     PR: 2557
      config: detect if assembler supports --noexecstack and pass it down.
      ms/uplink.c: fix Visual Studio 2010 warning.
      fips/Makefile: HP-UX-specific update.
      ARM assembler pack: add platform run-time detection.
      sha512-sparcv9.pl: minor optimization of sha256.
      Add RSAX builtin engine. It optimizes RSA1024 sign benchmark.
      aes-ppc.pl: minor optimization favoring embedded processors (performance     of "big" processors is unaffected).
      fips_canister.c: add support for embedded ppc linux.
      util/incore: make transition smoother.
      util/incore: fix brown-bag bug.
      cryptlib.c: OPENSSL_ia32cap environment variable to interpret ~ as cpuid mask.
      aes/asm/aesni-*.pl: fix CCM and further optimize it.     modes/ccm128.c: minor branch optimization.
      x86_64-mont.pl: futher optimization resulting in up to 48% improvement     (4096-bit RSA sign benchmark on Core2) in comparison to initial version     from 2005.
      Add provisory support for RDRAND instruction.
      alphacpuid.pl: fix alignment bug.     alpha-mont.pl: fix typo.     PR: 2577
      This commit completes recent modular exponentiation optimizations on     x86_64 platform. It targets specifically RSA1024 sign (using ideas     from http://eprint.iacr.org/2011/239) and adds more than 10% on most     platforms. Overall performance improvement relative to 1.0.0 is ~40%     in average, with best result of 54% on Westmere. Incidentally ~40%     is average improvement even for longer key lengths.
      x86_64-xlate.pl: fix movzw.
      SPARC assembler pack: fix FIPS linking errors.
      armv4-mont.pl: profiler-assisted optimization gives 8%-14% improvement     (more for longer keys) on RSA/DSA.
      eng_rdrand.c: make it link in './config 386' case.
      x86_64-mont5.pl: add missing Win64 support.
      bn_div.c: remove duplicate code by merging BN_div and BN_div_no_branch.
      Makefile.org: get commit#21249 right.
      modexp512-x86_64.pl: make it work with ml64.
      eng_rsax.c: improve portability.
      Add RC4-MD5 and AESNI-SHA1 "stitched" implementations.
      util/incore: fix typo.
      bn_exp.c: improve portability.
      crypto/bn/bn_gf2m.c: make it work with BN_DEBUG.
      config: don't add -Wa options with no-asm.
      Padlock engine: make it independent of inline assembler.
      engines/asm/e_padlock-x86_64.pl: name it right and fix small bug.
      Add so called Vector Permutation AES x86[_64] assembler, see     http://crypto.stanford.edu/vpaes/ for background information.     It's not integrated into build system yet.
      vpaes-x86[_64]*.pl: fix typo.
      Allow for dynamic base in Win64 FIPS module.
      Integrate Vector Permutation AES into build system.
      sha512-x86_64.pl: +15% better performance on Westmere and incidentally Atom.     Other Intel processors +5%, Opteron -2%.
      sha256-586.pl: minor optimization, +0-2% on all CPUs, +7% on Westmere.
      Make latest assembler additions (vpaes and e_padlock) work in Windows build.
      Add bit-sliced AES x86_64 assembler, see http://homes.esat.kuleuven.be/~ekasper/#software for background information. It's not integrated into build system yet.
      bsaes-x86_64.pl: add due credit.
      e_padlock-x86.pl: make it work on VIA C3 (which doesn't support SSE2).
      e_padlock-x86.pl: previous C3-specific fix was incomplete.
      e_padlock-x86*.pl: Nano-related update.
      e_padlock-x86_64.pl: fix typo.
      e_padlock: add CTR mode.
      e_padlock-x86[_64].pl: SHA fixes, comply with specification and fix bug.
      e_padlock-x86_64.pl: brown-bag bug in stack pointer handling.
      e_padlock-x86[_64].pl: protection against prefetch errata.
      Remove eng_aesni.c as AES-NI support is integrated directly at EVP.
      aesni-x86[_64].pl: fix bug in CCM code.
      e_aes.c: fix bug in aesni_gcm_tls_cipher.
      Add android-x86.
      Engage bsaes-x86_64.pl, bit-sliced AES.
      bn_shift.c: minimize reallocations, which allows BN_FLG_STATIC_DATA to     be shifted in specific cases.
      bn_mont.c: simplify BN_from_montgomery_word.
      x86_64-mont.pl: minor optimization.
      bn_exp.c: further optimizations using more ideas from     http://eprint.iacr.org/2011/239.
      bn_mont.c: get corner cases right in updated BN_from_montgomery_word.
      c_allc.c: add aes-xts to loop.
      [bs|vp]aes-x86[_64].pl: typos and clarifications.
      bsaes-x86_64.pl: make it work with ml64.
      x86_64-xlate.pl: make vpaes-x86_64.pl and rc4-md5-x86_64 work with ml64,     fix bug in .crt section alignment.     PR: 2620, 2624
      evp/e_aes.c: fold AES-NI modes that heavily rely on indirect calls     (trade 2% small-block performance), engage bit-sliced AES in GCM.
      engines/.cvsignore: stop whining about e_padlock-*.s.
      fips_enc.c: assign minimal block size to bad_cipher [to avoid arithmetic     exceptions in TLS layer].
      fips/*: extend fipsro segmenting to all _MSC_VER builds (including WinCE).
      fipssyms.h: assign alias to newly introduced bn_gather5.
      arm_arch.h: add missing pre-defined macro, __ARM_ARCH_5TEJ__.
      fips_canister.c: more cross-compiler platfroms verified.
      Remove superseded MIPS assembler modules.
      vxworks-mips: unify and add assembler.
      Drain unused MacOS directory.
      sha1-mips.pl: fix typo.
      fips/fips_[canister|premain].c: make it work with VC6 and add sentinels     even to code segments.
      armcap.c: auto-setup processor capability vector.
      fips.c: x86[_64] capability masking.
      fips.c: remove preprocessor artefact.
      mk1mk.pl: cleanup engines' handling and make fips build work on WIN64I.
      x86gas.pl: relax .init segment alignment.
      config: in cross-compile case interrogate cross-compiler, not host, work     around sub-shell limitation.
      fips_canister.c: harmonize fingerprinting for all Windows, CE or not.
      cryptlib.c: remove stdio dependency in Windows fipscanister.lib.
      e_aes.c: prevent potential DoS in aes_gcm_tls_cipher.
      e_aes.c: fold even aesni_ccm_cipher.
      ppc.pl: fix bug in bn_mul_comba4 [from HEAD].     PR: 2636     Submitted by: Charles Bryant
      x86cpuid.pl: don't punish "last-year" OSes on "this-year" CPUs [from HEAD].     PR: 2633
      armv4cpuid.S, armv4-gf2m.pl: make newest code compilable by older assembler [from HEAD].
      e_aes.c: fold aesni_xts_cipher and [most importantly] fix aes_xts_cipher's     return value after custom flag was rightly reverted [from HEAD].
      fipsld, incore: switch to new cross-compile support [from HEAD].
      Platform update from HEAD.

Ben Laurie (462):
      Add strictness, fix variable substition bugs.
      Autodetect FreeBSD 3.
      Typo.
      Fix option listing.
      Require Perl 5.
      This is not a bug in NT Perl, its a bug in Configure.
      Deal with generated files.
      Make Configure work again after eliminating files.
      Add prototypes. Make Montgomery stuff explicitly for that purpose.
      Fix incorrect DER encoding of SETs and all knock-ons from that.
      Fix pem/err ordering.
      Fix name delete problem.
      Document recent changes.
      Fix tests for ssleay -> openssl.
      Don't confuse matters by using the wrong library.
      Fix reference counting.
      Pass on BIO_CTRL_FLUSH.     Submitted by: Arne Ansper <arne at ats.cyber.ee>
      Remove the bugfix that was really a bug.     Submitted by: Arne Ansper <arne at ats.cyber.ee>
      Only free if it ain't NULL.
      Free the right thing.
      Make the world a safer place (if people object to this kind of change, speak up     soon - I intend to do a lot of it!).
      Fix export tests.
      Fix numeric -newkey args.     Contributed by: Bodo Moeller <3moeller at informatik.uni-hamburg.de>
      Send the right CAs to the client.
      Fix DH key generation.     Contributed by: Anonymous <nobody at replay.com>
      Accept NULL in *_free.
      Get rid of redundant files.
      Sort openssl functions by name.
      Fix comment.
      Add prototype, fix parameter passing bug.
      More prototypes.
      More prototypes.
      More prototypes.
      More prototypes.
      More prototypes.
      More prototypes.
      Generate an error on an invalid directory.
      Remove pointless MD5 hash.     Contributed by: Anonymous <nobody at replay.com>
      Oops. Missing NULL frees.
      Correct Linux 1 recognition.     Contributed by: Ulf M?ller <ulf at fitug.de>
      Fix major cockup with short keys in CAST-128.
      Dispose of generated programs.
      Ignore auto-generated programs.
      Spelling mistake.
      Finally lay dependencies to rest (I hope!).
      This time, get it right.
      Correct bracketing error.
      Minor constification.
      Make sure people know when they need to rebuild the Makefile.
      Reduce header dependencies.
      Declare correctly on FreeBSD.
      Update dependencies.
      Oops. One header too many.
      Update dependencies.
      Add dependencies.
      Update dependencies.
      Break circular dependency between pem and err.
      More pissing about to get pem.h to behave properly.
      Squeeze a bit more speed out of MD5 assembler.
      Yet more pissing about to get PEM built at the right moment.
      Clear error we don't care about.
      Typo in arguments.
      Diagnose errors.
      Process extensions when they are there.
      Slightly improved diagnostics.
      Minor tweaks to keep Perl 5.001 happy.
      More exactitude with function arguments.
      Update dependencies.
      Tidy up asm stuff.
      Actually use BN when selected!
      Some cleanup.
      Whoops, missed one.
      In the absence of feedback either way, commit the fix that looks right for     wrong keylength with export null ciphers.
      Add support for 3DES CBCM mode.
      Fix ghastly DES declarations, and all consequential warnings.
      Update dependencies.
      Finally(?) fix DES stuff.
      Add OAEP.
      Fix case of new functions in error files.
      Generate errors when public/private key check is done.
      Fix a warning.
      Fix warning.
      Add support for new TLS export ciphersuites.
      Undo a couple of kludges.
      More stuff for new TLS ciphersuites.
      Add syslogging BIO.
      Fix more warnings.
      Add reliable BIO.
      Code for reliable BIO.
      Fix clearly untested "clever" hack.
      Perhaps if I do a tiny bit of docco, others may follow?
      Update dependencies.
      Experiment with doxygen documentation.
      doxygen configuration file.
      More truth in declarations.
      Add functions to add certs to stacks, used for CA file/path stuff in servers.
      Supper's cooking.
      Permit null ciphers.
      Fix export ciphersuites, again.
      Put the dependencies back.
      Fix names of cert stack functions.
      Disable new TLS1 ciphersuites.
      Fix a typo.
      Always make links.
      Linux MIPS support.
      Fix DWP when only given three parameters.
      Fix perl assembler.
      Don't make links on Windoze.
      Don't make links in INSTALL doc - also, work first time!
      Make links no longer needed.
      test.
      Correct English.
      Go faster.
      Fix quad checksum bug.
      Remake cert links when the app is built.
      Use the right compiler for ctx_size.
      This is now generated, it seems.
      Solaris shared library support.
      Allow bsdi-gcc - see if it gets anyone anywhere.
      Update dependencies.
      Fail if test fails.
      Fix security hole.
      Fix Alpha assembler, remove redundant file.
      Linux PPC support.
      Don't shadow.
      Update dependencies.
      Don't shadow.
      Install signal handler if we are using sigaction.
      Rid the world of more evil casts.
      Adjust renegotiation slightly.
      Rid the world of yet more evil casts.
      gcc claims this is a shadow, though I can't find what it is shadowing...
      Add type-safe STACKs and SETs.
      Typo.
      Just use an ANSI declaration, instead.
      Add new experimental ciphersuites. Bring naming into line with RFC.
      Fix some warnings. Contributed by Anonymous.
      Another STACK bites the dust.
      Massive constification.
      Update dependencies.
      Fix const declarations.
      const correctness.
      Update dependencies.
      Fix DES export ciphersuites.
      Remove some unnecessary(?) casting.
      Reverse unexplained change.
      Work with -pedantic!
      Don't shadow.
      Another safe stack.
      Another stack.
      Another stack.
      Update dependencies.
      Yet another stack.
      Some more stack stuff.
      Add other people who've done stackification.
      Bodo didn't do that.
      Make -pedantic work again.
      Avoid shadowing, and a bit of constification while I'm at it.
      Update dependencies.
      Get rid of the cast.
      Add actual testing to bntest...
      Get rid of casts.
      Convert void *.
      Switch to new version numbering scheme.
      Prepare for a beta release.
      Revert.
      On seconds thoughts, the version number shoud _never_ decrease.
      Don't include top-level CVS directory.
      Prepare for final(?) beta.
      Move to beta 3.
      Here we go: prepare to roll 0.9.3.
      Move on to 0.9.4.
      Update dependencies.
      Prepare to release 0.9.3a
      Oops!
      And carry on with development...
      More safe stack.
      Another safe stack.
      Another safe stack.
      Another stack.
      Yet another stack.
      More stack.
      Stack.
      stack.
      Stack.
      Move stack implementations to more natural places.
      stack.
      Evil cast extermination.
      stack
      Make samples compile.
      More evil cast removal.
      Some constification and stacks that slipped through the cracks (how?).
      Aha! That's how pkcs12 got missed from stackification.
      const/type fixes.
      Survive pedanticism.
      Make "make test" fail if bntest fails an internal selfcheck.
      I keep forgetting to fix this: update the IV! Most important!
      Oops. Get rid of now incorrect comment.
      Fix warnings.
      Don't shadow.
      Make it compile under -pedantic.
      More diagnostics.
      Fix warnings.
      Fix warnings.
      Correct warnings.
      Fix warnings.
      Fix warnings.
      Don't return stuff from void functions.
      Constification.
      Fix (spurious) warnings.
      Fix warning.
      Update dependencies.
      Make salting the default. Fail gracefully if the input is not salted.
      Make NO_RSA compile with pedantic.
      Fix shadow.
      Correct time in seconds instead of minutes.
      Fix signed/unsigned warnings.
      Add support for Compaq Atalla crypto accelerator.
      Reflect API changes.
      Get rid of evil cast.
      Typo.
      Declare memset.
      Get definition of ssize_t.
      Allow UTCTIME objects to be retrieved. Check for imminent cert expiry.
      Typesafety thought police.
      Typesafety Thought Police Part 2.
      Typesafety Thought Police part 3.
      Typesafe Thought Police part 4.
      Typesafety Thought Police part 5.
      Typesafety Thought Police last part.
      Yet more typesafety.
      EVP constification.
      Use up-to-date functions.
      Don't let top go below zero!
      max -> dmax in bn_check_top.
      Use the passed buffer in ERR_error_string!
      Diagnose EOF on memory BIOs (or you just get mysterious errors with no error     message).
      Add demo state machine.
      Distinguish between assertions and conditions that should cause death.
      Handle WANT_READ more correctly (thanks to Bodo).
      Ignore executable.
      Document an old change.
      Always return a value.
      Make this stuff compile.
      Make Rijndael work! Those long flights have some good points.
      Better handling of EVP names, add EVP to speed.
      Oops! Read a full buffer instead of some spurious number from elswhere.
      Fix warnings.
      Fix a warning.
      Can't remember why this was needed?
      BN assembler is no longer option on x86.
      Make depend.
      Improve the state machine.
      Rijdael CBC mode and partial undebugged SSL support.
      Fix warning.
      Delete a redundant line.
      Fix a memory leak (there's another around here somewhere, though).     PR:
      Fix warning.
      Update nCipher header with more liberal licence.
      Constification.
      Remove unnecessary casts.
      Correct const-ness.
      Speed test decrypt EVP operations.
      Don't update argc, argv for decrypt flag!
      Use & instead of % - worth about 4% for 8 byte blocks.
      Handle the common case first (where input size is a multiple of block size).     Worth around 5% for encrypt. Slows down decrypt slightly, but I expect to     regain that later.
      A better compromise between encrypt and decrypt (but why isn't it as fast     for encrypt?).
      Clean up EVP macros, rename DES EDE3 modes correctly, temporary support for     OpenBSD /dev/crypto (this will be revamped later when the appropriate machinery     is available).
      ANSIfication.
      Only set the verify callback if there's one to set!
      Make EVPs allocate context memory, thus making them extensible. Rationalise     DES's keyschedules.
      Really add the EVP and all of the DES changes.
      Remove //.
      Remove old unused stuff.
      Document DES changes better.
      Make /dev/crypto work with new EVP structures.
      This ghastly hack prevents CVS wars over Kerberos (which is disabled by default).
      Header bloat reduction for EVP_PKEY.
      Get rid of the stuff we, err, got rid of.
      Reinstate accidentally deleted code.
      Remove extra whitespace. Sorry.
      Parameter correction for CIOFSESSION.
      Fix memory leak.
      Start to reduce some of the header bloat.
      Move CIPHER_CTX cleanups to _Final routines instead of _Init, which avoids     problems with leaks and uninitialised structures.
      Add first cut symmetric crypto support.
      Add EVP test program.
      Add AES tests.
      Add RC4 support to OpenBSD.
      More tests.
      Add digests.
      Test digests.
      Fix SSL memory leak.
      Make MD functions take EVP_MD_CTX * instead of void *, add copy() function.
      Redo type-safety fix.
      Now need sha.h for some reason.
      Remove duplication.
      Look up MD5 by name.
      Add a cleanup function for MDs.
      Fix warning.
      Fixes.
      Don't clean up stuff twice.
      Fix warning.
      Add paralellism to speed - note that this currently causes a weird memory leak.
      If verify fails, say why.
      Improve back compatibility.
      Security fix.
      Return value could be undefined.
      Add client_cert_cb prototype.
      Prototype info function.
      Constification, missing declaration, update dependencies.
      Fix memory leak.
      Stupid apps should die, not fail silently.
      Other errors are possible.
      Constification, add config to /dev/crypto.
      Make no config file not an error. Move /dev/crypto config to ctrl.
      Support old DES APIs by default.
      Fix warnings.
      Fix warnings.
      Handle read errors.
      Fix warnings, makefile cockup.
      Security fixes brought forward from 0.9.7.
      Correct asm exclusions.
      Fix warning.
      Old-style callbacks can be NULL!
      Constification.
      Blow away Makefile.ssl.
      Don't debug.
      Make tags target useful.
      Take account of Makefile.ssl removal.
      Give everything prototypes (well, everything that's actually used).
      Get rid of irritating noise.
      Simplicate and add lightness.
      Consistency.
      If input is bad, we still need to clear the buffer.
      Add prototypes.
      Add debug target, remove cast, note possible bug.
      Flag changes in Configure and config, too.
      make depend.
      Add DTLS support.
      Add prototype.
      Redundant changes.
      There must be an explicit way to build the .o!
      Propagate BUILDENV into subdirectories.
      Fix warnings.
      Brought forward from 0.9.8 - 64 bit warning fixes and fussy compiler fixes.
      Fix warning.
      Make D-H safer, include well-known primes.
      Generate primes, too.
      Fix warnings.
      Make things static that should be. Declare stuff in headers that should be.     Fix warnings.
      Forward port of IGE mode.
      Fix various warnings.
      Add RFC 3779 support.
      Fix warning.
      Don't die if the value is NULL (Coverity CID 98).
      Make sure we detect corruption.
      Die if serial number is invalid.
      Return an error if the serial number is badly formed. (Coverity ID 116).
      Missing return on error. Coverity ID 115.
      Don't free a NULL. Coverity ID 112.
      Fix buffer overrun. Coverity ID 106.
      Handle bad content type. Coverity ID 99.
      Resource leak.
      Free memory. Coverity ID 62.
      Avoid overrun. Coverity ID 60.
      Don't use a negative number as a length. Coverity ID 57.
      Missing config file.
      Don't dereference NULL argument. Coverity ID 52.
      Errors should actually be errors.
      Fix duplicate error number.
      Don't copy from a nonexistent next. Coverity ID 47.
      If you're going to check for negative, use an signed integer! Coverity ID 122.
      Yet another resource leak. Coverity ID 123.
      AES IGE mode speedup.
      More IGE speedup.
      Inline function declarations have to be prototypes.
      Fix warning.
      Typo? Why did this work, anyway?
      make errors.
      The other half of make errors.
      Fix dependencies. Make depend.
      New release.
      0.9.8f.
      Fix warnings.
      Fix buffer overflow.
      Missing headers.
      LHASH revamp. make depend.
      Memory saving patch.
      Only include windows headers when under windows.
      More type-checking.
      Fix warning.
      Ignoring errors in makedepend can hide problems.
      Add missing DTLS1_BAD_VER (hope I got the value right).
      Type-checked (and modern C compliant) OBJ_bsearch.
      Type-safe OBJ_bsearch_ex.
      Add XMPP STARTTLS support.
      Set comparison function in v3_add_canonize().
      Fix warning a different way.
      Constification.
      Add JPAKE.
      Fix warning.
      size_tification.
      More size_tification.
      Fix warning.
      Fix warnings.
      Fix asserts. Fix incorrect dependency.
      Formatting.
      Only one of these needs to be signed.
      J-PAKE is not experimental in HEAD.
      Ignore saved Makefile.
      Aftermath of a clashing size_t fix (now only format changes).
      Ignore generated ASM.
      Integrate J-PAKE and TLS-PSK. Increase PSK buffer size. Fix memory leaks.
      Missing return values (Coverity ID 204).
      Check for NULL before use (Coverity ID 203).
      Return error if DH_new() fails (Coverity ID 150).
      *** empty log message ***
      Back out pointless change.
      pval must always be set when pk7_cb() does anything (Coverity ID 146).
      !a && !a->b is clearly wrong! Changed to !a || !a->b (Coverity ID 145).
      Remove misleading dead code. Constify. (Coverity ID 142)
      Handle the unlikely event that BIO_get_mem_data() returns -ve.
      Deal with the unlikely event that EVP_MD_CTX_size() returns an error.     (Coverity ID 140).
      Check scalar->d before we use it (in BN_num_bits()). (Coverity ID 129)
      Remove dead code. (Coverity ID 2)
      Die earlier if we have no hash function.
      Reverse incorrect earlier fix.
      Die earlier if hash is NULL. (Coverity IDs 137 & 138).
      Make sure a bad parameter to RSA_verify_PKCS1_PSS() doesn't lead to a crash.     (Coverity ID 135).
      If we're going to return errors (no matter how stupid), then we should     test for them!
      Apparently s->ctx could be NULL at this point (see earlier     test). (Coverity ID 148).
      Apparently s->ctx could be NULL. (Coverity ID 147).
      Document dead code.
      Calculate offset correctly. (Coverity ID 233)
      srvr_ecdh cannot be NULL at this point (Coverity ID 232).
      Add missing entry.
      Allow CC to be overridden.
      Use new common flags and fix resulting warnings.
      Fix memory leak.
      Use the right length (reported by Quanhong Wang).
      Don't ask for -iv for ciphers that need no IV.
      Print IPv6 all 0s correctly (Rob Austein).
      Autogeneration seems to have changed slightly.
      Fix warnings.
      Fix warnings (note that gcc 4.2 has a bug that makes one of its     warnings hard to fix without major surgery).
      Missing declarations, no assembler in PEDANTIC.
      Non-executable stack in asm.
      Fix warnings.
      Missing prototype.
      Sign mismatch.
      Add Next Protocol Negotiation.
      Fix warnings.
      NPN tests.
      Fixes to NPN from Adam Langley.
      Fix warning.
      Constify.
      Fix warning.
      Add SRP support.
      Note SRP support.
      Fix Tom Wu's email.
      Missing SRP files.

Bodo M?ller (1685):
      Added comments to des_enc_{read,write} functions warning about their     cryptographic weakness (IV reuse).
      New option "-showcerts" for s_client
      Avoid EADDRINUSE for s_server.
      Be more optimistic about the availability of termios for ~ECHO,     because sgtty emulation tends to fail on various systems.     Submitted by:     Reviewed by:     PR:
      New "open issue" (ERR_...).
      Tiny comment to improve code comprehensibility.     Submitted by:     Reviewed by:     PR:
      Preprocessor file to allow testenc to test only those ciphers     that are available.     Submitted by:     Reviewed by:     PR:
      Bugfix: s_client occasionally would sleep in select() when it should     have checked SSL_pending() first.     Submitted by:     Reviewed by:     PR:
      Submitted by:     Reviewed by:     PR:
      Obsoleted by new openssl command "list-cipher-commands".     Submitted by:     Reviewed by:     PR:
      Don#t auto-generate crypto/pem/pem.h -- a fixed file is fine for it.
      Submitted by:     Reviewed by:     PR:
      Some tiny fixes.
      Make Windows compilers happy.
      Cleaning up Ben's clean-ups :-)
      /* Just some comments. */
      Removed extra semicolons.
      New "Configure" entry (Solaris with debug info)
      Fixed some race conditions.
      Submitted by:     Reviewed by:     PR:
      Don't return 0 from ssl2_read when a packet with empty payload is received.
      CVS confusion?
      Submitted by:     Reviewed by:     PR:
      Change #include filenames from <foo.h> to <openssl.h>.
      Submitted by:     Reviewed by:     PR:
      Submitted by:     Reviewed by:     PR:
      Submitted by:     Reviewed by:     PR:
      "make depend"
      Submitted by:     Reviewed by:     PR:
      Submitted by:     Reviewed by:     PR:
      Submitted by:     Reviewed by:     PR:
      Submitted by:     Reviewed by:     PR:
      C indentation style definition for Emacs.
      Avoid "incomprehensible" errors when required definitions are missing.
      Restore ERRC definitions that are needed to compile the library.
      Removed superfluous reference to ERRC.
      "perl util/mkerr.pl -static -recurse -rebuild" because the previous     codebase apparently was inconsistent.  And crypto/Makefile.ssl     *does* need an ERRC ..     Submitted by:     Reviewed by:     PR:
      Some instructions for how to handle the <foo.h>  =>  <openssl/foo.h>     transition.
      Fix header files so that any one can be included first.
      cryptall.h is not needed for anything and cannot even be #include-d     without producing error messages.     Submitted by:     Reviewed by:     PR:
      Removed traces of cryptall.h, and did a "make depend".
      Comment changed.
      Fixed a typo.
      A new comment.
      Install various scripts to $(OPENSSLDIR)/misc instead of $(INSTALLTOP)/bin.
      A faster (and more general, and better documented) replacement for mklink.sh.
      Use util/mklink.pl instead of util/mklink.sh.
      Typo fixed.
      Fix make target "install".
      Obey $(PERL) when running util/mklink.pl.
      Pass PERL to sub-Makefiles during "make links".
      New Configure options "threads" and "no-threads".     For Solaris and Linux, "threads" (with proper compiler options)     is the default.     Submitted by:     Reviewed by:     PR:
      Submitted by:     Reviewed by:     PR:
      Support INSTALL_PREFIX for packagers.
      ignore Makefile.save
      Superseded by mklink.pl.
      Remove extra brace.
      Hopefully improved compatibility with earlier versions of Perl5.
      New function SSL_CTX_set_session_id_context.
      Broken line that was too long.
      Use correct error macro so that error messages make sense.
      Add "static" to function definition
      Point out the "rehashing skipped" is not a problem.
      Support verify_depth from the SSL API without need for user-defined     callbacks.
      New function SSL_CTX_use_certificate_chain_file.
      Entry for resolved error macro confusion.
      Annotate a bug.
      Some comments.
      Restored path names that were changed by a previous "Configure" run.     (Rather than changing the files in places, we really should use .in files.)     Submitted by:     Reviewed by:     PR:
      This was an unused derivate of an old version of s_client.c that had     been changed so that it almost could be used under Windows.     No one asked to keep it (and no one volunteered to bring it into useable     state), so away with it.     Submitted by:     Reviewed by:     PR:
      Use "const char *" instead of "char *" for filenames passed to functions.
      Move variable definitions into the blocks where they are really needed,     so that warnings about unused variables don't appear if those blocks     are removed by the C preprocessor.
      Some tiny changes to the source code to make future diffs smaller     when restructuring the cert_st handling (removed unnused parts,     and the like).     Submitted by:     Reviewed by:     PR:
      Makefile.save was missing here.     Submitted by:     Reviewed by:     PR:
      One comment was in the wrong line ... some others are new.     Submitted by:     Reviewed by:     PR:
      Create a duplicate of the SSL_CTX's CERT in SSL_new instead of copying     pointers.  The cert_st handling is changed by this in various ways.     Submitted by:     Reviewed by:     PR:
      No actual change, but the cert_st member of struct ssl_session_st is now     called sess_cert instead of just cert.  This is in preparation of further     changes: Probably often when s->session->sess_cert is used, we should     use s->cert instead; s->session->sess_cert should be a new structure     containing only the stuff that is for just one connection (e.g.     the peer's certificate, which the SSL client implementations currently     store in s->session->[sess_]cert, which is a very confusing thing to do).     Submitted by:     Reviewed by:     PR:
      New entry debug-solaris-usparc-gcc, as debug-solaris-sparc-gcc no longer     applies to usparc systems.     Submitted by:     Reviewed by:     PR:
      Moved some variable declarations inside blocks where they are needed     so that warnings about unused variables (for certain     -D... constellations) are avoided; this corresponds to the earlier     change for SHA1.     Submitted by:     Reviewed by:     PR:
      The various character predicates (isspace and the like) may not be     used with negative char values, so I've added casts to unsigned char.     Maybe what really should be done is change all those arrays and     pointers to type unsigned char [] or unsigned char *, respectively;     but using plain char with those predicates is just wrong, so something     had to be done.     Submitted by:     Reviewed by:     PR:
      Changed a comment.     Submitted by:     Reviewed by:     PR:
      Make SSL library a little more fool-proof by not requiring any longer     that SSL_set_{accept,connect}_state be called before     SSL_{accept,connect} may be used.     Submitted by:     Reviewed by:     PR:
      And I thought I could spell ... but in caps really everything looks the same.     Submitted by:     Reviewed by:     PR:
      Clarify comment.     Submitted by:     Reviewed by:     PR:
      argc counting bug fixed.     Submitted by: Tomas Hulek     Reviewed by:     PR:
      Comment.     Submitted by:     Reviewed by:     PR:
      First tiny changes in preparation of changing of "sess_cert" handling.     Also I've subsituted real tabs for 8-spaces sequences in some lines so that     things don't look that weird with a tab-width of 4.
      Spacing in comment corrected.
      For solaris-usparc configurations, avoid problems with GNU as, which     cannot handle all opcodes we need.
      New structure type SESS_CERT used instead of CERT inside SSL_SESSION.     While modifying the sources, I found some inconsistencies on the use of     s->cert vs. s->session->sess_cert; I don't know if those could     really have caused problems, but possibly this is a proper bug-fix     and not just a clean-up.
      Some tiny clean-ups related to the cert_st / sess_cert_st change.
      Don't use reserved name "_encrypt" for parameters;     instead I've picked "enc", because that's what's in the prototypes.     ("_encrypt" is reserved only as an external name, but still     using it in an application doesn't look like good style to me --     and it certainly isn't if the point is just avoiding shadowing,     which is apparently why the previous name "encrypt" was changed.)
      Add release dates to the "CHANGES" file, because that's an obvious     place to look for them.
      Change cast in function calls to that which is, I think, the right     one for those functions (is it?).
      Delete a wish.
      *** empty log message ***
      Introduce and use function typedef pem_password_cb so that we don't call     those functions without having a parameter list declaration.     (There are various similar cases left ...)
      Fix cryptlib.c.     Submitted by:     Reviewed by:     PR:
      Various bugfixes: Uses locking for some more of the stuff that is not     thread-safe (where thread-safe counterparts are not available on all     platforms), and don't memcpy to NULL-pointers     Submitted by: Anonymous     Reviewed by: Bodo Moeller
      Avoid compiler warnings for x86.
      A comment.
      Comment.
      Return 0 for an error, 1 for no error from read_options;     that's what the calling code seems to expect.
      Update.
      Bugfix (set shutdown only when we should).     Submitted by: Oleg Girko
      Comment.
      e_os* corrections.
      e_os2.h is used for things that must be visible when external applications     use (certain parts of) OpenSSL.
      Use e_os2.h, not e_os.h in exported header file des.h.
      Get rid of another cast.
      Update dependencies.
      OPENSSL_EXTERN, OPENSSL_GLOBAL
      OPENSSL_EXTERN
      Use OPENSSL_GLOBAL, OPENSSL_EXTERN instead of GLOBAL and EXTERN.
      Don't run "make depend" automatically.
      Marked probable bug, pointed out by Anonymous.
      Added a comment pointing out the behaviour of "openssl x509 -conf ...",     which cost me some time to find out about.
      Change type of various DES function arguments from des_cblock     (meaning pointer to char) to des_cblock * (meaning pointer to     array with 8 char elements), which allows the compiler to     do more typechecking.  (The changed argument types were of type     des_cblock * back in SSLeay, and a lot of ugly casts were     used then to turn them into pointers to elements; but it can be     done without those casts.)
      DES changes.
      Typo.
      Keep text lines less than 80 characters wide.
      Clarification.
      Rename "openssl x509" option "-config" to "-extfile", because it     doesn't have a default value like the "-config" options of other     openssl subprograms.
      gcc (in some versions) doesn't like the const_des_cblock typedef.     So omit it for now :-(
      Additional, more descriptive error message for rejection of a session ID     because of missing session ID context (so that application programmers     are directly pointed to what they should do differently).
      Make MD5 work on Alpha, and fix a bug.     Submitted by: Andy Polyakov
      Substitute spaces for tab.
      If we couldn't handle "-showcerts" (which happens with the current     SSL2 implementation), show at least the server certificate.
      Get rid of some unnecessary casts and add a necessary one.
      For Solaris with old gcc versions (that don't understand     -mcpu=ultrasparc), don't silently step to solaris-sparc-gcc, which     would unnecessarily use less efficient assembler code.     Instead, use new configuration variant solaris-usparc-oldgcc;     this also means that someone who reads the output of ./config will     notice that it may be advantegeous to upgrade gcc.
      Bugfix: GCCVAR contains two lines ("Reading specs ..." and the actual     version), so we need        echo $GCCVAR | sed ...     instead of        echo "$GCCVAR" | sed ...     to process it as intended.
      Convert gcc version detection (for solaris-usparc-gcc) into a form     better suited for finding what went wrong in case that some compiler     versions create an output we can't parse.
      Note that the numbering scheme used to be different.
      Add -mv8 to solaris-usparc-oldgcc.
      Change self-description (mklink.pl is not just faster than the last     released version of mklink.sh -- the latter couldn't even handle     the ../../include/openssl case).
      Some solaris-usparc MD5 fixes.
      Don't install e_os.h in include/openssl, use it only as a local     include file.
      Add a kludge :-(     There were problems with putting e_os.h just into the top directory,     because the test programs are compiled within test/ in the "standard"     case in in their original directories in the makefile.one case;     and in the latter symlinks may not be available.
      It was a very bad idea to use #include "../e_os.h" -- when this occurs     in cryptlib.h (which is often included as "../cryptlib.h"), then the     question remains relative to which directory this is to be interpreted.     gcc went one further directory up, as intended; but makedepend thinks     differently, and so probably do some C compilers.  So the ../ must go away;     thus e_os.h goes back into include/openssl (but I now use     #include "openssl/e_os.h" instead of <openssl/e_os.h> to make the point) --     and we have another huge bunch of dependency changes.  Argh.
      Older versions of SINIX C development system inherited a bug from     SGI' cc; enable workaround.     Submitted by: Martin Kraemer
      Remove traces of bad idea :-)
      We need e_os.h here.
      Avoid memory hole when we don't like the session proposed by the client
      Let ssl_get_prev_session reliably work in multi-threaded settings.
      Comment about bug.
      Detect linux-mips.
      Don't use NULL-pointer :-/
      Final version for 0.9.3.
      Update for 0.9.3.
      Last minute VMS updates for 0.9.3.     Submitted by: Richard Levitte
      Temporary workaround for IRIX64 build.     Submitted by: Andy Polyakov <appro at fy.chalmers.se>
      Add closing parenthesis to usage output.
      Set #!... path to Perl in apps/der_chop automatically.
      Circument egcs bug.     Submitted by: Andy Polyakov <appro at fy.chalmers.se>
      I386_ONLY is defined in opensslconf.h, so we need to include it.     Submitted by: John Keith <jtkeith at kavi.com>
      der_chop is now generated from der_chop.in.
      Ignore directories created by "make -f makefile.one".
      Change function call according to current API.
      *** empty log message ***
      Updated some demos.     Submitted by: Sean O Riordain <Sean.ORiordain at cyrona.com>
      Updated C++ SSL demos.     Submitted (a month ago) by: Wade Scholine
      Include <stdio.h>.
      sco5-gcc configuration.
      Some assembler-related clean-ups.
      Pass INSTALL_PREFIX to subdirectories of crypto
      BSD/OS 4.x support (bsdi-elf-gcc)
      Adjust bsdi-elf-gcc to look more like FreeBSD-elf, linux-elf and the like.
      Complain about deficiency of internal_verify.
      "BTW, I no longer have a wish for this. This was solved in other ways."     Mats Nilsson <mats.nilsson at xware.se>,     <4.1.19990531095211.040bf2e0 at berit.xware.se> to <openssl-dev at openssl.org>
      More consistency.
      more typesafe stacks ...
      Labels longer than eight characters might cause problems.
      "linux-sparc64-gcc" configuration     Submitted by: Ray Miller <ray.miller at oucs.ox.ac.uk>
      remove conflict indicator ...
      Update.
      More general definition for S_ISDIR (needed not only for VMS but     also for NeXT).
      "linux-sparc" configuration.
      linux-sparc
      Comments added.
      Use only -O, not -O3 for NeXTstep:
      mkdir -p is not fully portable (according to Marc Crispin,     NeXTstep creates a directory called -p); now mkdir-p.pl does its job.
      Mention mkdir-p.pl.
      Introduce "BIO pairs", which (when finished) will relay data     so that the SSL library can be used for applications that     have to handle all the actual I/O themselves.
      Don't mix real tabs with tabs expanded as 8 spaces -- that's     a pain to read when using 4-space tabs.
      treat init properly
      Use the same path to perl in all #! lines in util.
      Use locking in a way that makes more sense.
      Fix for BIO pairs.
      Don't make assumptions on what the path looks like.
      Use mkdir-p.pl more efficiently.
      "request" added.
      Some pre-POSIX systems don't have unistd.h (but e.g. lib.c).     Allow configuring the name of that header file.
      Mention unistd.h.
      DES CBC change looks dubious to me.
      "make update" (added to top Makefile, and applied).
      Unify DES library: ncbc_enc.c wasn't used, but its content was almost     duplicated in cbc_enc.c (without IV updating) and in des_enc.c
      Update dependencies.
      des_cbc_encrypt / des_ncbc_encrypt issue.
      Delete unnecessary newlines in TABLE
      Oops, I forgot to add the dependency "TABLE: Configure".
      Repair PEM_write_PrivateKey and PEM_write_bio_PrivateKey.
      tiny optical change
      Another <unistd.h> ...
      Avoid warnings.
      Avoid warning.
      Try to detect NeXT 3.3 (working Configure entry for this still missing)
      hpux-cc (HPUX 9.x) does not work with BN_LLONG (floating point exceptions).
      NeXT 3.3 can handle -O3 (3.0 can't).
      Don't use unquoted whitespace in "case" case.
      Changes for BSD/OS 4.
      BIO pairs.
      "make update"
      Avoid some warnings (on silly compilers).
      Bugfix.
      Provide fallback configurations for all hpux... configurations     (problems with BN_LLONG have been reported both for hpux-cc     and for hpux10-gcc).
      rc4_locl.h and bf_locl.h incorrectly defined _HEADER_...;     opensslconf.h always expects HEADER_... (no leading underscore).
      Comment adjusted to reality.
      long obsolete
      Obsolete.
      Don't try to use zero-byte buffers.
      Some people don't have /dev/fd/0 on Solaris, so use - instead.
      Don't access configuration files outside the source tree.
      Use same name in the definition as in the header file declaration :-/     (the extra "get" makes the name quite long, but otherwise it'd sound     as if you could request something rather than obtain information     about what the peer did).
      New function CRYPTO_num_locks.
      "make update"
      Clarification.
      "make update"
      Perl variable names are case-sensitive ...
      Make some debug-... configurations more useful for debugging.
      Don't use inline assembler when configured for "no-asm".
      Avoid some memory holes, one of which was pointed out by     "Chad C. Mulligan" <mulligan at antipope.org>.
      Close another memory hole.
      Memory leak checks.
      Update TABLE.
      configuration change for debugging
      The Mingw32 configuration entry was missing one colon (found by     "Zot O'Connor" <zot at ZotConsulting.com>).     Also, Windows probably does not need the warning about multi-threading.
      Fix comments.     Submitted by: Anonymous
      With mingw32, use "long long" rather than "_int64" (the latter does     not work, at least the package mentioned in INSTALL.W32 does not know     about it).
      Don't use ...-oldgcc for egcs compiler.
      New functions SSL[_CTX]_{set,get}_mode; the initial set of mode flags is     SSL_MODE_ENABLE_PARTIAL_WRITE, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER.
      typo
      typo
      make debug-solaris-[u]sparc-gcc more useful
      Disable asserts for standard configurations.
      avoid confliction definitions of NDEBUG
      improve readability of #if conditions (ELF, if defined, supersedes BSDI     [which we don't really define if ELF is defined, but who knows])
      Updated to reflect recent "Configure" modification.
      Don't confuse mk1mf.pl by combining multiple options into one.
      Mention modification to Configure.
      remove editing artifacts
      Provide CFLAGS and PLATFORM information on Windows platforms.
      Fix memory checking.
      New function RSA_check_key,     openssl rsa -check
      New function RSA_check_key.
      typo
      correct error handling
      Looks like another memory leak ...
      typo in string
      fix memory leak in s3_clnt.c
      cosmetic changes
      Judging from various messages on the OpenSSL mailing lists, HP-UX 10     with cc (but not gcc) seems to work well with BN_LLONG; but -O4 is too     much.
      Fix option processing.     Submitted by: Sam Tetherow
      "make clean" has to delete date.h
      Add optional (compile-time configurable) time to CRYPTO_mem_leaks output.     This is much more helpful than the counter when doing tests with the library     interactively.
      Have CRYPTO_MDEBUG_TIME automatically set CRYPTO_MDEBUG,     and make it the default for some debugging configurations.
      New compile time option -DCRYPTO_MDEBUG_THREAD.
      SSL_MODE_ENABLE_PARTIAL_WRITE and SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER     work as intended, both for SSLv2 and TLS.
      "make TABLE" (to follow recent Configure change)
      Auto-generated file -- this should not be under version control     (and the other */asm/*.cpp files are not)
      slight clean-up
      avoid -DPLATFORM=\"...\" and -DCFLAGS=\"...\" command lines,     use new file buildinf.h instead.
      Additional user data argument to pem_password_cb function type     and to lots of PEM_... functions.     Submitted by: Damien Miller <dmiller at ilogic.com.au>
      additional argument for key_callback
      Torture weak compilers less by not automatically including x509.h where     it is not needed.
      date.h no longer to be deleted by "make clean"
      ignore r586unix.cpp
      Don't include x509.h when we just need asn1.h
      summary of Andy's changes to Configure
      -DPLATFORM and -DCFLAGS command line arguments are no longer used.
      change CFLAGS to those given in Configure
      Use correct CFLAG definition for makefile.one builds.
      close files.
      Always use buildinf.h, which now includes the mk1mfinf.h data.     Using different files caused problems because the dependencies     in the Makefiles produced by mk1mf.pl were for the standard case,     i.e. mentioned buildinf.h and not mk1mfinf.h.
      correct error signalling for opendir() failure
      by request: let BN_dup(NULL) just return NULL
      don't prematurely shut down socket -- use SSL_shutdown
      SSL_shutdown was done too early.
      The SSL_CTX's cert structure is not relevant for the SSL     (because now SSL_new makes a copy).
      avoid cast
      fix previous modification -- if ssl->cert is NULL, don't follow the pointer.
      generate error message
      avoid some NO_<cipher> problems
      Revert previous change -- it was an accident.
      automatically use no-mdc2 if no-des is requested.
      Revert erroneous change.
      comment
      0.9.4 won't be completed in July ...
      improve clarity of instructions
      Add a wish.
      New function DSA_dup_DH, and fixes for bugs that were found     while implementing and using it.
      DSA_dup_DH.
      Dont' assume that something starting with '-' is a filename --     "openssl gendsa -help" now prints the usage summary, not error     messages that now file -help was found.
      fix the bug
      change formatting a bit
      add some more entries for 0.9.4
      New option "-crlf" to s_client and s_server which tells them to convert     LFs into CRLFs when forwarding data from stdin to the TLS connection.     This is necessary for properly talking HTTP.     Because of the code freeze this change is by default disabled for now;     without -DAPPS_CRLF, the code is exactly as before.
      0.9.4
      more consistent formatting
      add comments
      Comments.
      spelling
      Provide fixed seed for parameter generation to speed up -dhe1024.
      -crlf option.
      BIO_write and BIO_read could, in theory, return -2.
      Updates.     Prototypes and constant declarations for non-copying reads and writes for     BIO pairs (which is totally untested as of now, so I don't yet commit     the actual source code, but reserve the numbers to avoid conflicts).
      Fix typo.
      Submitted by: Lidong Zhou <ldzhou at cs.cornell.edu>
      Remove -DWINDOWS in debug configuration.
      Disable the text about foo.h => openssl/foo.h.     Everyone should have got it by now.
      Return 0 for succesful exit when -noout is used.
      Really undo the base64 change so that make test survives
      Fix horrible (and hard to track down) bug in ssl23_get_client_hello:     In case of a restart, v[0] and v[1] were incorrectly initialised.     This was interpreted by ssl3_get_client_key_exchange as an RSA decryption     failure (don't ask me why) and caused it to create a _random_ master key     instead (even weirder), which obviously led to incorrect input to     ssl3_generate_master_secret and thus caused "block cipher pad is     wrong" error messages from ssl3_enc for the client's Finished message.     Arrgh.
      Handle "#if 0" correctly (I hope)
      Use closesocket macro consistently, not close directly, for easier     portability.     Submitted by: Lennart B?ng
      -no_dhe option for ssltest.c
      Fix server behaviour when facing backwards-compatible client hellos.
      Make previous bugfix actually work
      use explicit constant 11 just once
      Reinitialize global variables when necessary (for monolith application).
      Reinitialize conf to NULL whenver ca application is started.     Submitted by: Lennart Bang
      Non-copying interface to BIO pairs.     It's still totally untested ...
      some more patches for avoiding problems with non-automatic variables
      Re-enable message about transition <foo.h> => <openssl/foo.h>     because various programs are not updated that often     and hence still expect header files names without the openssl/ prefix.
      Truncate message about "new" include filenames
      typo
      Use non-copying BIO interface in ssltest.c.
      "make update"
      Repair another bug in s23_get_client_hello:     tls1 did not survive to restarts, so get rid of it.
      Fix yet another bug for client hello handling.
      Set s->version correctly for "natural" SSL 3.0 client hello
      Add some debug-solaris-...-cc configurations.
      typo in a comment
      Update dependencies.
      Document -startdate and -enddate in usage summary.
      Keep line lengths < 80 characters.
      typo
      Fix typo that I introduced when reformatting lines.
      Use a temporary file, not a pipe, for BN test because there are some     broken bc's around.
      Bugfix: avoid opening CAfile when it's NULL.
      Honor BUFSIZZ definition in s_server, don't use tiny 32 byte     buffer (which leads to truncation of client cipher list).
      Fix typo in error message.
      new control code BIO_C_RESET_READ_REQUEST
      "make update"
      Pass $(RANLIB) when doing "make install" in subdirectories;     rsaref needs ist.
      Use of DEVRANDOM must be #ifdef'ed (the #ifdef was commented out     between SSLeay 0.8.1b and 0.9.0b with no apparent reason).     If we *want* an error when DEVRANDOM is not defined (it always is with     the current e_os.h) we should use #error.
      Respect PEX_LIBS and EX_LIBS when building binaries     (needed for RSAREF builds)
      Improve support for running everything as a monolithic application.
      Update Borland C++ builder support.
      Report an error from X509_STORE_load_locations     when X509_LOOKUP_load_file or X509_LOOKUP_add_dir failed.
      Various randomness handling bugfixes and improvements --     some utilities that should have used RANDFILE did not,     and -rand handling was broken except in genrsa.
      New file app_rand.c with some functionality used in various openssl     applications.
      Don't be overly paranoid.
      Warn about RANDFILE being overwritten.
      Make md_rand.c more robust.
      Always hash the pid in the first iteration in ssleay_rand_bytes,     don't try to detect fork()s by looking at getpid().     The reason is that threads sharing the same memory can have different     PIDs; it's inefficient to run RAND_seed each time a different thread     calls RAND_bytes.
      Avoid some warnings.
      Undo silly change.
      Avoid deadlock.
      Store verify_result with sessions to avoid potential security hole.
      Restore traditional SSL_get_session behaviour so that s_client and s_server     don't leak tons of memory.
      Add functions des_set_key_checked, des_set_key_unchecked.     Never use des_set_key (it depends on the global variable des_check_key),     but usually des_set_key_unchecked.     Only destest.c bothered to look at the return values of des_set_key,     but it did not set des_check_key -- if it had done so,     most checks would have failed because of wrong parity and     because of weak keys.
      Use des_set_key_unchecked, not des_set_key.
      Useless files deleted -- they were just copies of files of the same name     in the apps/ directory (which were recently changed).
      Add missing semicolon to make compiler happy, and switch back     from MemCheck_start() to CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON)     because that is what applications should use     (MemCheck_start/stop never really worked for applications     unless CRYPTO_MDEBUG was defined both when compiling the library     and when compiling the application, so probably we should     get rid of it).
      Add a comment.
      Point out that openssl-bugs is public.
      Avoid shadowing p to make the compiler happy.
      - Don't assume that int and size_t have the same representation       (and that malloc can be called with an int argument).     - Use proper prototypes (with argument list) for various function pointers,       avoid casts  (however there are still many such cases left in these files).     - Avoid collissions in app_info_cmp if sizeof int != sizeof long.     - Use CRYPTO_LOCK_MALLOC in mem_dbg.c.
      fix typos and other little errors ...
      Rename        CRYPTO_add_info    => CRYPTO_push_info        CRYPTO_remove_info => CRYPTO_pop_info     in the hope that these names are more descriptive;     and "make update".
      Correct spelling, and don't abuse grave accent as left quote     (which was allowed by old ASCII definitions but is not compatible     with ISO 8859-1, ISO 10646 etc.).
      fix comment
      Delete NO_PROTO section (which apparently was just a typo for NOPROTO --     if anyone had actually ever needed that they should have fixed this typo)
      Fix SSL_CTX_add_session: When two SSL_SESSIONs have the same ID,     they can sometimes be different memory structures.
      Don't request client certificate in anonymous ciphersuites     except when following the specs is bound to fail.
      Rename CA.pl to CA.pl.in (no actual changes), and let Configure     set the #! line with the path to Perl.
      Slight code cleanup for handling finished labels.
      Use prototypes.
      Use separate arrays for certificate verify and for finished hashes.
      Use less complicated arrangement for data strutures related to Finished     messages.
      New functions SSL_get_finished, SSL_get_peer_finished.
      add "UnixWare", treated like "unixware"
      add V_CRYPTO_MDEBUG_ALL     Submitted by:     Reviewed by:     PR:
      make no-des and no-rc2 work.
      apps/openssl.cnf and the documentation say it's "nombstr",     but crypto/asn1/a_strnid.c had "nombchar".
      CA.pl is now generated automatically (using CA.pl.in as input)
      Use basename instead of complicated sed line.
      Unify doc/openssl.pod and doc/man/openssl.pod, which were almost the     same and now are identical.     The next step will be to delete doc/openssl.pod, this is just     to see the individual CVS deltas.
      superseded by doc/man/openssl.pod
      s_client and s_server now have their own man pages.
      Clean up some of the SSL server code.
      The buffer in ss3_read_n cannot actually occur because it is never     called with max > n when extend is set.
      add check for internal error
      add dependency and auto-generation rule for bn_prime.h     (created by bn_prime.pl, which now prints the copyright/license     note as found in bn_prime.h)
      Turn BN_prime_checks into a macro.
      Note about CRYPTO_malloc_init
      Use CRYPTO_push_info to find a memory leak in pkcs12.c.
      note about things still to do with RAND_bytes
      slightly change usage information
      Use CRYPTO_push_info to track down memory leak     (only the CRYPTO_push_info's in the apps/ directory     are included in the CVS commit, not all those I used     in crypto/)
      Avoid shadowing variables,     and re-enable seeding with more data than read from DEVRANDOM -- just     don't pretend it contains entropy.
      Avoid some warnings, and run "make update".
      - Pseudo-seed the PRNG in programs used for "make test"       because otherwise BN_rand will fail unless DEVRANDOM works,       which causes the programs to dump core because they       don't check the return value of BN_rand (and if they       did, we still couldn't test anything).
      In EVP_PKEY_assign[_...], return 0 for an error when they     "key" is NULL.
      Let "make test" survive without DEVRANDOM     (and rename a target in test/Makefile.ssl to make it     easier to guess the name of the file executed by it)
      Delete "random" file .rnd in "make clean".
      Enable memory checking earlier (we correctly free everything     except for the BIO through which we print the memory leak list,     and the leak printing function ignores this one block).
      RAND_bytes's return values is 0 for an error, not -1.
      add "randomness"
      In ssl3_read_n, set rwstate to SSL_NOTHING when the requested     number of bytes could be read.
      SSL_R_UNSUPPORTED_PROTOCOL (as in s23_clnt.c) for SSL 2 when     NO_SSL2 is defined, not SSL_R_UNKNOWN_PROTOCOL.
      Define WINDOWS.
      Define WINDOWS for Mingw32 and Cygwin.
      Rename lst1 to list1 to avoid name conflict on some platforms.
      Define WINDOWS in all Mingw32 cases.
      mention manual pages
      doc/man moved to doc/apps
      Don't "goto err" in client_master_key because no such label exists;     just return -1 as in other error cases.
      add ERR_print_errors after "end" label.
      In RAND_write_file, truncate the file to the no. of bytes written     (we're now using fopen(..., "rb+") instead of fopen(..., "wb"),     so the file is not truncated automatically).
      Avoid integer overflow in entropy counter.     Slightly clarify the RAND_... documentation.
      change comments
      update PRNG documentation/comments
      As ftruncate is not availabe on all platforms, switch back to     opening the output file with "wb" to truncate it except on VMS     (where the file now keeps its original length because it is opened     with "rb+" -- does VMS have ftruncate?)
      Under VMS, ftruncate should be available
      The des_xcbc_encrypt apparently always fails.     Workaround so that "make test" continues anyway.
      RAND_pseudo_bytes is good enough for encryption IVs,     we should not need RAND_bytes (and we cannot use the latter     unless we load a seed file)
      RAND_load_file(..., -1) now means "read the complete file";     this is what we now use to read $RANDFILE / $HOME/.rnd.     (Previously, after 'cat'ting lots of stuff into .rnd     only the first MB would be looked at.)
      Give the correct e-mail address even though the message is not quite serious
      Document RAND_load_file change.
      Improve clarity.
      Avoid a race condition.
      New manual page.
      Clarification.
      Some comments added, and slight code clean-ups.
      Correct typos that ispell did not find.
      Small correction.
      Update references.
      enable Montgomery test
      Add a pointer to a paper (is the algorithm in section 4.2 the     word-based algorithm we are using?)
      Update comments to provide a better approximation of reality.
      typo in a comment
      A couple of things were reversed for BN_pseudo_rand ...
      more information on 0.9.5
      Make DSA_generate_parameters, and fix a couple of bug     (including another problem in the s3_srvr.c state machine).
      Tiny changes to previous patch (the log message was meant to be     "Make DSA_generate_parameters faster").
      Make output of "openssl dsaparam 1024" more interesting :-)
      Documentation for BN_is_prime_fasttest.
      Reference for SHA-1.
      Change log entry completed.
      Pointer to important manual page that should be written.
      Typo in preprocessor symbol.
      If n0 == d0, we must alway compute 'rem' "by hand"
      rndsort{Miller, Rabin} primality test.
      Tolerate negative numbers in BN_is_prime.
      Include OpenSSL license.
      Some 'const's for BNs.
      Correct spelling as it was done in the source.
      Use correct, not American spelling.
      Report progress as in dsatest.c when creating a DHE key.
      Generate just one error code if iterated SSL_CTX_get() fails.     Avoid enabled 'assert()' in production library.
      Commit patch to bn.h that CVS decided to throw away during 'cvs update',     and initialize too_many because memset(..., 0, ...) is not used here.
      Cosmetic changes.
      Correction: openssl.c must get the long version of the apps_startup()     macro
      Memory leak.
      Note about des_ncbc_encrypt.
      16 * 8 = 128.
      'passwd' tool.
      Implement MD5-based "apr1" password hash.
      Update.
      Corrections.
      Casts now unnecessary because of changed prototype.
      Make sure the return value of by_file_ctrl(..., X509_L_FILE_LOAD, ...)     aka X509_LOOKUP_load_file(...) is always 0 or 1, not the counter     returned from the recently introduced function X509_load_cert_crl_file.     X509_STORE_load_locations expects X509_LOOKUP_load_file to return 1 on     success, and possibly there's other software that relies on this too.
      add missing 'static'
      Avoid potential conflicts between #defines in opensslconf.h and     defines when compiling applications, and allow applications to     select what #defines to enable -- OPENSSL_EXLUCDE_DEFINES     enables the "#define NO_whatever" stuff only, which avoids     potential severe confusion caused by "#define _REENTRANT" when     opensslconf.h is not the first header file #included.
      Stay compatible to older Perl5 releases (see diff -r1.11 -r1.12).
      Change the example to show apr1 with an 8-character salt.
      Keep variable names consistent with corresponding pre-processor     symbols.
      Allow for higher granularity of entropy estimates by using 'double'     instead of 'unsigned' counters.     Seed PRNG in MacOS/GetHTTPS.src/GetHTTPS.cpp.
      Tolerate fragmentation and interleaving in the SSL 3/TLS record layer.
      ignore Client Hellos when we're in handshake anyway
      Workaround for irrelevant problem.
      Move MAC computations for Finished from ssl3_read_bytes into     ssl3_get_message, which is more logical (and avoids a bug,     in addition to the one that I introduced yesterday :-)     and makes Microsoft "fast SGC" less special.     MS SGC should still work now without an extra state of its own     (it goes directly to SSL3_ST_SR_CLNT_HELLO_C, which is the usual state     for reading the body of a Client Hello message), however this should     be tested to make sure, and I don't have a MS SGC client.
      More news.
      Move ssl3_do_write from s3_pkt.c to s3_both.c.
      Fix some bugs and document others
      Workarounds to make broken programs happy (such as s_client and s_server).
      Avoid filename "test.c" because otherwise "make test"     will invoke a default rule built into make.
      Don't define platform-dependent preprocessor symbols for OPENSSL_THREAD_DEFINES.
      Do fflush(stdout) when there was an error.
      Don't use buffered fread() to read from DEVRANDOM,     because this will drain the entropy pool.
      Version 0.9.5beta2-dev (so that the next snapshot will not     claim to be 0.9.5beta1).
      handle entropy estimate correctly
      Clarification.
      Use threads for linux-ppc.
      Ignore files that, well, should be ignored.
      Fix warnings by using unsigned int where appropriate.
      In "make clean", delete files created by "make report".
      Fix off-by-one error :-)
      Add OpenSSL licen[cs]e.
      The previous revision should have generated _more_ warnings, not less ...     The return value of handshake_func is signed, not unsigned.
      Use unsigned loop index to make compilers happy
      More get0 et al. changes.  Also provide fgrep targets in CHANGES     where the new functions are mentioned.
      Add a comment.
      Use standard header file string.h for memset prototype (where     "standard" refers to the C language, probably there's also some     standard that defines memory.h).
      Switch to 0.9.6, and finally remove the annoying message     about renamed header files.
      Point to INSTALL.MacOS for MacOS pre X.
      Check BN_rand return value.
      'rand' application for creating pseudo-random files.
      Document the 'rand' application.
      'rand'/'-rand' documentation.
      Change comment.
      Use RAND_METHOD for implementing RAND_status.
      Add missing dependencies.
      Update comment.
      Use RAND_pseudo_bytes, not RAND_bytes, for IVs/salts.
      Use RAND_pseudo_bytes, not RAND_bytes, for IVs/salts.
      Fix for previous patch: If RAND_pseudo_bytes returns 0, this is not an error.
      New '-dsaparam' option for 'openssl dhparam', and related fixes.
      Avoid potential memory leak in code generated by 'openssl dhparam -C'.
      Use signed type where -1 may be returned.
      Add an #include.
      Note about PRNG error message for openssl command line tool.
      Generate correct error reasons strings for SYSerr.
      Change output text (ar is not a linker).
      Read complete seed files given in -rand options.
      There is no reason to use downcase letters throughout in error reason     strings, it's just the default because it's usually ok.
      Preserve reason strings in automatically build tables.
      Add missing include (only MONOLITH builds were possible without it).     Submitted by: Andrew W. Gray
      Fix the indentation, and avoid a compiler warning.
      {NEXT,OPEN}STEP don't have pid_t.
      spelling
      Clarification.
      Manual page installation did not work if INSTALL_PREFIX was a relative path.
      typo
      another typo
      Change to code generated by 'dhparam -C':
      Always use fixed DH parameters created with 'dhparam -C',     don't dynamically create them.  This allows using ssltest     for approximate performance comparisons:        $ time ./ssltest -num 50 -tls1 -cert ../apps/server2.pem \          [-no_dhe|-dhe1024dsa|-dhe1024]     (server2.pem contains a 1024 bit RSA key, the default has only     512 bits.) Note that these timings contain both the server's and     the client's computations, they are not a good indicator for     server workload in different configurations.
      Mention -ign_eof.
      Use signed types where necessary, and add missing functionality     to make SSL_nread0 work.
      On NeXT, ssize_t is int, not long (see <sys/types.h> -- the definition     is activated only when _POSIX_SOURCE is defined).
      Workaround for Windoze weirdness.
      cleaning up a little
      Remove Win32 assembler files.  They are always rebuilt (with some     choice of parameters) when they are needed.
      Connection timings (using ISO C function clock()).
      Copy DH key (if available) in addition to the bare parameters     in SSL_new.     If SSL_OP_SINGLE_DH_USE is set, don't waste time in SSL_[CTX_]set_tmp_dh     on computing a DH key that will be ignored anyway.
      Don't try to test the RSA command if it is not available.
      Update test suite so that 'make test' succeeds in 'no-rsa' configuration.
      Update usage info
      Corrections.
      Include a timing test that works without RSA.
      "openssl no-..." commands for avoiding the need to grep     "openssl list-standard-commands".
      Run test_ssl last -- it's the only test that really uses the SSL library     in addition to the crypto library.
      Clarifications for 'no-XXX'.
      Correction.
      typo
      another typo
      Remove "Makefile.uni" files and some related stuff.     This was meant for building individual ciphers separately;     but nothing of this is maintained, it does not work     because we rely on central configuration by the Configure     utility with <openssl/opensslconf.h> etc., so the files     are only wasting space and time.
      Use correct function names in SSLerr macros.
      Insert a comment: This is one of the few files in this directory     that is actually used (even though it may not appear so at first     sight).
      SSL_ALLOW_ADH no longer has a meaning.
      Avoid a warning.
      Remove CRYPTO_push/pop_info invocations to improve code readability --     I hope all memory leaks that may occur here have already been tracked down.
      Point out the PRNG usage bug affecting openssl rsa.     (Should we point to snapshots, or directly give the one-line patch?)
      Eliminate memory leaks in mem_dbg.c.
      Document pseudo-commands.
      "make update"
      Update for new hpux-parisc-cc-o4 entry.
      Explain configuration options more completely.
      List "no-..." option first because it's the most frequently needed one.
      NeXT workaround.
      Comments for SSL_get_peer_cert_chain inconsistency.
      Fix typo in -clrext option, but add a compatibility hack because     0.9.5a should not break anything that works in 0.9.5.
      'entropy >= ENTROPY_NEEDED' should be evaluated while the     variables are locked.
      Entry for ssleay_rand_status locking fix.
      Extend entry on ERR_print_errors.
      Avoid memory leak.
      Clarifications.
      In theory, TLS v1 ciphersuites are not the same as SSL v3 ciphersuites
      "make update" for DSO additions.
      Minor corrections.
      New function ERR_error_string_n.
      Ignore lib and Makefile.save.
      Correction.
      Warn about truncation also in the case when a single password is read using     the password prompt.
      Stylistic changes: Don't use a macro for the malloc'ed length since it     is not constant.
      Avoid leaking memory in thread_hash (and enable memory leak detection     for it).
      Add missing #include.
      Fix a memory leak, and don't generate inappropriate error message     when PEM_read_bio_X509_REQ fails.
      Note apps/x509.c bugfixes.
      When open()ing 'file' in RAND_write_file, don't use O_EXCL.     This is superfluous now that we don't have to avoid creating     multiple versions of the file on VMS (because older versions     are now deleted).
      typo
      Add "FIXME" comment, and adjust the indentation.
      Fix "FIXME" indentation :-)
      Add required cast.
      Avoid sprintf.
      Avoid sprintf, and harmonize indentation.
      Avoid sprintf.
      Avoid sprintf
      Implement SSL_OP_TLS_ROLLBACK_BUG for servers.
      typo
      Bugfix: clear error queue after ignoring ssl_verify_cert_chain result.
      Improve PRNG robustness.
      Add "FIXME" comment.
      Move Windows seeding functions into a separate file.     They have nothing to do with the particular PRNG (md_rand.c).
      When compiling with /opt/SUNWspro/SC4.2/bin/cc on Solaris, __svr4__ is     not defined, but __SVR4 is.
      strtoul is not used anywhere.
      dh and gendh have been obsoleted by dhparam.
      typo
      int may be smaller than 32 bits.
      use consistent indentation
      No need to abort if c_rehash fails here (e.g. because Perl is not where     it is expected).
      Speed up DH with small generator.
      Use the equivalent of a sliding window (without precomputation     because we're only handling words anyway) in BN_mod_exp_mont_word     making it a little faster for very small exponents,     and adjust the performance gain estimate in CHANGES according     to slightly more thorough measurements.     (15% faster than BN_mod_exp_mont for "large" base,     20% faster than BN_mod_exp_mont for small base.)
      Add entry that Richard forgot.
      Slightly faster DSA verification (BN_mod_exp2_mont),     marginally faster BN_mod_exp for 1024 bit exponents.
      Accept -F4 option in lower case, which is what the usage information     says one should use.
      Harmonize indentation.
      Another attempt to allow compiling on SunOS 4.*.
      Comment for increased code clarity.
      Comment about bcopy on SunOS 4.x.
      BN_mod_exp_mont_word entry:     Don't give performance gain estimates that appear to be more precise     than they really are, especially when they are wrong     (2/(1/1.15 + 1) = ca. 1.0698).
      In longer tests with g=2, DH exchange does not become quite as fast     as expected -- maybe it's the different processor, maybe my     previous timings were too inaccurate.
      Use BN_CTX_end when exiting early from BN_mod_exp_mont_word because     BN_mod_exp_atalla could be used.
      This probably fixes a BN_rshift bug.
      Report "error" (usually just "File exists", which is harmless)     when symlink() fails.
      There are compilers that complain if a variable has the same name as a     label. (Reported by Alexei Bakharevski.)
      In EVP_BytesToKey, replace explicit "8" by "PKCS5_SALT_LEN".
      typo
      Using speaking "variable" names in macros so that e.g. grepping for     sk_whatever_insert and sk_whatever_set immediately reveals the subtle     difference in parameter order.
      Add OPENSSL_free at the end of CRYPTO_destroy_dynlockid.
      Avoid unnecessary links and incomplete program file in apps/.
      In BN_mod_exp_mont_word, avoid one application of BN_MOD_MUL_WORD,     and for small 'a' also a couple of calls to     BN_mod_mul_montgomery(r, r, r, ...).
      Actually comment out the parts of BN_MOD_MUL_WORD that I inteded to     comment out in the previous commit
      BSD-style MD5-based password algorithm in 'openssl passwd'.     (Still needs to be tested against the original using sample passwords     of different length.)
      Don't dereference NULL pointers.     Submitted by: bowe at chip.ma.certco.com
      Fix code structure (if ... else if ... where both parts     may be disabled by preprocessor symbols)
      Return bignum '0' when BN_rand is asked for a 0 bit random number.
      Add an early reference to BN_CTX_new so that the usage of BN_CTX_start     is easier to grasp.
      Document -purpose option in usage string.
      Bugfix: use write locks, not just read locks
      crypto/err.c bugfix
      Fix SSL 2.0 rollback checking: The previous implementation of the     test was never triggered due to an off-by-one error.
      Document rollback issues.
      Update 'openssl passwd' documentation on selection of algorithms.
      Include SKIP DH parameters with OpenSSL.     These have been created by a SHA.1 based procedure, see     http://www.skip-vpn.org/spec/numbers.html.     (These values are taken from that document, I have not     implemented the prime generator.)
      -N option to diff is not essential, and mentioning it is unnecessarily     confusing to people whose diff doesn't implement it.
      QNX 4 support.
      Use C syntax, not FORTRAN or whatever that was :-)
      Undo change from 1.7 to 1.8:
      Tell CVS to ignore 'lib'.
      Include MD4 in documentation.
      -Wall insists that main return an int.
      Fix for BN_mul_word(a, 0).
      Avoid abort() throughout the library, except when preprocessor     symbols for debugging are defined.
      Use consistent indentation,
      Consistency
      Remove silly test for b->references at the end of BIO_write:     If some other thread deletes the BIO that one thread needs for     BIO_write, then there's a lot of trouble anyway; there's     nothing special about calling the callback.
      Ignore Makefile.save
      Increase print buffer (10K instead of just 2K).
      Mention fix in bio_lib.c.
      Clarification for SSL_ERROR_ZERO_RETURN
      Add rsautl.
      update
      Add OAEP. Seed the PRNG.
      typo
      Changes for QNX: there is no thread support, and the previous     configuration only worked with no-asm.
      'make update'
      Fix X509_STORE_CTX_init.  Make indentation more consistent.  Dump core less often.
      More indentation consistency: for (), while (), if (), return ()     usually get a space between keyword and opening paranthesis     so that they don't look like function calls, where no space is     used.
      Another round of indentation changes: Position braces consistently,     add some whitespace for 'if ()', 'for ()', 'while ()' to distinguish     keywords from function names, and finally remove parens around return     values (why be stingy with whitespace but fill the source code     with an abundance of parentheses that are not needed to structure     expressions for readability?).
      Another superfluous pair of parentheses.
      See RSA Security's press release at     http://www.rsasecurity.com/news/pr/000906-1.html (September 6, 2000):     "RSA Security Releases RSA Encryption Algorithm into Public Domain"
      Get rid of ASN1_UTCTIME_get, which cannot work with time_t     return type (on platforms where time_t is a 32 bit value).
      Use name ...-whatever-solaris2 instead of ...-sun-solaris2     (the middle string describes the architecture).
      clarification (source/sink BIOs are usually *both* source and sink)
      New SSL API mode 'SSL_MODE_AUTO_RETRY', which disables the default     behaviour that SSL_read may result in SSL_ERROR_WANT_READ.
      'make update'
      Some small clarifications.
      Clarification.
      Change spelling back to "behaviour" and "flavour" instead of the     American variants.
      TLS => TLS/SSL
      SSL => TLS/SSL
      Rename new BIO_set_shutdown_wr macro to just BIO_shutdown_wr     (it's similar to the shutdown(..., SHUT_WR) system call     for sockets).
      Disable buggy code variant in BN_mod_mul_montgomery that was enabled     in 0.9.6-beta1 and 0.9.6-beta2 and caused the BN_mont_exp_mont_word()     failure (bug report "openssh 2.2.0p1 fails with openssl 0.9.6-beta1").
      Document BN_mod_mul_montgomery bug;     make disabled code slightly more correct (this does not solve     the problem though).
      Clarification about Montgomery problem
      Totally remove the supposedly 'faster' variant in     BN_mod_mul_montgomery, which calls bn_sqr_recursive     without much preparation.
      Additions for 0.9.6.
      Avoid protocol rollback.
      typo
      Fix SSL_CTX_set_read_ahead macro.
      Don't modify s->read_ahead in SSL_clear, which is called from     accept/connect functions; those should not change the     read_ahead setting of the SSL structure.
      Set s->read_ahead in SSL_new because SSL_clear no longer modifies it.
      Note read_ahead-flag related fixes.
      Add BUGS section.
      Verbose output when installing manual pages so that you see that     something is going on (and what).
      BIO_sock_init() returns 1 for success and -1 for failure, not 0;     thus the condition '!BIO_sock_init()' doesn't make sense.
      Don't ever set 'seeded' if RAND_status() returned 0     (although maybe this static variable should be abolished totally,     it was introduced before RAND_status existed).
      internal_verify now does know about extensions
      Cert chain verification is useable by now.     Whether Steve is still working on 'proper' verification is up to     him to decide ...
      rsautl.c requires RSA.
      Never call load_dh_param(NULL) because this leads to an illegal     fopen(NULL).
      avoid memory leak
      handle the case when BN_new returns NULL
      Handle BN_copy failure after successful BN_new.
      BN_CTX-related fixes.
      tmp2 is not used in BN_mod_mul_montgomery.
      add missing word
      Point to SSL_set_bio(3) early because that manpage provides     information that is essential for using BIO pairs.
      Additional explanations for SSL_ERROR_WANT_READ/WRITE.
      Constify bn_dump1 implementation so that it matches the prototype     in bn.h
      Improve usability of 'openssl passwd' by including     password verification where it makes sense.
      Documentation on using the SSL library with non-blocking I/O.
      tag SSL_peek bugs
      include 'err' label only when it is actually used
      Increase permissible ClientKeyExchange message length.
      Elliptic curves over GF(p), new BIGNUM functions, Montgomery re-implementation.
      Remove CR at line ends.
      modular arithmetics
      Add bn_mod.c (should have happend in the previous commit ...).
      More BN_mod_... functions.
      Change submitted files so that they compile (in particular,     use BN_CTX_start/get/end instead of accessing ctx->tos).
      Change submitted files so that they compile (in particular,     use BN_CTX_start/get/end instead of accessing ctx->tos).
      Fix BN_is_... macros.     Fix BN_gcd.     Analyze BN_mod_inverse.     Add BN_kronecker.     "make update".
      Undo previous commit, which was an accident.
      Add bn_kron.c (BN_kronecker), which I forgot in the previous commit.
      Add test_kron function, which will contain a test for BN_kronecker.
      Disable SSL_peek until it is fixed.
      Comments on SSL_peek deficiencies
      Correct a bug in BN_kronecker.
      Note that SSL_peek has been disabled.
      Timings.
      Use BN_pseudo_rand instead of BN_rand
      Improve BN_mod_inverse performance.
      Make BN_mod_inverse a little faster
      avoid segmentation fault
      Implement BN_kronecker test.
      Expand expspeed.c to make BN_kronecker timings.     This caused a segmentation fault in calls to malloc, so I cleaned up     bn_lib.c a little so that it is easier to see what is going on.     The bug turned out to be an off-by-one error in BN_bin2bn.
      BN_bin2bn did *not* contain an off-by-one error;     I'm still investigating what caused the segementation fault     (maybe "make clean; make" will cure it ...).     But BN_bin2bn should always reset ret->neg.
      Fix warnings in expspeed.c (but the segmentation fault remains)
      add missing braces
      BN_to_montgomery expects its inputs to be in the interval 0 .. modulus-1,     so we have to reduce the random numbers used in test_mont.
      Fix BN_kronecker so that it works correctly if 'a' is negative     (we need the two's complement of BN_lsw then).
      mark a bug
      BN_legendre is no longer needed now that OpenSSL has BN_kronecker.
      BN_sqrt
      BN_mod_sqrt
      Handle special cases correctly in exponentation functions.
      Fix bntest.c problem -- one of the primes got lost
      bn_modfs.c is no longer needed, a BN_sqrt implementation     exists in bn_sqrt.c now
      Move reduction step from BN_mod_exp to BN_mod_exp_mont_word.     Fix BN_mod_exp_simple for a==0 (mod m).     Skip useless round in BN_mod_sqrt (1 is always a square, no need     to test BN_kronecker for it).
      BN_mod_exp problems ...
      Corrections to the comments in BN_mod_inverse.
      Changes to Lenka's Montgomery implementation.
      It's "#elif", not "#elsif".
      BN_mod_exp(r,a,p,m,ctx) should not be called with r == p.     But even if this is avoided, there are still segmentation violations     (during one of the BN_free()s at the end of test_kron     in some cases, in other cases during BN_kronecker, or     later in BN_sqrt; choosing a different exponentiation     algorithm in bntest.c appears to influence when the SIGSEGV     takes place).
      Remove randomness from the test. These constants give me a segment     violation in test_kron on a 32 bit system.
      Fix BN_rshift, which caused lots of trouble.
      Fix the recently introduced test that checks if the result is 0
      COMP_zlib should always be declared, even if it is not functional.
      update
      "make depend"
      functionality for BN_mod_sqrt timings
      Don't allow BIGNUMs to become so large that computations with dmax     might overflow.
      include <limits.h>
      Change error message to "bignum too long"
      Improve formatting.
      Discuss http://www.shoup.net/papers/oaep.ps.Z
      Workaround for broken (or missing) bc.
      Add a comment.
      Use bc's "print" feature whenever it is available,     not just on certain platforms.
      Printing "verify ..." should not be counted as a test for the     "xxx tests passed" message.
      Faster BN_mod_sqrt algorithm for p == 5 (8).
      BN_mod_sqrt documentation/comment
      Move 'q->neg = 0' to those places where it is needed     (just in cases someone uses a negative modulus)
      Sign-related fixes (and tests).
      TEST_MUL and TEST_SQR added.
      Fix some things that look like bugs.
      Placeholder for SCO bc bug detection
      Don't throw away bctest's error messages.
      Use continuation lines in test/bctest as far as it is possible     to dermine what the expression should look like.     Apparently CVS does not like lines longer than about 2^10 characters.
      Change/add comments
      Update.
      First step towards SSL_peek fix.
      The BN_mul bug test apparently is no longer needed
      typo
      Very few in the "README" is up-to-date
      The C version of bn_sub_part_words is needed not only     in NO_ASM configurations
      Locking issues.
      If CONF_get_string returns NULL and we want to tolerate this     (e.g., use a default), we have to call ERR_clear_error().
      Simplify preprocessor statements.
      When mentioning features that don't exist in current releases of     OpenSSL (such as the new undocumented '-prexit' option to s_client),     the FAQ should point out that they don't: The FAQ is not just part     of the release, it's current version is also published on the web.
      undo previous change: '-prexit' is already available in current versions of s_client
      Obtain lock CRYPTO_LOCK_RSA before creating BN_MONT_CTX     structures and setting rsa->_method_mod_{n,p,q}.
      Comment correction.
      Import s2_pkt.c wbuf fixes from OpenSSL_0_9_6-stable branch.
      Add a comment (intended change)
      Don't hold CRYPTO_LOCK_RSA during time-consuming operations.
      fix indentation
      Split a CHANGES entry so that one of the halves matches the     corresponding new entry in the OpenSSL_0_9_6-stable branch.
      Don't access non-existing element buf[256], use buf[255] instead.
      Fix SSL_peek and SSL_pending.
      Finish SSL_peek/SSL_pending fixes.
      Get rid of unused error code.
      Change prototypes for new CRYPTO_..._mem_ex_functions functions so     that they match the function definitions (namely, remove file/line     parameters from free_func).
      Fix C code generate by 'openssl dsaparam -C'.
      Add a pointer to digest options in the description of -fingerprint.
      'char' argument to islower must be converted to 'unsigned char'
      Add SSLEAY_DIR argument code for SSLeay_version.     Add '-d' option for 'openssl version' (included in '-a').
      make indentation consistent
      Last time I asked, no-one appeared to remember if these "NEEDS PATCH"     entries are still current or what they are about:
      Add new items:     - 0.9.6a is under development     - a couple of illegal includes of <openssl/e_os.h> should be purged     - ex_data sucks
      Use $(PERL) in place of hard-coded perl
      Pass ${PERL} down to the Makefile in sub-directory "test" in     "make tests"
      It's silly to use a different default for PERL than in the top     Makefile.  (The default is never actually used though because     the top Makefile passes its value of PERL down to sub-Makefiles.)
      After discussion with Richard, change the new API for extended memory     allocation callbacks so that it is no longer visible to applications     that these live at a different call level than conventional memory     allocation callbacks.
      No functional change, but slightly improved code clarity.
      New -newreq-nodes option to CA.pl.
      Remove "AVAILABLE PATCH" that has now been applied.
      When we are waiting for user action, we should say this explicitly.
      note strncpy problem
      isspace must be used only on *unsigned* chars
      New 'openssl ca -status <serial>' and 'openssl ca -updatedb'     commands.
      Disable RegQueryValueEx() call.     Problem reported by "Wolfgang Marczy" <WMarczy at topcall.co.at>     in a message to openssl-dev (19 Dec 2000 13:40:51 +0100).
      New '-extfile' option for 'openssl ca'.     This allows keeping extensions in a separate configuration file.
      Fix openssl passwd -1
      More on the e_os.h mess ...
      Use OpenSSL_add_all_algorithms instead of the backwards compatibility     alias SSLeay_add_all_algorithms
      For improved compatibility with 'strange' certificates, add some     digest aliases (as found in OpenSSL_add_all_digests).
      EVP_add_digest_alias additions to SS_library_init
      Update "OAEP reconsidered" comment
      update
      Comment and indentation
      Remove serial number file during 'make clean'.
      Include string.h (whis is in all relevant standards) instead of     memory.h (which is not).
      don't dump core
      Avoid coredumps for CONF_get_...(NULL, ...)
      platform specific CFLAGS don't belong into this Makefile
      Integrate my implementation of a countermeasure against     Bleichenbacher's DSA attack.  With this implementation, the expected     number of iterations never exceeds 2.
      oops -- remove observation code
      Change comments.  (The expected number of iterations in BN_rand_range     never exceeds 1.333...).
      Another comment change.  (Previous comment does not apply     for range = 11000000... or range = 100000...)
      add linux-s390 configuration (based on information submitted by     Denis Beauchemin <Denis.Beauchemin at Courrier.USherb.ca>)
      fix editing error
      Simplify BN_rand_range
      use case-insensitive comparison in set_table_opts     (similar to how arguments such as -inform/-outform specifications     are treated)
      disable stdin buffering in load_cert
      Add German SiG root certificates (extracted from the official cert registry     file http://www.nrca-ds.de/ftp/pkd.ttp, which contains a total of 288     certificates issued by the RegPT so far)
      Oops: It's RegTP, not RegPT ...
      Add uid.{c,o}
      Memory leak detection bugfixes for multi-threading.
      Fix BN_[pseudo_]rand: 'mask' must be used even if top=-1.
      update
      honour '-no_tmp_rsa'
      include e_os.h as "openssl/e_os.h" (as elsewhere)
      undo previous change: "e_os.h" is now the official name for the file     to include (but the OpenSSL_0_9_6-stable branche still has     inconsistencies)
      e_os.h problems have been solved in the main branch.
      EC_set_half and the 'h' component of struct bn_ec_struct are unnecessary.     The computations for which h was used can be done more efficiently     by using BN_rshift1.
      increase emailAddress_max
      New option '-subj arg' for 'openssl req' and 'openssl ca'.  This     sets the subject name for a new request or supersedes the     subject name in a given request.
      Move ec.h to ec2.h because it is not compatible with what we will use.
      Add more EC vaporware (empty source code files I missed in my     previous commit).
      Add yet another (still empty) source code file that I forgot.
      Another file I had forgotten to add.
      Some declarations that outline what I intend to implement.
      Change comments.
      Add EC_GROUP_new_GFp prototype.
      Add BN_CTX arguments where appropriate.
      New function declarations.
      'is_at_infinity' tests don't need a BN_CTX.
      Change obj_... generation so that it does not generate rubbish or     abort with errors if no name is defined for some object, which was the     case for 'pilotAttributeType 27'.
      Add a few 'const's
      Implement dispatcher for EC_GROUP and EC_POINT method functions.
      Fix ERR_R_... problems.
      In clear_free, clear the complete structure just in case     the method misses something.
      Oops ...
      extra_data 'mixin'.     (This will be used for Lim/Lee precomputation data.)
      The next bunch of vaporware.
      Optimized EC_METHODs need specific 'set_curve' and 'free' functions.
      ..._init functions are method-specific too     (they can't do much useful, but they will have to set pointers     to NULL)
      Some actual method functions (not enough yet to use the EC library, though),     including EC arithmetics derived from Lenka Fibikova's code (with some     additional optimizations).
      More method functions.
      More method functions for EC_GFp_simple_method.
      More 'TODO' items.
      Let EC_POINT_copy do nothing if dest==src
      Get rid of '#define ERR_file_name __FILE__', which is unnecessary indirection.     (It cannot possibly help to avoid duplicate 'name of file' strings     in object files because the preprocessor does not work at object file     level.)
      Order ERR_load_... calls like the stuff in err.h.
      Integrate ectest.c (which does not yet do anything).
      Sort openssl.ec, the configuration file for mkerr.pl.
      Throw out *all* absolute pathnames, not matter what they look like.     The filenames we are interested in for Makefile dependencies     are always relative.
      Integrate ec_err.[co].
      Constify BN_value_one.
      avoid compiler warning
      Hide BN_CTX structure details.
      Comment
      Bugfix: previously the serial number file could turn negative     because an incompletely initialized ASN1_INTEGER was used.
      More method functions for elliptic curves,     and an ectest.c that actually tests something.
      Fixes to make 'no-ec' work (it should not turn 'objects' into 'objts' for example)
      Implement EC_GFp_mont_method.
      Avoid problems with multi-line NAME sections.
      add ssl23_peek
      ssl23_peek
      Fix ec_GFp_simple_cmp.
      Consistently use 'void *' for SSL read, peek and write functions.
      Workaround for solaris64 linking problem (explicit "ar rs" is needed     to create a symbol table).
      Instead of telling both 'make' and the user that ranlib     errors can be tolerated, hide the error from 'make'.     This gives shorter output both if ranlib fails and if     it works.
      More EC stuff, including EC_POINTs_mul() for simultaneous scalar     multiplication of an arbitrary number of points.
      Remove files from Lenka's EC implementation.
      comment and error code update
      Change timing output: We don't have "exponents" here, curves are     considered additive
      use fflush
      handle negative scalars correctly when doing point multiplication
      Add functions EC_POINT_mul and EC_GROUP_precompute.     The latter does nothing for now, but its existence means     that applications can request precomputation when appropriate.
      Timings are not supposed to be enabled by default ...
      Forcibly enable memory leak checking during "make test"
      EC_METHOD based on bn_mont2 (not used in the library)
      Add various X9.62 OIDs. (GF(2^n) mostly left out.)
      Rename function EC_GROUP_precompute to EC_GROUP_precompute_mult,     which indicate its purpose more clearly.
      fix memory leak in err.c
      Use err_clear_data macro
      typo
      Fix: return 0 if no error occured.
      The former ULTRASPARC preprocessor symbol is now called     OPENSSL_SYSNAME_ULTRASPARC, so we'd better check for that one
      More error_data memory leaks
      error codes are longs, not ints
      avoid infinite loop
      Completely remove mont2 stuff.     It does not appear to be faster than the current Montgomery code     except for very small moduli (somewhere between 192 and 224 bits     in a 64-bit Sun environment, and even less than 192 bits     on 32 bit systems).
      Explicitly ignore the exit code of ./bctest.  Usually the shell     ignores it anyway in command substitution, but Ultrix reportedly     aborted the test when bctest returned 1.
      Update.
      Table for window sizes.
      Increase boundaries in EC_window_bits_for_scalar_size table.
      Tag EC_GFp_{nist,recp}_method as "NOEXIST" because they have     not yet been implemented.
      Update docs.
      Harmonize CHANGES and STATUS files between the 0.9.6a branch and     the trunk to keep diffs small.
      Add missing '#ifndef OPENSSL_NO_DSA'.
      Fix bctest, and add a workaround that should solve the problem with     FreeBSD's /bin/sh.
      News for 0.9.6a.
      For -WWW, fix test for ".." directory references (and avoid warning for     index -1).
      this time *really* fix the /../ check ...
      avoid buffer overflow
      This change should be suitable as a workaround for the Solaris x86     compiler bug reported in <01032110293775.22278 at weba3.iname.net>     (the '++seq[i]' condition is evaluated as 256 rather than 0     when the previous value is 255).
      Make sure OPENSSL_SYS_... is defined when we need it.
      Fix warnings.
      don't use shell functions
      Don't use 'tt' uninitialized when reporting an error     (we don't have an ASN1_TEMPLATE to complain about at this stage,     so  errtt == NULL  should be OK)
      Avoid assert() in the library.
      '||', '&&' and 'test -x' apparently don't work on Ultrix;     also 'test' appears to be available as '[' only in 'if' conditions.
      avoid '||' since Ultrix apparently doesn't understand it
      binary algorithm for modular inversion
      code documentation
      comment
      update (0.9.6a)
      Adjust BN_mod_inverse algorithm selection according to experiments on     Ultra-Sparcs (both 32-bit and 64-bit compilations)
      Mention automatically queried EGD sockets (OpenSSL 0.9.7).
      Add information on 0.9.6a (in a form such that the list can be     verified by looking at 'diff -u ../openssl-0.9.6a/CHANGES CHANGES')
      update from 0.9.6a
      undo previous change ...
      update so that changes going into the 0.9.6 tree can be logged
      fix md_rand.c locking bugs
      typo
      bctest changes for Ultrix (don't return 1 from bctest, otherwise make aborts)
      .rnd issues
      fix an old entry
      restore change undone in 1.831 (apparently by accident)
      increase DEFAULT_BUFFER_SIZE (4K instead of just 1K)
      Fix Bleichenbacher PKCS #1 1.5 countermeasure.     (The attack against SSL 3.1 and TLS 1.0 is impractical anyway,     otherwise this would be a security relevant patch.)
      when checking OAEP, signal just a single kind of 'decoding error'
      OAEP fix
      Earlier OpenSSL versions printed prompts to stderr.     In the new crypto/ui/, this was changed into tty (which is usually     /dev/tty), i.e. the FILE * used for reading passwords from the user.     However stdio buffering for read/write streams is not without pitfalls     (passwords would be echoed on some systems).     To avoid problems, split tty into tty_in and tty_out (which are     opened separately).
      Add directory name to the entry on /crypto/ui/.
      even use of default engines leaks memory
      For MSDOS, the tty filename still is "con", not "/dev/tty" ...
      pay attention to blocksize before attempting decryption
      Translate into valid C (don't call functions with wrong prototypes).
      DSA verification should insist that r and s are in the allowed range.
      Entry for Andy's mips3.s fix.
      Call ENGINE_cleanup() to avoid memory leak.
      Engine memory leaks have been fixed by now.
      Align with 0.9.6-stable CHANGES file, and make some corrections.
      Precomputation will not necessarily be LIm-Lee precomputation.
      In version numbers, there is just one "M" nybble.
      Fix PRNG.
      comment change
      For consistency with the terminology used in my SAC2001 paper, avoid     the term "simultaneous multiplication" (which -- acording to the     paper, at least -- applies only to certain methods which we don't use     here)
      Avoid race condition.
      avoid warnings
      add a comment
      always reject data >= n
      md_rand.c thread safety
      Don't preserve existing keys in DH_generate_key.
      DH key generation should not use a do ... while loop,     or bogus DH parameters can be used for launching DOS attacks
      Undo DH_generate_key() change: s3_srvr.c was using it correctly
      length of secret exponent is needed only when we create one
      remove a comma
      Reinsert typedef'ed names for structs to help those trying to read the     sourcecode (including fgrep)
      More typedef'd struct names as search targets
      Bugfix: larger message size in ssl3_get_key_exchange() because     ServerKeyExchange message may be skipped.
      add missing link
      rearrange #includes because trying to include <crypto/cryptodev.h>     is a bad idea if OPENSSL_OPENBSD_DEV_CRYPTO is not defined
      Use uniformly chosen witnesses for Miller-Rabin test     (by using new BN_pseudo_rand_range function)
      Rename recently introduced functions for improved code clarity:           [DR]SA_up  =>  [DR]SA_up_ref
      delete redundant ERR_load_CRYPTO_strings() prototype
      OpenSSL copyright notices ...
      CHANGES should list all API changes relevant for applications     (here: X509_STORE_CTX_init())
      changing something requires a write lock, not a read lock
      Now that we have ERR_unload_strings(), ERR_load_ERR_strings() must     always load its strings because they might have been unloaded     since the 'init' flag was deleted.
      typo
      Solaris <string.h> does not declare 'strdup' if _XOPEN_SOURCE is     defined.
      -mcpu=i486 vs. -m486 ...
      Oops, wrong line
      Oops^2: It was the correct line, but an incorrect change.
      Renaming DH_up to DH_up_ref does not warrant a CHANGES entry of its own     as the functions were only introduced a couple of days ago.
      Mention DSO_up => DSO_up_ref renaming
      fix formatting so that the file can be view with any tab-width
      improve OAEP check
      Totally get rid of CRYPTO_LOCK_ERR_HASH.
      Avoid strdup.
      The various hash #includes in rand_lcl.h *are* needed despite     <openssl/evp.h> is now used (MD_DIGEST_LENGTH definitions!).     No need to include such headers directly in md_rand.c.
      Fix apps/openssl.c and ssl/ssltest.c so that they use     CRYPTO_set_mem_debug_options() instead of CRYPTO_dbg_set_options(),     which is the default implementation of the former and should usually     not be directly used by applications (at least if we assume that the     options accepted by the default implementation will also be meaningful     to any other implementations).
      Delete pointless casts
      copyright
      Get rid of hazardous EVP_DigestInit_dbg/EVP_DigestInit case     distinction (which does not work well because if CRYPTO_MDEBUG is     defined at library compile time, it is not necessarily defined at     application compile time; and memory debugging now can be reconfigured     at run-time anyway).  To get the intended semantics, we could just use     the EVP_DigestInit_dbg unconditionally (which uses the caller's     __FILE__ and __LINE__ for memory leak debugging), but this would make     memory debugging inconsistent.  Instead, callers can use     CRYPTO_push_info() to track down memory leaks.
      Get rid of hazardous EVP_DigestInit_dbg/EVP_DigestInit case     distinction (which does not work well because if CRYPTO_MDEBUG is     defined at library compile time, it is not necessarily defined at     application compile time; and memory debugging now can be reconfigured     at run-time anyway).  To get the intended semantics, we could just use     the EVP_DigestInit_dbg unconditionally (which uses the caller's     __FILE__ and __LINE__ for memory leak debugging), but this would make     memory debugging inconsistent.  Instead, callers can use     CRYPTO_push_info() to track down memory leaks.
      typo
      Update so that progs.h can indeed be automatically generated
      add AES ciphers
      exclude disabled message digests
      avoid warning ('const' discarded)
      fix memory leak
      restore previous revision -- memory leak should be fixed in mem.c
      remove an old comment
      fix memory leak (I think)
      While ispell may not like it, "cancelling" may be spelt with two "l"s
      ex_data situation is no longer that bad
      update
      add 'release showstopper' entry
      avoid "statement not reached" warning
      add details
      Get rid of junk (deleted/renamed function) by rebuilding     based on 0.9.6 tree.
      add comment
      Another demo.
      Change Makefile so that it works without any additional changes     at least on Solaris
      comments
      Fix ssl/s3_enc.c, ssl/t1_enc.c and ssl/s3_pkt.c so that we don't     reveal whether illegal block cipher padding was found or a MAC     verification error occured.
      fix ssl3_accept: don't call ssl_init_wbio_buffer() in HelloRequest case
      make update
      New function SSL_renegotiate_pending().     New option SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION.
      Bugfix: correct cleanup after sending a HelloRequest
      Disable session related stuff in SSL_ST_OK case of ssl3_accept if we     just sent a HelloRequest.
      bugfix: handle HelloRequest received during handshake correctly
      crypto/idea and crypto/rijndael were missing in the list of     directories that may have been deleted
      The 'no-rijndael' option must define OPENSSL_NO_AES because that is     what we look for in crypto/evp.
      avoid everything resembling a magic trigraph
      ignore binary
      comment
      'openssl speed' does not include AES support yet
      'openssl rsa' etc. should include AES support in addition to DES
      the previous commit accidentily removed 'ret = 1' from the SSL_ST_OK     case of ssl3_accept
      Fix ssl3_get_message handle message fragmentation correctly.
      make sure .rnd exists
      Change ssl3_get_message and the functions using it so that complete     'Handshake' protocol structures are kept in memory, including     'msg_type' and 'length'.
      For consistency, set s->init_num in the 'reuse_message' case     (if s23_srvr.c faked the message, s->init_num is 0).
      The message header for fake SSL 3.0/TLS 1.0 client hellos created from     SSL 2.0 client hellos added with the previous commit was totally wrong --     it must start with the message type, not the protocol version.     (Not that this particular header is actually used anywhere ...)
      Add per-SSL 'msg_callback' with 'msg_callback_arg'.     Both have per-SSL_CTX defaults.     These new values can be set by calling SSL[_CTX]_[callback_]ctrl     with codes SSL_CTRL_SET_MSG_CALLBACK and SSL_CTRL_SET_MSG_CALLBACK_ARG.
      document SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
      gcc complained about "write" being shadowed even though the "write"     variable name occured just in a function *prototype* -- so rename it
      New functions SSL[_CTX]_set_msg_callback().     New macros SSL[_CTX]_set_msg_callback_arg().
      Call msg_callback with correct length parameter if ssl3_write_bytes had to     be called multiple times
      Fix memory leak.
      Fix SSL handshake functions and SSL_clear() such that SSL_clear()     never resets s->method to s->ctx->method when called from within     one of the SSL handshake functions.
      Assume TLS 1.0 when ClientHello fragment is too short.
      Consistency with s2_... and s23_... variants (no real functional     change)
      filenames are des_old.[ch], not des.comp*
      Add '-noemailDN' option to 'openssl ca'.  This prevents inclusion of     the e-mail address in the DN (i.e., it will go into a certificate     extension only).  The new configuration file option 'email_in_dn = no'     has the same effect.
      mention des_old.h
      remove redundant definitions that are also in des.h
      Like MD_Init, MD now must include a NULL engine pointer in its definition.
      disable caching in BIO_gethostbyname
      Consistency fix in BUF_MEM_grow: Initialise to zero when new memory     had to be allocated, not just when reusing the existing buffer.
      Note BUF_MEM_grow() consistency fix.
      Don't define _REENTRANT here in e_os.h.  On systems where we need     _REENTRANT if threads support is enabled, the ./Configure entry must     define it so that it ends up in CFLAG.
      clarify
      cast to 'unsigned long' before using ~ if we need an unsigned long result
      adjust to OpenSSL_0_9_6-stable version
      2001, not 2000
      Implement msg_callback for SSL 2.0.
      more output for SSL 2.0 in our msg_callback
      msg_callback documentation
      remove incorrect 'callback' prototype
      make code a little more similar to what it looked like before the fixes,     call ssl2_part_read again to parse error message
      Order chronologically: move entry for recent s2_clnt.c/s2_srvr.c fixes     (nearly) to the top.
      add changes between OpenSSL 0.9.6b and OpenSSL 0.9.6c
      the PRNG race conditions were mostly a theoretical issue, remove from NEWS
      Add unixware-7-gcc as in 0.9.6 branch (except that we need a 'sys_id'     field here, which is left empty).
      information on 0.9.6c-engine
      synchronise with 0.9.6 stable branch
      consistency between main branch and stable branch
      cast to unsigned int, not to int to avoid the warning -- all these     values really are unsigned
      remove obsolete entry
      Improve EC efficiency.
      comments etc.
      use a more interesting test case
      comment
      avoid stupid compiler warning
      wNAFs use does not bring that much performance on Sparcs (where     elliptic curves are are relatively faster than on PCs anyway)
      comment
      OS/390 support
      check OPENSSL_NO_... before including header files that might be     disabled
      fix submitted by Andy Schneider <andy.schneider at bjss.co.uk>     (in main branch, hn_ncipher.c is already correct)
      info on 0.9.6 engine branch
      For future portability reasons MIT is moving all macros to function     calls.  This patch allows compilation either way.
      discuss -name and default_ca more correctly (I hope)
      Fix: 2.5.29 is "id-ce", not "ld-ce" (sort of a typo in objects.h).
      crypto/objects stuff
      fix warnings (one of them was clearly justified)
      fix BN_rand_range
      consistency with 0.9.6 stable "CHANGES"
      remove redundant ERR_load_... declarations
      oops
      formatting consistency
      update FAQ and CHANGES file (0.9.6c has been released)
      fix EVP_CIPHER_mode macro
      add automatically generated ERR_load_... prototype
      Changes that break something should be included in CHANGES     to make it easier to fix things.
      fix 'Configure TABLE' output
      synchronize with engine-0.9.6 tree
      add documentation for SSLeay_version(SSLEAY_DIR) and     'openssl version -d'
      add a sentence previously deleted by accident
      Return -1 from ssl3_get_server_done (ssl3/s3_clnt.c) if     the SSL_R_LENGTH_MISMATCH error is detected.
      Bugfix: In ssl3_accept, don't use a local variable 'got_new_session'     to indicate that a real handshake is taking place (the value will be     lost during multiple invocations). Set s->new_session to 2 instead.
      run test_evp before test_ssl
      disable broken code
      Reword CHANGES entry for _old_des_..., as it was a little complicated     syntactically.
      New functions         ERR_peek_last_error         ERR_peek_last_error_line         ERR_peek_last_error_line_data     (supersedes ERR_peek_top_error).
      fix formatting of automatically generated error section
      sort functions ...
      Undo previous change,  X509_check_issued() was correct.     [See          Message-ID: <3BB07999.30432AD2 at celocom.com>          Date: Tue, 25 Sep 2001 13:33:29 +0100          From: Dr S N Henson <drh at celocom.com>          To: openssl-dev at openssl.org          Subject: Re: Error in v3_purp.c     ]
      add a wish
      We should implement a countermeasure against the predictable-IV CBC     weakness in SSL/TLS
      add support for named curves
      new locks
      some modifications to named curve support
      ECDSA support
      EC_GROUP_get_group_by_name() is now called EC_GROUP_new_by_name()
      don't call OPENSSL_config(), this does not make any sense during "make test"
      move ECDSA test right after EC test
      fix memory leak
      fix '-C'
      '-C' is still quite broken
      make it possible to disable memory checking for timings
      fix indentation
      bugfix: allocate sufficiently large buffer
      typo
      simplifications
      disable '#ifdef DEBUG' sections
      disable '#ifdef DEBUG' sections
      Add 'void *' argument to app_verify_callback.
      use ERR_peek_last_error() instead of ERR_peek_error() to ignore     any other errors that may be left in the error queue
      use ERR_peek_last_error() instead of ERR_peek_error()
      '#if OPENSSL_VERSION_NUMBER >= ...' to document the recent change
      disable '#ifdef DEBUG' code
      more X9.62 OIDs
      fix 'ecdsaparam -C' output
      typo
      fix printf call
      fix 'ecdsaparam -C'
      Rephrase statement on the security of two-key 3DES.
      reference counting for EC_GROUP structures is not needed (at the     moment at least), so remove it
      add SECG OIDs
      Add more curves.     Submitted by: Nils Larsch
      fix spacing
      EC curve stuff
      asm/mips3.o problems
      use BIO_nwrite() more properly to demonstrate the general idea of     BIO_nwrite0/BIO_nwrite (the previous code was OK for BIO pairs but not     in general)
      Fixes for 'no-hw' combined with 'no-SOME_CIPHER'.     Fix dsaparam usage output.
      add OIDs for WAP/TLS curves
      fix ssl3_pending
      Rename 'cray-t90-cc' into 'cray-j90'.     Add to 'config'.
      fix #include position
      Fix bugs and typos.     Add some WTLS curves.     New function EC_GROUP_check() (this will probably     be implemented differently soon).
      Fix typo.
      New function EC_GROUP_check_discriminant().     Restructure implementation of EC_GROUP_check().
      fix DH_generate_parameters for general 'generator'
      fix conditational compilation for OPENSSL_NO_...
      add missing declaration
      fix memory leak
      fix warnings
      add usage examples
      fix ECDSA handling
      harmonize capitalization
      ECDSA representation bugfixes
      clean up and synchronize with 0.9.6-stable
      looks like a typo
      Implement known-IV countermeasure.
      fix length field we create when converting SSL 2.0 format into SSL 3.0/TLS 1.0 format     (the bug was introduced with message callback support)
      remove disabled code
      get rid of some assignments that have become obsolete
      check return values
      'version' is not optional in the encoding
      'version' is not optional in the encoding
      fix usage (no 'key')
      AlgorithmIdentifier bugs
      oops
      new items for 0.9.7
      Fix crypto/asn1/a_sign.c so that 'parameters' is omitted (not     encoded as NULL) with id-dsa-with-sha1.
      undo nonsense patch (r *is* signed or we have signedness mismatches elsewhere)
      fix casts
      disable AES ciphersuites unless explicitly requested
      improve wNAF generation
      update
      fix warning
      refer to latest draft for AES ciphersuites
      ensure that, for each strength, RC4 ciphers have least preference     in the default ciphersuite list
      Fix ciphersuite list to enforce low priority for RC4.
      in SignerInfo, use ecdsa-with-SHA1 OID for ECDSA (not ecPublicKey)
      Change internals of the EC library so that the functions     EC_GROUP_{set_generator,get_generator,get_order,get_cofactor} are     implemented directly in crypto/ec/ec_lib.c and not dispatched to     methods.
      make b_print.c consistent with the rest of OpenSSL:     disable assert() except for debug builds
      update
      fix EVP_dsa_sha macro
      accept NULL in 'free' functions
      fix Cygwin (remove extra colons)
      New functions EC_POINT_point2bn(), EC_POINT_bn2point(), EC_POINT_point2hex(), EC_POINT_hex2point()
      fix memory leak
      remove unnecessary calls to EC_POINT_copy()
      fix for 'make update'
      move ECC ASN1 that is not specific to ECDSA into crypto/ec/,     and make some appropriate changes to the EC library.
      move ECC ASN1 that is not specific to ECDSA into crypto/ec/,     and make some appropriate changes to the EC library.
      simplify asn1_flag
      typo
      New option SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS for disabling CBC     vulnerability workaround (included in SSL_OP_ALL).
      typo
      Implement handling of EC parameter seeds (new functions     EC_GROUP_set_seed(), EC_GROUP_get0_seed(), EC_GROUP_get_seed_len()).
      always include <string.h> (we do this in various other header files,     so it can't be bad)
      always include <string.h> (we do this in various other header files,     so it can't be bad)
      update an entry on EVP changes
      Make sure buffers are large enough even for weird parameters
      AES cipher suites are now official (RFC3268)
      emtpy fragments are not necessary for SSL_eNULL     (but noone uses it anyway)
      fix synopsis
      remove obsolete comment
      Replace 'ecdsaparam' commandline utility by 'ecparam'     (the same keys can be used for ECC schemes other than ECDSA)     and add some new options.
      Fix bug introduced with revision 1.95 when this filed was modified to     use the new X509_CRL_set_issuer_name() function:     The CRL issuer should be X509_get_subject_name(x509), not     X509_get_issuer_name(x509).
      update
      add an explanation and fix a typo
      fix a typo and clarify
      harmonize options with those for 'ecparam',     remove redudant option '-pub'
      more detailed instructions for export from US
      Move zeroing from bn_expand_internal() to bn_expand2() so that it     happens reliably, even if the BIGNUM is already sufficiently large.
      Use SEC1 format for EC private keys.     This is not ECDSA specific, so it's now PEM_STRING_ECPRIVATEKEY etc.
      mention SSL_do_handshake()
      get rid of OpenSSLDie
      New error code ERR_R_DISABLED
      Add more WAP/WTLS elliptic curve OIDs.
      Binary field arithmetic contributed by Sun Microsystems.     The 'OPENSSL_NO_SUN_DIV' default is still subject to change,     so I didn't bother to finish the CHANGES entry yet.
      extend curve list (additional curves over binary fields)
      add support for elliptic curves over binary fields
      there is no alternative EC_METHOD for curves over GF(2^m) (yet)
      ec2_smpt.c must be listed in LIBSRC
      typos
      Rename implementations of method functions so that they match     the new method names where _GF... suffixes have been removed.
      move GF2m tests to the end
      Change BN_mod_sqrt() so that it verifies that the input value is     really the square of the return value.
      update
      Let BN_rand_range() abort with an error after 100 iterations     without success.
      remove obsoleted disabled code
      remove obsolete part of comment
      typo
      optical changes
      fix bn_expand2
      disable Sun divison algorithm by default
      use bn_wexpand instead of bn_expand2 (the latter is not needed here,     and it does not yet work correctly)
      fix bn_expand2
      oops, undo previous change (was just for testing)
      oops -- must use EVP_MD_size, not EVP_MD_block_size
      avoid SIGSEGV
      use a generic EC_KEY structure (EC keys are not ECDSA specific)
      Add ECDH support.
      ECC ciphersuite support
      ECDH engine support
      use 0, not NULL
      add field type to text output     don't print seed value as a number (leading zeros must not be removed)
      fix warnings
      make update
      .cvsignore for crypto/ecdh
      add 0.9.6g information
      get rid of EVP_PKEY_ECDSA (now we have EVP_PKEY_EC instead)
      fix comment
      remove debug messages
      remove comment
      fix previous commit (there's no SSLEAY_VERSION_TEXT)
      Scripts for testing ECC ciphersuites.
      add 'TODO' items
      move a TODO from CHANGES to STATUS
      change how pod2man is handled: explicitly invoke '$PERL' only when     needed, call 'pod2man' directly if this works
      Simplify handling of named curves: get rid of EC_GROUP_new_by_name(),     EC_GROUP_new_by_nid() should be enough.  This avoids a lot of     redundancy.
      add crypto/ecdh
      fix manpage
      fix warnings (CHARSET_EBCDIC)
      use correct function code in error message
      'EC' vs. 'ECDSA'
      typo
      ecdsa => ec
      fix offsets
      ASN1 for binary curves
      move EC_GROUP_get_basis_type() from ec_lib.c to ec_asn1.c
      fix spacing
      less specific interface for EC_GROUP_get_basis_type
      change 'usage' formatting
      don't write beyond buffer
      don't memset(data,0,...) if data is NULL
      change API for looking at the internal curve list
      mention EC_get_builtin_curves()
      -nameopt fix has been moved to 0.9.7
      Let 'openssl req' fail if an argument to '-newkey' is not     recognized instead of using RSA as a default.
      1. switch from "-newkey ecdsa:..." to "-newkey ec:..."     2. automatically create required sub-directories
      add URL for Internet Draft
      make sure 'neg' flag (which does not really matter for GF(2^m), but     could cause confusion for ECDSA) is set to zero
      fix race condition
      there is no minimum length for session IDs
      really fix race condition
      really fix race conditions
      fix more race conditions
      synchronize with 0.9.7-stable version of this file
      change Emacs indentation style to make it easier to insert     tabs manually
      I don't like c-tab-always-indent ...
      fix warnings, and harmonize indentation
      remove superfluous code
      fast reduction for NIST curves
      clean up new code for NIST primes
      'broken' PKCS #8 format does not apply to ECDSA
      increase permissible message length so that we can handle     CertificateVerify for 4096 bit RSA signatures
      'covenant HOWTO' (what to do about the Sun covenant if you modify the code)
      Sun has agreed to removing the covenant language from most files.
      avoid warnings ('index' shadows global declaration)
      implement and use new macros BN_get_sign(), BN_set_sign()
      fix typo
      avoid Purify warnings
      print less output (no details unless a test failed)
      corrections to built-in curves
      do tests with all built-in curves
      remove unused old directory crypto/rijndael (superseded by crypto/aes)
      disable weird assert()s
      use new BIO_indent() function here as well
      fix output
      harmonize with 0.9.7 tree
      this method does not need field_data1
      allocate bio_err before memory debugging is enabled to avoid memory leaks     (we can't release it before the CRYPTO_mem_leaks() call!)
      fix memory leak in memory debuggin code ...
      use consistent order of function definitions
      remove redundant functions
      allocate bio_err before memory debugging is enabled to avoid memory leaks     (we can't release it before the CRYPTO_mem_leaks() call!)
      Make ec_GFp_simple_point_get_affine_coordinates() faster     for Montgomery representations.
      avoid uninitialized memory read
      add a comment
      rename some functions to improve consistency
      Don't compute timings here, we can do this elsewhere.     Include X9.62 signature examples.
      In ECPKParameters_print, output the private key length correctly     (length of the order of the group, not length of the actual key, which     will be shorter in some cases).
      typo
      Typo.
      document BN_GENCB API by adding an example
      add something to the '$no_shared_warn' text
      undo part of a recent change: it's "surname", not "surName"     (see X.520 aka ISO/IEC 9594-6)
      "!Cname surname" has now become redundant ...
      update error library for EC... changes
      avoid potential confusion about curves (prime192v1 and prime256v1 are     also known as secp192r1 and secp256r1, respectively)
      fix warnings
      For ecdsa-with-SHA1, as for id-dsa-with-sha1, omit 'parameters'     in AlgorithmIdentifier
      consistency
      cofactor is optional in parameter encodings
      simplify
      Update PRNG entry:     - OpenSSL version differences     - Sun /dev/urandom patch information
      typo
      SSL_add_dir_cert_subjects_to_stack now exists for WIN32
      typo in WIN16 section
      implement fast point multiplication with precomputation
      typo
      comment
      remove debugging leftovers
      avoid coredump
      fix EC_GROUP_copy for EC_GFp_nist_method()
      first section is now "Changes between 0.9.7a and 0.9.8", not "... 0.9.7 and 0.9.8"
      comments
      Allow EC_GROUP objects to share precomputation for improved memory     efficiency (EC_PRE_COMP objects are now constant once completed).
      new lock for EC_PRE_COMP structures
      make update
      Remove "+Olibcalls" option from HPUX targets.
      typo
      ECPublicKey_set_octet_string and ECPublicKey_get_octet_string     behaviour was not quite consistent with the conventions     for d2i and i2d functions as far as handling of the 'out'     or 'in' pointer is concerned.
      treat 'out' like i2d functions do; cf. asn1_item_flags_i2d (crypto/asn/tasn_enc.c)
      include OpenSSL license (in addition to EAY license)
      year 2003
      add Certicom licensing e-mail address
      use tabs for indentation, not spaces
      memset problem has been handled
      - new ECDH_compute_key interface (KDF is no longer a fixed built-in)     - bugfix: in ECDH_compute_key, pad x coordinate with leading zeros if necessary
      fix formatting
      countermeasure against new Klima-Pokorny-Rosa atack
      make sure RSA blinding works when the PRNG is not properly seeded;     enable it automatically for the built-in engine
      remove patch ID (which is supposed to appear in patched variants of     old OpenSSL releases, but not in new releases)
      make RSA blinding thread-safe
      include 'Changes between 0.9.6i and 0.9.6j'
      fix typo
      implement PKCS #8 / SEC1 private key format for ECC
      manpages for 'openssl ec' and 'openssl ecparam'
      new function EC_GROUP_cmp() (used by EVP_PKEY_cmp())
      fix: 0.9.7 is based on 0.9.6h, not on 0.9.6k
      tolerate extra data at end of client hello for SSL 3.0
      add test for secp160r1     add code for kP+lQ timings
      updates for draft-ietf-tls-ecc-03.txt
      add OpenSSL license
      make sure no error is left in the queue that is intentionally ignored
      fix out-of-bounds check in lock_dbg_cb (was too lose to detect all     invalid cases)
      certain changes have to be listed twice in this file because OpenSSL     0.9.6h forked into 0.9.6i and 0.9.7 ...
      - update from current 0.9.6-stable CHANGES file     - update from current 0.9.7-stable CHANGES file:
      BIS correction/addition
      improve wording
      Change ./Configure so that certain algorithms can be disabled by default.     This is now the case for RC5.
      In addition to RC5, also exclude MDC2 from compilation unless     the algorithm is explicitly requested.
      Take MDC2 patent into account.
      Fix typo
      fix potential memory leak when allocation fails
      It seems that Configure revision 1.404 broke "make depend" by hiding     from it which algorithms were disabled.  With these new changes,     "make depend" will properly take into account algorithms that are skipped.
      "make depend".  This takes into account the algorithms that are now     disabled by default (MDC2 and RC5), which until now were skipped     by "make links" and yet supposedly required by some of the Makefiles,     meaning that the recent snapshots failed to compile.
      Harmonize with CHANGES as distributed in OpenSSL 0.9.7f.
      HISTORY section: point out change of default digest
      This is a collection of those CVS change log entries for the 0.9.7     branch (OpenSSL_0_9_7-stable) that do not appear similarly in     0.9.8-dev (CVS head).
      first step to melt down ChangeLog.0_9_7-stable_not-in-head :-)
      bring up-to-date
      add recent changes; now this file is up-to-date
      remove some false positives
      remove extra whitespace; fix link
      update
      fix editing error, and remove a false positive
      remove some more changes that came from HEAD
      remove some more false positives
      remove some more false positives
      Sort out changes in FIPS and other changes, collected in separate files.     (Also remove another "make update".)
      Remove some more entries that are false positives, or have been     resolved by recent commits.
      Use OPENSSL_NO_CAST, not OPENSSL_NO_CAST5 in e_old.c
      move some more entries into FIPS file
      make update
      some more false positives to remove
      fix SSLerr stuff for DTLS1 code;     move some functions from exported header <openssl/dtl1.h> into "ssl_locl.h";     fix silly indentation (a TAB is *not* always 4 spaces)
      make update
      remove some functions from exported headers
      let mkdef.pl know about OPENSSL_NO_DGRAM     (which appears in the new file crypto/bio/bss_dgram.c)
      take OPENSSL_NO_DGRAM into account     (via make update)
      Fix various incorrect error function codes.
      "PS" to Steve's commit (Port prime utility across from stable branch).
      util/mk1mf.pl issues have been resolved
      there's no such thing as Makefile.ssl anymore
      give EC_GROUP_*_nid functions a more meaningful name         EC_GROUP_get_nid -> EC_GROUP_get_curve_name         EC_GROUP_set_nid -> EC_GROUP_set_curve_name
      improve comment readability
      rebuild (starting with state from 0.9.7-stable branch) to avoid clutter
      Update util/ck_errf.pl script, and have it run automatically     during "make errors" and thus during "make update".
      Fix more error codes.
      Move some entries from ChangeLog.0_9_7-stable_not-in-head     to ChangeLog.0_9_7-stable_not-in-head_FIPS.
      Don't use the SSL 2.0 Client Hello format if SSL 2.0 is disabled     with the SSL_OP_NO_SSLv2 option.
      Move another item into ChangeLog.0_9_7-stable_not-in-head_FIPS
      fix msg_callback() arguments for SSL 2.0 compatible client hello     (previous revision got this wrong)
      make update
      rebuild to synchronize with additions to 0.9.7 branch
      Implement fixed-window exponentiation to mitigate hyper-threading     timing attacks.
      Change wording for BN_mod_exp_mont_consttime() entry
      fix memory leak (BIO_free_all needs pointer to first BIO)
      check BN_copy() return value
      make sure DSA signing exponentiations really are constant-time
      Use BN_with_flags() in a cleaner way.
      avoid potential spurious BN_free()
      recent DH change does not avoid *all* possible small-subgroup attacks;     let's be clear about that
      correct+extend publication info
      new option "openssl ciphers -V"
      harmonize with 0.9.7-stable and 0.9.8-stable variants of CHANGES
      fix stupid typo
      Add fixes for CAN-2005-2969.     (This were in 0.9.7-stable and 0.9.8-stable, but not in HEAD so far.)
      deFUDify: don't require OPENSSL_EC_BIN_PT_COMP
      disable some invalid ciphersuites
      deFUDify: don't require OPENSSL_EC_BIN_PT_COMP
      comment
      update TLS-ECC code
      Rewrite timeout computation in a way that is less prone to overflow.
      Support TLS extensions (specifically, HostName)
      C style fix-up
      Make sure that after the change from revision 1.261,     it's still possible to do a partial build.
      Various changes in the new TLS extension code, including the following:      - fix indentation      - rename some functions and macros      - fix up confusion between SSL_ERROR_... and SSL_AD_... values
      Add names for people who provided the TLS extension patch.
      Fixes for TLS server_name extension
      complete and correct RFC3546 error codes
      make sure that the unrecognized_name alert actually gets sent
      prepare for additional RFC3546 alerts
      There's no such things as DTLS1_AD_MISSING_HANDSHAKE_MESSAGE.     For now, anyway.
      Some error code cleanups (SSL lib. used SSL_R_... codes reserved for alerts)
      include max. codes in debug output
      Detect SSL error code mishandling.
      Detect more errors.     Change assignment strategy: rathern than using max+r for new codes,     find first hole in list of existing codes.
      Avoid contradictive error code assignments.     "make errors".
      Further TLS extension updates
      More TLS extension related changes.
      improvements for alert handling
      Further TLS extension improvements
      move new member of SSL_SESSION to the end     (minimize changes to binary format)
      clarification
      Implement the Supported Point Formats Extension for ECC ciphersuites
      udpate Supported Point Formats Extension code
      fix sign problems
      Simplify ASN.1 for point format list
      Implement cipher-suite selection logic given Supported Point Formats Extension.
      Change default curve (for compatibility with a     soon-to-be-widely-deployed implementation that doesn't support the     previous default)
      Implement Supported Elliptic Curves Extension.
      fix for hostname extension
      fix memory leak
      Avoid hard-coded table length where we can use sizeof.
      simplify: use s2n macro
      check length properly
      clarification
      Remove ECC extension information from external representation     of the session -- we don't really need it once the handshake     has completed.
      Camellia cipher, contributed by NTT
      Camellia cipher, contributed by NTT
      Camellia cipher, contributed by NTT
      Fix a bug recently introduced when updating this file to use the new     keygen API: make sure that 'pkey_type' is actually visible to MAIN().
      Thread-safety fixes
      Make sure that AES ciphersuites get priority over Camellia     ciphersuites in the default cipher string.
      Ciphersuite string bugfixes, and ECC-related (re-)definitions.
      Disable invalid ciphersuites
      Oops ... deleted too much in the previous commit when I deleted     the Fortezza stuff
      Fix another bug introduced yesterday when deleting Fortezza stuff:     make sure 'mask' is initialized in ssl_cipher_get_disabled().
      Fix another new bug in the cipherstring logic.
      Fix algorithm handling for ECC ciphersuites: Adapt to recent changes,     and allow more general RSA OIDs for ECC certs with RSA CA sig.
      Call 'print_stuff' even if a handshake failed.
      Error messages for client ECC cert verification.
      another thread-safety fix
      Change array representation of binary polynomials to make GF2m part of     the BN library more generally useful.
      Remove ECC ciphersuites from 0.9.8 branch (should use 0.9.9 branch)
      Change in 0.9.8 branch:     Put ECCdraft ciphersuites back into default build (but disabled     unless specifically requested)
      New functions CRYPTO_set_idptr_callback(),     CRYPTO_get_idptr_callback(), CRYPTO_thread_idptr() for a 'void *' type     thread ID, since the 'unsigned long' type of the existing thread ID     does not always work well.
      always read in RAND_poll() if we can't use select because of a too     large FD: it's non-blocking mode anyway
      use <poll.h> as by Single Unix Specification
      documentation for "HIGH" vs. "MEDIUM" was not up-to-date
      Camellia information
      New Camellia implementation (replacing previous version)
      Camellia IPR information
      Every change so far that is in the 0.9.8 branch is (or should be) in HEAD
      Make consistent with 0.9.8-branch version of this file
      Remove non-functional part of recent patch, after discussion with     Colin Percival (this would have caused more problems than solved,     and isn't really necessary anyway)
      update information on "current version" ...
      Make sure the int_rsa_verify() prototype matches the implementation     (m_len currently is 'unsigned int', not 'size_t')
      ensure that ciphersuite strings such as "RC4-MD5" match the SSL 2.0     ciphersuite as well
      Update
      Ensure that the addition mods[i]+delta cannot overflow in probable_prime().
      include 0.9.8d and 0.9.7l information
      Introduce limits to prevent malicious keys being able to     cause a denial of service.  (CVE-2006-2940)     [Steve Henson, Bodo Moeller]
      All 0.9.8d patches have been applied to HEAD now, so we no longer need     the redundant entries under the 0.9.9 heading.
      ASN1_item_verify needs to initialize ctx before any "goto err" can     happen; the new code for the OID cross reference table failed to do so.
      fix support for receiving fragmented handshake messages
      Fix the BIT STRING encoding of EC points or parameter seeds     (need to prevent the removal of trailing zero bits).
      Reorganize the data used for SSL ciphersuite pattern matching.     This change resolves a number of problems and obviates multiple kludges.     A new feature is that you can now say "AES256" or "AES128" (not just     "AES", which enables both).
      fix incorrect strength bit values for certain Kerberos ciphersuites
      fix warnings/inconsistencies caused by the recent changes to the     ciphersuite selection code in HEAD
      fix warnings for CIPHER_DEBUG builds
      Include "!eNULL" in SSL_DEFAULT_CIPHER_LIST to make sure that a     ciphersuite string such as "DEFAULT:RSA" cannot enable     authentication-only ciphersuites.
      fix a typo in the new ciphersuite ordering code
      Improve ciphersuite order stability when disabling ciphersuites.     Change ssl_create_cipher_list() to prefer ephemeral ECDH over     ephemeral DH.
      SSL_kKRB5 ciphersuites shouldn't be preferred by default
      delete obsolete comment
      prefer SHA1 over MD5 (this affects the Kerberos ciphersuites)
      Fix incorrect substitution that happened during the recent ciphersuite     selection remodeling
      use 2007 copyright for generated files
      include complete 0.9.7 history     include release date of 0.9.8e
      clarification regarding libdes files
      stricter session ID context matching
      Change to mitigate branch prediction attacks
      make BN_FLG_CONSTTIME semantics more fool-proof
      don't violate the bn_check_top assertion in BN_mod_inverse_no_branch()
      fix error codes
      Add SEED encryption algorithm.
      All ciphersuites should have a strength designator.
      remove leftover from editing ...
      fix function codes for error
      Fix crypto/ec/ec_mult.c to work properly with scalars of value 0
      document -S and -nopad options in usage information
      Make sure that BN_from_montgomery keeps the BIGNUMS in proper format
      Clean up error codes a bit.     (engines/ccgost/ remains utter chaos, though; "make errors" is not happy.)
      fix warning
      Implement the Opaque PRF Input TLS extension     (draft-rescorla-tls-opaque-prf-input-00.txt), and do some cleanups and     bugfixes on the way.  In particular, this fixes the buffer bounds     checks in ssl_add_clienthello_tlsext() and in ssl_add_serverhello_tlsext().
      fix length parameter in SSL_set_tlsext_opaque_prf_input() calls
      properly handle length-zero opaque PRF input values     (which are pointless, but still might occur)
      The hash length check wasn't strict enough,     as pointed out by Ernst G Giessmann
      fix typos
      Should reject signatures that we can't properly verify     and couldn't generate     (as pointed out by Ernst G Giessmann)
      Make sure to set indent-tabs-mode so that we get tabs, not spaces.
      fix BIGNUM flag handling
      Montgomery-related minor cleanups/documentation
      Clarifying comment.
      Disable code that clearly doesn't currently serve any useful purpose.     (Buggy line reported by Matthias Koenig.)
      Change use of CRYPTO_THREADID so that we always use both the ulong and     ptr members.
      year 2008
      grammar
      From HEAD:
      From HEAD:
      sync with 0.9.8 branch
      Everyone's had a few years to port their favorite additions to 0.9.7     to HEAD (and the 0.9.8 branch).  Remove the reminder.
      avoid potential infinite loop in final reduction round of BN_GF2m_mod_arr()
      Make sure not to read beyond end of buffer
      We should check the eight bytes starting at p[-9] for rollback attack     detection, or the probability for an erroneous RSA_R_SSLV3_ROLLBACK_ATTACK     will be larger than necessary.
      Fix error codes for memory-saving patch.
      Mention ERR_remove_state() deprecation, and ERR_remove_thread_state(NULL).
      fix error function codes
      sanity check
      Don't use assertions to check application-provided arguments;     and don't unnecessarily fail on input size 0.
      Some precautions to avoid potential security-relevant problems.
      Really get rid of unsafe double-checked locking.
      Note about CVS branch inconsistency.
      Fix SSL state transitions.
      oops
      update comment
      from 0.9.8 branch
      From branch OpenSSL_0_9_8-stable: Allow soft-loading engines.
      Make sure that SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG can't     enable disabled ciphersuites.
      symbol deobnoxification
      warnings (mostly)
      Implement Configure option pattern "experimental-foo"     (specifically, "experimental-jpake").
      experimental-foo support for mk1mf.pl.
      Put back a variable deleted by the previous revision,     but used in the code.
      -hex option for openssl rand
      For -hex, print just one \n
      Make CHANGES in CVS head consistent with the CHANGES files in the     branches.
      Constify crypto/cast.
      Constify crypto/cast.
      Use properly local variables for thread-safety.
      Fix X509_STORE locking
      Always check bn_wexpend() return values for failure (CVE-2009-3245).
      Fix for "Record of death" vulnerability CVE-2010-0740.
      Harmonize with OpenSSL_1_0_1-stable version of CHANGES.
      ECC library bugfixes.
      New 64-bit optimized implementation EC_GFp_nistp224_method().     This will only be compiled in if explicitly requested     (#ifdef EC_NISTP224_64_GCC_128).
      (formatting error)
      Patch from PR #1833 was broken: there's no s->s3->new_session     (only s->new_session).
      For better forward-security support, add functions     SSL_[CTX_]set_not_resumable_session_callback.
      Update version numbers
      C conformity fixes:     - Move declarations before statements in all blocks.     - Where 64-bit type is required, use it explicitly (not 1l).
      C conformity fixes: Move declarations before statements in all blocks.
      More C language police work.
      Fix error codes.
      make update
      CVE-2010-4180 fix (from OpenSSL_1_0_0-stable)
      fix omissions
      Assorted bugfixes:     - safestack macro changes for C++ were incomplete     - RLE decompression boundary case     - SSL 2.0 key arg length check
      Synchronize with 1.0.0 branch
      OCSP stapling fix (OpenSSL 0.9.8r/1.0.0d)
      Sync with 1.0.1 branch.     (CVE-2011-0014 OCSP stapling fix has been applied to HEAD as well.)
      Fix the version history: changes going into 1.1.0 that are also going     into 1.0.1 should not be listed as "changes between 1.0.1 and 1.0.0".
      Fix typo.
      Synchronize with 1.0.1 CHANGES file.
      Fix error codes.
      Fix expected DEFFLAG for default config.
      make update
      Fix memory leak on bad inputs.
      (EC)DH memory handling fixes.
      Fix d2i_SSL_SESSION.
      Fix session handling.
      oops
      Fix OPENSSL_BN_ASM_MONT5 for corner cases; add a test.
      In ssl3_clear, preserve s3->init_extra along with s3->rbuf.
      typo
      Clarify warning
      Make CTR mode behaviour consistent with other modes:     - clear ctx->num in EVP_CipherInit_ex     - adapt e_eas.c changes from http://cvs.openssl.org/chngview?cn=19816       for eng_aesni.c
      Avoid failed assertion in BN_DEBUG builds
      Oops - ectest.c finds further problems beyond those exposed by bntext.c
      use -no_ecdhe when using -no_dhe
      Improve optional 64-bit NIST-P224 implementation, and add NIST-P256 and     NIST-P521. (Now -DEC_NISTP_64_GCC_128 enables all three of these;     -DEC_NISTP224_64_GCC_128 no longer works.)
      Fix warnings.     Also, use the common Configure mechanism for enabling/disabling the 64-bit ECC code.
      Fix indentation
      BN_BLINDING multi-threading fix.
      "make update" (partial)

Dr. Stephen Henson (3002):
      Add extended key usage OID and update STATUS file.
      Move DSA test in ca.c inside #ifdef and make pubkey BIT STRING always have     zero unused bits.
      Make sure applications free up pkey structures and add netscape extension     handling to x509.c
      Remove one EVP_PKEY_free() that shouldn't be there.
      More EVP_PKEY patches for new functionality.
      Fix things so DH_free() will be no-op when passed NULL, like RSA_free() and     DSA_free(): this was causing crashes when for example an attempt was made     to handle a (currently) unsupported DH public key. Also X509_PUBKEY_set()i     wasn't checking errors from d2i_PublicKey().
      Oops! update CHANGES file properly.
      Fix the gendsa program and add it to the app list. The progs.h file is     auto generated but not auto updated so it is included. Also remove the     encryption from the sample DSA keys.
      Fix OBJ_txt2nid(): old function was broken when input used the "dot" form, e.g.     1.2.3.4 . Also added new function OBJ_txt2obj().
      Submitted by: Neil Costigan <neil.costigan at celocom.com>     PR:
      Fix parameters to dummy function BN_ref_mod_exp().
      Time to blow up the source tree :-) This is the beginning of support for     GeneralizedTime. At several points PKIX specifies that GeneralizedTime can be     used but OpenSSL doesn't currently support it. This patch adds several files     and a bunch of functions.
      Update CHANGES for GeneralizedTime info.
      New err_code.pl script to retain old error codes. This should allow the use     of 'make errors' without causing huge re-organisations of files when a new     code is added.
      This is the result of a "make errors" with the new error building functionality     in place.
      Continued patches so certificates and CRLs now can support and use     GeneralizedTime.
      Initial addition of new X509 V3 files, tidy of old files.
      Continuing adding X509 V3 support. This starts to integrate the code with     the main library, but only with printing at present. To see this try:     openssl x509 -in cert.pem -text     on a certificate with some extensions in it.
      Add file x509v3.err.
      More X509 V3 stuff. Add support for extensions in the 'req' application     so that: openssl req -x509 -new -out cert.pem     will take extensions from openssl.cnf a sample for a CA is included.     Also change the directory order so pem is nearer the end. Otherwise 'make links'     wont work because pem.h can't be built.
      Still more X509 V3 stuff. Modify ca.c to work with the new code and modify     openssl.cnf for the new syntax.
      Add a few extended key usage OIDs.
      Add ASN1 code for netscape certificate sequences.
      Remember to add the new file this time :-)
      Allow the -certfile argument to be used multiple times in crl2pkcs7.     Also fix typos in the usage messages: "inout" instead of "input".
      New program 'nseq' added to apps to allow Netscape certificate sequences to     be pulled apart and built.
      Update STATUS, modify ssl.h so mkdef.pl will pick up prototypes and     add x509v3.h to mkdef.pl list of include files.
      Fix various stuff: that VC++ 5.0 chokes on:     1. Add *lots* of missing prototypes for static ssl functions.     2. VC++ doesn't understand the 'LL' suffix for 64 bits constants: change bn.org     3. Add a few missing prototypes in pem.org     Fix mk1mf.pl so it outputs a Makefile that doesn't choke Win95.     Fix mkdef.pl so it doesn't truncate longer names.
      More Win32 fixes. The Configure script used to give *lots* of warnings about     use of undefined variables: kludge so they all get initialised. Also avoid use     of POSIX module.
      Delete bogus V3 prototype and update the *.num files to include ordinals for     the new functions. Update MINFO.
      Oops! Restore ssleay.num: it got overwritten with libeay.num :-(
      Rename v3_bitstr.c to v3_bitst.c to fit in 8+3. Rebuild MINFO to reflect     change.
      Delete legacy file.
      Add support for GeneralName and GeneralNames extensions. Also preliminary     support for subject and issuer alt name. Add a new ASN1 macro and fix a     nasty bug that left an ASN1 buffer modified on an error condition with     IMPLICIT tagging.
      Fix filename in comment.
      Comment out def of currently unimplemented function to stop warning.
      Support for ASN1 ENUMERATED type. This copies and duplicates the ASN1_INTEGER     code and adds support to ASN1_TYPE and asn1parse.
      Oops... forgot to add new ENUMERATED file...
      More extension code. Incomplete support for subject and issuer alt     name, issuer and authority key id. Change the i2v function parameters     and add an extra 'crl' parameter in the X509V3_CTX structure: guess     what that's for :-) Fix to ASN1 macro which messed up     IMPLICIT tag and add f_enum.c which adds a2i, i2a for ENUMERATED.
      Oops. Forgot to do a 'make errors'.
      Delete a few unused files in apps, restore CAST WIN32 ASM file to main     tree.
      Make the 'crypto' and 'ssl' options in the perl script mkdef.pl really work,     also add an 'update' option to automatically append any new functions to the     ssleay.num and libeay.num files.
      Fix typo in asn1.h (PRINTABLESTRING_STRING) and fix a bug in object creation     perl script. It failed if the OID had any zeros in it.
      Modify configure script to generate some files that Win32 needs and new     script that does the same as 'make files'.
      Oops... add other changes this time too.
      More Win32 fixes and upsdate INSTALL.W32 documentation.
      Convert ms/do_ms.bat to DOS EOL format of DOS chokes on it.
      Add support for raw extensions. This means that you can include the DER encoding     of an arbitrary extension: e.g. 1.3.4.5=critical,RAW:12:34:56 Using this     technique currently unsupported extensions can be generated if you know their     DER encoding. Even if the extension is supported in future the raw extension     will still work: that is the raw version can always be used even if it is a     supported extension.
      Update error codes.
      Patch to Configure script. For some reason the BN_ASM part was truncated to     the first word which broke (at least) the Linux compile. Hopefully this wont     break other platforms.
      Fix various memory leaks in SSL, apps and DSA
      Added code to GENERAL_NAME with support for more options and preliminary     support for assignment in config files.
      Fuller authority key id support, partial support for private key usage extension     and really fix the ASN.1 IMPLICIT bug this time :-)
      Oops! Remeber to include the other patches this time...
      Overhaul 'crl' application, add a proper X509_CRL_print function and start     to support CRL extensions.
      Patch so the new crl stuff actually compiles this time :-) Also update the     Win32 ordinals.
      Preliminary support for reason code CRL extension.
      Add more functionality to issuer alt name and subject alt name. New options     to include email addresses from DN and copy details from issuer certificate.     Include examples in openssl.cnf, update Win32 ordinals.
      Make RSA_NO_PADDING really use no padding.
      Add preliminary user level config documentation for extension stuff. Programming     info will come later...
      Various changes to make this stuff compile under Win32 and VC++ with and     without -debug option to mk1mf.pl. Change _export to is_export (_export is     a reserved word under VC++). Add yucky function prototype function pointer     casts. Sanitise the included files in crypto/x509v3.
      Redo the way 'req' and 'ca' add objects: add support for oid_section.
      Remove debugging fprintf from req.c and fix the code so it properly skips over     the first leading XXX. in the DN.
      BN_RECURSION causes the stuff in bn_mont.c to fall over for large keys. For     now change it to BN_RECURSION_MONT so it isn't compiled in.
      Fix the Win32 compile environment and add various changes so it will now compile     under Win32 (9X and NT) again. Note: some signed/unsigned changes recently     checked in were killing the Win32 compile.
      Deleted my str_dup() function from X509V3: the same functionality is provided     by BUF_MEM_strdup(). Added text documentation to the BUF_MEM stuff.
      Workaround for a Win95 console bug triggered by the password read stuff.
      Fix the PKCS#7 stuff: signature verify could fail if attributes reordered, the     detached data encoding was wrong and free up public keys.
      Add an extra 'raw' function r2i to the extension code. Nothing uses this yet and     it is just a place holder for functionality to be added later. Its been added     now so the X509V3_EXT_METHOD structure shouldn't (hopefully) have to change     after the release.
      Added support for adding extensions to CRLs, also fix a memory leak and     make 'req' check the config file syntax before it adds extensions. Added     info in the documentation as well.
      Delete obsolete old X509V3 files.
      Various fixes to Win32, update ssleay.num, libeay.num, shuffle various #ifdefs     around so more options appear in e_os.h
      Add missing funtions from non ANSI section of header files and add missing     ordinals to libeay.num.
      Comment out two unimplemented functions from bio.h. Attempt to get the     Win32 test batch file going again.
      Remove some hard coded paths from Win32 test stuff.
      Make CC,CFLAG etc get passed to make links and various Win32 fixes.
      Fix couple of ANSI declarations and prototypes
      Fix for RSA private key encryption if p < q. This took ***ages*** to track down.
      Delete NULL ciphers from 'ALL' in the cipher list aliases. This means that     NULL ciphers specifically have to be enabled with e.g. "DEFAULT:eNULL". This     prevents cipher lists from inadvertantly having NULL ciphers at the top     of their list (e.g. the default ones) because they didn't have to be taken     into account before.
      Delete Win32 test with testreq.pem and req: there is already a test with     testreq2.pem.
      Remove some references which called malloc and free instead of Malloc and Free.
      Using int for the digest length in EVP_DigestFinal() broke some compilers.     Changed to unsigned int: also need an evil cast in pk7_doit.c because a     signed, unsigned comparison chokes VC++.
      Comment out the lines that generated by mk1mf.pl include three separate rules     that are equivalent to $(OUT_D). This was what was causing the 'too many rules'     warning under VC++.
      Add initial support for Thawte strong extranet certificate extensions and     include an 'indent' option to V3 stuff.
      extranet file added...
      This is the beginning of PKCS#12 integration. This just adds the PKCS#12     objects to objects.h
      Further PKCS#12 integration, PBE, PKCS#8 additions.
      Yet more PKCS#12 integration: add lots of files under crypto/pkcs12 and add     them to the build environment.
      Various PKCS#12 related tidies and fixes: it might even compile now :-)
      Include pkcs12 program as part of openssl. This completes most of the PKCS#12     integration.
      Remove deleted PKCS#12 functions from pkcs12.h, get rid of object creation     kludge, remove CRs from ssl_ciph.c and update Win32 functions for PKCS#12     code. It might compile under Win32 now ...
      Delete some auto generated files and correct a typo in crypto/asn1/p5_pbe.c
      Did a 'make errors' to update asn1 error codes now typo is fixed
      Add PKCS#5 v2.0 ASN1 structures.
      Delete all the old X509V3 pack and unpack stuff and various structures and     files associated with them. This stuff is all obsoleted by the new X509V3 code.
      Add some utilities to support SXNet extension also add support in DEF files     generator to typesafe stacks.
      Fix a horrible BN bug in bn_expand2 which caused BN_add_word() et al to fail     when they cause the destination to expand.
      Add initial support for r2i RAW extensions which can access the config database     add various X509V3_CTX helper functions and support for LHASH as the config     database.
      Add support for VISIBLESTRING and UTF8String
      Allow asn1parse to print out VISIBLESTRING and some code needed for certificate     policies extension.
      Initial support for Certificate Policies extension: print out works but setting     isn't fully implemented (yet).
      Finish off support for Certificate Policies extension.
      Various fixes so Win32 compile may work. Convert GeneralNames to use safe stack.
      Suppport for CRL distribution points extension. Also document some of     this stuff.
      Oops! Fixup CHANGES.
      Complete rewrite of the error code generation script. It now runs as a single     script, translates function codes better and doesn't need the K&R function     prototypes to work (NB. the K&R prototypes can't be wiped just yet: they are     still needed by the DEF generator...). I also ran the script with the -rewrite     option to update all the header and source files.
      Delete the unnecessary ERR and ERRC lines in makefiles, add some functionality     to error code script: it can now find untranslatable function codes (usually     because the function is static and not defined in a header: occasionally because     of a typo...) and unreferenced function and reason codes. To see this try:     perl util/mkerr.pl -recurse -debug     Also fixed some typos in crypto/pkcs12 that this found :-)     Also tidy up some error calls that had to be all on one line: the old error     script couldn't find codes unless the call was all on one line.
      Change the command line options of mkerr.pl so -static is now default and     a -write option is needed to actually change anything. Second attempt at     getting rid of ERR, ERRC definitions: it might even work this time :-)
      Fix mkerr.pl to find functions returning function pointers (thanks Ulf!)     also add a few missing prototypes.
      Various header consistency fixes.
      Fixes so it will compile again under Win32.
      Extensively changed the DEF file generator mkdef.pl to use a modified version     of Ulf's prototype parser, also general tidying and fixing of several problems     with the original. Its still a bit of a hack but should work.
      Add PKCS#12 documentation and new option in x509 to add certificate extensions.
      Oops ... fix warning.
      Fix a couple of cases where an attempt is made to lock an already locked     mutex.
      GeneralizedTime setting fixes.
      Allows PKCS#12 password to be placed on command line and add allow config     file name for 'ca' to come from the environment.
      Various Win32 fixes. Win95 doesn't support MoveFileEx() (which was used for a     Win32 version of rename() ). There isn't a precise rename() equivalent under     Win95: the standard rename() complains if the destination already exists so     replaced with a combination of unlink() and MoveFile().
      Kill evil casts, fix PKCS#7 and add new X509V3 Function.
      Various PKCS#7 fixes to properly (maybe!) handle PKCS#7 enveloped data.     Containts elements of code by Sebastian Akerman <sak at parallelconsulting.com>     and made a bit less "naughty" by Steve.
      Various PKCS#7 related fixes,tidies and comments.
      Add new -out option to asn1parse to allow the parsed data to be output.     Fixed -strparse option: it didn't work if used more than once (this was due     to the d2i_ASN1_TYPE call parsing a freed buffer). On Win32 the file wincrypt.h     #define's X509_NAME and PKCS7_SIGNER_INFO causing clashes so these are #undef'ed
      Several of the EVP_CIPHER structures had the get and set asn1 parameter     functions transposed.
      The encoding of negative ASN1 INTEGERs and the conversion of BNs to negative     integers was completely broken. Also added a NEG_PUBKEY_BUG compilation option     to compensate for public keys improperly encoded as negative integers.
      Various Win32 fixes. Change args in do_ms.bat to put platform last. Fix     unsigned/signed cmp error in asn1parse. Change various pem_all.c args to     use pem_password_cb.
      Fix some obvious bugs in the PKCS#7 library handling. It didn't try to     find the right RecipientInfo based on the recipient certificate (so would     fail a lot of the time) and fixup cipher structures to correctly (maybe)     modify the AlgorithmIdentifiers.  Largely untested at present... this will be     fixed in due course. Well the stuff was broken to begin with so if its broken     now then you haven't lost anything :-)
      Fix various less obvious bugs in PKCS#7 handling: such as not zeroing     the secret key before we've encrypted it and using the right NID for RC2-64.     Add various arguments to the experimental programs 'dec' and 'enc' to make     testing less painful.
      Oops! Get the pmatch test the right way round.
      Various clarifications to extension docs: change the name of literal     extensions from RAW to DER to avoid confusion with raw extensions.
      Change default PKCS#12 iteration count to 2048, include rsa_oeap_test in the     test batch file.
      New functions sk_set, sk_value and sk_num to replace existing macros: this is     to minimise the effects on existing code.
      Include some notes on basic extension usage and change openssl.cnf to usually     do sensible things with extensions.
      The last argument in the d2i_XXX_fp and  d2i_XXX_bio functions should be     of type XXX ** not XXX *
      Move the Win32 #undefs of X509_NAME and PKCS7_ISSUER_AND_SERIAL so they will     always get included with the relevant files.
      Fixup do_nt.bat for new mk1mf arg order.
      Set ext_list to NULL after use.
      Fix URL for perl in INSTALL.W32
      Update md5 assembly source for Win32.
      Fix for memory leak.
      Free up 'out' before exiting pkcs12 application.     Submitted by: Wu Zhigang <zhigangwu at yahoo.com>
      Add PKCS#5 v1.5 compatible algorithms and initial PKCS#8 support. PKCS#8 needs     more work: need an application and make the private key routines automatically     handle PKCS#8.
      The rest of the PKCS#5, PKCS#8 patch I forgot before :-)
      Add a 'pkcs8' application for initial PKCS#8 support. Still needs lots more     options to handle encrypted and unencrypted forms and DER format input and     output.
      Add d2i,i2d bio and fp functions for PKCS#8 and add -inform and -outform     arguments to pkcs8 application.
      More PKCS#8 stuff. Support for unencrypted forms of private key.
      Change so PEM private key read routines can handle PKCS#8 transparently.
      Rewrite PBE handling read to support PKCS#5 v2.0 and update the function     list for Win32.
      Change PBE handling a bit more: now the key and iv generator does calls     EVP_CipherInit() this because the IV wont be easily available when doing     PKCS#5 v2.0
      More PKCS#5 v2.0 development. Add a function to setup a PKCS#5 v2.0     AlgorithmIdentifier and make various ASN1 fixes.
      This is the main PKCS#5 v2.0 key generation function, it parses the ASN1     structure and decides what key to generate (if any). Not currently added to     the PBE algorithm list because it is largely untested.
      Complete support for PKCS#5 v2.0. Still needs extensive testing.
      Change the PEM function implementation to use a common set of macros: this     should make modifying them easier.
      Reformat and "modernise" the sign.c demo.
      Two new functions to write out PKCS#8 private keys. Also fixes for some of     the the PBE code and a new constant PKCS5_DEFAULT_ITER for the default     iteration count if it is passed as zero.
      Document the X509V3 code and change some of the extension function pointers     to use 'void *' rather than 'char *' for an "arbitrary extension".
      Fix to i2d_DSAPublicKey() to return the correct length.     Submitted by: Jeon KyoungHo <khjeon at sds.samsung.co.kr>
      New functions CONF_load_bio() and CONF_load_fp() to load a configuration     file from a bio or fp. Added some more constification to the BN library.
      Convert the CONF library to use a typesafe stack: a STACK_OF(CONF_VALUE). It     seemed like a good idea at the time... several hours later it was rather     obvious that these are used all over the place making the changes rather     extensive.
      Implement STACK_OF(ANS1_OBJECT) for extended key usage extension, change the     documentation to reflect the STACK_OF(CONF_VALUE) change to the CONF lib and     use ANSI typedefs for X509V3_EXT_I2D and X509V3_EXT_FREE.
      Change the PEM_* function prototypes to use DECLARE_PEM macros and change     util/mkdef.pl to handle this. Also do a 'make update'.
      New function PKCS7_signatureVerify to allow the signing certificate to     be explicitly stated with PKCS#7 verify.
      Fix d2i_ASN1_INTEGER() and i2d_ASN1_INTEGER() so it correctly works out     the length of negative integers.
      New functions to allow RSA_METHODs to be changed without poking round in     RSA structure internals.
      SXnet code was freeing up the extension data rather than the temporary     zone number.
      Fix a bug in x509.c that omitted DSA parameters when they didn't match the     signers parameters. Changed it to never omit parameters.
      Copy flags in ASN1_STRING_dup()
      Add a debugging option to PKCS#5 v2.0 key generation function.
      Various changes to stop VC++ choking under Win32.
      Beginnings of experimental support for NASM assembler. This is a free     assembler for various X86 platforms including Win32. It can output object files     that VC++ will tolerate so it could be used to provide assembly language support     to Win32 without the need for MASM.
      More NASM support code it still doesn't work but it doesn't work less than it     didn't work before :-)
      Continues NASM support. This might work now. Its still experimental but it     passes all the tests. Added documentation in INSTALL.W32.
      Eliminate a warning: BN_mod_inverse() returns a (BIGNUM *) and remove and     unnecessary cast.
      New RSA flag RSA_FLAG_EXT_PKEY, to always call rsa_mod_exp.
      New function OBJ_obj2txt()
      Tidy up pkcs12 application.
      Allow the PKCS#7 (S/MIME encrypt) application to support more than one     recipient.
      Fix to PKCS#12 code to use the cipher block length when allocating a buffer     for encrypted data, rather than hard coding '8'.
      Configure fix for Windows: under Windows+perl "system" ends up going via the     command shell which means that redirecttion needs backslashes in the paths.
      Change all the -'s to _'s.
      Fix -startdate and -enddate arguments to 'ca' program. Also update NEWS file     with some 0.9.4 changes.
      *** empty log message ***
      Support for parsing of certificate extensions in PKCS#10 requests: these are     used by things like Xenroll. Also include documentation for extendedKeyUsage     extension.
      Add functions to allow extensions to be added to certificate requests.
      Fix PKCS7_ENC_CONTENT_new() to include a sensible default content type and add     support for encrypted content type in PKCS7_set_content().
      Allow memory bios to be read only and change PKCS#7 routines to use them.
      Initial support for DSA_METHOD...
      Initial support for DH_METHOD. Also added a DH lock. A few changes made to     DSA_METHOD to make it more consistent with RSA_METHOD.
      Fix for a bug which meant encrypting BIOs sometimes wouldn't read the final     block.
      Allow extensions to be added to certificate requests, update the sample     config file (change RAW to DER).
      Allow the 1.OU="my OU" syntax in 'ca' for SPKACs.
      Allow the extension section specified in config files to be overridden     on the command line for various utilities.
      Make DH_free() free up any ex_data and also call the finish method.
      Add new 'spkac' utility and several SPKAC utility functions.
      New UTF8 utility functions to parse/generate UTF8 strings.
      New function to convert ASN1 tag values to strings. Also fix typo in asn1.h
      This is preliminary support for an "RSA null" cipher. Unfortunately when     OpenSSL is compiled with NO_RSA, no RSA operations can be used: including     key generation storage and display of RSA keys. Since these operations are     not covered by the RSA patent (my understanding is it only covers encrypt,     decrypt, sign and verify) they can be included: this is an often requested     feature, attempts to use the patented operations return an error code.
      Oops... forgot the other RSA_NULL patches...
      Fix typo.
      Fix typo.
      Various CRL enhancements tidies and workaround for broken CRLs.
      Add new sign and verify members to RSA_METHOD and change SSL code to use sign     and verify rather than direct encrypt/decrypt.
      Lots of evil casts to stop VC++ choking with "possible loss of data"     warnings :-(
      Fix to make s_client and s_server work under Windows. A bit of a hack but     an improvement on not working at all.
      Modify the 'speed' application so it now uses RSA_sign and RSA_verify     instead of RSA_private_encrypt and RSA_public_decrypt
      Fix for base64 BIO decoding bug
      Fix for d2i_ASN1_bytes and stop PKCS#7 routines crashing is signed message     contains no certificates.
      Add support for public key input and output in rsa and dsa utilities with some     new DSA public key functions that were missing.
      New option -dhparam to s_server to allow the DH parameter file to be set     explicitly. Previously it couldn't be changed because it was hard coded as     "server.pem".
      Fix for bug in pkcs12 program and typo in ASN1_tag2str().
      Fix for bug in pkcs12 program and typo in ASN1_tag2str().
      Fix incorrect usage messages in some commands.
      New functions to parse and get extensions.
      Add EX_DATA support to X509.     Fix a bug in the X509_get_d2i() functions which didn't check if crit was NULL.
      Initial support for certificate purpose checking: this will     ultimately lead to certificate chain verification. It is     VERY EXPERIMENTAL at present though.
      Replace the macros in asn1.h with function equivalents. Also make UTF8Strings     tolerated in certificates.
      New function ASN1_mbstring_copy() to handle ASN1 string copying. Ultimately     this will be used to clear up the horrible DN mess.
      More multibyte character support.
      Continued multibyte character support.
      Fix to PKCS#7 routines so it can decrypt some oddball RC2 handling.
      Allow additional information to be attached to a     certificate: currently this includes trust settings     and a "friendly name".
      Fix to the -revoke option in ca. It was leaking memory, crashing and just     plain not working :-(
      Very preliminary POD format documentation for some     of the openssl utility commands...
      Oops. The pkcs8 man page wasn't finished: this is an updated version
      Fix a couple of outstanding issues: update STATUS file, fix NO_FP_API problems.
      Add password command line options to some utils. Fix and update man     pages.
      More docs and corrections/updates
      Oops forgot the S/MIME v3 RFC.
      Merge some common functionality in the apps, delete     the encryption option in the pkcs7 utility (they never     did anything) and add a couple more options to pkcs7.
      Add an spkac manual page and fix the pkcs7 manpage.
      Correct x509 manpaghe and add a crl manpage
      Add info about the header and footer lines used in PEM formats     and add an nseq manpage.
      Add support for the 40 and 64 bit RC2 and RC4 ciphers in 'enc'     add documentation for 'enc'.
      Add some examples to the enc man page.
      'req' fixes. Reinstate length check one request fields.     Fix to stop null being added to attributes.     Modify X509_LOOKUP, X509_INFO to handle auxiliary info.
      New function X509_cmp().
      Add a salt to the key derivation using the 'enc' program.
      Clarify docs.
      Fix for a bug in PKCS#7 code and non-detached data.
      Modify verify code to handle self signed certificates.
      Support for otherName in GeneralName.
      Transparent support for PKCS#8 private keys in RSA/DSA.
      Support for authority information access extension.
      Initial chain verify code: not tested probably not working     at present. However nothing enables it yet so this doesn't     matter :-)
      New options to the -verify program which can be used for chain verification.     Extend the X509_PURPOSE structure to include shortnames for purposed and default     trust ids.
      Initial trust code: allow setting of trust checking functions     in a table. Doesn't do too much yet.
      Oops! Commit died on me :-(
      Add trust setting support to the verify code. It now checks the     trust settings of the root CA.
      Add part of chain verify SSL support code: not complete or doing anything     yet.
      Remainder of SSL purpose and trust code: trust and purpose setting in     SSL_CTX and SSL, functions to set them and defaults if no values set.
      Document all possible errors (and some impossible) from the verify program.
      Document the extension tests performed by the -purpose test     in the x509 utility.
      Modify the X509 V3 extension lookup code.
      Change the trust and purpose code so it doesn't need init     either and has a static and dynamic mix.
      Fix a bug in the modified purpose code: it wasn't updated to use the     new purpose getting function.
      New function PKC12_newpass()
      Merge in my S/MIME library and utility.
      Modify S/MIME application so the -signer option writes the signer(s)     to a file if we are verifying.
      Add i2d_ASN1_PRINTABLESTRING() function, and do 'make update'
      Make the PKCS#7 S/MIME functions check for passed NULL pointers.
      Fix for crashing INTEGERs, ENUMERATEDs and OBJECT IDENTIFIERs.
      Various S/MIME fixes.
      Fix a typo in a_enum.c.
      Various S/MIME fixes. Fix for memory leak, recipient list bug     and not excluding parameters with DSA keys.
      Fix the S/MIME code to use canonical MIME format for     encrypted mail. Also update the smime docs.
      Delete an unused variable and make the PKCS#12 keygen debugging code work     again.
      Support for ASN1 NULL type.
      Add PKCS#8 utility functions and add PBE options.
      Fixes so NO_RSA works again.
      Allow passwords to be included on command line for a few     more utilities.
      New {i2d,d2i}_PrivateKey_{bio, fp} functions.
      Simplify the trust structure: basically zap the bit strings and     represent everything by OIDs.
      Add OIDs for idea and blowfish. Unfortunately these are in     the middle of the OID table so the diff is rather large :-(
      Fix some of the command line password stuff. New function     that can automatically determine the type of a DER encoded     "traditional" format private key and change some of the     d2i functions to use it instead of requiring the application     to work out the key type.
      Add support for MS "fast SGC".
      Initial automation changes to 'req' and X509_ATTRIBUTE functions.
      More X509_ATTRIBUTE changes.
      #undef PKCS7_SIGNER_INFO for Win32 to avoid clashes.
      Add PKCS#12 manpage and use MAC iteration counts by default.
      Manpages for the DH utils and fix for a memory leak in dh program
      Add -prexit command to s_client and patch some BIO     functions so it doesn't crash. Document s_client.
      Man page for s_server.
      New function X509_CTX_rget_chain(), make SSL_SESSION_print() display return code.     Remove references to 'TXT' in -inform and -outform switches.
      Update docs.
      Rename X509_att*() stuff to X509at_*(), add X509_REQ wrappers.
      Finish off the X509_ATTRIBUTE string stuff.
      Oops... undo change to wrong prototype.
      Change the 'man' directory to 'apps'. Yes I wish cvs     could rename too :-(
      Make -CAcreateserial start from 1 instead of 0 for     serial numbers.
      Docs for sess_id utility.
      Apply Lutz Behnke's 56 bit cipher patch with a few     minor changes.
      Gets Lutz Jaenicke's name right this time :-)
      Add new program dhparam and update docs.
      Minor patch: check only match @STRENGTH and remove eNULL     comment.
      Make s_server, s_client check cipher list return codes.
      Tidy up CRYPTO_EX_DATA structures.
      Document how CRYPTO_EX_DATA stuff works for     RSA structures. Other structures behave in     a similar way.
      New -pkcs12 option to CA.pl.     Document CA.pl script.     Initialise and free up the extra DH fields     (nothing uses them yet though).
      Add CA.pl man page this time...
      Fix CRL encoding bug.
      Update docs.
      Update docs.
      Add new -notext option to 'ca', -pubkey option to spkac.
      Rename SSLeay_add_all_algorithms() et al to     OpenSSL_add_all_algorithms(). Move these into     separate files so they work properly.
      Add support for some broken PKCS#8 formats.
      Document EVP digest operations.
      Rename the X509V3_*_d2i functions to X509_get_ext_d2i() etc.     This better reflects their behaviour.
      Add command line password options to the reamining utilities,     amend docs.
      Update docs.
      Make pkcs12 and smime applications seed random number     generator (otherwise they don't work) and add -rand     option. Update docs.
      Modernise 'selfsign.c' to use new X509_NAME code     and add example of extension aliasing. Also fix     the extension aliasing because it didn't work :-)
      Fix for Netscape "hang" bug.
      Pass phrase reorganisation.
      Add -pass argument to 'enc'.     Fix to make Win32 compile work again.
      New functions and option to use NEW in certificate requests.
      Add -clrext option to 'x509'
      Change the 'other' structure in certificate aux info.
      Change EVP_MD_CTX_type so it is more logical and add EVP_MD_CTX_md for     the old functionality.
      Update docs.
      Make pkcs8 work again.
      Allow ADH to be used but not present in the default cipher     list.
      Add PBE algorithms with ciphers, not digests.
      Allow code which calls RSA temp key callback to cope     with a failure.
      Rename functions for new convention.
      Fix shadow warning.
      Make ASN1 types real typedefs.
      Fix so Win32 assembly language works with MASM.
      Fix so Win32 compiles again...
      Don't call BN_rand with zero bits in bntest.c
      Ouch! PKCS7_encrypt() was heading MIME text headers twice     because it added them manually and as part of SMIME_crlf_copy().     Removed the manual add.
      Fix bug which would free up a public key     twice if the verify callback tried to     continue after a signature failure.
      Move the 'file scope' argument in set_label to     the third argument: the second was being used     already.
      Make name_funcs_stack static.
      Fix the PKCS#8 DSA code so it works again. All the     broken formats worked but the valid didn't :-(
      New compatability trust and purpose settings.
      Manual pages for EVP signing and verifying.
      Manual pages for EVP_Open* and EVP_Seal*
      Fix typo and make ca get the CA and request fields correct.
      Don't Free() password if it was read from config file.
      Make V_ASN1_APP_CHOOSE work again.
      Fix a memory leak in PKCS12_parse.     Don't copy private key to X509 etc public key structures.     Fix for warning.
      Update docs and remove old PKCS#7 README file.
      Add a few more FAQs.
      Update docs.
      Fix for HMAC.
      Add a couple of FAQs.
      Make PKCS#12 code handle missing passwords.
      Fix for SSL server purpose checking
      Fix c_rehash script, add -fingerprint option to crl.
      Add DSA library string. Workaround for IIS .key file invalid     ASN1 encoding.
      Beginnings of EVP cipher overhaul. This should eventually     enhance and tidy up the EVP interface.
      Second phase of EVP cipher overhaul.
      Third phase of EVP cipher overhaul.
      Fourth phase EVP revision.
      Fourth phase EVP revision.
      More EVP cipher revision.
      Document EVP routines. Change EVP_SealInit() and EVP_OpenInit()     to support multiple calls.
      Make EVP_SealInit() and EVP_OpenInit() check EVP_EncryptInit() and     EVP_DecryptInit() return values.
      Fix evp_locl.h macros.
      Add support for the modified SGC key format used in IIS.
      Safe stack reorganisation in terms of function casts.
      Handle ASN1_SET_OF and PKCS12_STACK_OF using function     casts in the same way as STACK_OF.
      Fixes for Win32 build.
      Change mkstack.pl so it now sorts each group     into lexical order. Previously it depended on     the order of files in the directory.
      Update STATUS.
      New ASN1 functions that just deal with     content octets, not tag+length.
      Fix some typose in the i2d/d2i functions that     call the i2c/c2i (they were not using the     content length for the headers).
      Make req seed the PRNG if signing with     an already existing DSA key.
      Make NEG_PUBKEY_BUG on by default.
      Fix warnings.
      Fix a bug in the new i2d_{ENUMERATED,INTEGER} that     didn't recognise NULL to mean 'don't output anything'
      New ASN1_STRING_print_ex() and X509_NAME_print_ex()     functions. These are intended to be replacements     for the ancient ASN1_STRING_print() and X509_NAME_print()     functions.
      Document the new DN printing options.
      Changes needed for Tandem NSK, supplied by Scott Uroff (scott at xypro.com).
      Fix for bad sorting of object names.
      Various fixes...
      Fixes to d2i_ASN1_OBJECT, ASN1_INTEGER_to_BN and a_strex.c
      Fix ASN1_INTEGER_to_BN properly this time...
      Add support for 'other' PKCS#7 content types.
      New option to CA.pl to sign request using CA extensions.     This allows intermediate CAs to be created more easily.
      Change PKCS#7 test data to take account of removal of     indefinite length encoding.
      Fix typo in i2d_ASN1_ENUMERATED
      Add 'rsautl' low level RSA utility.
      Keep a not of original encoding in certificate requests.
      *BIG* verify code reorganisation.
      Fix typo in rsautl.
      Some BIO docs, incomplete, more to follow.
      Add docs for BIO_find_type() and friends.
      Ugh, BIO_find_type() cannot be passed a NULL.
      Two new PKCS#12 demo programs.
      Update verify docs.
      Add BIO_read() (etc.) docs.
      Really add BIO_read this time...
      More preliminary BIO docs...
      More new BIO docs, correct some old ones.
      Docs for cipher and base64 BIOs.
      More BIO docs.
      Clarify some of the I/O issues.
      BIO_s_fd() manual page.
      Docs for socket BIO.
      Initial connect BIO docs.
      BIO_s_bio() manual page detailing BIO pair.
      Update BIO_s_connect().
      Accept BIO docs.
      BIO_f_ssl() docs.
      Remove redundant manpages and references to them.
      New macro BIO_set_shutdown_wr().
      Work around for Netscape PKCS#7 signedData bug.
      Clarify the BIO_seek() mess and related issues.
      Fix a typo in apps/pkcs12.c which was using the wrong part of     ASN1_TYPE (though they are both ASN1_STRING so it didn't cause     any problems).
      Add docs for X509_get_ext_d2i() function.
      Fix ASN1_TYPE bug.
      Only use the new informational verify codes if we     specifically ask for them.
      Global DirectoryString mask fix.
      More code for X509_print_ex() support.
      Make non blocking I/O work for accept BIOs.
      Fix for typo in certificate directory lookup code.
      Update test server certificate in apps/server.pem (it was expired).
      Move expired CA certificate.
      Fix for bug (?) in assembly language routines for SHA1. This     causes MASM to complain and not produce valid debug info.     Hopefully this wont break anything else...
      Merge from the ASN1 branch of new ASN1 code     to main trunk.
      Rewrite the extension code to use an ASN1_ITEM structure     for its ASN1 operations as well as the old style function     pointers (i2d, d2i, new, free). Change standard extensions     to support this.
      Stop extension creation code core dumping.
      Replace the old style OCSP ASN1 module.
      Change the PKCS7 structure to use SEQUENCE OF for the     authenticated attributes: this is used to retain the     original encoding and not break signatures.
      New function X509_signature_print() to remove some duplicate     code from certificate, CRL and request printing routines.
      New function X509V3_extensions_print() this removes extension duplication     from the print routines.
      Add OCSP nonce extension to supported extensions.
      Implement some standard OCSP extensions in the v3 code. These     are all raw print only extensions at present.
      Add a couple of FAQs.
      Make mkdef.pl parse some ASN1 IMPLEMENT macros.
      Add support for the noCheck OCSP extension. This is     just a NULL and appears in a certificate.
      Add OCSP service locator extension.
      Redo OCSP response printing. Remove duplicate or     obsolete code. Delete some redundant files.
      Fixes to OCSP print code.
      Various Win32 related fixes. Doesn't compile yet on     Win32 but it is getting there...
      New function X509V3_add_i2d() this is used for     encoding, replacing and deleting extensions.
      X509V3_add_i2d() needs to be able to allocate a     STACK_OF(X509_EXTENSION) so it should be passed     STACK_OF(X509_EXTENSION) ** in the first argument.
      Avoid compiler warnings in hw_ubsec.c: unused static     functions and signed/unsigned mismatch.
      New OCSP extension functions.
      ASN1_ITEM versions of sign, verify, pack and unpack.
      Add NO_ASN1_OLD to remove some old style functions:     currently OpenSSL itself wont compile with this set     because some old style stuff remains.
      ASN1_ITEM version of ASN1_dup(). Might want     something more efficient later...
      Replace the old ASN1_dup() with ASN1_item_dup() and     zap some evil function pointers casts along the way...
      ASN1_ITEM versions of ASN1_d2i_{fp, bio} and replacement of     most of the old wrappers. A few of the old versions remain     because they are non standard and the corresponding ASN1     code has not been reimplemented yet.
      Delete PKCS#12 redundant files.
      Rewrite PKCS#12 code and remove some of the old     horrible macros.
      Fix the S/MIME code so it now works again and     uses the new ASN1 code.
      Update OCSP API.
      Fix typo in OCSP nonce extension.
      Modify OCSP API to more closely reflect     application needs.
      Add set of OCSP client functions. All experimental     and subject to addition, modifcation or deletion.
      Add prototypes for new OCSP functions.
      Fix uni2asc() so it can properly convert zero length     unicode strings. Certain PKCS#12 files contain these     in BMPStrings and it used to crash on them.
      OCSP basic response verify. Very incomplete     but will verify the signatures on a response     and locate the signers certifcate.
      Fix typo in OCSP ASN1 module, this caused     invalid format in OCSP request signatures.
      New OCSP utility. This can generate, parse and print     OCSP requests. It can also query reponders and parse or     print out responses.
      Preliminary ocsp utility documentation.
      Fix warning in apps/ca.c
      Change PKCS#12 key derivation routines to cope with     non null terminated passwords.
      Initial OCSP certificate verify. Not complete,     it just supports a "trusted OCSP global root CA".
      Implement remaining OCSP verify checks in     accordance with RFC2560.
      Don't shadow.
      Additional functionality in ocsp utility: print summary     of status info. Check nonce values. Option to disable     verify. Update usage message.
      Fixes to various ASN1_INTEGER routines for negative case.
      Update ocsp utility documentation.
      Fix to stop X509_time_adj() using GeneralizedTime.
      Add debugging info to new ASN1 code to trace memory leaks.
      Zero the premaster secret after deriving the master secret in DH     ciphersuites.
      New OCSP response verify option OCSP_TRUSTOTHER
      Make sk_sort tolearate a NULL argument.
      Tolerate some "variations" used in some     certificates.
      Tidy up the mess in bss_sock.c and bss_fd.c     by placing them socket/fd code in separate     files rather than trying to have them both     share the same one.
      Various function for commmon operations.
      Various OCSP responder utility functions.
      Fix ASN1_TIME_to_generlizedtime().
      New function to copy nonce values from OCSP     request to response.
      Fix AES code.
      Allow various options to be included for signing and verify of     OCSP responses.
      Add missing \n's to ocsp usage message.
      Various updates to mkdef.pl to cope with new aes     and ASN1 code.
      Various Win32 related fixed. Make no-krb5 work in mkdef.pl .
      Fix CRL printing to correctly show when there are no revoked certificates.
      Work around for libsafe "error".
      Modify OCSP nonce behaviour.
      New function OCSP_parse_url() and -url option for ocsp utility.
      Initial OCSP SSL support.
      Option to disable standard block padding with EVP API.
      New options to 'ca' utility to support CRL entry extensions.
      New -set_serial options to 'req' and 'x509'.
      Fix typo.
      Rebuild ASN1 error codes to remove unused function and reason codes.
      Initial support for ASN1_ITEM_FUNCTION option to     change the way ASN1 modules are exported.
      Get rid of ASN1_ITEM_FUNCTIONS dummy function     prototype hack. This unfortunately means that     every ASN1_*_END construct cannot have a     trailing ;
      Oops, forgot CHANGES entry for ASN1_ITEM_FUNCTIONS.
      Make OCSP cert id code tolerate a missing issuer certificate     or serial number.
      Stop PKCS7_verify() core dumping with unknown public     key algorithms and leaking if the signature verify     fails.
      Print out OID of unknown signature or public key     algorithms.
      New function and options to check OCSP response validity.
      Trap an invalid ASN1_ITEM construction and print out     the errant field for more ASN1 error conditions.
      Enhance OCSP_request_verify() so it finds the signers certificate     properly and supports several flags.
      Typo in comment.
      Fix a bug which caused BN_div to produce the     wrong result if rm==num and num < 0.
      Fix bug in copy_email() which would not     find emailAddress at start of subject name.
      Make EVP_Digest*() routines return a value.
      Change the EVP_somecipher() and EVP_somedigest()     functions to return constant EVP_MD and EVP_CIPHER     pointers.
      Update docs.
      Add the 'ec' directory to mkdef.pl and mkfiles.pl     so the Windows build can see it.
      Typo.
      In crypto/ec #if 0 out structures which reference (currently)     non existent functions because this breaks shared libraries.
      Initial docs for PEM routines.
      Document the -certopt option to the x509 utility.
      Overhaul the display of certificate details in     the 'ca' utility. This can now be extensively     customised in the configuration file and handles     multibyte strings and extensions properly.
      Add 'align' option to nameopt.
      Add copy_extensions option to 'ca' utility.
      Fix PKCS#12 key generation bug.
      Rewrite CHOICE field setting code to properly handle     combine in CHOICE options.
      Fix ASN1 bug when decoding OTHER type.
      Win32 fixes:
      Initial CRL based revocation checking.
      Allow various X509_STORE_CTX properties to be     inherited from X509_STORE.
      Fix to allow multiple NONE libraries in mkerr.pl .
      Fix warning with DEBUG_SAFESTACK
      Purpose and trust setting functions for X509_STORE.
      Typo.
      Under VC++ _DLL is set to indicate that the application     will be linked against the DLL runtime library. It is     automatically set when /MD is used.
      Change Win32 to use EXPORT_VAR_AS_FN.
      #if 0 out deleted (?) functions to stop Win32 DLL     build falling over.
      Fix for new UI functions under Win32.
      Add examples to EVP_EncryptInit manual page.
      Add missing variable length cipher flag for Blowfish.
      Add support for MS CSP Name PKCS#12 attribute.
      Initialize UI ex_data.
      Make update
      Don't set pointer if add_lock_callback used.
      make apps compile again
      Fix memory leaks.
      Change all calls to low level digest routines in the library and     applications to use EVP. Add missing calls to HMAC_cleanup() and     don't assume HMAC_CTX can be copied using memcpy().
      Fix memory leak when RAND is used: need to cleanup     RANDs ENGINE reference in ENGINE_cleanup().
      Update my config entry to allow use of DSOs.
      In UI_dup_*() function, use the duped string, not the original.
      Fix UI leak in apps.
      Fix hwcrhk_insert_card.
      In {RSA,DSA,DH}_new_method(x) need to increase the reference     count of the ENGINE is x is not NULL since it will be freed     in {RSA,DSA,DH}_free().
      Handle empty X509_NAME in printing routines.
      Another empty X509_NAME fix.
      Modify apps to use NCONF code instead of old CONF code.
      In ocsp_match_issuerid() we are passed the CA that signed the responder     certificate so need to match its subject with the certificate IDs in the     response.
      Delete extra ;
      Initial OCSP server support, using index.txt format.
      Allow OCSP server to handle multiple requests.
      First of several reorganisations to     reduce linker bloat. For example the     single line:
      More linker bloat reorganisation:
      Make sure *outl is always initialized in EVP_EncryptUpdate().
      Add CRL utility functions to allow CRLs to be     built up without accessing structures directly.
      Make -passin -passout etc work again.
      Add #ifdefs to some devcrypto code
      Load OCSP responder key before waiting for an incoming     connection so it can prompt for pass phrase on startup     instead of after the first connection.
      Replace old (and invalid) copyright notice.
      Add certificate and request demos.
      Fix AES CBC mode EVP_CIPHER structures: the IV length is always     16.
      Support fractional seconds in GeneralizedTime
      Make (ancient) sign.c demo compile again.
      Constify EVP_SealInit, EVP_OpenInit
      Modernise and fix (ancient) "maurice" demos.
      Make EVP_DecryptUpdate work again.
      Use the maximum block length for the extra size in the encrypt     BIO buffer instead of hard coding it as 8.
      Retain compatibility of EVP_DigestInit() and EVP_DigestFinal()     with existing code.
      Update docs.
      Modify EVP cipher behaviour in a similar way     to digests to retain compatibility.
      Update docs.
      Add missing EVP_CIPHER_CTX_{init,cleanup}
      Typo.
      Stop spurious "unable to load config info" errors in req
      Reject certificates with unhandled critical extensions.
      Sanitize CHANGES entry.
      New options to allow req to accept UTF8 strings as input.
      Add support for Subject Info Acess extension.
      Stop compiler warnings.
      Bugfixes for noemailDN option. Make it use the     correct name (instead of NULL) if nomailDN is     not set, fix memory leaks and retain DN structure     when deleting emailAddress.
      Allow ca to certify requests containing BMPStrings and UTF8Strings.
      Another noemailDN fix.
      Fix email address delete code.
      Win32 fixes.
      PKCS#12 code fixes: initialize and cleanup digests and ciphers     properly.
      Add an FAQ.
      NO_DSA, NO_RSA patches.
      Add -pubkey option to req command.
      Make EVP_SealInit() return the correct value.
      EVP_BytesToKey documentation.
      Don't overwrite signing time.
      Update PEM docs
      Experimental configuration code.
      Initial ENGINE config module, docs to follow.
      default_algorithms option in ENGINE config.
      Constification.
      #undef some things that cause a conflict under Win32 when     wincrypt.h is included.
      Config file updates from stable branch
      Config code updates.
      Update from stable branch.
      make errors
      non-Monolith fixes.
      Fix for AIX.
      New OPENSSL_LOAD_CONF define to load openssl.cnf     when OpenSSL_add_all_algorithms() is called.
      Updates from stable branch.
      Make the engine config module always add dynamic ENGINEs     to the list using dynamic_path. This stops ENGINEs which     don't supply any default algorithms being automatically     freed (because they have no references) and allows them     to be accessed by id.
      Fix new -aes command argument handling
      Always init ctx_tmp in PKCS7_dataFinal since it is always cleaned up.
      Fix warnings about signed/unsigned mismatch and global     shadowing (random, index) in hw_4758_cca.c
      Make sure the type accessed by the LONG and ZLONG ASN1 type     is really a long, to avoid problems on platforms where     sizeof(int) != sizeof(long).
      ENGINE module additions.
      Fix the Win32_rename() function so it correctly     returns an error code. Use the same code in Win9X     and NT.
      Make {RSA,DSA,DH}_new_method obtain and release an ENGINE     functional reference in all cases.
      Make ciphers and digests obtain an ENGINE functional reference     if impl is explicitly supplied.
      Fix various warnings when compiling with KRB5 code.
      Fix ASN1 additions for KRB5
      Fix Kerberos warnings with VC++.
      Undo previous patch: avoid warnings by #undef'ing     duplicate definitions.
      Initialize cipher context in KRB5     ("D. Russell" <russelld at aol.net>)
      Ensure EVP_CipherInit() uses the correct encode/decode parameter if     enc == -1
      Initialize ciph_ctx in kssl.c
      Add apps_startup and bio_err init code to smime.c
      Avoid gcc warning: BN_DEC_CONV when SIXTY_FOUR_BIT is defined is unsigned.
      Fallback to normal multiply if n2 == 8 and dna or dnb is not zero     in bn_mul_recursive.
      Add config entry debug-steve-linux-pseudo64.  This sets the     SIXTY_FOUR bignum library option to use 64 bit operations     on the 32 bit linux platform.
      EVP_SealFinal should return a value.
      Zero cipher_data in EVP_CIPHER_CTX_cleanup
      Add missing EVP_CIPHER_CTX_init call.
      Fix Mingw32 asm build: use the Unix     bignum assembly method of bn-586.pl     and co-586.pl which (for some reason)     VC++ doesn't use.
      Reorganise -subj option code, fix buffer overrun.
      Make i2c_ASN1_BIT_STRING return the correct length.
      The new ASN1 code automatically allocates     structures for fields that are not OPTIONAL.
      Fix ext_dat.h extension ordering.
      Fix the ASN1 sanity check: correct header length     calculation and check overflow against LONG_MAX.
      Fix typo
      Fix typo in OBJ_txt2obj which incorrectly passed the content     length, instead of the encoding length to d2i_ASN1_OBJECT.
      Fix block_size field for CFB and OFB modes: it should be 1.
      Fix crahses and leaks in pkcs12 utility -chain option
      #if out unused function to shut the compiler up.
      Change C++ style comments
      Make -nameopt work in req and add support for -reqopt
      Reinstate the check for invalid length BIT STRINGS,     which was effectively bypassed in the ASN1 changed.
      Fix ASN1_STRING_to_UTF8: remove non sensical !*out test.
      Fix typos in PKCS#12 ASN1 code.
      Really fix PKCS7_set_detached this time...
      Preliminary streaming ASN1 encode support.
      Various enhancements to PKCS#12 code, new     medium level API, improved PKCS12_create     and additional functionality in pkcs12     utility.
      Update mkdef.pl to handle new ASN1 macro
      Add declaration got PKCS#7 NDEF.
      make update
      Add version info to Win32 DLLs.
      Typo.
      Some docs relating to X509 ASN1 functions.
      Update RSAPublicKey manual page...
      Oops, remove old comment out debugging printf...
      Various Win32 fixes.
      Update DH parameter docs.
      Update docs.
      Update docs.
      Document "0" and "1" naming convention.
      More d2i/i2d manual pages.
      More docs.
      PKCS7_verify() docs.
      More man pages.
      PKCS12_create manual page
      PKCS12_parse manual page.
      Update docs.
      Typo.
      More docs.
      New docs.
      Typo: v3 is represented by 2.
      Check for NULL ASN1_ITEM when initializeing     boolean option in ASN1_TYPE.
      CRL reason code docs.
      Typo in OCSP ASN1 module
      Typo
      Initial ASN1 generation code. This can construct     arbitrary encodings from strings and config files.
      Initial ASN1 generation documentation.
      Update docs
      Fix memory leak in s2i_ASN_INTEGER and return an error     if any invalid characters are present.
      Add header ctype.h
      Only accept exact match for modifier or tag name
      Put NAME in right place, fix typo
      Update docs
      Typo
      Fix get_email: 0 is a valid return value
      Fix documentation of i2d_X509_fp and i2d_X509_bio.
      Add SETWRAP modifier to ASN1 generate.
      In asn1_d2i_read_bio, don't assume BIO_read will     return the requested number of bytes when reading     content.
      Typo in X509v3_get_ext_by_critical
      Make ASN1_TYPE_get() work for V_ASN1_NULL type.
      Fix leak.
      NULL tofree when it is freed to avoid double free.
      Typo.
      Set EXPORT_VAR_AS_FN for BC-32 to work around a compiler bug,
      EVP_DecryptInit() should call EVP_CipherInit() not EVP_CipherInit_ex().
      Check return value of gmtime() and add error codes     where it fails in ASN1_TIME_set().
      Correct EVP_SealInit() documentation, iv is an output     parameter.
      IPv6 display and input support for extensions usingh GeneralName.
      Typo.
      GeneralString support in mini-ASN1 compiler
      Option to disable SSL auto chain build
      Single pass processing to cleartext S/MIME signing.
      Update docs.
      Typo.
      Update debub-steve* entries.
      Fix bug in base64 bios during write an non blocking I/O:     if the write fails when flushing the buffer return the     value to the application so it can retry.
      Re enable the read side non blocking test BIO code.
      Ooops forgot to recognise V_ASN1_GENERALSTRING.
      Base64 bio fixes. The base64 bio was seriously broken     when reading from a non blocking BIO.
      Fix indefinite length encoding so EOC correctly updates     the buffer pointer.
      Support for dirName from config files in GeneralName extensions.
      Typo.
      Encryption BIOs misbehave when used with non blocking I/O.
      Fixes for EVP_DigestInit_ex() and OPENSSL_NO_ENGINE.
      Avoid warnings for no-engine and PEDANTIC
      Return an error if gmtime returns NULL.
      Fix PEDANTIC stuff...
      Add some OIDs.
      Add entry for domainComponent so it is treated correctly.
      Don't give an error if response reason absent in OCSP HTTP.
      Fix for no-ec on Windows.
      Fix Certificate and CRL adding in X509_load_cert_crl_file:     an X509_INFO structure can contain more than one object,     for example a certififcate and a CRL.
      make update
      Avoid warning.
      Typo: OID should be policyMappings
      Support for policyMappings
      New ASN1 macros to just implement and declare the new and free functions     and changes to mkdef.pl so it recognises them.
      make update
      Support for policy constraints.
      make update
      Name Constraints OID.
      Support for name constraints.
      make update
      Update ocsp usage message and docs.
      Multi valued AVA support.
      Update from stable branch.
      Typo.
      Make DER option work again.
      Add correct DN entry for serialNumber.
      Fix docs.
      The square brackets in BIO_s_bio.pod for some     reason cause wml to bomb out with the error     message:
      PR: 631     Submitted by: Doug Sauder <dws+001 at hunnysoft.com>
      PR: 627
      Various S/MIME bug and compatibility fixes.
      Stop checking for CRLF when start of buffer is reached.
      Only count 'LF' as EOL in pk7_mime.c, this avoids incorrect     results if CR+LF straddles the line buffer.
      Update CHANGES to reflect base64 fix added to 0.9.7
      Really get X509_CRL_CHECK_ALL right this time...
      Return EOF when an S/MIME part have been read.
      Avoid clashes with Win32 names in WinCrypt.h
      outlen should be int * in out_utf8.
      Only accept a client certificate if the server requests     one, as required by SSL/TLS specs.
      New -ignore_err option in ocsp application to stop the server     exiting on the first error in a request.
      Typos.
      In order to get the expected self signed error when     calling X509_verify_cert() in x509.c the cert should     not be added to the trusted store.
      Add -passin support to rsautl
      ASN1 parse fix and release file changes.
      Avoid warnings: add missing prototype, don't shadow.
      Retrieve correct content to sign when the     type is "other".
      Initialize digested data type in PKCS7_set_type().
      New function to initialize a PKCS7 structure of type other.
      Simplify cipher and digest lookup in PKCS#7 code.
      Add support for digested data PKCS#7 type.
      Print out GeneralizedTime and UTCTime in ASN1_STRING_print_ex().
      Give CRLDP its standard name.
      Typos.
      Replace expired certificate.
      Add flag to avoid continuous     memory allocate when calling EVP_MD_CTX_copy_ex().
      Fix handling of -offset and -length in asn1parse tool.
      Use an OCTET STRING for the encoding of an OCSP nonce value.
      Initial docs for the OpenSSL library configuration via openssl.cnf
      More autoconfig docs.
      Documentation of the KISS autoconfig functions.
      Config docs.
      Indent some of the code examples.
      Typos.
      Various X509 fixes. Disable broken certificate workarounds     when X509_V_FLAG_X509_STRICT is set. Check for CRLSign in     CRL issuer certificates. Reject CRLs with unhandled (any)     critical extensions.
      Memory leak fix.
      Call autoconfig code in pkcs7 utility.
      Cleanup ASN1 OID module when it exits.
      Support for inhibitAnyPolicy extension.
      Fix policy constraints syntax.
      Avoid warnings.
      Initial support for certificate policy checking and evaluation.
      Fix ASN1 warnings.
      Fix loads of warnings in policy code.
      Remove BN_CTX debug from debug-steve
      Free up BIO properly when using streaming S/MIME sign.
      Extend OID config module format.
      Allow CRLs to be passed into X509_STORE_CTX. This is useful when the     verified structure can contain its own CRLs (such as PKCS#7 signedData).
      Remove obsolete files.
      Make {i2v,v2i}_ASN1_BIT_STRING global.
      Enhance EVP code to generate random symmetric keys of the     appropriate form, for example correct DES parity.
      New function X509_POLICY_NODE_print()
      Oops forgot CHANGES entry.
      Don't use C++ reserved word.
      Add some root CAs.
      Clear error if unique_subject lookup fails.
      Reduce chances of issuer and serial number duplication by use of random     initial serial numbers.
      Use X509_get_serialNumber() instead of accessing internals in x509.c
      New option to 'x509' -next_serial. This outputs the certificate     serial number plus 1 to the output file. Its purpose is to allow     serial number files to be initialized when random serial numbers     are used.
      Fix leak.
      Reformat/tidy some of the ASN1 code.
      More ASN1 reformat/tidy.
      Make ASN1 code work again...
      Make self signing option of 'x509' use random serial numbers too.
      Fixes so alerts are sent properly in s3_pkt.c
      Add SHA256 and SHA512 algorithms to mkdef.pl.
      Delete obsolete and unimplemented function.
      Delete unused function from libeay.num, replace with one     that does exist.
      Reformat pkcs8 source.
      Stop compiler warnings with debug-steve
      Don't try to parse non string types.
      PKCS#8 fixes from stable branch.
      Delete non-POSIX header file.
      Delta CRL support in extension code.
      Add FIPS library name to error routines.
      Oops, wrong version...
      Don't ignore return value of EVP_DigestInit_ex() in md BIOs and dgst utility.
      Call setup_engine after autoconfig.
      Make ASN1_INTEGER_cmp() work as expected with negative integers.
      Update FAQ.
      Stop compiler warnings.
      New X509_VERIFY_PARAM structure and associated functionality.
      Reformat smime.c
      Don't use 'explicit' for variable name.
      Reformat smime utility.
      When looking for request extensions in a certificate look first     for the PKCS#9 OID then the non standard MS OID.
      Change values of MBSTRING_* to the form MBSTRING_FLAG|nbyte as assumed     in ASN1_STRING_to_UTF8().
      Check ASN1_TYPE structure type is a SEQUENCE in PKCS7_get_smimecap().
      Don't use C++ reserved work "explicit".
      Update debug-steve
      Fix race condition when CRL checking is enabled.
      Oops!
      Fix race condition when SSL ciphers are initialized.
      Update FAQ.
      Update NEWS
      Don't return an error with crl -noout.
      Use the default_md config file value when signing CRLs.
      Fix x509.c so it creates serial number file again if no     serial number is supplied on command line.
      PR: 969     Submitted by: David Holmes <davidh at 3blackdogs.com>
      Zap obsolete der_chop script.
      PR: 938
      PR: 923
      PR: 940
      Initial pod documentation of X509V3 config file format.
      PR: 910
      Update X509v3 docs.
      Update X509v3 doc.
      In "req" exit immediately if configuration file is needed and it can't     be loaded instead of giving the misleading:
      Fix memory leak.
      Typo.
      Check return code of EVP_CipherInit() in PKCS#12 code.
      Update docs.
      Update docs
      Allow alternative manual sections to be embedded in .pod file comments.
      Add errstr manual page
      Typo.
      Perform partial comparison of different character types in X509_NAME_cmp().
      Add couple of OIDs. Resync NIDs for consistency with 0.9.7.
      V1 certificates that aren't self signed can't be accepted as CAs.
      Add -passin argument to dgst command.
      In by_file.c check last error for no start line, not first error.
      Update year.
      Add lots of checks for memory allocation failure, error codes to indicate     failure and freeing up memory if a failure occurs.
      Remaing bits of PR:620 relevant to 0.9.8.
      Use X509_cmp_time() in -checkend option, to support GeneralizedTime.
      Update 'certs' directory. Move expired certificates to expired directory     and zero assurance demontrations CAs to 'demo'.
      Automatically mark the CRL cached encoding as invalid when some operations     are performed.
      Remove duplicate lines.
      Fix s_client so it works without a certificate again.
      Don't use multiple storage types.
      Remove unused buffer 'buf'.
      Prompt for passphrases for PKCS12 input format
      PKCS7_verify() performance optimization. When the content is large and a     memory BIO (for example from SMIME_read_PKCS7 and detached data) avoid lots     of slow memory copies from the memory BIO by saving the content in a     temporary read only memory BIO.
      In mkdef.pl ignore trailing whitespace in #ifdef lines
      Fix possible memory leak.
      Ensure (SSL_RANDOM_BYTES - 4) of pseudo random data is used for server and     client random values.
      Doc fixes.
      Update FAQ
      Typo
      Make kerberos ciphersuite code work with newer header files
      Move allow_proxy_certs declaration to start of function.
      Include error library value in C error source files instead of fixing up     at runtime.
      Rebuild error codes.
      Replace overwritten lines before error codes.
      More overwritten stuff...
      Update FAQ.
      Check return values of <Digest>_Init functions in low level digest calls.
      Fix from stable branch.
      Various Win32 and other fixes for warnings and compilation errors.
      Update year.
      Ignore TYPEDEF_OF in mkdef.pl
      New "algorithm define" OPENSSL_NO_GMP. Update mkdef.pl and Configure script     to use it.
      Stop perl warning.
      Fix logic in mkdef.pl function is_valid.
      Handle similar mk1mf.pl options with a hash table.
      Process MINFO file earlier in mk1mf.pl so it can modify variables like CFLAGS.
      Stop bogus shadowing warning.
      Stop compiler warnings about deprecated lvalue casts.
      Rename typed version of M_ASN1_get M_ASN1_get_x to avoid conflicts.
      Make kerberos ciphersuite code compile again.
      Don't use standard kerberos library locations in MK1MF builds.
      Recognize zlib and krb5 options in mk1mf.pl
      Oops...
      False positive removed.
      Fixes for signed/unsigned warnings and shadows.
      Remove more false positives.
      Port from stable branch.
      Remove more false positives.
      Port prime utility across from stable branch.
      More false positives and cases covered by port of prime.c
      Port from stable branch.
      Remove more false positives.
      Stop unused variable warning.
      Port BN_MONT_CTX_set_locked() from stable branch.
      Change method_mont_p from (char *) to (BN_MONT_CTX *) and remove several     casts.
      Lots of Win32 fixes for DTLS.
      Update default dependency flags.
      Increase offset for BIO_f_enc() to avoid problems with overlapping buffers     when decrypting data.
      Use more efficient way to locate end of an ASN1 structure.
      Don't attempt to parse nested ASN1 strings by default.
      Typo.
      Support for smime-type MIME parameter.
      Typo.
      Fix from stable branch.
      Avoid warnings.
      Some C compilers produce warnings or compilation errors if an attempt     is made to directly cast a function of one type to what it considers and     incompatible type. In particular gcc 3.4.2.
      openssl_fcast should always be defined, not just with DEBUG_SAFESTACK
      Make -CSP option work again in pkcs12 utility by checking for     attribute in EVP_PKEY structure.
      Make update.
      Assing check_{cert,crl}_time to 'ok' variable so it returns errors on     expiry.
      Update from 0.9.7-stable. Also repatch and rebuild error codes.
      Add pss/x931 files.
      Update from stable branch.
      Update from 0.9.7-stable.
      Update CHANGES.
      Typo.
      Use correct name for config file env variable.
      Fix for padding X9.31 padding check and zero padding bytes.
      Fix extension ordering.
      Typo.
      Add Argen root CAs.
      Sync libeay.num
      Check PKCS7 structures in PKCS#12 files are of type data.
      Update from stable branch.
      Initial print only support for IDP CRL extension.
      Print out previously unsupported fields in CRLDP by i2r instead of i2v.
      Typo which prevents mult valued RDNs being created.
      Allow setting of all fields in CRLDP. Few cosmetic changes to output.
      Don't use @syntax for extended CRLDP format.
      Add support for setting IDP too.
      Add declaration for IDP ASN1 functions.
      Update ASN1 printing code. Highly experimental, not working properly (neither     did the old code) and not compiled in yet...
      Handle case where it==NULL
      Allow PKCS7_decrypt() to work if no cert supplied.
      Initialize SSL_METHOD structures at compile time. This removes the need     for locking code. The CRYPTO_LOCK_SSL_METHOD lock is now no longer used.
      New version of ASN1 print code, still not compiled in though.
      Remove ASN1_METHOD code replace with new ASN1 alternative.
      Update from stable branch.
      Add file which includes new ASN1 NETSCAPE format for certificates.
      Delete old ASN1_METHOD files.
      Command line support for RSAPublicKey format.
      Use correct date and filename.
      Integrated support for PVK files.
      Initial support for ASN1 print code.
      Update ASN1 printing code and add a -print option to 'pkcs7' utility for     initial testing.
      Return 2 from X509_NAME printing routine to add newline.
      Extend callback function to support print customization.
      Two new verify flags functions.
      Update to ASN1 printing code.
      Update asn1t.h too for ASN1 print.
      Update ASN1 print implement macro.
      Update print macro properly this time...
      Fix for Win32.
      Change openssl.cnf to use UTF8Strings by default and not always include issuer     and serial versions of AKID.
      128 bit AES ciphersuites should be classified as HIGH.
      Update from stable branch.
      Make OPENSSL_NO_COMP compile again.
      Fix compilation without OPENSSL_NO_COMP :-)
      Make OPENSSL_NO_COMP work under Win32.
      Oops :-)
      Initialize bignum constants using BN_bin2bn() instead of BN_hex2bn(). This     saves a bit of space and avoids a compiler warning about string length.
      New option SSL_OP_NO_COMP to disable compression. New ctrls to set     maximum send fragment size. Allocate I/O buffers accordingly.
      Avoid warning on Win32.
      Add PVK support to dsa utility.
      Include kerberos libraries (if used) when linking test apps: some need it.
      Update from stable branch.
      Add symbols for ASN1 print functions, update ordinal file.
      Make DLL engines the default in 0.9.9 and VC++.
      Update from stable branch.
      Update docs.
      Update from stable branch.
      Extensive OID code enhancement and fixes.
      Make CA.pl script use CA extensions when creating a root CA.
      Typo
      Include EVP_whirlpool() prototype in evp.h
      Add error checking to avoid crashing when zlib cannot be loaded.
      New functions to support opaque EVP_CIPHER_CTX handling.
      Update ordinals and include changes from 0.9.8.
      Oops...
      Make ZLIB without ZLIB_SHARED compiled again.
      Make mk1mf.pl and friends recognize Whirlpool.
      Update from stable branch.
      Update from 0.9.8-stable.
      Avoid warnings on VC++ 2005.
      Initial attempt at Whirlpool assembler support on VC++.
      Don't include zlib header dir if it is not defined.
      Add cpuid code to VC++ build.
      In ASN1_parse() show tag value for ASN1 tags > 30.
      Update from stable branch.
      Typo.
      Fix from stable branch.
      Fixes for BOOL handling: produce errors for invalid string for mini-compiler,     correctly encode FALSE for BOOL in ASN1_TYPE.
      Ignore zero length constructed segments.
      Recognize mingw in perlasm.
      Update filenames in makefiles.
      Update from 0.9.7-stable.
      Avoid warnings about shadowed definitions.
      Fix warnings about "sin" conflicting with sin(3) definition.
      Add FAQ about AKID.
      Minor clarification.
      Fix warnings.
      Fix from stable branch.
      Tolerate a SEQUENCE in DN components.
      Print out <INVALID> if an OID value is invalid.
      Check EVP_DigestInit_ex() return value in EVP_BytesToKey().
      Typo.
      Stop compiler warnings.
      Initial support for pluggable public key ASN1 support. Process most public     key ASN1 handling through a single EVP_PKEY_ASN1_METHOD structure and move     the spaghetti algorithm specific code to a single ASN1 module for each     algorithm.
      Transfer parameter handling and key comparison to algorithm methods.
      DH EVP_PKEY_ASN1_METHOD, doesn't do much (yet?).
      Gather printing routines into EVP_PKEY_ASN1_METHOD.
      Move algorithm specific print code from crypto/asn1/t_pkey.c to separate     *_prn.c files in each algorithm directory.
      Make EVP_PKEY_ASN1_METHOD opaque. Add application level functions to     initialize it. Initial support for application added public key ASN1.
      Add information and pem strings. Update dependencies.
      Fix bug in DSA, EC methods.
      Typo.
      Add support for legacy PEM format private keys in EVP_PKEY_ASN1_METHOD.
      Initial support for generalized public key parameters.
      New general public key utility 'pkey'.
      New utility pkeyparam. Enhance and bugfix algorithm specific parameter     functions to support it.
      Typo.
      Fix bug where freed OIDs could be accessed in EVP_cleanup() by     defering freeing in OBJ_cleanup().
      Add missing function declaration.
      Add some GOST OIDs.
      Fix typo.
      Fix gost OIDs.
      Initialize pval.
      Don't free up key in priv_decode.
      Add GOST parameter set OIDs.
      More GOST OIDs
      Update and add last (?) set of GOST OIDs.
      Stop warning.
      New function to retrieve ASN1 info on public key algorithms. New command     line option to print out info.
      Fix dynamic public key method lookup.
      Add an explicit load_config() call so any added algorithms are     visible.
      Minor object name edit.
      Typo.
      Typos in a few OID names.
      Rebuild mac table to avoid duplicates.
      Last arg to EVP_PKEY_assign() should be void *.
      New function to add dynamic alias.
      Initial definitions and a few functions for EVP_PKEY_METHOD: an extension     of the EVP routines to public key algorithms.
      Updated to EVP_PKEY_METHOD code... still doesn't do much.
      Initial functions for main EVP_PKEY_METHOD operations.     No method implementations yet.
      Include EVP_PKEY argument in EVP_PKEY_CTX_new(). This avoids the     need for a separate EVP_PKEY parameter in the other operation     initialization routines.
      New utility 'pkeyutl' a general purpose version of 'rsautl'.
      If <operatio>_init function is zero interpret as noop.
      Initial functions for RSA EVP_PKEY_METHOD.
      Implement encrypt/decrypt using RSA.
      Update dependencies.
      Reformat pkeyutl.c, add support for verify operation but nothing actually     supports it (yet).
      Fix typo. Add EVP_PKEY_CTX control function for later use by command line     utilities.
      Add RSA ctrl for padding mode, add ctrl support in pkeyutl.
      Add checking to padding ctrl.
      Support for digest signing and X931 in rsa_pkey_meth.
      Bugfix X9.31 padding.
      Constification.
      Store digests as EVP_MD instead of a NID.
      New utility function to reverse a buffer, either by copying or in-place.
      Implementation of pkey_rsa_verify. Some constification.
      Change operation values so they can be used as a mask.
      Beginnings of PSS support.
      Preliminary PSS support.
      ctrls to set PSS salt length.
      Initial keygen support.
      Add support for setting keybits and public exponent value for pkey RSA keygen.
      Add parameter generation option to genpkey.
      Write parameters if -genparam option include.
      Fix parameter error messages.
      Initial DSA EVP_PKEY_METHOD. Fixup some error codes.
      Support for DSA keygen, fix for genpkey.
      Add file dso_beos.c missing from original commit.
      Compare parameters when comparing public keys.
      Extend DH ASN1 method to support public key encode/decode and parameter     utilities.
      PKCS#3 DH PKCS#8 ASN1 support.
      Fix leak.
      Extend DH ASN1 method, add DH EVP_PKEY_METHOD.
      Typo.
      Change the option setting command line switch to "-pkeyopt" to avoid confusion     with algorithm parameters.
      Add key derivation support.
      Update dependencies.
      Complete key derivation support.
      Add functions to allow setting and adding external EVP_PKEY_METHOD.
      Print out zero length string properly.
      Update copyright notices on a few files where all original SSLeay code has     been deleted.
      If cipher list contains a match for an explicit ciphersuite only match that     one suite.
      Oops...
      Revert to original...
      Fix from 0.9.7-stable branch.
      Use more flexible method of determining output length, by setting &outlen     value of the passed output buffer is NULL.
      Provisional support for EC pkey method, supporting ECDH and ECDSA.
      Fix (most) WIN32 warnings and errors.
      If we include winsock2.h then FD_SET wants an unsigned type for an fd.
      Allow public key ASN1 methods to set PKCS#7 SignerInfo structures.
      Add OID cross reference table.
      Remove comment from SSLeay days about EVP_PKEY_METHOD.
      Remove link between digests and signature algorithms.
      Remove dss1 hack from S/MIME code.
      Add 'flags' parameter to EVP_PKEY_asn1_meth_new() to set algorithm flags.
      Correct copyright notice... this doesn't contain any SSLeay code.
      Add prototypes and pkey accessor function for EVP_PKEY_CTX.
      Fix usage message for pkeyutl.
      Don't free up parameter. The public key ASN1 method can do that if it needs     to.
      New function to extract AlgorithmIdentifier for PKCS7_RECIP_INFO.
      Code tidy.
      Replace RSA specific PKCS7_RECIP_INFO set up with an public key algorithm     ctrl.
      Fix from stable branch.
      Update EVP_PKEY_cmp() and X509_check_private() to return sensible values and     handle unsupported key types.
      Update from stable branch.
      Update FAQ.
      Update from stable branch.
      Fix from stable branch.
      Add support for default public key digest type ctrl.
      Update S/MIME code to use default digest.
      Update PKCS#7 enveloped data to new API.
      Update PKCS#7 decrypt routines to use new API.
      New functions to get key types without dereferncing EVP_PKEY.
      Update 'req' command to use new keygen API.
      Typo.
      Stop warnings about deprecated -mcpu option.
      In interactive mode only config OpenSSL once.
      Typo.
      Check for deprecated private key types before PKCS#8 types.
      Extend PBE code to support non default PKCS#5 v2.0 PRFs.
      Add feature to PKCS12_create() if the encryption NID corresponds to a     supported encryption algorithm instead of a PBE NID then use that     algorithm with PBES2.
      Correctly handle missing DSA parameters.
      Bugfix: the NONE string for PBE algorithms wasn't working.
      Update old **EVIL** PEM_X509_INFO_read_bio() function to correctly assign     private keys.
      Change builting PBE to use static table. Add entries for HMAC and MD5, GOST.
      Add PRF preference ctrl to ciphers.
      Gather keygen options in req and only use them after all other options have     been processed. This allows any ENGINE changing operations to be processed     first (for example a config file).
      HMAC OIDs from RFC4231.
      Oops...
      Extended PBES2 function supporting application supplied IV and PRF NID.
      Tidy up of S/MIME code and add new functions which will make is easier     to create S/MIME signed data with multiple signers.
      PKCS#12 mac key length should equal digest length.
      Don't try to print PBE information if it can't be decoded.
      New option to pkcs12 utility to set alternative MAC digest algorithm.
      Reformat smime.c utility.
      Multiple signer support in smime application.
      Remove old digest type hacks for non RSA keys.
      More S/MIME tidy. Place some common attribute operations in utility     functions.
      make update
      Typo.
      Code tidy.
      Add -resign and -md options to smime command to support resigning an     existing structure and using alternative digest for signing.
      Add ctrl to EVP_MD and EVP_PKEY_CTX to EVP_MD_CTX. These will be used     for enhanced sign/verify operations.
      Fix smime -pk7out.
      Use size_t for new crypto size parameters.
      Fix warnings.
      New functions for enchanced digest sign/verify.
      New function to dup EVP_PKEY_CTX. This will be needed to make new signing     functions and EVP_MD_CTX_copy work properly.
      Update EVP_MD_CTX_copy_ex() to use EVP_PKEY_CTX_dup().
      Add prototypes, update Win32 ordinals.
      Allow any supported cipher to be used with smime -encrypt.
      Update pkeyutl to use size_t for pkey functions.
      Fix warnings.
      Flush p7bio when all data has been copied.
      Install openssl.cnf to OPENSSLDIR in mk1mf.pl
      New pkey functions for keygen callbacks and retrieving operation type.
      Add engine table for EVP_PKEY_METHOD. Doesn't do much yet.
      Add missing prototype. Extend engine utility to print public key algorithms.
      Fix error code. make update
      Add ENGINE support for EVP_PKEY_METHOD including lookups of ENGINE     implementations and functional reference counting when a context     is allocated, free or copied.
      Typo.
      Extend default method string to include public key methods.
      Automatically free up dynamically allocated public key methods when     and ENGINE is destroyed.
      Initial public key ASN1 method engine support. Not integrated yet.
      Make update.
      Complete EVP_PKEY_ASN1_METHOD ENGINE support.
      Clarify comment and add #ifdef.
      Add AES and GOST S/MIME capabilities if algorithms are supported.
      Output MIME parameter micalg according to RFC3851 and RFC4490 instead of hard     coding it to "sha1".
      Fix EVP_PKEY_CTX_dup() to return correct value and handle NULL keys in     the source.
      Make return value from EVP_PKEY_cmp() and EVP_PKEY_cmp_parameters() consistent.
      dsa_pub_cmp() doesn't need to check parameters because that is done in     EVP_PKEY_cmp().
      Add documentation for new smime options.
      Docs for new utilities.
      Initial docs for pkeyutl.
      Typo.
      Update docs with algorithm options.
      Add some EVP_PKEY_METHOD docs.
      Update docs.
      New docs.
      EVP_PKEY_verify() docs.
      Add some examples.
      EVP_PKEY_derive() docs.
      Keygen docs.
      New functions to enumerate digests and ciphers.
      Update docs.
      EVP_PKEY_CTX_ctrl() docs.
      EVP_PKEY_get_default_digest() manual page.
      Public key comparison and printing routine functions.
      Set detached flag in PKCS7 structure earlier to avoid eating up memory.
      New functions to add and free up application defined signature OIDs.
      Allow digests to supply S/MIME micalg values from a ctrl.
      make update
      Update some usage messages.
      Add docs for pkeyparam. Update some existing docs.
      New docs for EVP_Digest{Sign,Verify}*() function. Update existing docs.
      Typo.
      Bugfix: don't look in internal table for signature if found in application     supplied list.
      In genpkey, also look for algorithm string name in any supplied ENGINE.
      There is should be no need to rewind the input stream any more.
      New non-blocking OCSP functionality.
      Add -timeout option to ocsp utility.
      Fix various error codes to match functions.
      Update .cvsignore
      Update .cvsignore again.
      WIN32 fixes signed/unsigned issues and slightly socket semantics.
      Store canonical encodings of Name structures. Update X509_NAME_cmp() to use     them.
      Use correct pointer types for various functions.
      Avoid warnings.
      Avoid WIN32 warning.
      Avoid warning.
      Cache some CRL related extensions.
      Support for multiple CRLs with same issuer name in X509_STORE. Modify     verify logic to try to use an unexpired CRL if possible.
      Fix leak
      Fix C++ style comments, change assert to OPENSSL_assert, stop warning with     pedantic mode.
      Kill more C++ comments.
      Add an FAQ.
      Additional detail.
      Add verify callback functions to lookup a STACK of matching certs or CRLs     based on subject name.
      Fixes for new CRL/cert callbacks. Update CRL processing code to use new     callbacks.
      Update docs.
      Support for AKID in CRLs and partial support for IDP. Overhaul of CRL     handling to support this.
      GOST public key algorithm ENGINE donated to the OpenSSL by Cryptocom.
      Overhaul of by_dir code to handle dynamic loading of CRLs.
      Tidy up CRL handling by checking for critical extensions when it is     loaded. Add new function X509_CRL_get0_by_serial() to lookup a revoked     entry to avoid the need to access the structure directly.
      Do CRL method init after other operations.
      Updated version of gost engine.
      Compile in gost engine.
      Make int_rsa_sign function match prototype.
      Add missing prototype. Fix various warnings (C++ comments, ; outside function).
      Updated file.
      Update length if copying MSB set in asn1_string_canon().
      Using correct lock for X509_REQ.
      Buffer size handling fix for enc.
      Submitted by: Brad Spencer <spencer at jacknife.org>     Reviewed by: steve
      Initialize new callbacks and make sure hent is always initialized.
      Place standard CRL behaviour in default X509_CRL_METHOD new functions to     create, free and set default CRL method.
      Typo.
      Initialize old_priv_encode, old_priv_decode.
      Add documentetion for noCheck extension and add a few cross references to     the extension documentation.
      Add v3 ref to see also sections.
      Typo.
      Fix link for ASN1_generate_nconf
      Typo.
      Don't add the TS EKU by default in openssl.cnf because it then     makes certificates genereated by ca, CA.pl etc useless for anything else.
      Avoid shadow warning.
      Make TSA tests use the noprompt mode of utilities rather than piping     the result into interative utilities.
      OCSP library tidy. Use extension to encode OCSP extensions instead of doing     it manually. Make OCSP_CERTID_dup() a real function instead of a macro.
      Don't assume requestorName is present for signed requests. ASN1 OCSP module     fix: certs field is OPTIONAL.
      Initial, incomplete support for typesafe macros without using function     casts.
      Remove redundant PREDECLARE statement.
      Remove illegal IMPLEMENT macros from header file.
      Update ordinals.
      Update from 0.9.8 stable. Eliminate duplicate error codes.
      Add .cvsignore
      Win32 fixes from stable branch.
      Update dependencies.
      Import ordinals from 0.9.8 and update.
      Fix default dependency flags.
      Fix change to OPENSSL_NO_RFC3779
      Sync OID NIDs with OpenSSL 0.9.8.
      Update from 0.9.7-stable branch.
      Experimental streaming PKCS#7 support.
      Add bit I missed from PKCS#7 streaming encoder.
      Add AOL an AOLTW root CAs to bundle.
      Constify version strings and some structures.
      Constify version strings is ssl lib.
      Update from 0.9.7-stable.
      Update from fips2 branch.
      Add -hmac option to dgst from 0.9.7 stable branch.
      PR: 1483
      Updates from 0.9.8-stable branch.
      Update from 0.9.7-stable.
      Update FAQ,NEWS in HEAD.
      Update from stable branch.
      Fix from stable branch.
      Win32 fixes. Add GOST algorithm to mkdef, update ordinals. Signed/unsigned fixes.
      Stage 1 GOST ciphersuite support.
      New -sigopt option for dgst utility.
      Preliminary support for signctx/verifyctx callbacks.
      Fix digest signing so digest type is set after init.
      Fix from stable branch.
      Don't ignore config_name parameter passed to OPENSSL_config(). Use     "openssl_conf" in config file if config_name variable is missing.
      Constification.
      Experimental HMAC support via EVP_PKEY_METHOD.
      Update CHANGES.
      New -mac and -macopt options to dgst utility. Reimplement -hmac option in     terms of new API.
      Copy update callback across when copying EVP_MD_CTX.
      Update smime utility to support streaming for -encrypt and -sign -nodetach     options. Add new streaming i2d (though strictly speaking it is BER format     when streaming) and PEM functions.
      Update docs.
      Update docs.
      Oops...
      d2i_PKCS7_bio_stream() docs.
      Typo.
      More docs for streaming functions.
      PKCS7_sign_add_signer() docs.
      Don't finalize signerinfo if reuse and partial both set.
      Flush b64 BIO.
      Add a bunch of S/MIME sample programs and data.
      Sample text files for S/MIME test programs.
      New function ASN1_STRING_copy() to copy to an already     alloacted ASN1_STRING structure.
      More useful ASN1 macros for static allocation functions.
      Tidy up docs, remove warning.
      Improve error detection when streaming S/MIME.
      Document streaming options.
      Change C++ style comments.
      New function EVP_PKEY_asn1_copy(). Use default MD if type param is NULL.
      Fix error code name.
      PR: 1516
      Use EVP_DigestVerify() in dgst.c if verifying.
      Use default md if none specified in dgst utility.
      Prepend signature name in dgst output.
      Set len to buffer size.
      Add .cvsignore to seed dir.
      Initial GOST MAC support. Not fully working yet...
      Updated GOST MAC support.
      Fix warning and back out bad modification.
      Fixes for dgst tool. Initialize md_name, sig_name properly. Return error code     on failure. Keep output format consistent with previous versions.
      Typo.
      Revert broken change to ccgost.
      Fix X509_REQ_print_ex() to process extension options.
      Update ordinals.
      Fix for GOST engine on platforms where sizeof(size_t) != sizeof(int).
      Handle NULL parameter in some EVP utility functions.
      Update ssl library to support EVP_PKEY MAC API. Include generic MAC support.
      Avoid use of function pointer casts in pem library. Modify safestack to     always use inline functions.
      Back out safestack.h change for now: seems to break some things.
      Finish gcc 4.2 changes.
      Remove unnecessary casts and avoid some warnings with gcc 4.2.
      WIN32 fixes.
      Make ordinals consistent with OpenSSL 0.9.8
      Update .cvsignore
      Update from stable branch.
      WIN32 VC++ build fixes.
      Update debug-steve
      RFC4507 (including RFC4507bis) TLS stateless session resumption support     for OpenSSL.
      Remove debugging fprintfs, fix typo.
      Fix warnings.
      Typo.
      Fix warning and make no-tlsext work.
      OPENSSL_NO_TLS1 WIN32 build support. Fix so normal build works again.
      Fix for asm/no-asm on WIN32.
      Use SHA256 for ticket HMAC if possible.
      Docs and usage messages for RFC4507bis support.
      Add usage message for -sess_out, -sess_in
      Document ticket disabling option.
      Update from stable branch.
      Add Google sponsorship note.
      Add ctrls to set and get RFC4507bis keys to enable several contexts to     reuse the same tickets.
      Check return code when attempting to receive new session ticket message.
      Update ssl code to support digests other than MD5+SHA1 in handshake.
      Fix warnings: computed value not use, incompatible pointer initialization     and cast from pointer to int of different size (linux-x86_64 and align).
      Change safestack reimplementation to match 0.9.8.
      Fix another warning.
      Fix warning: print format option not compatible with size_t.
      Handle empty case in X509_NAME canonical encoding.
      Update from stable branch.
      Update from stable branch.
      Use accept flag for new session ticket write.
      Support for certificate status TLS extension.
      Typo.
      Move no status notification to ssl_check_serverhello_tlsext() to ensure     no status is notified even if no server extensions are present.
      Off by one fix from stable branch.
      Fix from fips branch.
      Update CHANGES. Keep ordinals consistent.
      Fix from stable branch.
      Don't lookup zero length session ID.     PR: 1591
      Fix from stable branch.
      1. Changes for s_client.c to make it return non-zero exit code in case     of handshake failure
      GOST ENGINE information.
      Fix duplicate error codes.
      Fix from stable branch.
      Rebuild object cross reference table.
      Submitted by: "Victor B. Wagner" <vitus at cryptocom.ru>
      Update debug-steve targets.
      Avoid warning.
      Submitted by: "Victor B. Wagner" <vitus at cryptocom.ru>
      Lookup public key ASN1 methods by string by iterating through all     implementations instead of all added ENGINEs to cover case where an     ENGINE is not added.
      Add caRepository OID and sync object NIDs with OpenSSL 0.9.8.
      Fix from stable branch.
      Rebuild OID database: duplicates got in there somehow??
      Submitted by: Victor B. Wagner <vitus at cryptocom.ru>, steve
      Handle non-SHA1 digests for certids in OCSP test responder.
      Initialize sigsize.
      Update ordinals
      Avoid aliasing warning.
      Add quotes to Win32 install directories.     Submitted by:  Mladen Turk <mturk at apache.org>
      Netware support.     Submitted by: Guenter Knauf <eflash at gmx.net>
      Move CHANGES entry. Revert include file install line.
      Avoid WIN32 signed/unsigned warnings.
      Update WIN32 nasm build to use new asm files.
      Update netware to use new SHA2 assembly language modules.
      Add sha2 defines.
      Add extra SHA2 defines.
      Include Mont asm files in WIN32 build.
      Update perl asm scripts include paths for perlasm.
      Experimental support for import of more options from Configure     (via top level Makefile) into mk1mf builds. This avoids the need     to duplicate the CFLAG handling and can auto build assembly language     source files from perl scripts.
      <strings.h> does not exist under WIN32.
      Clarify BITLIST format and include an example.
      Clarify FAQ.
      Add Global Sign root CA.
      Support custom primitive type printing routines and add one to LONG type.
      Extend attribute setting routines to support non-string types.
      Utility attribute function to retrieve attribute data from an expected     type. Useful for many attributes which are single valued and can only     have one type.
      Typo.
      Add OIDs for compressedData content type and zlib compression.
      Use default value for $dir if it is empty.
      Clarification and fix typo.
      Fix typo and avoid warning.
      Fix error code function name mismatches in GOST engine, rebuild errors.
      Avoid warnings.
      We already have an object for "zlib compression" but it was a place     holder and its actual encoding never used.
      #undef X509_EXTENSIONS to avoid conflict with CryptoAPI.
      Update year.
      And so it begins...
      Free up additional data in RecipientInfo structure
      .cvignore file for cms
      RFC4134 S/MIME examples test script.
      Only call free once in CHOICE type.
      New utility functions for encryptedData content type which will also be used     by envelopedData.
      Encrypted Data type processing. Add options to cms utility and run section 7     tests in RFC4134.
      Reorganise encrypted content info code to avoid duplication and be more     consistent with other content types.
      Typos.
      Delete temp files.
      Initial support for Encrypted Data type generation.
      Return error if no cipher set for encrypted data type.
      Check for cipher BIO errors and set key length after parameter decode.
      Initial support for enveloped data decrypt. Extent runex.pl to cover these     examples. All RFC4134 examples can not be processed.
      Initial support for enveloped data decrypt. Extent runex.pl to cover these     examples. All RFC4134 examples can now be processed.
      Add support for random key generation: this will be needed by enveloped data.
      Extend runex.pl to extract examples directly from RFC text.
      Don't need to check for examples directory any more.
      Remove deleted function from header file, update mkfiles.pl
      Adapt to diffrent OpenSSL utility locations.
      Fix some warnings.
      Preliminary support for enveloped data content type creation.
      Partial support for KEKRecipientInfo type.
      More support for KEK RecipientInfo.
      Various tidies/fixes:
      Add extensive PCKS7 and CMS consistency test script.
      Fixes for S/MIME consistency checker and flexibility enhancements.
      Uninitialized variable bug fix.
      Add enveloped data keyid test.
      Delete tmp files, silence openssl commands, compare extracted content.
      Delete standard out and err temp files too.
      Make 3DES default cipher in cms utility.
      Add support for KEKRecipientInfo in cms application.
      Additional sanity check.
      Produce meaningful error if sanity check fails.
      Add support for KEK decrypt in cms utility.
      Rebuild CMS error codes.
      Allow alternate eContentType oids to be set in cms utility.
      Preliminary documentation for CMS utility.
      Update dependencies.
      Fix duplicate asn1 ctrl values.
      Add support for CMS structure printing in cms utility.
      Add signed receipt ASN1 structures. Initial GENERAL_NAME utility functions.
      Signed Receipt Request utility functions and option on CMS utility to     print out receipt requests.
      Add support for signed receipt request printout and generation.
      Support for verification of signed receipts.
      Signed receipt generation code.
      Update docs.
      Remove unnecessary header.
      Update dependencies.
      Use correct headers for signed receipts. Use consistent naming.
      Fix macro.
      Fix it properly this time....
      Add signed receipt tests.
      Avoid warnings.
      Since OID NIDs with 0.9.8.
      Update CHANGES.
      Update CHANGES.
      Rename runex.pl to cms-examples.pl
      Make mk1mf.pl recognize no-cms.
      Delete nonexistant function from pkcs7.h header file. WIN32 build fix from     stable branch. Sync and update ordinals.
      Give consistent return value and add error code for duplicate certificates.
      Fix typo and add header files to err library.
      Set contentType attribute just before signing to allow encapsulated content     type to be set at any time in applications.
      Implement CMS_NOCRL.
      Initial CMS API documentation.
      Correct d2i/i2d typos.
      Fix various typos, update SMIMECapabilities description.
      More CMS API documentation.
      Add CMS_compress() docs.
      Add CMS_uncompress manual page.
      Update docs.
      Correct references to smime in cms app.
      Signed receipt request function documentation.
      Spellcheck CMS docs.
      Add CMS signed receipt genration and verification docs.
      Ignore nonsensical flags for signed receipts.
      Add additional parameter to CMS_final() to handle detached content.
      Add docs for CMS_final() and BIO_new_CMS().
      Typo.
      Correct HISTORY reference.
      Reformat, fix typos and clarify CMS API docs.
      PKCS#7 examples converted to CMS.
      Fix for compression and updated CMS_final().
      CMS compressed data examples.
      Make CMS_uncompress() argument order consistent with other functions.
      Fix comments.
      Revert argument swap change... oops CMS_uncompress() was consistent...
      Fix prototype for CMS_decrypt(), don't free up detached content.
      Correct argument order for CMS_decrypt() in docs.
      Detached encrypt/decrypt example, fix decrypt sample.
      Make certs argument work in CMS_sign() add test case.     PR:1664
      Disable debugging fprintf.
      Don't send zero length session ID if stateless session resupmtion is     successful. Check be seeing if there is a cache hit.
      Update from stable branch.
      Update from stable branch.
      Oops!
      Update from stable branch.
      Update from stable branch.
      Use "cont" consistently in cms-examples.pl
      Typo.
      Indicate support for digest init ctrl.
      New function CMS_add1_crl().
      Add missing cast.
      Fix from stable branch.
      Fix two invalid memory reads in RSA OAEP mode.     Submitted by: Ivan Nestlerode <inestlerode at us.ibm.com>     Reviewed by: steve
      Fix from stable branch.
      Update from stable branch.
      Update ordinals.
      Typo.
      Typo.
      C++ style comments fixed.
      Avoid warning about empty structures and always define CHECKED_PTR_OF
      Avoid "duplicate const" warnings.
      Fix from stable branch.
      Stop const mismatch warning in VC++.
      Stop warning about extra ';' outside of function.
      Stop const mismatch warning.
      Recognize LHASH_OF().
      Add CryptoAPI ENGINE from stable branch.
      Add CryptoAPI error file too.
      More CryptoAPI engine code from stable branch.
      Update VC-32.pl and load CryptoAPI engine in the right place.
      Update from stable branch.
      Update from stable branch.
      Add support for ENGINE supplied SSL client auth.
      Update error codes, move typedef of SSL, SSL_CTX to ossl_typ.h
      Add client cert engine to SSL routines.
      Update error codes.
      Allow ENGINE client cert callback to specify a set of other certs, for     the rest of the certificate chain. Currently unused.
      Release engine reference when calling SSL_CTX_free().
      Get and note keyspec when signing.
      Use keyspec for DSA too.
      Add ctrl for alternative certificate store names.
      Free old store name (if any).
      Avoid cast with wrapper function.
      Revert, doesn't fix warning :-(
      Avoid case in ca.c fix.
      Fix indentation.
      #undef OCSP_RESPONSE: CryptoAPI uses this too.
      Windows batch file to rebuild error codes for CryptoAPI ENGINE.
      Update year.
      Prevent signed/unsigned warning on VC++
      Add preliminary SSL client auth callback to CryptoAPI ENGINE.
      Add support for client cert engine setting in s_client app.     Add appropriate #ifdefs round client cert functions in headers.
      Match empty CA list to anything for ssl client auth in CryptoAPI engine.
      Add initial support for multiple SSL client certifcate selection in     CryptoAPI ENGINE.
      Avoid name clash.
      Remove store from Windows build.
      Update ordinals.
      Make DSO WIN32 compile again.
      Tidy up and add comments to selection code.
      Remove old non-safestack code.
      Add support for Windoes dialog box based certificate selection.
      Use an appropriate Window for selection dialog.
      Compilation option to use a specific ssl client auth engine automatically.
      Remove test fprintf.
      Update from stable branch.
      Link in extra CryptoAPI related libraries if needed.
      Sync ordinals with stable branch.
      Update from stable branch.
      Update from stable branch.
      Update CHANGES.
      Update from stable branch.
      Don't change _WIN32_WINNT and detect GetConsoleWindow() and     CryptUIDlgSelectCertificateFromStore() at runtime. Add callback function     for selection mechanism.
      Remove uidlg library from VC-32.pl, it is now bound at runtime.
      Fix memory leak. The canonical X509_NAME_ENTRY STACK is reallocated rather     than referencing existing X509_NAME_ENTRY structures so needs to be     completely freed.
      Sync ordinals.
      Add acknowledgement.
      Update from stable branch.
      Update from stable branch.
      Update from stable branch.
      Fix from stable branch.
      Update ordinals.
      Update from stable branch.
      Update from stable branch.
      Avoid warnings with -pedantic, specifically:
      X509 verification fixes.
      We support inhibit any policy extension, add to table.
      Zero is a valid value for any_skip and map_skip
      Policy validation fixes.
      Initial support for alternative CRL issuing certificates.
      Make explicit_policy handling match expected RFC3280 behaviour.
      Add support for nameRelativeToCRLIssuer field in distribution point name     fields.
      Correctly handle errors in CMS I/O code.
      Initial support for name constraints certificate extension.
      Support for policy mappings extension.
      Initial code to support distinct certificate and CRL signing keys where the     CRL issuer is not part of the main path.
      Initial support for CRL path validation. This supports distinct certificate     and CRL signing keys.
      Support for certificateIssuer CRL entry extension.
      Initial indirect CRL support.
      Add support for freshest CRL extension.
      Add support for CRLs partitioned by reason code.
      Initial support for delta CRLs. If "use deltas" flag is set attempt to find     a delta CRL in addition to a full CRL. Check and search delta in addition to     the base.
      Perl script to run and verify OpenSSL against PKITS RFC3280 compliance     test suite.
      Make no-tlsext compile.
      Do not discard cached handshake records during resumed sessions:     they are used for mac computation.
      Fix from stable branch.
      Add SSL_FIPS flag for FIPS 140-2 approved ciphersuites and add a new     strength "FIPS" to represent all FIPS approved ciphersuites without NULL     encryption.
      Update FAQ.
      Add missing CHANGES entry.
      Experimental new date handling routines. These fix issues with X509_time_adj()     and should avoid any OS date limitations such as the year 2038 bug.
      Add missing lock definitions.
      Add missing lock definitions...
      Ooops... remove code accidentally commited from FIPS version.
      Fix multiple ; warning.
      Fix Warning...
      Fix a shed load or warnings:
      Reinstate obj_xref.h as it is not auto generated on all platforms.
      Create function of the form OBJ_bsearch_xxx() in bsearch typesafe macros     with the appropriate parameters which calls OBJ_bsearch(). A compiler will     typically inline this.
      Add permanentIdentifier OID.
      Add support for -crlnumber option in crl utility.
      Fix warnings and various issues.
      Win32 fixes... add new directory to build system. Fix warnings.
      Add install target to crypto/jpake/Makefile
      Fix warnings about mismatched prototypes, undefined size_t and value computed     not used.
      Fix warnings: printf format mismatches on 64 bit platforms.     Change assert to OPENSSL_assert().     Fix e_padlock prototype.
      Update HMAC functions to return an error where relevant.
      Fix prototypes.
      Use stddef.h to pick up size_t def.
      Fix prototypes.
      Not sure about this one... seems to be needed to make 64 bit release     builds work properly...
      Don't use clobbered 'i' for checking UTCTime and GeneralizedTime length.
      Update obsolete email address...
      PR: 1777     Submitted by: "Alon Bar-Lev" <alon.barlev at gmail.com>     Approved by: steve at openssl.org
      Make -DKSSL_DEBUG work again.
      Update from stable branch.
      Update from stable branch.
      Tolerate -----BEGIN PKCS #7 SIGNED DATA----- header lines as used by some     implementations.
      Reinstate camellia header fix patch.
      Update from stable branch.
      Revert another size_t change.
      mk1mf.pl update from stable branch.
      Oops...
      PR: 1574     Submitted by: Jouni Malinen <j at w1.fi>     Approved by: steve at openssl.org
      Don't disable JPAKE by default in head...
      Set memory BIOs up properly when stripping text headers from S/MIME messages.
      Update from stable-branch.
      Stop warning about different const qualifiers.
      Update libeay.num
      Update from stable branch.
      Don't stop -cipher from working.
      Handle case where v6stat.zero_pos == 0 correctly.
      Oops should check zero_pos >= 0.
      Fix from stable branch.
      Make no-engine work again.
      Update steve-debug* options.
      Add standard .cvsignore file.
      Update FAQ.
      Updatde from stable branch.
      Add a set of standard gcc warning options which are designed to be the     minimum requirement for committed code. Added to debug-steve* config targets     for now.
      Fix sign-compare warnings.
      Fix missing prototype warnings then fix different prototype warnings ;-)
      Fix warnings properly this time ;-)
      Add CRYPTO_MDEBUG_ABORT to abort() is there are any memory leaks. This will     cause "make test" failures and make resource leaks more obvious.
      Make PKCS#8 the standard write format for private keys, replacing the     ancient SSLeay format.
      Update certificate hash line format to handle canonical format     and avoid MD5 dependency.
      Typo: just copy across an unknown type.
      Update from stable branch.
      Print out UTF8 and NumericString types in ASN1 parsing utility.
      Just to be awkward Ubuntu 8.10 doesn't like _XOPEN_SOURCE_EXTENDED...
      Submitted by: Peter Sylvester <Peter.Sylvester at edelweb.fr>     Reviewed by: steve
      Add error checking to obj_xref.pl and add command line support for data     file locations.
      Avoid leaks in pkcs8 app, tidy code up.
      Return correct exit code.
      PR: 1835     Submitted by: Damien Miller <djm at mindrot.org>     Approved by: steve at openssl.org
      Make no-engine work again.
      Stop warning about use of *printf() without a format.
      PR: 1843     Use correct array size for SHA1 hash.
      Submitted by:  "Victor B. Wagner" <vitus at cryptocom.ru>     Reviewed by: steve at openssl.org
      PR: 1778
      Submitted by: "Victor B. Wagner" <vitus at cryptocom.ru>     Approved by: steve
      Update from stable branch.
      Typo.
      Update from stable branch.
      Update from stable branch.
      Update from stable branch.
      PR: 1854     Submitted by: Oliver Martin <oliver at volatilevoid.net>     Reviewed by: steve at openssl.org
      Update from stable branch.
      PR: 1862
      Submitted by: Victor Duchovni <Victor.Duchovni at morganstanley.com>     Reviewed by: steve at openssl.org
      Update from stable branch.
      PR: 1864     Submitted by: Ger Hobbelt <ger at hobbelt.com>     Reviewed by: steve at openssl.org
      Update from stable branch.
      Fix from stable branch.
      Use correct ctx name.
      Use OPENSSL_assert() instead of assert.
      Submitted by: "Victor B. Wagner" <vitus at cryptocom.ru>     Reviewed by: steve at openssl.org
      Submitted by: Victor B. Wagner <vitus at cryptocom.ru>     Reviewed by: steve at openssl.org
      Typo in usage message.
      Update from stable branch.
      Update from stable branch.
      Update from stable branch.
      Update FAQ.
      Update CHANGES.
      Update from stable branch.
      Fix typo in CHANGES.
      Update NEWS file.
      Nothing to see here... move along....
      Allow use of algorithm and cipher names for dgsts and enc utilities instead     of having to manually include each one.
      Update STATUS and NEWS.
      HEAD is now 1.1.0     The 1.0.0 branch is now OpenSSL_1_0_0-stable
      Stop warnings.
      Update from 0.9.8-stable
      Ooops reverse previous patch.
      Fix from 1.0.0-stable
      Update from 1.0.0-stable
      Update from 1.0.0-stable.
      Merge from 1.0.0-stable branch.
      Update version info.
      Updates from 1.0.0-stable
      Updates from 1.0.0-stable
      Update from 1.0.0-stable
      Update from 0.9.8-stable.
      Changes from 1.0.0-stable.
      Update from 1.0.0-stable
      Updates from 1.0.0-stable.
      Updates from 1.0.0-stable branch.
      Merge from 1.0.0-stable branch.
      Update from 1.0.0-stable.
      Update from 1.0.0-stable.
      Typo.
      Updates from 1.0.0 stable branch.
      Fix from 1.0.0-stable.
      Update from 1.0.0-stable branch.
      Typo.
      Typo.
      Update from stable branch.
      Update from 1.0.0-stable.
      Update from stable branch.
      Update from 1.0.0-stable.
      Update from 1.0.0-stable.
      PR: 1929     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Approved by: steve at openssl.org
      Update from 1.0.0 stable branch.
      Update from 1.0.0-stable.
      Update from 1.0.0-stable
      Fix from 1.0.0-stable.
      Update from 1.0.0-stable.
      Update from 1.0.0-stable.
      Update from 1.0.0-stable.
      Add CHANGES entries from 0.9.8-stable.
      Update from 1.0.0-stable.
      Sync ordinals from 1.0.0-stable
      Update from 1.0.0-stable
      Update from 0.9.8-stable.
      Add ignored FIPS options to evp.h change clashing flag value.
      Update from 1.0.0-stable.
      Update from 1.0.0-stable.
      Oops, update CHANGES entry.
      PR: 1945     Submitted by: Guenter <lists at gknw.net>     Approved by: steve at openssl.org
      PR: 1938     Submitted by: Mark Phalan <Mark.Phalan at Sun.COM>     Reviewed by: steve at openssl.org
      PR: 1946     Submitted by: Guenter <lists at gknw.net>     Reviewed by: steve at openssl.org
      Update from 1.0.0-stable.
      Updates from 1.0.0-stable
      PR: 1952     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Reviewed by: steve at openssl.org
      Update from 1.0.0-stable.
      Fix error codes.
      Update from 0.9.8-stable.
      Submitted by: Artem Chuprina <ran at cryptocom.ru>     Reviewed by: steve at openssl.org
      PR: 1946     Submitted by: Guenter <lists at gknw.net>     Approved by: steve at openssl.org
      Submitted by: Peter Gutmann <pgut001 at cs.auckland.ac.nz>     Approved by: steve at openssl.org
      PR: 1956     Submitted by: Guenter <lists at gknw.net>     Approved by: steve at openssl.org
      PR: 1958     Submitted by: Sean Boudreau <seanb at qnx.com>     Approved by: steve at openssl.org
      Update from 1.0.0-stable.
      Rename asc2uni and uni2asc functions to avoid clashes.
      Add beos as a supported DSO scheme.
      Initialize outlen.
      Update FAQ with note about online docs.
      Update from 1.0.0-stable
      Stop warnings in gcc where "a" is const passed as a non-const argument.
      Update from 1.0.0-stable.
      Update from 0.9.8-stable.
      Fix from 0.9.8-stable.
      Update from 0.9.8-stable.
      Allow setting of verify depth in verify parameters (as opposed to the depth     implemented using the verify callback).
      Update from 1.0.0-stable
      Update from 1.0.0-stable.
      Update from 1.0.0-stable.
      Updates from 1.0.0-stable
      Use common verify parameters instead of the small ad-hoc subset in     s_client, s_server.
      Typo.
      Update from 0.9.8-stable
      Update from 1.0.0-stable
      Update from 1.0.0-stable
      Update from 1.0.0-stable
      Update from 1.0.0-stable
      Update from 1.0.0-stable
      Update from 1.0.0-stable.
      Upadte from 1.0.0-stable
      PR: 1981     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Approved by: steve at openssl.org
      Fix warnings.
      Delete MD2 from algorithm tables as in 0.9.8-stable. However since this is     a new branch we can also disable it by default.
      Make update.
      Update from 1.0.0-stable.
      PR: 1624     Submitted by: "Simon L. Nielsen" <simon at FreeBSD.org>     Obtained from: steve at openssl.org
      Update from 0.9.8-stable
      Use new time routines to avoid possible overflow.
      Update from 1.0.0-stable.
      Document MD2 deprecation.
      Updates from 1.0.0-stable.
      Updates from 1.0.0-stable
      Update from 1.0.0-stable.
      Updates from 1.0.0-stable
      Use correct extension and OSX detection.
      Update from 0.9.8-stable
      Update from 0.9.8-stable
      Update from 0.9.8-stable.
      Fix from 0.9.8-stable
      PR: 1993
      Document removal of digest+signature algorithm link.
      PR: 1990
      New debug targets from 1.0.0-stable
      Fix typos.
      Remove MD2 test from WIN32 as we don't compile it in by default any more.
      Update from 0.9.8-stable.
      Update from 1.0.0-stable
      Update from 1.0.0-stable.
      PR: 2001     Submitted by: Tomas Mraz <tmraz at redhat.com>     Approved by: steve at openssl.org
      Update from 1.0.0-stable.
      Oops!
      PR: 2002     Submitted by: Tomas Mraz <tmraz at redhat.com>     Obtained from: steve at openssl.org
      Reject leading 0x80 in OID subidentifiers.
      Fix error code.
      Add COMP error strings.
      PR: 2003     Make it possible to install OpenSSL in directories with name other     than "lib" for example "lib64". Based on patch from Jeremy Utley.
      PR: 2004     Submitted by: Peter Sylvester <peter.sylvester at edelweb.fr>     Approved by: steve at openssl.org
      PR: 1999     Submitted by: "Bayram Kurumahmut" <kbayram at ubicom.com>     Approved by: steve at openssl.org
      Typo
      PR: 1997     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Approved by: steve at openssl.org
      Update README with bug report and contribution details.
      Enable mdc2 support by default as the patent has now expired.
      Update default dependency flags.     Make error name discrepancies a fatal error.     Fix error codes.     make update
      Use SHA1 and not deprecated MD5 in demos.
      Stop unused variable warning on WIN32 et al.
      PR: 2015     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Approved by: steve at openssl.org
      PR: 2006     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Approved by: steve at openssl.org
      PR: 2005     Submitted by: steve at openssl.org
      Missing break.
      Tidy up and fix verify callbacks to avoid structure dereference, use of     obsolete functions and enhance to handle new conditions such as policy printing.
      PR: 2022     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Approved by: steve at openssl.org
      PR: 2009     Submitted by: "Alexei Khlebnikov" <alexei.khlebnikov at opera.com>     Approved by: steve at openssl.org
      PR: 2013     Submitted by: steve at openssl.org
      PR: 2029     Submitted by: Tomas Mraz <tmraz at redhat.com>     Checked by: steve at openssl.org
      PR: 2020     Submitted by: Keith Beckman <kbeckman at mcg.edu>,  Tomas Mraz <tmraz at redhat.com>     Checked by: steve at openssl.org
      Oops, s can be NULL
      Correction: salt is now default
      PR: 2028     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Approved by: steve at openssl.org
      PR: 1644     Submitted by: steve at openssl.org
      Make update, deleting bogus DTLS error code
      Typo presumably....
      PR: 2031     Submitted by: steve at openssl.org
      Seed PRNG with DSA and ECDSA digests for additional protection against     possible PRNG state duplication.
      Add new option --strict-warnings to Configure script. This is used to add     in devteam warnings into other configurations.
      PR: 2033     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Approved by: steve at openssl.org
      PR: 2038     Submitted by: Artem Chuprina <ran at cryptocom.ru>     Approved by: steve at openssl.org
      PR: 1411     Submitted by: steve at openssl.org
      PR: 2025     Submitted by: Tomas Mraz <tmraz at redhat.com>     Approved by: steve at openssl.org
      PR: 2023     Submitted by: James Beckett <jmb.openssl at nospam.hackery.net>, steve     Approved by: steve at openssl.org
      Submitted by:  Julia Lawall <julia at diku.dk>
      PR: 2039     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Approved by: steve at openssl.org
      PR: 2048     Submitted by: john blair <mailtome200420032002 at yahoo.com>     Approved by: steve at openssl.org
      add version info for VC-WIN64I too
      Don't use __try+__except unless on VC++
      Ooops, missing close quote
      PR: 2047     Submitted by: David Lee <live4thee at gmail.com>, steve at openssl.org     Approved by: steve at openssl.org
      PR: 2050     Submitted by: Michael Tuexen <tuexen at fh-muenster.de>     Approved by: steve at openssl.org
      Add attribute to check if return value of certain functions is incorrectly     ignored.
      Add DEBUG_UNUSED to debug-steve* entries
      Add more return value checking attributes to evp.h and hmac.h
      Audit libcrypto for unchecked return values: fix all cases enountered
      Fixup sureware ENGINE to handle new RAND_METHOD
      Free SSL_CTX after BIO
      PR: 2064, 728     Submitted by: steve at openssl.org
      Change version from 0.9.9 to 1.0.0 in docs
      PR: 2058     Submitted by: Julia Lawall <julia at diku.dk>     Approved by: steve at openssl.org
      PR: 2057     Submitted by: Julia Lawall <julia at diku.dk>     Approved by: steve at openssl.org
      PR: 2063     Submitted by: Julia Lawall <julia at diku.dk>     Approved by: steve at openssl.org
      PR: 2054     Submitted by: Julia Lawall <julia at diku.dk>     Approved by: steve at openssl.org
      PR: 2055     Submitted by: Julia Lawall <julia at diku.dk>     Approved by: steve at openssl.org
      PR: 2056     Submitted by: Julia Lawall <julia at diku.dk>     Approved by: steve at openssl.org
      PR: 2059     Submitted by: Julia Lawall <julia at diku.dk>     Approved by: steve at openssl.org
      PR: 2062     Submitted by: Julia Lawall <julia at diku.dk>     Approved by: steve at openssl.org
      PR: 2061     Submitted by: Julia Lawall <julia at diku.dk>     Approved by: steve at openssl.org
      Yes it is a typo ;-)
      Typo.
      Prevent aliasing warning
      Prevent ignored return value warning
      Fix warnings about ignoring fgets return value
      Fix unitialized warnings
      Allow cross compilation prefix to come from CROSS_COMPILE environment variable
      Allow uname values to be overridden by the environment
      Rename CROSS_COMPILE_PREFIX to CROSS_COMPILE
      PR: 2066     Submitted by: Guenter <lists at gknw.net>     Approved by: steve at openssl.org
      Revert extra changes from previous commit.
      PR: 1847     Submitted by: Tomas Mraz <tmraz at redhat.com>     Approved by: steve at openssl.org
      PR: 2069     Submitted by: Michael Tuexen <tuexen at fh-muenster.de>     Approved by: steve at openssl.org
      Update ordinals.
      Fix for WIN32 and possibly other platforms which don't define in_port_t.
      Fixes to CROSS_COMPILE, don't override command line option from environment
      PR: 2073     Submitted by: Tomas Mraz <tmraz at redhat.com>     Approved by: steve at openssl.org
      PR: 2072     Submitted by: Tomas Mraz <tmraz at redhat.com>     Approved by: steve at openssl.org
      PR: 2074     Submitted by: Bram Neijt <bneijt at gmail.com>     Approved by: steve at openssl.org
      Manual page for X509_verify_cert()
      Typo.
      More X509 verification docs.
      Add docs for X509_STORE_CTX_new() and related functions.
      Preliminary documentation for X509_VERIFY_PARAM.
      Clarification.
      Add "missing" function X509_STORE_set_verify_cb().
      Verification callback functions.
      Document more error codes.
      take install prefix from the environment
      Use new X509_STORE_set_verify_cb function instead of old macro.
      make update
      PR: 2070     Submitted by: Alexander Nikitovskiy <Nikitovski at ya.ru>     Approved by: steve at openssl.org
      Need to check <= 0 here.
      If not checking all certificates don't attempt to find a CRL     for the leaf certificate of a CRL path.
      Add an FAQ.
      Clarification
      PR: 2078     Submitted by: Dale Anderson <dra at redevised.net>     Approved by: steve at openssl.org
      PR: 2080     Submitted by: Mike Frysinger <vapier at gentoo.org>     Approved by: steve at openssl.org
      PR: 2081     Submitted by: Mike Frysinger <vapier at gentoo.org>     Approved by: steve at openssl.org
      Don't replace whole AR line
      Add -no_cache option to s_server
      PR: 2085     Submitted by: Mike Frysinger <vapier at gentoo.org>     Approved by: steve at openssl.org
      oops!
      Don't attempt session resumption if no ticket is present and session     ID length is zero.
      Fix statless session resumption so it can coexist with SNI
      Move CHANGES entry to 0.9.8l section
      Generate stateless session ID just after the ticket is received instead     of when a session is loaded. This will mean that applications that     just hold onto SSL_SESSION structures and never call d2i_SSL_SESSION()     will still work.
      Add option to allow in-band CRL loading in verify utility. Add function     load_crls and tidy up load_certs. Remove useless purpose variable from     verify utility: now done with args_verify.
      Add missing functions to allow access to newer X509_STORE_CTX status     information. Add more informative message to verify callback to indicate     when CRL path validation is taking place.
      PR: 2089     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Approved by: steve at openssl.org
      Ooops, revert committed conflict.
      If it is a new session don't send the old TLS ticket: send a zero length     ticket to request a new session.
      Remove BF_PTR2 from configuration: it doesn't improve performance any more and causes gcc warnings about arrays out of range
      make udpate
      update CHANGES
      First cut of renegotiation extension. (port to HEAD)
      PR: 2090     Submitted by: Martin Kaiser <lists at kaiser.cx>, Stephen Henson     Approved by: steve at openssl.org
      PR: 2091     Submitted by: Martin Kaiser <lists at kaiser.cx>, Stephen Henson     Approved by: steve at openssl.org
      PR: 1686     Submitted by: Hanno B????ck <hanno at hboeck.de>     Approved by: steve at openssl.org
      commit missing apps code for reneg fix
      add missing parts of reneg port, fix apps patch
      PR: 2098     Submitted by: Corinna Vinschen <vinschen at redhat.com>     Approved by: steve at openssl.org
      set engine to NULL after releasing it
      PR: 2088     Submitted by: Aleksey Samsonov <s4ms0n0v at gmail.com>     Approved by: steve at openssl.org
      PR: 2101     Submitted by: Doug Kaufman <dkaufman at rahul.net>     Approved by: steve at openssl.org
      PR: 2101 (additional)     Submitted by: Roumen Petrov <openssl at roumenpetrov.info>     Approved by: steve at openssl.org
      PR: 2103     Submitted by: Rob Austein <sra at hactrn.net>     Approved by: steve at openssl.org
      Include a more meaningful error message when rejecting legacy renegotiation
      Don't use SSLv2 compatible client hello if we don't tolerate legacy renegotiation
      Servers can't end up talking SSLv2 with legacy renegotiation disabled
      Split PBES2 into cipher and PBKDF2 versions. This tidies the code somewhat     and is a pre-requisite to adding password based CMS support.
      Add PBKFD2 prototype.
      Add OID for PWRI KEK algorithm.
      Experimental CMS password based recipient Info support.
      typo
      PR: 2118     Submitted by: Mounir IDRASSI <mounir.idrassi at idrix.net>     Approved by: steve at openssl.org
      PR: 1432     Submitted by: "Andrzej Chmielowiec" <achmielowiec at enigma.com.pl>, steve at openssl.org     Approved by: steve at openssl.org
      PR: 2115     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Approved by: steve at openssl.org
      check DSA_sign() return value properly
      Ooops...
      PR: 2120     Submitted by: steve at openssl.org
      Check it actually compiles this time ;-)
      Replace the broken SPKAC certification with the correct version.
      Update CHANGES.
      PR: 2111     Submitted by: Martin Olsson <molsson at opera.com>
      Initial experimental TLSv1.1 support
      PR: 2121     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>
      Add support for magic cipher suite value (MCSV). Make secure renegotiation     work in SSLv3: initial handshake has no extensions but includes MCSV, if     server indicates RI support then renegotiation handshakes include RI.
      Add ctrl and macro so we can determine if peer support secure renegotiation.
      Send no_renegotiation alert as required by spec.
      Add ctrls to clear options and mode.
      PR: 2124     Submitted by: Jan Pechanec <Jan.Pechanec at Sun.COM>
      Revert lhash patch for PR#2124
      Add patch to crypto/evp which didn't apply from PR#2124
      Check s3 is not NULL
      remove DEBUG_UNUSED from config for now
      Document option clearning functions.
      clarify docs
      Move SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION out of SSL_OP_ALL and move SSL_OP_NO_TLSv1_1
      Allow initial connection (but no renegoriation) to servers which don't support     RI.
      New option to enable/disable connection to unpatched servers
      PR: 2127     Submitted by: Tomas Mraz <tmraz at redhat.com>
      Alert to use is now defined in spec: update code
      Traditional Yuletide commit ;-)
      Update RI to match latest spec.
      Typo
      Add simple external session cache to s_server. This serialises sessions     just like a "real" server making it easier to trace any problems.
      return v1.1 methods for client/server
      Include CHANGES entry for external cache
      Compression handling on session resume was badly broken: it always     used compression algorithms in client hello (a legacy from when     the compression algorithm wasn't serialized with SSL_SESSION).
      Client side compression algorithm sanity checks: ensure old compression     algorithm matches current and give error if compression is disabled and     server requests it (shouldn't happen unless server is broken).
      Remove tabs on blank lines: they produce warnings in pod2man
      PR: 2132     Submitted by: steve
      Typo
      PR: 2102     Submitted by: John Fitzgibbon <john_fitzgibbon at yahoo.com>
      ENGINE_load_capi() now exists on all platforms (but no op on non-WIN32)
      compress_meth should be unsigned
      Missing commit from change ofr compress_meth to unsigned
      Updates to conform with draft-ietf-tls-renegotiation-03.txt:
      Simplify RI+SCSV logic:
      PR: 2136     Submitted by: Willy Weisz <weisz at vcpc.univie.ac.at>
      update and sync ordinals
      Modify compression code so it avoids using ex_data free functions. This     stops applications that call CRYPTO_free_all_ex_data() prematurely leaking     memory.
      Fix version handling so it can cope with a major version >3.
      PR: 2125     Submitted by: "Alon Bar-Lev" <alon.barlev at gmail.com>
      make update
      convert to Unix EOL form
      PR: 2133     Submitted by: steve at openssl.org
      PR: 2144     Submitted by: steve at openssl.org
      PR: 2135     Submitted by: Mike Frysinger <vapier at gentoo.org>
      PR: 2144     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>
      PR: 2141     Submitted by: "NARUSE, Yui" <naruse at airemix.jp>
      The use of NIDs in the password based encryption table can result in     algorithms not found when an application uses PKCS#12 and only calls     SSL_library_init() instead of OpenSSL_add_all_algorithms(). Simple     work around is to add the missing algorithm (40 bit RC2) in     SSL_library_init().
      Support -L options in VC++ link.
      Update demo
      update NEWS file
      oops
      fix comments
      typo
      If legacy renegotiation is not permitted then send a fatal alert if a patched     server attempts to renegotiate with an unpatched client.
      Tolerate PKCS#8 DSA format with negative private key.
      The fix for PR#1949 unfortunately broke cases where the BIO_CTRL_WPENDING     ctrl is incorrectly implemented (e.g. some versions of Apache). As a workaround     call both BIO_CTRL_INFO and BIO_CTRL_WPENDING if it returns zero. This should     both address the original bug and retain compatibility with the old behaviour.
      PR: 2153, 2125     Submitted by: steve at openssl.org
      PR: 2149     Submitted by: Douglas Stebila <douglas at stebila.ca>
      Typo
      export OPENSSL_isservice and make update
      OPENSSL_isservice is now defined on all platforms not just WIN32
      Add flags functions which were added to 0.9.8 for fips but not 1.0.0 and     later.
      PR: 2138     Submitted by: Kevin Regan <k.regan at f5.com>
      PR: 1949     Submitted by: steve at openssl.org
      PR: 2157     Submitted by: "Green, Paul" <Paul.Green at stratus.com>
      typo
      Some shells print out the directory name if CDPATH is set breaking the     pod2man test. Use ./util instead to avoid this.
      update documentation to reflect new renegotiation options
      revert wrongly committed test code
      reword RI description
      revert previous change
      oops revert test code accidentally committed
      In engine_table_select() don't clear out entire error queue: just clear     out any we added using ERR_set_mark() and ERR_pop_to_mark() otherwise     errors from other sources (e.g. SSL library) can be wiped.
      Experimental renegotiation support in s_server test -www server.
      typo
      PR: 2159     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>
      PR: 2160     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>
      PR: 2161     Submitted by: Doug Goldstein <cardoe at gentoo.org>, Steve.
      tolerate broken CMS/PKCS7 implementations using signature OID instead of digest
      don't assume 0x is at start of string
      Add missing function EVP_CIPHER_CTX_copy(). Current code uses memcpy() to copy     an EVP_CIPHER_CTX structure which may have problems with external ENGINEs     who need to duplicate internal handles etc.
      oops, use new value for new flag
      make update
      Initial experimental CMAC implementation.
      Make CMAC API similar to HMAC API. Add methods for CMAC.
      Make update.
      add cvsignore
      Use supplied ENGINE when initialising CMAC. Restore pctx setting.
      update year
      Fix memory leak in ENGINE autoconfig code. Improve error logging.
      PR: 2170     Submitted by: Magnus Lilja <lilja.magnus at gmail.com>
      update references to new RI RFC
      PR: 2164     Submitted by: "Noszticzius, Istvan" <inoszticzius at rightnow.com>
      add EVP_CIPH_FLAG_LENGTH_BITS from 0.9.8-stable
      Correct ECB mode EVP_CIPHER definition: IV length is 0
      The "block length" for CFB mode was incorrectly coded as 1 all the time. It     should be the number of feedback bits expressed in bytes. For CFB1 mode set     this to 1 by rounding up to the nearest multiple of 8.
      PR: 2171     Submitted by: Tomas Mraz <tmraz at redhat.com>
      Submitted by:  Dmitry Ivanov <vonami at gmail.com>
      PR: 2100     Submitted by: James Baker <jbaker at tableausoftware.com> et al.
      Allow renegotiation if SSL_OP_LEGACY_SERVER_CONNECT is set as well as     initial connection to unpatched servers. There are no additional security     concerns in doing this as clients don't see renegotiation during an     attack anyway.
      OR default SSL_OP_LEGACY_SERVER_CONNECT so existing options are preserved
      clarify documentation
      The meaning of the X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY and     X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT error codes were reversed in     the verify application documentation.
      prevent warning
      add anyExtendedKeyUsage OID
      Include self-signed flag in certificates by checking SKID/AKID as well     as issuer and subject names. Although this is an incompatible change     it should have little impact in pratice because self-issued certificates     that are not self-signed are rarely encountered.
      verify parameter enumeration functions
      allow setting of verify names in command line utilities and print out verify names in verify utility
      Experimental support for partial chain verification: if an intermediate     certificate is explicitly trusted (using -addtrust option to x509 utility     for example) the verification is sucessful even if the chain is not complete.
      tidy verify code. xn not used any more and check for self signed more efficiently
      add -trusted_first option and verify flag
      update FAQ
      update NEWS
      oops, use correct date
      Revert CFB block length change. Despite what SP800-38a says the input to     CFB mode does *not* have to be a multiple of the block length and several     other specifications (e.g. PKCS#11) do not require this.
      include TVS 1.1 version string
      Add Kerberos fix which was in 0.9.8-stable but never committed to HEAD and     1.0.0. Original fix was on 2007-Mar-09 and had the log message: "Fix kerberos     ciphersuite bugs introduced with PR:1336."
      oops, revert verify.c change
      algorithms field has changed in 1.0.0 and later: update
      update cryptodev to match 1.0.0 stable branch version
      load cryptodev if HAVE_CRYPTODEV is set too
      make USE_CRYPTODEV_DIGESTS work
      'typo'
      oops, reinstate correct prototype
      use supplied ENGINE in genrsa
      PR: 2178     Submitted by: "Kennedy, Brendan" <brendan.kennedy at intel.com>
      don't mix definitions and code
      Submitted by: Tomas Hoger <thoger at redhat.com>
      PR: 2183
      option to replace extensions with new ones: mainly for creating cross-certificates
      Add -engine_impl option to dgst which will use an implementation of     an algorithm from the supplied engine instead of just the default one.
      Fix memory leak: free up ENGINE functional reference if digest is not     found in an ENGINE.
      Add algorithm specific signature printing. An individual ASN1 method can     now print out signatures instead of the standard hex dump.
      fix indent, newline
      Add PSS algorithm printing. This is an initial step towards full PSS support.
      don't add digest alias if signature algorithm is undefined
      update ASN1 sign/verify to use EVP_DigestSign and EVP_DigestVerify
      add MGF1 digest ctrl
      add separate PSS decode function, rename PSS parameters to RSA_PSS_PARAMS
      typo
      oops, make EVP ctr mode work again
      although AES is a variable length cipher, AES EVP methods have a fixed key length
      The OID sanity check was incorrect. It should only disallow *leading* 0x80     values.
      oops
      print outermost signature algorithm parameters too
      correct error code
      RSA PSS verification support including certificates and certificate     requests. Add new ASN1 signature initialisation function to handle this     case.
      reserve a few more bits for future cipher modes
      PR: 2186     Submitted By: "Joel Rabinovitch" <Joel.Rabinovitch at tecsys.com>
      PR: 2188     Submitted By: Jaroslav Imrich <jaroslav.imrich at disig.sk>
      don't leave bogus errors in the queue
      New function X509_ALGOR_set_md() to set X509_ALGOR (DigestAlgorithmIdentifier)     from a digest algorithm.
      update cms code to use X509_ALGOR_set_md instead of internal function
      Algorithm specific ASN1 signing functions.
      Extend PSS padding code to support different digests for MGF1 and message.
      Add support for new PSS functions in RSA EVP_PKEY_METHOD
      ctrl operations to retrieve RSA algorithm settings
      typo
      RSA PSS ASN1 signing method
      typo
      alg2 can be NULL
      Submitted by: Martin Kaiser
      missing goto meant signature was never printed out
      PR: 2192     Submitted By: Jaroslav Imrich <jaroslav.imrich at disig.sk>
      new sigopt and PSS support for req and x509 utilities
      add X509_CRL_sign_ctx function
      add -sigopt option to ca utility
      update CHANGES
      clear bogus errors in ca utility
      free up sigopts STACK
      print signature parameters with CRLs too
      workaround for missing definition in some headers
      PR: 1731 and maybe 2197
      initialise buf if wrong_info not used
      update FAQ
      PR: 1813     Submitted by: Torsten Hilbrich <torsten.hilbrich at secunet.com>
      PR: 1904     Submitted by: David Woodhouse <dwmw2 at infradead.org>
      sync ordinals with 1.0.0
      PR: 1763
      PR: 1696
      update HEAD FAQ
      update FAQ
      update FAQ
      fix FAQ
      update FAQ
      fix FAQ (again)
      PR: 2220
      PR: 2223     Submitted By: Robin Seggelmann <seggelmann at fh-muenster.de>
      PR: 2219     Submitted By: Robin Seggelmann <seggelmann at fh-muenster.de>
      PR: 2218     Submitted By: Robin Seggelmann <seggelmann at fh-muenster.de>
      PR: 2209     Submitted Daniel Mentz <danielml at sent.com>
      Remove obsolete PRNG note. Add comment about use of SHA256 et al.
      Add SHA2 algorithms to SSL_library_init(). Although these aren't used     directly by SSL/TLS SHA2 certificates are becoming more common and     applications that only call SSL_library_init() and not     OpenSSL_add_all_alrgorithms() will fail when verifying certificates.
      make GOST MAC work again
      PR: 2228     Submitted By: Robin Seggelmann <seggelmann at fh-muenster.de>
      PR: 2229     Submitted By: Robin Seggelmann <seggelmann at fh-muenster.de>
      PR: 2230     Submitted By: Robin Seggelmann <seggelmann at fh-muenster.de>
      check ASN1 type before using it
      fix bug in ccgost CFB mode code
      fix signed/unsigned comparison warnings
      update FAQ
      PR: 2235     Submitted By: Bruce Stephens <bruce.stephens at isode.com>
      PR: 2234     Submitted By: Matthias Andree <matthias.andree at gmx.de>
      oops, commit Configure part of PR#2234
      oops revert patch not part of Configure diff
      new function to diff tm structures
      PR: 2241     Submitted By: Artemy Lebedev <vagran.ast at gmail.com>
      experimental function to convert ASN1_TIME to tm, not used or even compiled in yet
      PR: 2250     Submitted By: Ger Hobbelt <ger at hobbelt.com>
      PR: 2244     Submitted By: "PMHager" <hager at dortmund.net>
      PR: 2230     Submitted By: Robin Seggelmann <seggelmann at fh-muenster.de>
      PR: 2252     Submitted By: Ger Hobbelt <ger at hobbelt.com>
      PR: 2255     Submitted By: Ger Hobbelt <ger at hobbelt.com>
      PR: 2253     Submitted By: Ger Hobbelt <ger at hobbelt.com>
      oops, revert test patch
      PR: 2259     Submitted By: Artem Chuprina <ran at cryptocom.ru>
      Update cms-test.pl to handle some Unix like Windows environments where     calling shlib_wrap.sh doesn't work.
      oops, typo
      Stop compiler complaining in pedantic mode: may be a better way to do this...
      PR: 2251     Submitted by: Ger Hobbelt <ger at hobbelt.com>     Approved by: steve at openssl.org
      PR: 2254     Submitted by: Ger Hobbelt <ger at hobbelt.com>     Approved by: steve at openssl.org
      Avoid use of ex_data free function in Chil ENGINE so it can be safely     reloaded.
      PR: 2266     Submitted By: Jonathan Gray <jsg at goblin.cx>
      PR: 2258     Submitted By: Ger Hobbelt <ger at hobbelt.com>
      PR: 2261     Submitted By: De Rudder, Stephen L." <s_derudder at tditx.com>
      PR: 2262     Submitted By: Victor Wagner <vitus at cryptocom.ru>
      update NEWS
      PR: 2278     Submitted By: Mattias Ellert <mattias.ellert at fysast.uu.se>
      fix PR#2261 in a different way
      add CVE-2010-0742 and CVS-2010-1633 fixes
      update FAQ
      clarify comment
      no need for empty fragments with TLS 1.1 and later due to explicit IV
      i variable is used on some platforms
      PR: 2297     Submitted by: Antony, Benoy <bantony at ebay.com>     Approved by: steve at openssl.org
      Fix warnings (From HEAD, original patch by Ben).
      oops, revert wrong patch..
      PR: 1830     Submitted By: Robin Seggelmann <seggelmann at fh-muenster.de>, Steve Henson
      Add call to ENGINE_register_all_complete() to ENGINE_load_builtin_engines(),     this means that some implementations will be used automatically, e.g. aesni,     we do this for cryptodev anyway.
      Fix WIN32 build system to correctly link ENGINE DLLs contained in a     directory: currently the GOST ENGINE is the only case.
      Add modes.h and cmac to WIN32 build system.
      Update symhacks.
      Sync ordinals and update.
      WIN32 build fix.
      #if out deleted function from headers so it isn't picked up by WIN32 build     system.
      Add new type ossl_ssize_t instead of ssize_t and move definitions to     e_os2.h, this should fix WIN32 compilation issues and hopefully avoid     conflicts with other headers which may workaround ssize_t in different ways.
      Make ctr mode behaviour consistent with other modes.
      Fix ctr mode properly this time....
      PR: 2315
      PR: 1833     Submitted By: Robin Seggelmann <seggelmann at fh-muenster.de>
      sync and update ordinals
      PR: 1833     Submitted By: Robin Seggelmann <seggelmann at fh-muenster.de>
      fix bug in AES_unwrap()
      make no-gost work on Windows
      Add call to ENGINE_register_all_complete() to ENGINE_load_builtin_engines(),     this means that some implementations will be used automatically, e.g. aesni,     we do this for cryptodev anyway.
      Typo, PR#2346
      Minor documentation fixes, PR#2344
      Minor documentation fixes, PR#2345
      fix warnings
      fix signature printing routines
      We can't always read 6 bytes in an OCSP response: fix so error statuses     are read correctly for non-blocking I/O.
      PR: 2314     Submitted by: Mounir IDRASSI <mounir.idrassi at idrix.net>     Reviewed by: steve
      move CHANGES entry to correct place
      PR: 2295     Submitted by: Alexei Khlebnikov <alexei.khlebnikov at opera.com>     Reviewed by: steve
      Submitted by: Jonathan Dixon <joth at chromium.org>     Reviewed by: steve
      PR: 2366     Submitted by: Damien Miller <djm at mindrot.org>     Reviewed by: steve
      Submitted By: Bogdan Harjoc <harjoc at gmail.com>     Add missing debug WIN64 targets.
      preliminary acknowledgments file
      Get correct GOST private key instead of just assuming the last one is     correct: this isn't always true if we have more than one certificate.
      Only use explicit IV if cipher is in CBC mode.
      If EVP_PKEY structure contains an ENGINE the key is ENGINE specific and     we should use its method instead of any generic one.
      add TLS v1.1 options to s_server
      bring HEAD up to date, add CVE-2010-3864 fix, update NEWS files
      Don't assume a decode error if session tlsext_ecpointformatlist is not NULL: it can be legitimately set elsewhere.
      oops, reinstate TLSv1 string
      PR: 2372     Submitted by: "W.C.A. Wijngaards" <wouter at nlnetlabs.nl>     Reviewed by: steve
      fix no SIGALRM case in speed.c
      compile cts128.c on VMS
      remove duplicate statement
      PR: 2374     Submitted by: Guenter <lists at gknw.net>     Reviewed by: steve
      PR: 2375     Submitted by: Guenter <lists at gknw.net>     Reviewed by: steve
      PR: 2376     Submitted by: Guenter <lists at gknw.net>     Reviewed by: steve
      add pice of PR#2295 not committed to HEAD
      constify EVP_PKEY_new_mac_key()
      use generalise mac API for SSL key generation
      oops, revert invalid change
      add "missing" functions to copy EVP_PKEY_METHOD and examine info
      VERY EXPERIMENTAL HMAC redirection example in OpenSSL ENGINE. Untested at this     stage and probably wont work properly.
      fix typo in HMAC redirection, add HMAC INIT tracing
      using_ecc doesn't just apply to TLSv1
      PR: 2240     Submitted by: Jack Lloyd <lloyd at randombit.net>, "Mounir IDRASSI" <mounir.idrassi at idrix.net>, steve     Reviewed by: steve
      Some of the MS_STATIC use in crypto/evp is a legacy from the days when     EVP_MD_CTX was much larger: it isn't needed anymore.
      apply J-PKAKE fix to HEAD (original by Ben)
      PR: 2385     Submitted by: Stefan Birrer <stefan.birrer at adnovum.ch>     Reviewed by: steve
      update FAQ
      use right version this time in FAQ
      fix doc typos
      PR: 2386     Submitted by: Stefan Birrer <stefan.birrer at adnovum.ch>     Reviewed by: steve
      update FAQ
      ignore leading null fields
      Support routines for ASN1 scanning function, doesn't do much yet.
      avoid verification loops in trusted store when path building
      PR: 2413     Submitted by: Michael Bergandi <mbergandi at gmail.com>     Reviewed by: steve
      PR: 2410     Submitted by: Rob Austein <sra at hactrn.net>     Reviewed by: steve
      Fix escaping code for string printing. If *any* escaping is enabled we     must escape the escape character itself (backslash).
      PR: 2411     Submitted by: Rob Austein <sra at hactrn.net>     Reviewed by: steve
      oops missed an assert
      Since DTLS 1.0 is based on TLS 1.1 we should never return a decryption_failed     alert.
      Don't use decryption_failed alert for TLS v1.1 or later.
      add X9.31 prime generation routines from 0.9.8 branch
      move some string utilities to buf_str.c to reduce some dependencies (from 0.9.8 branch).
      missed change in ACKNOWLEDGEMENTS file
      stop warning with no-engine
      add va_list version of ERR_add_error_data
      Add additional parameter to dsa_builtin_paramgen to output the generated     seed to: this doesn't introduce any binary compatibility issues as the     function is only used internally.
      oops, revert mistakenly committed EC changes
      PR: 1612     Submitted by: Robert Jackson <robert at rjsweb.net>     Reviewed by: steve
      check EC public key isn't point at infinity
      New function EC_KEY_set_affine_coordinates() this performs all the     NIST PKV tests.
      PR: 2433     Submitted by: Chris Wilson <chris at qwirx.com>     Reviewed by: steve
      revert Makefile change
      recalculate DSA signature if r or s is zero (FIPS 186-3 requirement)
      Move DSA_sign, DSA_verify to dsa_asn1.c and include separate versions of     DSA_SIG_new() and DSA_SIG_free() to remove ASN1 dependencies from DSA_do_sign()     and DSA_do_verify().
      Move BN_options function to bn_print.c to remove dependency for BIO printf     routines from bn_lib.c
      Move RSA encryption functions to new file crypto/rsa/rsa_crpt.c to separate     crypto and ENGINE dependencies in RSA library.
      And so it begins... again.
      add some missing fips files
      add fips/Makefile
      add fips/des/Makefile
      add fips/aes/Makefile
      add fips/sha files
      add fips_sha1_selftest.c
      add fips_premain.c.sha1
      update mkerr.pl for use fips directory, add arx.pl script
      FIPS_allow_md5() no longer exists and is no longer required
      Add fipscanisterbuild configuration option and update Makefile.org: doesn't compile yet
      FIPS mode changes to make RNG compile (this will need updating later as we     need a whole new PRNG for FIPS).
      FIPS mode EVP changes:
      add new RAND errors
      FIPS mode RSA changes:
      FIPS mode DSA changes:
      FIPS DH changes: selftest checks and key range checks.
      FIPS mode ERR changes. Redirect errors to tiny FIPS callbacks to avoid ERR     library dependencies.
      Change AR to ARX to allow exclusion of fips object modules
      FIPS HMAC changes:
      Use ARX in crypto/Makefile
      FIPS changes to test/Makefile: rules to build FIPS test applications.
      Internal version of BN_mod_inverse allowing checking of no-inverse without     need to inspect error queue.
      update .cvsignore
      use FIPSEVP in some bn and rsa files
      Move locking and thread ID functions into new files lock.c and thr_id.c,     redirect locking to minimal FIPS_lock() function where required.
      New FIPS_lock() function for minimal FIPS locking API: to avoid dependencies     on OpenSSL locking code. Use API in some internal FIPS files.
      Include thread ID code in fips module.
      Change OPENSSL_FIPSEVP to OPENSSL_FIPSAPI as it doesn't just refer     to EVP any more.
      Update source files to handle new FIPS_lock() location. Add FIPS_lock()     definition. Remove stale function references from fips.h
      add fips_dsatest.c file
      Redirect FIPS memory allocation to FIPS_malloc() routine, remove     OpenSSL malloc dependencies.
      add FIPS API malloc/free
      add .cvsignore
      Move all FIPSAPI renames into fips.h header file, include early in     crypto.h if needed.
      Add preliminary FIPS information.
      don't descend fips directory if not in fips mode
      typo
      update version to 2.0
      use different default fips install directory
      add fiplibdir and basedir options to Configure
      Add fips option into Configure, disable endian code for no-asm and FIPS.     Make shared library default for fips.
      Fix shared build for fips
      stop warnings about no previous prototype when compiling shared engines
      Provisional, experimental support for DSA2 parameter generation algorithm.     Not properly integrated or tested yet.
      Since FIPS 186-3 specifies we use the leftmost bits of the digest     we shouldn't reject digest lengths larger than SHA256: the FIPS     algorithm tests include SHA384 and SHA512 tests.
      update README.FIPS
      fixes for DSA2 parameter generation
      Tolerate mixed case and leading zeroes when comparing.
      Support more DSA2 tests.
      Add DSA2 support to final algorithm tests: keypair and keyver.
      Don't try to set pmd if it is NULL.
      Remove DSA parameter generation from DSA selftest. It is unnecessary and     can be very slow on embedded platforms. Hard code DSA parameters instead.
      Add sign/verify digest API to handle an explicit digest instead of finalising     a context.
      Make no-asm work in fips mode. Add android platform.
      Fix target config errors.
      Cope with new DSA2 file format where some p/q only tests are made.
      Use single X931 key generation source file for FIPS and non-FIPS builds.
      Add FIPS support to mkdef.pl script, update ordinals.
      For now disable EC_GFp_nistp224_method() for WIN32 so the WIN32 build     completes without linker errors.
      Add Windows FIPS build utilities.
      add -stripcr option to copy.pl from 0.9.8
      Add FIPS error codes.
      Include fips header file in err_all.c if needed.
      Rename crypto/fips_err.c to fips_ers.c to avoid clash with other fips_err.c
      Transfer error redirection to fips.h, add OPENSSL_FIPSAPI to source files     that use it.
      Add FIPS support to the WIN32 build system.
      Remove unneeded functions, make some functions and variables static.
      Fix duplicate code and typo.
      Use default ASN1 if flag set.
      Fix memory leak.
      New flags EVP_CIPH_FLAG_CUSTOM_CIPHER in cipher structures if an underlying     cipher handles all cipher symantics itself.
      Typo.
      Use 0 not -1 (since type is size_t) for finalisation argument to do_cipher:     the NULL value for the input buffer is sufficient to notice this case.
      Add CRYPTO_gcm128_tag() function to retrieve the tag.
      Initial *very* experimental EVP support for AES-GCM. Note: probably very     broken and subject to change.
      Link GCM into FIPS module. Check return value in EVP gcm.
      Experimental incomplete AES GCM algorithm test program.
      Set values to NULL after freeing them.
      Equally experimental encrypt side for fips_gcmtest. Currently this uses IVs     in the request file need to update it to generate IVs once we have an IV     generator in place.
      Add GCM IV generator. Add some FIPS restrictions to GCM. Update fips_gcmtest.
      Disable FIPS restrictions when doing GCM testing.
      Free keys if DSA pairwise error.
      Return security strength for supported DSA parameters: will be used     later.
      In FIPS mode only use "Generation by Testing Candidates" equivalent.
      Make Windows build work with GCM.
      New "fispcanisteronly" build option: only build fipscanister.o and     associated utilities. This functionality will be used by the validated     tarball.
      Add Makefile.fips.
      New option to disable characteristic two fields in EC code.
      Disable some functions in headers with no-ec2m
      Make no-ec2m work on Win32 build. Add nexprotoneg support too.
      Change FIPS source and utilities to use the "FIPS_" names directly     instead of using regular OpenSSL API names.
      Remove dependency of dsa_sign.o and dsa_vrf.o: new functions FIPS_dsa_sig_new     and FIPS_dsa_sig_free, reimplment DSA_SIG_new and DSA_SIG_free from ASN1     library.
      New function BN_nist_mod_func which returns an appropriate function     if the passed prime is a NIST prime.
      Use BN_nist_mod_func to avoid need to peek error queue.
      Reorganise ECC code for inclusion in FIPS module.
      Don't use FIPS api for ec2_oct.c
      Include support for an add_lock callback to tiny FIPS locking API.
      Add ECDSA functionality to fips module. Initial very incomplete version     of algorithm test program.
      Add .cvsignore.
      Update ECDSA test program to handle ECDSA2 format files.     Correctly handle hex strings with an odd number of digits.
      Add support for SigGen and KeyPair tests.
      Ignore final '\n' when checking if hex line length is odd.
      Add FIPS flags to AES ciphers and SHA* digests.
      Add non-FIPS algorithm blocking and selftest checking.
      Update pairwise consistency checks to use SHA-256.
      Use SHA-256 in fips_test_suite.
      Add pairwise consistency test to EC.
      Experimental symbol renaming to avoid clashes with regular OpenSSL.
      Experimental FIPS symbol renaming.
      Include openssl/crypto.h first in several other files so FIPS renaming     is picked up.
      Don't need err library for Makefile.fips
      Remove debugging command.
      Update auto generated comment.
      Correct fipssyms.h for more assembly language symbols.
      Experimental perl script to edit assembly language source files,     call the assembler, then restore original file.
      Make -DOPENSSL_FIPSSYMS work for assembly language builds.
      AES GCM selftests.
      add ECDSA POST
      Move gcm128_context definition to modes_lcl.h (along with some related     definitions) so we can use it in EVP GCM code avoiding need to allocate     it.
      Make fipscanisteronly build only required files.
      *** empty log message ***
      tools and rehash not needed for fips build.
      x509v3.h header file not needed in fips algorithm test utilities.
      Need to link additional directories for fipscanisteronly build.
      Remove unnecessary dependencies.
      Create fips links even if not compiling in fips mode.
      Update dependencies.
      Remove unnecessary link directories.
      *** empty log message ***
      Remove debugging option.
      Call Makefile.fips when making a fips tarball.
      Initial perl script to filter out unneeded files for a fips tarball.
      typo
      Make "make links" work in fipscanisteronly builds.
      Don't try and update c_rehash for fipscanisteronly builds.
      Removing debugging print.
      Add modes_lcl.h to header list.
      Remove duplicate test rule.
      Add fips/ecdsa directory to mkfiles.pl
      Make fipscanisteronly work with WIN32 build system.
      Include ms directory for fips distribution.
      Make mkfiles.pl work with fipscanisteronly.
      Make -DOPENSSL_FIPSSYMS work under WIN32: run perl script when     WIN32 assembly language files are created, add norunasm option     to just translate and not run the assembler.
      Add new symbols to fipssyms.h
      Add DllMain to fips symbols: will need to call this in FIPS capable OpenSSL.
      Use more portable options when making links in Makefile.fips
      Stop warnings.
      Update status information.
      Initial, provisional, subject to wholesale change, untested, probably     not working, incomplete and unused SP800-90 DRBGs for CTR and Hash modes.
      Updates to DRBG: fix bugs in infrastructure. Add initial experimental     algorithm test generator.
      Fix couple of bugs in CTR DRBG implementation.
      Uninstantiate and free functions for DRBG.
      Remove need for redirection on RNG and DSS algorithm test programs: some     platforms don't support it.
      Remove redirection from fipsalgtest.pl script.
      Support I/O with files in new fips_gcmtest program.
      Add file I/O to fips_drbgvs program.
      Add meaningful error codes to DRBG.
      New SP 800-56A compliant version of DH_compute_key().
      New initial DH algorithm test driver.
      Typo.
      Update .cvsignore
      Update fips_dhvs to handle functional test by generating keys.
      Enter FIPS mode in fips_dhvs. Support file I/O in fips_ecdsavs.
      Add ECDH to validated module.
      Add a few more symbol renames.
      Make no-ec2m work again.
      Update status.
      make no-dsa work again
      Check requested security strength in DRBG. Add function to retrieve the     security strength.
      Remove redundant check to stop compiler warning.
      Fix warnings: signed/unisgned comparison, shadowing (in some cases global     functions such as rand() ).
      PR: 2469     Submitted by: Jim Studt <jim at studt.net>     Reviewed by: steve
      Add extensive DRBG selftest data and option to corrupt it in fips_test_suite.
      Fix broken SRP error/function code assignment.
      Fix warnings about ignored return values.
      Implement health checks needed by SP800-90.
      Implement continuous RNG test for SP800-90 DRBGs.
      Typo.
      Free DRBG context in self tests.
      Use a signed value to check return value of do_cipher().
      Typo.
      Make some Unix builds work again.
      Fix compiler warnings.
      Remove unused function.
      Add .cvsignore
      Allow setting of get_entropy and get_nonce callbacks outside test mode.     Test mode is now set when a DRBG context is initialised.
      Disable cmac tests by default so the old algorithm test vectors work.
      Have all algorithm test programs call fips_algtest_init() at startup:     this will perform all standalone operations such as setting error     callbacks, entering FIPS mode etc.
      Add .cvsignore
      Update .cvsignore
      fix warnings
      Reorganise DRBG API so the entropy and nonce callbacks can return a     pointer to a buffer instead of copying to a fixed length buffer. This     removes the entropy and nonce length restrictions.
      Remove redundant definitions. Give error code if DRBG sefltest fails.
      Unused, untested, provisional RAND interface for DRBG.
      Initial switch to DRBG base PRNG in FIPS mode. Include bogus seeding for     test applications.
      Provisional support for auto called OPENSSL_init() function. This can be     used to set up any appropriate functions such as FIPS callbacks without     requiring an explicit application call.
      Add additional OPENSSL_init() handling add dummy call to (hopefully)     ensure OPENSSL_init() is always linked into an application.
      Allow FIPS malloc callback setting. Automatically set some callbacks     in OPENSSL_init().
      Only zeroise sensitive parts of DRBG context, so the type and flags     are undisturbed.
      temporarily update .cvsignore
      delete lib file
      restore .cvsignore
      restore .cvsignore
      Make WIN32 static builds work again.
      PR: 2457     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Reviewed by: steve
      PR: 2458     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Reviewed by: steve
      PR: 2462     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Reviewed by: steve
      check RAND_pseudo_bytes return value
      Change RNG test to block oriented instead of request oriented, add option     to test a "stuck" DRBG.
      Disable test fprintf.
      Change FIPS locking functions to macros so we get useful line information.
      Use environment when builds libcrypto shared library so CC value is picked up     in FIPS builds.
      Set error code is additional data callback fails.
      Updated error codes for FIPS library.
      FIPS mode support for openssl utility: doesn't work properly yet due     to missing DRBG support in libcrypto.
      Rename deprecated FIPS_rand functions to FIPS_x931. These shouldn't be     used by applications directly and the X9.31 PRNG is deprecated by new     FIPS140-2 rules anyway.
      Extensive reorganisation of PRNG handling in FIPS module: all calls     now use an internal RAND_METHOD. All dependencies to OpenSSL standard     PRNG are now removed: it is the applications resposibility to setup     the FIPS PRNG and initalise it.
      Update fipssyms.h to keep all symbols in FIPS,fips namespace.
      updated FIPS status
      check buffer is larger enough before overwriting
      Remove rand files from fipscanister.o
      Add missing error code strings.
      Update OpenSSL DRBG support code. Use date time vector as additional data.     Set FIPS RAND_METHOD at same time as OpenSSL RAND_METHOD.
      Add fips hmac key to dgst utility.
      Update CHANGES.
      Only use fake rand once per operation. This stops the EC     pairwise consistency test interfering with the test.
      DH keys have an (until now) unused 'q' parameter. When creating     from DSA copy q across and if q present generate DH key in the     correct range.
      New function to return security strength of PRNG.
      Before initalising a live DRBG (i.e. not in test mode) run a complete health     check on a DRBG of the same type.
      Add error for health check failure.
      remove ENGINE dependency from ecdh
      Remove unused build targets from Makefile.fips, add cmac to dist list.
      Auto configure for fips is from restricted tarball.
      Clarify README.FIPS.
      set OPENSSL_FIPSSYMS for restricted buils and auto detect no-ec2m
      Auto detect no-ec2m add option to make no-ec2m tarball.
      fix fipscanisteronly autodetect
      Typo: fix duplicate call.
      Don't give dependency warning for fips builds.
      Reorder headers to get definitions before they are used.
      Set length to 41 (40 hex characters + null).
      Fix warning.
      Add mem_clr.c explicity for no-asm builds.
      Use correct version number.
      Update copyright year.
      Update fips_premain.c fingerprint.
      Update ECDSA selftest to use hard coded private keys. Include tests for     prime and binary fields.
      No need to disable leak checking for FIPS builds now we use internal     memory callbacks.
      Stop warning and fix memory leaks.
      Fix memory leaks: uninstantiate DRBG during health checks. Cleanup md_ctx     when performing ECDSA selftest.
      Update RSA selftest code to use a 2048 bit RSA and only a single KAT     for PSS+SHA256
      Complete rewrite of FIPS_selftest_dsa(). Use hardcoded 2048 bit DSA key     and SHA384. Use fips_pkey_signature_test().
      Update fips_pkey_signature_test: use fixed string if supplies tbs is     NULL. Always allocate signature buffer.
      Provisional AES XTS support.
      Use consistent FIPS tarball name.
      Remove duplicate flag.
      Initial incomplete POST overhaul: add support for POST callback to     allow status of POST to be monitored and/or failures induced.
      Remove several of the old obsolete FIPS_corrupt_*() functions.
      Update CMAC, HMAC, GCM to use new POST system.
      Revise fips_test_suite to use table of IDs for human readable strings.
      Report each cipher used with CMAC tests.
      Add new POST support to X9.31 PRNG.
      Add algorithm driver for XTS mode. Fix several bugs in EVP XTS implementation.
      Add XTS selftest, include in fips_test_suite.
      Add length limitation from SP800-38E.
      Add "post" option to fips_test_suite to run the POST only and exit.
      Remove PSS salt length detection hack from fipslagtest.pl by allowing a regexp     search of the file to determine its type. This will be needed for other tests     later...
      Remove shlib_wrap.sh as it is not needed (all algorithm tests are     staticly linked to fipscanister.o). Add option to generate a shell     script to run all tests: this is useful for platforms that don't have     perl.
      Don't need separate tag buffer for GCM mode: use EVP_CIPHER_CTX buf     field which is not unused for custom ciphers.
      Compile ccm128.c, move some structures to modes_lcl.h add prototypes.
      Initial untested CCM support via EVP.
      CCM encrypt algorithm test support.
      Override flag for XTS length limit.
      Typo.
      Fix EVP CCM decrypt. Add decrypt support to algorithm test program.
      Add fips/cmac directory to WIN32 build.
      Use 0 for tbslen to perform strlen.
      Add AES CCM selftest.
      Warn if lines are truncated in algorithm test utilities.
      Add partial DH and ECDH primitives only testing to fipsalgtest.pl
      Add partial GCM tests to fipsalgtest.pl
      Add periodic DRBG health checks as required by SP800-90.
      Update DRBG to use new POST scheme.
      Add continuous RNG test to entropy source. Entropy callbacks now need     to specify a "block length".
      Update ordinals.
      Fix WIN32 warning.
      Make fipscanisteronly auto detect work on WIN32.
      Reconise no-ec-nistp224-64-gcc-128 option.
      Initial do_fips.bat build script for WIN32 fipscanister.
      Rewrite OutputValue to avoid use of buffer when printing out hex values.
      Add XTS test vector support to fipsalgtest.pl
      Return errors instead of aborting when selftest fails.
      Add PRNG security strength checking.
      Always return multiple of block length bytes from default DRBG seed     callback.
      Oops, work out expanded buffer length before allocating it...
      Make sure overrides work for RSA/DSA.
      More fixes for DSA FIPS overrides.
      Clarification.
      Recognise invalid enable/disable options.
      Fix warning.
      Stop warnings about undefined _exit on Android.
      Don't assume version of rm supports -rf: use RM instead.
      Initial "opaque SSL" framework. If an application defines     OPENSSL_NO_SSL_INTERN all ssl related structures are opaque     and internals cannot be directly accessed. Many applications     will need some modification to support this and most likely some     additional functions added to OpenSSL.
      Initial incomplete TLS v1.2 support. New ciphersuites added, new version     checking added, SHA256 PRF support added.
      no need to include memory.h
      Update symbol translation table.
      Disable SHA256 if not supported.
      Some changes to support VxWorks in the validted module.
      For FIPS algorithm test utilities use our own version of strcasecmp and     strncasecmp to cover cases where platforms don't support them.
      Add ppc_cap.c to restricted tarball.
      Include crypto.h in ppccap.c
      Rename some more symbols.
      Handle multiple CPUID_OBJ correctly.
      Two more symbol renames.
      Quick hack to time POST.
      Stop warning in VxWorks.
      Use more portable clock_gettime() for fips_test_suite timing.
      Use faster curves for ECDSA self test.
      Fix do_fips script.
      PR: 2499     Submitted by: "James 'J.C.' Jones" <james.jc.jones at gmail.com>
      Remove useless setting.
      Include fipssyms.h for ARM builds to translate symbols.
      Fix warning.
      Remove debugging print.
      Update status.
      Remove superfluous PRNG self tests.
      Fix warning of signed/unsigned comparison.
      Hide more symbols.
      Continuing TLS v1.2 support: add support for server parsing of     signature algorithms extension and correct signature format for     server key exchange.
      Return error codes for selftest failure instead of hard assertion errors.
      Don't fail WIN32 builds on warnings.
      Get OPENSSL_FIPSSYMS from environment in fipsas.pl, include ppccap.c and .S     files in fipsdist.
      Fixes for WIN64 FIPS build.
      Don't include GF2m source files is NOEC2M set.
      Omit GF2m properly this time ;-)
      Remove FIXME comments.
      Remove gf2m modules from bn_asm if no-ec2m set.
      allow SHA384, SHA512 wit DSA
      Call fipsas.pl directly for pa-risc targets.
      Initial TLS v1.2 client support. Include a default supported signature     algorithms extension (including everything we support). Swicth to new     signature format where needed and relax ECC restrictions.
      Initialise rc.
      Typo.
      Update instructions.
      Add NSA sublicense info.
      Inlcude README.ECC in FIPS restricted tarball.
      Rename FIPS_mode_set and FIPS_mode. Theses symbols will be defined in     the FIPS capable OpenSSL.
      Set FIPS mode for values other than 1. The only current effect     is to return a consistent value. So calling FIPS_module_mode_set(n)     for n != 0 will result in FIPS_module_mode() returning n. This     will support future expansion of more FIPS modes e.g. a Suite B mode.
      Reorder signature algorithms in strongest hash first order.
      make kerberos work with OPENSSL_NO_SSL_INTERN
      Sync ordinals.
      Add SSL_INTERN definition.
      Fix error discrepancy.
      Process signature algorithms during TLS v1.2 client authentication.
      Provisional support for TLS v1.2 client authentication: client side only.
      Enter FIPS mode by calling FIPS_module_mode_set in openssl.c until     FIPS_mode_set is implemented.
      Recognise NO_NISTP224-64-GCC-128
      typo
      Typo.
      NULL is a valid cspname
      new flag to stop ENGINE methods being registered
      set encodedPoint to NULL after freeing it
      inherit HMAC flags from MD_CTX
      update date
      oops
      Implement FIPS_mode and FIPS_mode_set
      Add CHANGES entry: add FIPS support to ssl
      PR: 2295     Submitted by: Alexei Khlebnikov <alexei.khlebnikov at opera.com>     Reviewed by: steve
      PR: 2522     Submitted by: Henrik Grindal Bakken <henribak at cisco.com>
      use TLS1_get_version macro to check version so TLS v1.2 changes don't interfere with DTLS
      PR: 2505     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Reviewed by: steve
      PR: 2506     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Reviewed by: steve
      PR: 2512     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Reviewed by: steve
      Oops use up to date patch for PR#2506
      Some nextproto patches broke DTLS: fix
      Fix the ECDSA timing attack mentioned in the paper at:
      Fix the ECDSA timing attack mentioned in the paper at:
      PR: 2527     Submitted by: Marcus Meissner <meissner at suse.de>     Reviewed by: steve
      PR: 2529     Submitted by: Marcus Meissner <meissner at suse.de>     Reviewed by: steve
      PR: 2533     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Reviewed by: steve
      Don't advertise or use MD5 for TLS v1.2 in FIPS mode
      More symbol renaming.
      Only install FIPS related files for fipscanisteronly build.
      Install fips_standalone_sha1 and make use of it in fipsld script.
      In fipsld use FIPSLIBCRYPTO environment variable to specify an alternative     location for libcrypto.a, support shared library builds in different     source tree.
      Use FIPSLD_LIBCRYPTO for consistency with other env variables in fipsld.     Use current directory for fips_premain_dso
      Typo.
      Rename many internal only module functions from FIPS_* to fips_*.
      Add prototypes for FIPS EVP implementations: for use in FIPS capable     OpenSSL.
      Add FIPS_digestinit prototype for FIPS capable OpenSSL.
      Prototypes for more FIPS functions for use in FIPS capable OpenSSL.
      Add more cipher prototypes.
      Output supported curves in preference order instead of numerically.
      Don't round up partitioned premaster secret length if there is only one     digest in use: this caused the PRF to fail for an odd premaster secret     length.
      Fake CPU caps so fips_standalone_sha1 compiles.
      set FIPS permitted flag before initalising digest
      typo
      Add DSA and ECDSA "clone digests" to module for compatibility with old     applications.
      Clone digest prototypes.
      Simple automated certificate creation demo.
      Move FIPS RSA function definitions to fips.h
      Remove FIPS RSA functions from crypto/rsa.
      Typo.
      Constify RSA signature buffer.
      Add "OPENSSL_FIPSCAPABLE" define for a version of OpenSSL which is     FIPS capable: i.e. FIPS module is supplied externally.
      license correction, no EAY code included in this file
      fix error discrepancy
      Move function prototype to fips.h
      Set SSL_FIPS flag in ECC ciphersuites.
      Add prototypes for some FIPS EC functions.
      Set flags in ECDH and ECDSA methods for FIPS.
      Add flags for DH FIPS method.
      fix memory leak
      Add more prototypes.
      more prototypes in fips.h
      Install FIPS module in FIPSDIR if set.
      Remove x509.h from SHA1 clone digests, update dependencies.
      Update dependencies for m_dss.c too.
      #undef bn_div_words as it is defined for FIPS builds.
      CMAC FIPS prototypes.
      HMAC fips prototypes
      Use FIPSCAPABLE for FIPS module functions used in FIPS capable OpenSSL.
      Don't export functions marked as FIPSCAPABLE.
      sync and update ordinals
      Allow applications to specify alternative FIPS RAND methods if they     are sure they are OK.
      make sure custom cipher flag doesn't use any mode bits
      set FIPS allow before initialising ctx
      Update to mk1mf.pl and ms\do_fips.bat to install relevant files for     WIN32 FIPS builds.
      Don't include des.h any more: it is not needed.
      Option "fipscheck" which checks to see if FIPS is autodetected in     a build. Use this for WIN32 builds.
      Give parameters names in prototypes.
      Initial FIPS capable OpenSSL information
      Strip CRs when installing fips_premain.c Correct compat library rule     in FIPS mode.
      Correction.
      add null cipher to FIPS module
      typo
      make EVP_dss() work for DSA signing
      Add prototype for null cipher.
      Don't set FIPS rand method at same time as RAND method as this can cause the     FIPS library to fail. Applications that want to set the FIPS rand method can do     so explicitly and presumably they know what they are doing...
      allow MD5 use for computing old format hash links
      add symbol rename
      Now the FIPS capable OpenSSL is available simplify the various FIPS test     build options.
      stop complaints about no CVS version
      typo
      correctly encode OIDs near 2^32
      PR: 2540     Submitted by: emmanuel.azencot at bull.net     Reviewed by: steve
      PR: 2543     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Reviewed by: steve
      PR: 2470     Submitted by: Corinna Vinschen <vinschen at redhat.com>     Reviewed by: steve
      Add sparcv9cap.c to restricted tarball.
      get the filename right
      allow KERNEL_BITS to be specified in the environment
      Add stub for HMAC DRBG.
      typo
      Fix CPRNG test for Hash DRBG.
      auto detect configuration using KERNEL_BITS and CC
      Recognise fipscheck option and call fipsas for WIN64 builds.
      Add no-asm argument to Configure if needed.
      Delete any EXARG value first.
      Additional error checking.
      If make clean fails it is not a fatal error.
      Add functions to return FIPS module version.
      Rename symbol.
      PR: 2556 (partial)     Reported by: Daniel Marschall <daniel-marschall at viathinksoft.de>     Reviewed by: steve
      Add support for ECCCDH test format.
      PR: 2550     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Reviewed by: steve
      PR: 2555     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Reviewed by: steve
      PR: 2559     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Reviewed by: steve
      Rename another symbol.
      stop warnings
      Make sure OPENSSL_FIPSCANISTER is visible to ARM assembly language files.
      More symbol renaming.
      Add HMAC ECC ciphersuites from RFC5289. Include SHA384 PRF support and     prohibit use of these ciphersuites for TLS < 1.2
      oops, remove debug option
      Update CHANGES.
      Fix warnings.
      recognise ecdsaWithSHA1 OID
      Expand range of ctrls for AES GCM to support retrieval and setting of     invocation field.
      fix memory leak
      Initial support for tests for 2.0 module. Not complete and not all working     yet.
      Fix DSA to skip EOL test when parsing mod line.
      Use "resp" for default directory name for .rsp files.
      Add HMAC DRBG from SP800-90
      Remove redundant assignment.
      Include armcap.c in fips tarball.
      prevent compilation errors and warnings
      aesni TLS GCM support
      Remove hard coded ecdsaWithSHA1 hack in ssl routines and check for RSA     using OBJ xref utilities instead of string comparison with OID name.
      Enable rsa-pss0 for non-v2 tests.
      quote LIBS to copy with empty string
      Delete library install from Makefile.fips: it isn't used.
      Update instructions to recommend use of included incore script.
      typo
      Fix fipsalgtest.pl to still work with old test vectors.
      Correct maximum request length. SP800-90 quotes maximum bits, not bytes.
      Rename sparc symbols.
      Don't use some object files in FIPS build.
      Fix warning.
      Add support for canonical generation of DSA parameter g.     Modify fips_dssvs to support appropriate file format.
      Add support for DSA2 PQG generation of g parameter.
      Fix ecdh primitives test command line.
      Print private key component is -exout parameter is given.
      PR: 2586     Submitted by: Thomas Jarosch <thomas.jarosch at intra2net.com>     Reviewed by: steve
      PR: 2586     Submitted by: Thomas Jarosch <thomas.jarosch at intra2net.com>     Reviewed by: steve
      PR: 2588     Submitted by: Thomas Jarosch <thomas.jarosch at intra2net.com>     Reviewed by: steve
      PR: 2589     Submitted by: Thomas Jarosch <thomas.jarosch at intra2net.com>     Reviewed by: steve
      PR: 2573     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Reviewed by: steve
      Stop warnings.
      make timing attack protection unconditional
      PR: 2340     Submitted by: "Mauro H. Leggieri" <mxmauro at caiman.com.ar>     Reviewed by: steve
      Sync ordinals with 1.0.1-stable.
      PR: 2576     Submitted by: Doug Goldstein <cardoe at gentoo.org>     Reviewed by: steve
      Don't use *from++ in tolower as this is implemented as a macro on some     platforms. Thanks to Shayne Murray <Shayne.Murray at Polycom.com> for     reporting this issue.
      Rename some more symbols for fips module.
      Extension of DRBG selftests using new data.
      Add header to Makefile.
      Update dependencies.
      Don't perform full DRBG health check on all DRBG types on power up, just     one shorter KAT per mechanism.
      Place DRBG in error state if health check fails.
      Check reseed interval before generating output.
      Update FAQ.
      Initialise X509_STORE_CTX properly so CRLs with nextUpdate date in the past     produce an error (CVE-2011-3207)
      Add error codes for DRBG KAT failures.
      Put quick DRBG selftest return after first generate operation.
      Add /fixed option to linker with fips builds.
      Add support for Dual EC DRBG from SP800-90. Include updates to algorithm     tests and POST code.
      Fix 3DES Monte Carlo test file output which previously outputted     extra bogus lines. Update fipsalgtest.pl to tolerate the old format.
      Check we recognise DRBG type in fips_drbgvs.c initialised DRBG_CTX if we     don't set type in FIPS_drbg_new().
      Delete strength parameter from FIPS_drbg_generate. It isn't very useful     (strength can be queried using FIPS_drbg_get_strength ) and adds a     substantial extra overhead to health check (need to check every combination     of parameters).
      Check length of additional input in DRBG generate function.
      More extensive DRBG health check. New function to call health check     for all DRBG combinations.
      new function to lookup FIPS supported ciphers by NID
      Remove fipsdso target: it isn't supported in the 2.0 module.
      Update CMAC/HMAC sefltests to use NIDs instead of function pointers.
      Fix warning.
      Make HMAC kat symbols static.
      Don't use vpaes in fips builds and exclude from restricted tarball.
      Minor code tidy and bug fix: need to set t = s after first pass and     t and s do not need to have independent values after the first pass     so set t = s.
      clarify comment
      Sync error codes with 1.0.1-stable.
      Allow reseed interval to be set.
      Update error codes.
      Revise DRBG to split between internal and external flags.
      Perform health check on all reseed operations not associated with     prediction resistance requests. Although SP 800-90 is arguably unclear     on whether this is necessary adding an additional check has minimal     penalty (very few applications will make an explicit reseed request).
      Remove unused variable.
      Don't print out errors in cases where errors are expected: testing     DSA parameter validity and EC public key validity.
      Use function name FIPS_drbg_health_check() for health check function.
      Typo.
      Run PQGVer test before DSA2 tests.
      PR: 2347     Submitted by: Tomas Mraz <tmraz at redhat.com>     Reviewed by: steve
      PR: 2602     Submitted by: Robin Seggelmann <seggelmann at fh-muenster.de>     Reviewed by: steve
      PR: 2606     Submitted by: Christoph Viethen <cv at kawo2.rwth-aachen.de>     Reviewed by: steve
      use keyformat for -x509toreq, don't hard code PEM
      make sure eivlen is initialised
      Handle provable prime parameters for canonical g generation which are     sometimes erroneously included.
      Add a --disable-all option to disable all tests.
      fix signed/unsigned warning
      Fix output format for DSA2 parameter generation.
      Check return codes properly.
      Remove s = s * P deferral.
      Add FIPS selftests for ECDH algorithm.
      make depend
      Never echo Num lines for PQGGen DSA2 test.
      Make fips algorithm test utilities use RESP_EOL for end of line character(s).     This should be CRLF even under *nix.
      ? crypto/aes/aes-armv4.S     ? crypto/aes/aesni-sha1-x86_64.s     ? crypto/aes/aesni-x86_64.s     ? crypto/aes/foo.pl     ? crypto/aes/vpaes-x86_64.s     ? crypto/bn/.bn_lib.c.swp     ? crypto/bn/armv4-gf2m.S     ? crypto/bn/diffs     ? crypto/bn/modexp512-x86_64.s     ? crypto/bn/x86_64-gf2m.s     ? crypto/bn/x86_64-mont5.s     ? crypto/ec/bc.txt     ? crypto/ec/diffs     ? crypto/modes/a.out     ? crypto/modes/diffs     ? crypto/modes/ghash-armv4.S     ? crypto/modes/ghash-x86_64.s     ? crypto/modes/op.h     ? crypto/modes/tst.c     ? crypto/modes/x.h     ? crypto/objects/.obj_xref.txt.swp     ? crypto/rand/diffs     ? crypto/sha/sha-512     ? crypto/sha/sha1-armv4-large.S     ? crypto/sha/sha256-armv4.S     ? crypto/sha/sha512-armv4.S     Index: crypto/objects/obj_xref.c     ===================================================================     RCS file: /v/openssl/cvs/openssl/crypto/objects/obj_xref.c,v     retrieving revision 1.9     diff -u -r1.9 obj_xref.c     --- crypto/objects/obj_xref.c	5 Nov 2008 18:38:58 -0000	1.9     +++ crypto/objects/obj_xref.c	6 Oct 2011 20:30:21 -0000     @@ -110,8 +110,10 @@      #endif      	if (rv == NULL)      		return 0;     -	*pdig_nid = rv->hash_id;     -	*ppkey_nid = rv->pkey_id;     +	if (pdig_nid)     +		*pdig_nid = rv->hash_id;     +	if (ppkey_nid)     +		*ppkey_nid = rv->pkey_id;      	return 1;      	}
      use client version when eliminating TLS v1.2 ciphersuites in client hello
      New -force_pubkey option to x509 utility to supply a different public     key to the one in a request. This is useful for cases where the public     key cannot be used for signing e.g. DH.
      Add fips/ecdh directory.
      PR: 2482     Submitted by: Rob Austein <sra at hactrn.net>     Reviewed by: steve
      Sync ordinals with 1.0.1-stable.
      fix memory leaks
      fix CHANGES entry
      Synv ordinals with 1.0.1-stable.
      Don't disable TLS v1.2 by default now.
      disable GCM if not available
      add GCM ciphers in SSL_library_init
      fix leak properly this time...
      remove some debugging code
      def_rsa_finish not used any more.
      print out subgroup order if present
      update pkey method initialisation and copy
      Only include one ECDH selftest.
      Fix warnings.
      ECDH POST selftest failure inducing support.
      Handle broken test on verify too.
      Updates to handle some verification of v2 tests.
      Update instructions.
      Handle partial test where H is absent: needed to check g generation.
      Skip ECDH sanity check. Add --compare-all to run comparison tests on     all files instead of sanity checks.
      Remove o_init.o special case from Makefile: this doesn't work.
      Update README.FIPS for new FIPS 2.0 testvectors.
      increase test RSA key size to 1024 bits
      Print curve type for signature tests.
      Add usage messages.
      Don't use TPREFIX shell variable for minimal script.
      Allow override of GCCVER and noexecstack checking from environment.
      more vxworks patches
      Clarify usage message.
      L=3072, N=256 provides 128 bits of security not 112.
      Do global replace to remove assembly language object files.
      Update premain fingerprint.
      Recognise new option.
      Build fipscanister.o only by default. Utility build now needs     make build_tests
      Typo (?)
      add authentication parameter to FIPS_module_mode_set
      Add "nopass" for empty password too.
      Fix error codes.
      Check for uninitialised DRBG_CTX and don't free up default DRBG_CTX.
      fix (?) AVX clearing
      Update error codes.
      Check for selftest failure in various places.
      No need for custom flag in XTS mode: block length is 1.
      typo
      prepare for RC1
      Prepare for RC2.
      PR: 2632     Submitted by: emmanuel.azencot at bull.net     Reviewed by: steve
      Add support for multicall fips_algvs utility combining functionality     of all fips test utilities in a single binary and some minimal script     parsing for platforms lacking a suitable shell.
      Replace exit calls with return in fips_test_suite
      Print out an error for "make test" in FIPS builds.
      Remove duplicate test from health check. Fix memory leaks by uninstantiating     DRBG before reinitialising it.
      Add support for memory leak checking in fips_algvs.
      Add single call public key sign and verify functions.
      fix set but unused warnings
      typo: use key for POST callback
      make post failure simulation reversible in all cases
      typo
      Update fips_test_suite to take multiple command line options and     an induced error checking function.
      check for unset entropy and nonce callbacks
      MacOS and iOS support
      Prepare for RC2
      add fips_algvs.c to restricted tarball
      Prepare for RC3 (which may never happen).
      fclose streams in fips_drbvs.c
      portability fix for some perl versions
      In EC_KEY_set_public_key_affine_coordinates include explicit check to see passed components do not exceed field order
      prepare for RC3
      bump version to rc4-dev
      Add flag to support cofactor ECDH
      prepare for rc4
      bump version for rc5-dev: hopefully will never be needed...
      check counter value against 4 * L, not 4096
      return error if counter exceeds limit and seed value supplied
      prepare for rc5
      bn/asm/mips.pl: fix typos [from HEAD], original by Andy
      remove unused functions from module
      functions aren't unused: revert
      Add tests to ensure ECDSA key gen and DSA signing fails if DRBG     entropy source fails.
      Prepare for RC6.
      Change EVP_MAXCHUNK so it doesn't wraparound to 0 on some platforms (IP32L64).
      Fix x86cpuid so it doesn't fail for some (currently theoretical) virtual     machines.
      avoid use of symlinks on Windows: it causes problems on some build environments
      Workaround for VxWorks
      use BUILD_ONE_CMD for fips specific links otherwise we effectively do 'make links' twice
      For FIPS builds we don't use the normal test files (and in the restricted     tarball some don't exist) so set TEST='' to avoid linking to them. This also     avoids problems on platforms that copy instead of symlink.
      prepare for RC6
      Close file streams in FIPS algorithm test utilities.
      use different names for asm temp files to avoid problems on some platforms
      Retry rename operation with a slight delay to workaround problems on     some versions of Windows.
      Prepare for RC7.
      set version to rc8-dev
      unlink target and retry to avoid intermittent Win32 failures
      Prepare RC8
      typo
      give a hand old assemblers assembling loop instruction. (original by Andy)
      revert fipslink.pl unlink retry change
      file hmac_sha1.pl was added on branch OpenSSL-fips-2_0-stable on 2012-10-04 13:27:10 +0000
      file msincore was added on branch OpenSSL-fips-2_0-stable on 2012-10-04 13:27:10 +0000
      Add support for Windows CE and C64+ to FIPS module.
      update CHANGES
      Add BSD-ppc85xx support and avoid copying overlapping buffers in fips_dssvs.c

Geoff Thorpe (408):
      Gets around VC++ compiler pickiness. (long != double)
      More VC++ pickiness. (destest.c doesn't have a "return" and the usual     signed/unsigned stuff in s3_pkt.c)
      another one done.
      This is a set of startup code for the DSO support, it's not yet linked into     the build process (an upcoming commit no doubt), and is very much *new*     code - what that means is that it compiles ok - usually. It certainly     doesn't mean it runs well or even properly yet. Please don't muck round     with this unless you're looking to help out and hunt bugs. :-)
      This commit ties the new DSO code (crypto/dso/) into the build for a     variety of platforms. A few are missing, and they will be added in     eventually, but as this is new stuff, it was better to not break lots of     platforms in one go that we can't easily test. The changes to "Configure"     should illustrate how to add support to other systems if you feel like     having a go.
      Better make a note of what's going on ... :-)
      This helps make the DSO stuff more portable;     * "no-dso" option available in Configure so that all DSO methods will       return NULL, overriding any support the platform might otherwise       have built.     * dlfcn_no_h config string now available rather than just dlfcn. This       is for platforms that have dlfcn.h functions but do not have (or       need) the dlfcn.h header file.
      I forgot about $openssl_other_defines ... should probably do this     for consistency. Not sure though whether HAVE_DLFCN_H should be     included too? If we go the autoconf route then this probably wouldn't     be included.
      Constification, and a silly mistake in the comments.
      This change facilitates name translation for shared libraries. The     technique used is far from perfect and alternatives are welcome.     Basically if the translation flag is set, the string is not too     long, and there appears to be no path information in the string,     then it is converted to whatever the standard should be for the     DSO_METHOD in question, eg;         blah --> libblah.so   on *nix, and         blah --> blah.dll     on win32.
      Thanks to "make update" ...
      Previously, the default RSA_METHOD was NULL until the first RSA structure was     initialised, at which point an appropriate default was chosen. This meant a     call to RSA_get_default_method might have returned FALSE.
      The handling of DSA_METHOD and DH_METHOD wasn't quite as problematic as     with RSA_METHOD (the **_get_default_methods do set the default value if     it's not set). However, the code had some duplication and was a bit     conter-intuitive.
      This case in the "dso_unload" handlers should not be reported as an error -     if a DSO_load(NULL,...) operation fails, it will have to call DSO_free() on     the DSO structure it created and that will filter through to this "unload"     call.
      cvs update
      oops.
      This declaration seems to have been added into the header file accidently.     There's no trace of it being implemented and it doesn't seem to have been     intended given that it is prototyped with a BIO yet there was a BIO-     specific version added in at the same time.
      It seems that mktime does what is required here. Certainly timegm() can     not be used because it is not available on all systems (most notably,     win32).
      another warning.
      Minor corrections to documentation.
      "make update"
      All the little functions created by the IMPLEMENT_STACK_OF() macro will     cast their type-specific STACK into a real STACK and call the underlying     sk_*** function. The problem is that if the STACK_OF(..) parameter being     passed in has a "const *" qualifier, it is discarded by the cast.
      sk_value was also suffering from de-const-ification.     Also, add in a couple of missing declarations in pkcs7 code.
      sk_***_new_null() seems to be there to avoid exactly this sort of thing     which is a cast between NULL and a function pointer.
      This is the first of two commits (didn't want to dump them all into the     same one). However, the first will temporarily break things until the     second comes through. :-)
      The previous commit to crypto/stack/*.[ch] pulled the type-safety strings     yet tighter, and also put some heat on the rest of the library by     insisting (correctly) that compare callbacks used in stacks are prototyped     with "const" parameters. This has led to a depth-first explosion of     compiler warnings in the code where 1 constification has led to 3 or 4     more. Fortunately these have all been resolved to completion and the code     seems cleaner as a result - in particular many of the _cmp() functions     should have been prototyped with "const"s, and now are. There was one     little problem however;
      This change will cause builds (by default) to not use different STACK     structures and functions for each stack type. The previous behaviour     can be enabled by configuring with the "-DDEBUG_SAFESTACK" option.     This will also cause "make update" (mkdef.pl in particular) to     update the libeay.num and ssleay.num symbol tables with the number of     extra functions DEBUG_SAFESTACK creates.
      "make update" + stripping the type-specific stack functions out of     libeay.num and ssleay.num.
      Enable DSO support on alpha (OSF1), cc and gcc.
      The atalla functionality doesn't work with the "word" version of     BN_mod_exp. Call the regular atalla mod_exp operation instead.
      Currently the DSO_METHOD interface has one entry point to bind all     "symbols" including functions (of all prototypes( and variables. Whilst     casting any function type to another violates ANSI C (I believe), it is     a necessary evil in shared-library APIs. However, it is quite     conceivable that functions in general and data symbols could very well     be represented differently to each other on some systems, as Bodo said;
      'make update'
      * This adds some checking to the 'dlfcn' DSO_METHOD that at least lets       it cope with OpenBSD which doesn't understand "RTLD_NOW".     * Added the dso_scheme config string entry for OpenBSD-x86 to give it       DSO support.     * 'make update' that has also absorbed some of Steve's mkstack changes       for the ASN-related macros.
      Steve fixed up some strange errors introduced into dso_win32.c, and I'm     just converting some spaces to tabs from his fix. :-)
      Time to get rid of some rather silly code duplication - some DSO_ctrl()     commands are common to all DSO_METHODs, hence handle them at the top.
      None of the DSO_METHOD's were handling anything except generic messages.     These are now processed inside DSO_ctrl() itself.
      DSO_ctrl() changes have removed a couple of DSO_METHOD-specific functions     so I've regenerated the error numbers and strings for the DSO functions.
      This changes the behaviour of the DSO mechanism for determining an     appropriate filename translation on the host system. Apart from this point,     users should also note that there's a slight change in the API functions     too. The DSO now contains its own to-be-converted filename     ("dso->filename"), and at the time the DSO loads the "dso->loaded_filename"     value is set to the translated form. As such, this also provides an impicit     way of determining if the DSO is currently loaded or not. Except, perhaps,     VMS .... :-)
      Add a note about the recent DSO changes in CHANGES.
      DSO_load() should also work when it is passed a NULL - a new DSO is created     automatically, however some code was still referring to the original     pointer rather than the internal one (and thus to NULL instead of the     created pointer).
      This is a demo that performs SSL tunneling (client and/or server) and is     built using an abstracted state machine with a non-blocking IP wrapper     around it. README will follow in the next commit.
      Explanation, tips, etc.
      oops, remove comments that are no longer true.
      Richard moved hw_nuron.c over to DSO-land recently, so this include isn't     needed now.
      Many applications that use OpenSSL with ENGINE support might face a     situation where they've initialised the ENGINE, loaded keys (which are then     linked to that ENGINE), and performed other checks (such as verifying     certificate chains etc). At that point, if the application goes     multi-threaded or multi-process it creates problems for any ENGINE     implementations that are either not thread/process safe or that perform     optimally when they do not have to perform locking and other contention     management tasks at "run-time".
      I have no idea how this comment got there, but it's certainly not     applicable to ENGINE_ctrl()
      Ensure that the "ex_data" member of an RSA structure is initialised before     the RSA_METHOD's "init()" handler is called, and is cleaned up after the     RSA_METHOD's "finish()" handler is called. Custom RSA_METHODs may wish to     initialise contexts and other specifics in the RSA structure upon creation     and that was previously not possible - "ex_data" is where that stuff     should go and it was being initialised too late for it to be used.
      It was a small change, but it *could* conceivably affect people - so I'm     making a note in the CHANGES file.
      A typo and a couple of logic errors fixed. I think there may still be one     or two kinks lurking around, but it now appears to deal with the basic     test cases ok.
      Minor tweaks and improvements to the tunala demo.
      Make s_client/s_server-style cert verification output configurable by     command line, and make the peer-authentication similarly configurable.
      More little changes to the tunala demo;
      Do to DH and DSA what has already been done to RSA. This involves moving     the initialisation and cleanup of "ex_data" elements to before an init()     handler and after a finish() handler respectively.
      Amend the original CHANGES log entry. The ex_data handling has been     similarly modified now on DH and DSA.
      * Fix a slight bug in the state-machine. This caused the client end of a       tunnel to not pro-actively close down when failing an SSL handshake.
      First step in tidying up the LHASH code. The callback prototypes (and     casts) used in the lhash code are about as horrible and evil as they can     be. For starters, the callback prototypes contain empty parameter lists.     Yuck.
      Next step in tidying up the LHASH code. This commit defines DECLARE and     IMPLEMENT macros for defining wrapper functions for "hash" and "cmp" callbacks     that are specific to the underlying item type in a hash-table. This prevents     function pointer casting altogether, and also provides some type-safety     because the macro does per-variable casting from the (void *) type used in     LHASH itself to the type declared in the macro - and if that doesn't match the     prototype expected by the "hash" or "cmp" function then a compiler error will     result.
      Use the new LHASH macros to declare type-safe wrapper functions that can     be used as the hash/compare callbacks without function pointer casting.
      Make the remaining LHASH macro changes. This should leave no remaining     cases of function pointer casting in lh_new() calls - and leave only the     lh_doall and lh_doall_arg cases to be finished.
      Make a note of the LHASH changes.
      Update the documentation to the current state of the LHASH changes. There     will probably be more when the lh_doall[_arg] callbacks are similarly     tidied up, but this 'pod' should now be current.
      ANSI C doesn't allow trailing semi-colons after a function's closing brace     so these macros probably shouldn't be used like that at all. So, this     change removes the misleading comment and also adds an implicit trailing     semi-colon to the DECLARE macros so they too don't require one.
      Sync up with a minor change in lhash.h
      Next step in tidying up the LHASH code.
      This is an engine contributed by Broadcom - it is meant to support the     BCM5805 and BCM5820 units. So far I've merely taken a skim over the code     and changed a few things from their original contributed source     (de-shadowing variables, removing variables from the header, and     re-constifying some functions to remove warnings). If this gives     compilation problems on any system, please let me know. We will hopefully     know for sure whether this actually functions on a system with the relevant     hardware in a day or two.  :-)
      Make a note of the new engine.
      Some minor changes to the "tunala" demo.
      This adds support to 'tunala' for supplying DH parameters (without which it     will not support EDH cipher suites). The parameters can either be loaded     from a file (via "-dh_file"), generated by the application on start-up     ("-dh_special generate"), or be standard DH parameters (as used in     s_server, etc).
      Re-order the options in tunala and add command switches like s_server for     disabling different SSL/TLS protocol versions.
      Whilst in the process of fixing outstanding function-pointer casts in the     LHASH code, this evil was uncovered. The cast was obscuring the fact that     the function was prototyped to take 2 parameters when in fact it is being     used as a callback that should take only one. Anyway, the function itself     ignores the second parameter (thankfully). A proper cure is on the way but     for now this corrects the inconsistency.
      This adds macros to implement (and/or declare) type-safe wrapper functions     around the callbacks required in the LHASH code for the "doall" functions.
      Get rid of the function pointer casting in the debugging memory code due     to LHASH usage. NB: The callback type used as been suctioned off into     crypto.h as CRYPTO_MEM_LEAK_CB to improve clarity.
      Move all the existing function pointer casts associated with LHASH's two     "doall" functions to using type-safe wrappers. As and where required, this     can be replaced by redeclaring the underlying callbacks to use the     underlying "void"-based prototypes (eg. if performance suffers from an     extra level of function invocation).
      It was correctly pointed out to me that my CHANGES entry was a little thin     on details. :-)
      oops, void functions shouldn't try and return a value. Strangely, gcc     didn't even give a warning for this yet HPUX cc considered it an error.     Reported by Lutz(@openssl.org).
      Update the LHASH man page.
      Insert a missing space to stop pod2man giving stroppy "malformed" warnings.
      This change was a quick experiment that I'd wanted to try that works quite     well (and is a good demonstration of how encapsulating the SSL in a     memory-based state machine can make it easier to apply to different     situations).
      Re-order a couple of static functions and "#if 0" out unused ones - this     gets rid of gcc warnings.
      The callbacks in the NAME_FUNCS structure are not used directly as LHASH     callbacks, and their prototypes were consistent as they were. These casts     need reversing.
      'make update'
      This change allows a callback to be used to override the generation of     SSL/TLS session IDs in a server. According to RFC2246, the session ID is an     arbitrary value chosen by the server. It can be useful to have some control     over this "arbitrary value" so as to choose it in ways that can aid in     things like external session caching and balancing (eg. clustering). The     default session ID generation is to fill the ID with random data.
      This adds command-line support to s_server for controlling the generation     of session IDs. Namely, passing "-id_prefix <text>" will set a     generate_session_id() callback that generates session IDs as random data     with <text> block-copied over the top of the start of the ID. This can be     viewed by watching the session ID s_client's output when it connects.
      Note changes re: session ID generation callbacks, etc.
      If a callback is generating a new session ID for SSLv2, then upon exiting,     the ID will be padded out to 16 bytes if the callback attempted to generate     a shorter one. The problem is that the uniqueness checking function used in     callbacks may mistakenly think a 9-byte ID is unique when in fact its     padded 16-byte version is not. This makes the checking function detect     SSLv2 cases, and ensures the padded form is checked rather than the shorter     one passed by the callback.
      Fix an oversight - when checking a potential session ID for conflicts with     an SSL_CTX's session cache, it is necessary to compare the ssl_version at     the same time (a conflict is defined, courtesy of SSL_SESSION_cmp(), as a     matching id/id_length pair and a matching ssl_version). However, the     SSL_SESSION that will result from the current negotiation does not     necessarily have the same ssl version as the "SSL_METHOD" in use by the     SSL_CTX - part of the work in a handshake is to agree on an ssl version!
      I missed one.
      Don't return an error until the global lock is released.
      Actually there were two error cases that could return without releasing the     lock - stupidly, my last change addressed only one of them.
      ENGINE_load_[private|public]_key had error handling that could return     without releasing a lock. This is the same fix as applied to     OpenSSL-engine-0_9_6-stable, minus the ENGINE_ctrl() change - the HEAD     already had that fixed.
      'make update'
      This moves string constants out of vendor headers and into C files.
      Structural references should never be decremented directly - so leave that     to ENGINE_free(). Also, remove "#if 0" code that has no useful future.
      Some more tweaks to ENGINE code.
      Some more tweaks to ENGINE code.
      Some more tweaks to ENGINE code.
      Some more tweaks from ENGINE code.
      Make the shared library name and function symbol for the "nuron" ENGINE     static data where they could be parameterised by ctrl() commands.
      Make a note of the recent ENGINE developments.
      Some more tweaks to ENGINE code.
      Some BIG tweaks to ENGINE code.
      Some more tweaks to ENGINE code.
      Changes to "openssl engine" to support the new control command code in     ENGINE.
      Add notes about the new ENGINE functionality.
      Make update.
      This change to the "dl", "dlfcn", and "win32" DSO_METHODs adds the filename     or symbol name to the error stack in the event a load or bind operation     failed.
      This adds 2 things to the ENGINE code.
      Make notes about ENGINE changes.
      "make update"
      Some fixes to the reference-counting in ENGINE code. First, there were a     few statements equivalent to "ENGINE_add(ENGINE_openssl())" etc. The inner     call to ENGINE_openssl() (as with other functions like it) orphans a     structural reference count. Second, the ENGINE_cleanup() function also     needs to clean up the functional reference counts held internally as the     list of "defaults" (ie. as used when RSA_new() requires an appropriate     ENGINE reference). So ENGINE_clear_defaults() was created and is called     from within ENGINE_cleanup(). Third, some of the existing code was     logically broken in its treatment of reference counts and locking (my     fault), so the necessary bits have been restructured and tidied up.
      For some inexplicable reason, I'd (a) left the debugging irreversibly     turned on, and (b) left a somewhat curious debugging string in the output.
      In RSA, DSA, DH, and RAND - if the "***_new()" function fails because the     ENGINE code does not return a default, set an error.
      Fix a memory leak in 'sk_dup' in the case a realloc() fails. Also, tidy up     a bit of weird code in sk_new.
      openssl speed is quite useful for testing hardware support (among other     things), especially as the RSA keys are fixed. However, DSA only fixes the     DSA parameters and then generates the public and private components on the     fly each time - this commit hard-codes some sampled key values so that this     is no longer the case.
      Currently, RSA code, when using no padding scheme, simply checks that input     does not contain more bytes than the RSA modulus 'n' - it does not check     that the input is strictly *less* than 'n'. Whether this should be the     case or not is open to debate - however, due to security problems with     returning miscalculated CRT results, the 'rsa_mod_exp' implementation in     rsa_eay.c now performs a public-key exponentiation to verify the CRT result     and in the event of an error will instead recalculate and return a non-CRT     (more expensive) mod_exp calculation. As the mod_exp of 'I' is equivalent     to the mod_exp of 'I mod n', and the verify result is automatically between     0 and n-1 inclusive, the verify only matches the input if 'I' was less than     'n', otherwise even a correct CRT calculation is only congruent to 'I' (ie.     they differ by a multiple of 'n'). Rather than rejecting correct     calculations and doing redundant and slower ones instead, this changes the     equality check in the verification code to a congruence check.
      Tidy up "cvs update" output a bit.
      - New INSTALL document describing different ways to build "tunala" and       possible problems.     - New file breakage.c handles (so far) missing functions.     - Get rid of some signed/unsigned/const warnings thanks to solaris-cc     - Add autoconf/automake input files, and helper scripts to populate missing       (but auto-generated) files.
      The indexes returned by ***_get_ex_new_index() functions are used when     setting stack (actually, array) values in ex_data. So only increment the     global counters if the underlying CRYPTO_get_ex_new_index() call succeeds.     This change doesn't make "ex_data" right (see the comment at the head of     ex_data.c to know why), but at least makes the source code marginally less     frustrating.
      The indexes returned by ***_get_ex_new_index() functions are used when     setting stack (actually, array) values in ex_data. So only increment the     global counters if the underlying CRYPTO_get_ex_new_index() call succeeds.     This change doesn't make "ex_data" right (see the comment at the head of     ex_data.c to know why), but at least makes the source code marginally less     frustrating.
      Give DH, DSA, and RSA functions to "up" their reference counts. Otherwise,     dependant code has to directly increment the "references" value of each     such structure using the corresponding lock. Apart from code duplication,     this provided no "REF_CHECK/REF_PRINT" checking and violated     encapsulation.
      Changes crypto/evp/ and ssl/ code from directly incrementing reference     counts in DH, DSA, and RSA structures. Instead they use the new "***_up()"     functions that handle this.
      Make a note of the "up" functions.
      This changes the "ERR" code to have all access to state (a hash table of     error strings and a hash table storing per-thread error state) go via an     ERR_FNS function table. The first time an ERR operation occurs, the     implementation that will be used (from then on) is set to the internal     "defaults" implementation if it has not already been set. The actual LHASH     tables are only accessed by this implementation.
      Note the "ERR" changes.
      Tidy up some code formatting.
      gcc can't spot that 'derlst' is not used uninitialised, so appease it.
      "make update"
      Make sure "CRYPTO_mem_leaks_fp" doesn't itself create a reportable memory     leak.
      Ensure that failure to create the BIO in 'CRYPTO_mem_leaks_fp' doesn't     leave memory debugging turned off.     [Spotted by G?tz Babin-Ebell]
      (A version of) gcc had been giving somewhat odd "trigraph" warnings about     this construct, and Ulf provided the following insight as to why;
      Only OPENSSL_free() non-NULL pointers.
      First step in fixing "ex_data" support. Warning: big commit log ...
      Make the necessary changes to work with the recent "ex_data" overhaul.     See the commit log message for that for more information.
      Note the "ex_data" changes.
      Convert "max" to "mx" for variable names (brought to my attention by Steve     Henson). Also, reverse a previous change that used an implicit function     pointer cast rather than an explicit data pointer cast in the STACK cleanup     code.
      Correct a typo.
      Add a new ERR function, "ERR_unload_strings", to complement the existing     "ERR_load_strings" function.
      Note the "ERR_unload_strings" function.
      This change adds a new ENGINE called "dynamic" that allows new ENGINE     implementations to be loaded from self-contained shared-libraries. It also     provides (in engine.h) definitions and macros to help implement a     self-contained ENGINE. Version control is handled in a way whereby the     loader or loadee can veto the load depending on any objections it has with     each other's declared interface level. The way this is currently     implemented assumes a veto will only take place when one side notices the     other's interface level is too *old*. If the other side is newer, it should     be assumed the newer version knows better whether to veto the load or not.     Version checking (like other "dynamic" settings) can be controlled using     the "dynamic" ENGINE's control commands. Also, the semantics for the     loading allow a shared-library ENGINE implementation to handle differing     interface levels on the fly (eg. loading secondary shared-libraries     depending on the versions required).
      This changes the existing hardware ENGINE implementations to dynamically     declare their own error strings so that they can be more easily compiled as     external shared-libraries if desired. Also, each implementation has been     given canonical "dynamic" support at the base of each file and is only     built if the ENGINE_DYNAMIC_SUPPORT symbol is defined.
      Add a "_up" -> "_up_ref" change to libeay.num that was missing from the     recent changes. Also, do the same change to the DSO_up() function.
      Make the 'dynamic' ENGINE bundle up the loading application/library's     locking callbacks to pass to the loaded library (in addition to the     existing mem, ex_data, and err callbacks). Also change the default     implementation of the "bind_engine" function to apply those callbacks, ie.     the IMPLEMENT_DYNAMIC_BIND_FN macro.
      Update the ENGINE README, and stock it up with extra verbeage for good     measure (including info and instructions on "dynamic" ENGINEs).
      "DH_up" had been changed to "DH_up_ref" in libeay.num but the function     declaration and implementation had not. So a recent update recreated the     original definition in libeay.num ... this corrects it and changes the "dh"     code to the "up_ref" variant.
      Change DH_up() -> DH_up_ref()
      Add some missing CHANGES items.
      ENGINE's init() and finish() handler functions are used when the ENGINE is     being enabled or disabled (respectively) for operation. Additionally, each     ENGINE has a constructor function where it can do more 'structural' level     intialisations such as loading error strings, creating "ex_data" indices,     etc. This change introduces a handler function that gives an ENGINE a     corresponding opportunity to cleanup when the ENGINE is being destroyed. It     also adds the "get/set" API functions that control this "destroy" handler     function in an ENGINE.
      This adds "destroy" handlers to the existing ENGINEs that load their own     error strings - the destroy handler functions unload the error strings so     any pending error state referring to them will not attempt to reference     them after the ENGINE has been destroyed.
      ENGINEs can now perform structural cleanup.
      enginetest needs 'memset' defined.
      Put all "common" initialisation in the apps_startup() and apps_shutdown()     macros in apps.h.
      make update
      ENGINE files were renamed, and error strings are now in eng_err.c
      ENGINE uses a very opaque design, so we can predeclare the structure type     in "types.h" so that very few headers will need to include engine.h,     generally only C files using API functions will need it (reducing     the header dependencies quite a lot).
      Reduce the header dependencies on engine.h in apps/.
      Updated dependencies from "make update"
      'evp_test' needs to initialise and cleanup EVP_CIPHER_CTX structures. Also,     fix a typo and add cleanup operations. This also switches on memory leak     checking (which is how the rest was found).
      Add a SHA1 test to evptests.txt - only the MD5 hash algorithm was being     tested previously.
      Fix a typo in the preprocessor logic in eng_list.c that had left RSA, DSA,     and DH all conditional upon OPENSSL_NO_RSA.
      Some of the ENGINE file names were changed for 8.3 filename uniqueness     recently. So comments including file names have been fixed, and copyright     notices brought up to "2001" at the same time.
      "make update"
      Some major restructuring changes to ENGINE, including integrated cipher and     digest support, are on their way. Rather than having gigantic commit log     messages and/or CHANGES entries, this change to the README will serve as an     outline of what it all is and how it all works.
      This change replaces the ENGINE's underlying mechanics with the new     ENGINE_TABLE-based stuff - as described in crypto/engine/README.
      This commits the changes to STACK macros forced by recent ENGINE surgery.
      This commits changes to various parts of libcrypto required by the recent     ENGINE surgery. DH, DSA, RAND, and RSA now use *both* "method" and ENGINE     pointers to manage their hooking with ENGINE. Previously their use of     "method" pointers was replaced by use of ENGINE references. See     crypto/engine/README for details.
      Make necessary tweaks to apps/ files due to recent ENGINE surgery. See     crypto/engine/README for details.
      "make update".
      indentation.
      This change adds cipher and digest support into ENGINE using the     ENGING_TABLE mechanism. The necessary hooks from crypto/evp/ to use this     will be committed shortly.
      This changes EVP's cipher and digest code to hook via the ENGINE support.     See crypto/engine/README for details.
      This change adds dummy RC4 and SHA1 support to the "openssl" ENGINE for     testing. Because of the recent changes (see crypto/engine/README), the     "openssl" ENGINE is no longer needed nor is it loaded automatically or by     ENGINE_load_builtin_engines(). So a explicit ENGINE_load_openssl() call is     required by applications or a modification to eng_all.c before this ENGINE     will be used. This change will send output to stderr as/when its     implementations are used.
      This change puts the original OpenBSD /dev/crypto support that was in     crypto/evp/ into the corresponding ENGINE. This code is currently untested.
      Fiddling.
      Put the cipher info back into the "openssl engine" command.
      Make update to bring in all the cipher/digest-related ENGINE changes.     NB: It looks like mkdef.pl is causing certain cvs wars by continually     flipping the order of some definitions ...
      "FALLBACK" handling was a hack that was thrown out long ago in the     ENGINE redevelopment. The idea had been that "-1" could be used as a     special "ask me later" 'nid' rather than specifying supported cipher and     digest 'nid's up front. However the idea turned out to be pretty broken.
      ENGINE_register_all_complete() will register all implementations of all     algorithms present in all loaded ENGINEs. The result is that if any of     those ENGINEs successfully initialises, and the ENGINE_TABLE_FLAG_NOINIT     flag isn't set, then they will always be used (and cached as defaults) in     preference to software implementations. Ie. accidental auto-detection of     acceleration hardware :-)
      Make "openssl engine -c" list any supported digests as well as supported     ciphers.
      Make an (overdue) note about the recent ENGINE restructuring. Apart from     a few items however, most of the details are deferred to the     crypto/engine/README file.
      The STACK macros take care of casting to and from the designated item type     of the stack, and the (void *) type used in the underlying sk_***     functions.  However, declaring a STACK_OF(type) where type is a *function*     type implicitly involves casts between function pointers and data pointers.     That's a no-no. This changes the ENGINE_CLEANUP handling to use a regular     data type in the stack.
      The cleanup stack in ENGINE changed slightly, so this "make update" is     needed.
      Missing pointer in the eng_table_register function. Reported by     Martin Szotkowski.
      Make sure the "ENGINE_TABLE" cleanup callbacks have correct prototypes.
      As ENGINE_load_openbsd_dev_crypto() is an API function, it makes sense for     it to be defined on all platforms whether or not it is of any practical     use on them. This also resolves linker problems on "special" platforms,     such as win32.
      EVP_EncryptInit_ex() and EVP_DecryptInit_ex() had been defined in evp.h but     not implemented. (Bug reported by Martin Szotkowski)
      Change some EVP prototypes to use "cipher" rather than "type" as a variable     name. The implementations already use this anyway.
      evp_test.c and evptests.txt both need to be linked in the test/ directory     however for different reasons. This separation should prevent the win32     build from interpreting evptests.txt as source code.
      'flags' should only be set inside DSO_load() if constructing a new DSO     object - otherwise we overwrite any flags that had been previously set in     the DSO before calling DSO_load().
      The "openssl" ENGINE is no longer used except as a testing/debugging     device. This change enables it for building as a self-contained "dynamic"     ENGINE, to help testing such mechanisms.
      When the "dynamic" ENGINE loads another ENGINE from a shared-library, it     essentially overwrites itself with the new ENGINE, with the exception of     reference counts, ex_data structures, and other 'admin' elements. However     if the new ENGINE doesn't populate certain elements, there's the risk of     the "dynamic" ENGINE's elements showing through - the "cmd_defns" were just     one of the possibilities. This implements a more comprehensive cleanup.
      In this particular error condition, the structural reference wasn't being     released.
      Cut "ENGINE_ID" to the more concise "ID".
      This looks to have been a typo.
      Constify.
      - Add the same header stuff to aes_locl.h as is in des_locl.h to avoid       undefined functions (memset, etc).     - Put a .cvsignore in the aes directory too.
      - libtool finally annoyed me too much, so I'm nuking it,     - tidy up some output,     - print a warning when running an SSL server with no cert,     - only log each connect/disconnect if the new "-out_conns" switch is used.
      - Network errors could pollute the buffers because -1 isn't noticed in an       "unsigned int".     - Remove redundant processing with machine->ssl is NULL.     - Remove compiler warnings about uninitialised 'ctx' (it's not used       uninitialised, but gcc can't see that).
      The sample certs had expired, so these are newer ones that should last     quite a bit longer.
      Produce less confusing statistics when "-out_totals" is used.
      Correct for the recent prototype changes.
      The 'type' parameter, an EVP_MD pointer, represents the type of digest     required as well as a default implementation (when no ENGINE provides a     replacement implementation). This change makes sure the correct     implementation's "init()" handler is used rather than assuming 'type'.
      - Add support for cipher suites that require a temporary RSA key for       key-agreement.     - Tolerate signal interruptions of select().
      Make the "ungunk" logic a little more robust.
      A rough little self-test for tunala. This runs through all cipher-suite /     SSL/TLS version combinations looking for mishaps.
      make update
      This adds a new ENGINE to support IBM 4758 cards, contributed by Maurice     Gittens.
      This apparently fixes compilation on OSX that was failing in 0.9.7 betas.
      Make sure any ENGINE control commands make local copies of string     pointers passed to them whenever necessary. Otherwise it is possible the     caller may have overwritten (or deallocated) the original string data     when a later ENGINE operation tries to use the stored values.
      Correct an error in the README.ENGINE file.
      oops, there were other cases of "ENGINE_ID" to change too.
      This documentation change was being written at the same time as Richard's     changes. So I'm committing this version to overwrite his changes for now,     and he can always take his turn to overwrite my words if he wants :-)
      Fix "make install_docs" (and thus "make install").
      A single monolithic man page for the ENGINE stuff. This is a rough     first-cut but provides better documentation than having nothing on the     ENGINE API.
      Various parts of the RSA documentation were inaccurate and out of date and     this fixes those that I'm currently aware of. In particular, the ENGINE     interference in the RSA API has hopefully been clarified. This still needs     to be done for other areas of the API ...
      typo fix
      These are updates/fixes to DH/DSA/RAND docs based on the fixes to the RSA     docs. There were a couple of other places (including RSA) where the docs     were not quite synchronised with the API that are now fixed. One or two     still remain to be fixed though ...
      Fix a bug to allow the 4758 ENGINE to build as a DSO.
      - Remo Inverardi noticed that ENGINEs don't have an "up_ref" function in the     normal 'structural' case (ENGINE_init() satisfies this in the less normal     'functional' case). This change provides such a function.
      The ENGINE implementations in ./engines/ should be role models on how to     write external engines (and thus should require only installed openssl     headers and libs to compile without warnings). So this gets rid of recently     introduced compilation warnings (no longer including internal headers) by     including string.h directly.
      The loop variable is 'l', not 'i'.
      We need to propogate SHARED_LIBS to sub-directories for "install" targets     now.
      Another ENGINE implementation dependant on string.h.
      If dynamically-loadable ENGINEs are linked against a shared-library version     of libcrypto, then it is possible that when they are loaded they will share     the same static data as the loading application/library. This means it will     be too late to set memory/ERR/ex_data/[etc] callbacks, but entirely     unnecessary to try. This change puts a static variable in the core ENGINE     code (contained in libcrypto) and a function returning a pointer to it. If     the loaded ENGINE's return value from this function matches the loading     application/library's return value - they share static data. If they don't     match, the loaded ENGINE has its own copy of libcrypto's static data and so     the callbacks need to be set.
      Make pod2man happier.
      Correct and enhance the behaviour of "internal" session caching as it     relates to SSL_CTX flags and the use of "external" session caching. The     existing flag, "SSL_SESS_CACHE_NO_INTERNAL_LOOKUP" remains but is     supplemented with a complimentary flag, "SSL_SESS_CACHE_NO_INTERNAL_STORE".     The bitwise OR of the two flags is also defined as     "SSL_SESS_CACHE_NO_INTERNAL" and is the flag that should be used by most     applications wanting to implement session caching *entirely* by its own     provided callbacks. As the documented behaviour contradicted actual     behaviour up until recently, and since that point behaviour has itself been     inconsistent anyway, this change should not introduce any compatibility     problems. I've adjusted the relevant documentation to elaborate about how     this works.
      The last character of inconsistency in my recent commits is hereby     squashed.
      The recent CHANGES note between 0.9.6g and 0.9.6h needs copying into the     other branches.
      Add a HISTORY section to the man page to mention the new flags.
      Fix a warning, and do some constification as a lucky side-effect :-)
      This is a first-cut at improving the callback mechanisms used in     key-generation and prime-checking functions. Rather than explicitly passing     callback functions and caller-defined context data for the callbacks, a new     structure BN_GENCB is defined that encapsulates this; a pointer to the     structure is passed to all such functions instead.
      Undefine OPENSSL_NO_DEPRECATED inside openssl application code if we are     being built with it defined - it is not a symbol to affect how openssl     itself builds, but to alter the way openssl headers can be used from an API     point of view. The "deprecated" function wrappers will always remain inside     OpenSSL at least as long as they're still being used internally. :-)
      Nils Larsch submitted;       - a patch to fix a memory leak in rsa_gen.c       - a note about compiler warnings with unions       - a note about improving structure element names
      This stops a compiler warning from -Wmissing-prototypes.     (Noticed by Nils Larsch)
      Make 'tunala' link with zlib if possible (so it works if openssl was     configured with zlib support).
      The ampersand is not required in these constructs, and was giving AIX     warnings.
      This is the first step in allowing RSA_METHODs to implement their own key     generation. This prototype matches the new API function     RSA_generate_key_ex(), though both may be subject to change during     development before 0.9.8.
      RSA_METHOD now supports key-generation, but (for now) none of these     ENGINEs implement it.
      As with RSA, which was modified recently, this change makes it possible to     override key-generation implementations by placing handlers in the methods     for DSA and DH. Also, parameter generation for DSA and DH is possible by     another new handler for each method.
      "openssl engine" will not display ENGINE/DSO load failure errors when     testing availability of engines with "-t" - the old behaviour of is     produced by increasing the feature's verbosity with "-tt".
      Commit a slightly modified version of an old experiment to do RSA private     key operations using the GMP library. The default is not to build (or use)     this code unless OPENSSL_USE_GMP is defined (because it will impose header     and linker dependencies that might need specifying too).
      This glues the GMP wrapper ENGINE into OpenSSL if it is being built (ie. if     the OPENSSL_USE_GMP symbol is defined). Also, I've re-ordered the listing     of other builtin ENGINEs to be alphabetical (though "dynamic" will still     come first).
      Summarise the last couple of commits.
      David Brumley <dbrumley at stanford.edu> noted and corrected a case in the     verification step of CRT private key operations in the RSA code -     previously no montgomery form was checked or used for 'n', and so it would     be generated on the fly each time. As a result, private key operations are     now a percent or two faster.
      We cache a montgomery form for 'n' if the PUBLIC flag is set, not PRIVATE.
      Declare prototypes for function pointer types, even if they are likely to     be cast later on.
      Session cache implementations shouldn't have to access SSL_SESSION     elements directly, so this missing functionality is required.
      The default implementation of DSA_METHOD has an interdependence on the     dsa_mod_exp() and bn_mod_exp() handlers from dsa_do_verify() and     dsa_sign_setup(). When another DSA_METHOD implementation does not define     these lower-level handlers, it becomes impossible to do a fallback to     software on errors using a simple DSA_OpenSSL()->fn(key).
      Fix a bone-head bug. This warrants a CHANGES entry because it could affect     applications if they were passing a bogus 'flags' parameter yet having     things work as they wanted anyway.
      This memset() in the ubsec ENGINE is a bug. Zeroing out the result array     should not be necessary in any case, but more importantly the result and     input BIGNUMs could be the same, in which case this is clearly a problem.
      These should be write-locks, not read-locks.
      Remove duplicate prototypes have already been (correctly) added to rsa.h,     as this is already included by x509.h anyway.
      crypto/evp/evptests.txt is copied to tests/ rather than symlinked because     of windows (see checkin 1.75 of crypto/evp/Makefile.ssl), so quiet cvs     noise for the copied version.
      Ignore derived file.
      make update
      Add my own debug config target.
      The "cryptodev" engine preprocessor logic used undefined symbols in     comparisons. It's better not to allow this, because it gives false     positives when using compiler warnings that detect mistyped symbols.
      When OPENSSL_NO_DEPRECATED is defined, deprecated functions are (or should     be) precompiled out in the API headers. This change is to ensure that if     it is defined when compiling openssl, the deprecated functions aren't     implemented either.
      Update any code that was using deprecated functions so that everything builds     and links with OPENSSL_NO_DEPRECATED defined.
      For whatever reason (compiler or header bugs), at least one commonly-used     linux system (namely mine) chokes on our definitions and uses of the "HZ"     symbol in crypto/tmdiff.[ch] and apps/speed.c as a "bad function cast"     (when in fact there is no function casting involved at all). In both cases,     it is easily worked around by not defining a cast into the macro and     jiggling the expressions slightly.
      Avoid "empty source file" warnings.
      Comments out some unimplemented functions instead of redeclaring them.
      Relax some over-zealous constification that gave some lhash-based code no     choice but to have to cast away "const" qualifiers from their prototypes.     This does not remove constification restrictions from hash/compare     callbacks, but allows destructor commands to be run over a tables' elements     without bad casts.
      Remove redundant declaration.
      Remove an unnecessary cast that causes certain compilers (eg. mine) some     confusion. Also silence a couple of signed/unsigned warnings.
      remove accidentally committed debugging cruft.
      BN_CTX is opaque and the static initialiser BN_CTX_init() is not used     except internally to the allocator BN_CTX_new(), as such this deprecates     the use of BN_CTX_init() in the API. Moreover, the structure definition of     BN_CTX is taken out of bn_lcl.h and moved into bn_ctx.c itself.
      A general spring-cleaning (in autumn) to fix up signed/unsigned warnings.     I have tried to convert 'len' type variable declarations to unsigned as a     means to address these warnings when appropriate, but when in doubt I have     used casts in the comparisons instead. The better solution (that would get     us all lynched by API users) would be to go through and convert all the     function prototypes and structure definitions to use unsigned variables     except when signed is necessary. The proliferation of (signed) "int" for     strictly non-negative uses is unfortunate.
      Some provisional bignum debugging has begun to detect inconsistent BIGNUM     structures being passed in to or out of API functions, and this corrects a     couple of cases found so far.
      Make md32_common.h friendlier to compiler warnings.     Obtained from: Andy Polyakov <appro at openssl.org>
      Oops, this file already had the "empty source file" workaround but it     requires -DPEDANTIC and was hidden at the bottom of the file. This moves it     to the top and removes the redundant declaration.
      Copy-n-paste bug (don't mix variable declarations and code). This sets the     callback structure just before it is needed.
      Remove a line that was causing redundant declarations.     Obtained from: Stephen Henson <steve at openssl.org>
      Tighten up my compiler settings.
      make update
      This fixes a couple of cases where an inconsistent BIGNUM could be passed as     input to a function.
      When a BN_CTX is used for temporary workspace, the variables are sometimes     left in an inconsistent state when they are released for later reuse. This     change resets the BIGNUMs when they are released back to the context.
      bn_div() does some pretty nasty things with temporary variables,     constructing BIGNUM structures with pointers offset into other bignums     (among other things). This corrects some of it that is too plainly insane,     and tries to ensure that bignums are normalised when passed to other     functions.
      This is the least unacceptable way I've found for declaring the bignum data     and structures as constant without having to cast away const at any point.     There is still plenty of other code that makes gcc's "-Wcast-qual" unhappy,     but crypto/bn/ is now ok. Purists are welcome to suggest alternatives.
      Avoid some shadowed variable names.     Submitted by: Nils Larsch
      Put the first stage of my bignum debugging adventures into CVS. This code     is itself experimental, and in addition may cause execution to break on     existing openssl "bugs" that previously were harmless or at least     invisible.
      This is a revert of my previous commit to "improve" the declaration of     constant BIGNUMs. It turns out that this trips up different but equally     useful compiler warnings to -Wcast-qual, and so wasn't worth the ugliness     it created. (Thanks to Ulf for the forehead-slap.)
      Put more debug screening in BN_div() and correct a comment.
      Add debug-screening of input parameters to some functions I'd missed     before.
      This extends the debugging macros to use "pollution" during     bn_correct_top(), previously only bn_check_top() did this.
      Avoid possible memory leaks in error-handling.
      General improvements to the ec_asn1.c code. This squashes at least one bug     (where it was impossible to create an EC certificate with a compressed     public key), and has some style improvements based on some comments from     Steve Henson about use of the ASN1 macros.
      This rewrites two "for" loops in BN_rshift() - equality with zero is     generally a more efficient comparison than comparing two integers, and the     first of these two loops was off-by-one (copying one too many values). This     change also removes a superfluous assignment that would set an unused word     to zero (and potentially allow an overrun in some cases).
      Fix a small bug in str_copy: if more than one variable is replaced, make     sure the current length is used to calculate the new buffer length instead     of using the old length (prior to any variable substitution).
      BN_div() cleanup: replace the use of BN_sub and BN_add with bn_sub_words     and bn_add_words to avoid using fake bignums to window other bignums that     can lead to corruption. This change allows all bignum tests to pass with     BN_DEBUG and BN_DEBUG_RAND debugging and valgrind. NB: This should be     tested on a few different architectures and configuration targets, as the     bignum code this deals with is quite preprocessor (and assembly) sensitive.
      Some changes for bn_gf2m.c: better error checking plus some minor     optimizations.
      Fix some handling in bn_word. This also resolves the issues observed in     ticket 697 (though uses a different solution than the proposed one). This     problem was initially raised by Otto Moerbeek.
      Due to recent debugging bursts, openssl should be more or less solid     against inconsistent BIGNUMs coming out of any of its API functions. So     this change no longer "fixes" the bn_print.c functions, but it makes for     cleaner code. This patch was a part of ticket 697.
      Get rid of some signed/unsigned comparison warnings.
      This improves the placement of check_top() macros in a couple of bn_lib     functions.
      Make BN_DEBUG_RAND less painfully slow by only consuming one byte of     pseudo-random data for each bn_pollute().
      Improve a couple of the bignum macros. Note, this doesn't eliminate     tolerance of ambiguous zero-representation, it just improves     BN_abs_is_word() and simplifies other macros that depend on it.
      If BN_STRICT is defined, don't accept an ambiguous representation of zero     (ie. where top may be zero, or it may be one if the corresponding word is     set to zero). Note, this only affects the macros in bn.h, there are probably     similar corrections required in some c files.
      Add more debugging to my Configure target, and "make update" to incorporate     this and a few other changes.
      bn_fix_top() exists for compatibility's sake and is mapped to     bn_correct_top() or bn_check_top() depending on debug settings. For     internal source, all bn_fix_top()s should be converted one way or the other     depending on whether the use of bn_correct_top() is justified.
      The bn_set_max() macro is only "used" by the bn_set_[low|high]() macros     which, in turn, are used nowhere at all. This is a good thing because     bn_set_max() would currently generate code that wouldn't compile (BIGNUM     has no 'max' element).
      Add missing bn_check_top()s to bn_gf2m.c and remove some miscellaneous     white-space.
      Add missing bn_check_top()s to bn_kron.c, remove some miscellaneous     white-space, and include extra headers to satisfy debugging builds.
      Declare the static BIGNUM "BN_value_one()" more carefully.
      BN_FLG_FREE is of extremely dubious usefulness, and is only referred to     once in the source (where it is set for the benefit of no other code     whatsoever). I've deprecated the declaration in the header and likewise     made the use of the flag conditional in bn_lib.c. Note, this change also     NULLs the 'd' pointer in a BIGNUM when it is reset but not deallocated.
      Use the BN_is_odd() macro in place of code that (inconsistently) does much     the same thing.
      Incremental cleanups to bn_lib.c.     - Add missing bn_check_top() calls and relocate some others     - Use BN_is_zero() where appropriate     - Remove assert()s that bn_check_top() is already covering     - Simplify the code in places (esp. bn_expand2())     - Only keep ambiguous zero handling if BN_STRICT isn't defined     - Remove some white-space and make some other aesthetic tweaks
      minor signed/unsigned warning fixes
      When adding positive elements, we can use BN_uadd() instead of BN_add().
      A cleanup of the ecs_ossl.c code and some (doxygen) comments for ecdsa.h
      Add ECDSA documentation.
      More changes coming out of the bignum auditing. BN_CTX_get() should ideally     return a "zero" bignum as BN_new() does - so reset 'top'. During     BN_CTX_end(), released bignums should be consistent so enforce this in     debug builds. Also, reduce the number of wasted BN_clear_free() calls from     BN_CTX_end() (typically by 75% or so).
      Minimise the amount of code dependent on BN_DEBUG_RAND. In particular,     redefine bn_clear_top2max() to be a NOP in the non-debugging case, and     remove some unnecessary usages in bn_nist.c.
      static
      Document a change I'd already made, and at the same time, correct the     change to work properly; BN_zero() should set 'neg' to zero as well as     'top' to match the behaviour of BN_new().
      The efforts to eliminate the dual-representation of zero and to ensure     bignums are passed in and out of functions and APIs in a consistent form     has highlighted that zero-valued bignums don't need any allocated word     data. The use of BN_set_word() to initialise a bignum to zero causes     needless allocation and gives it a return value that must be checked. This     change converts BN_zero() to a self-contained macro that has no     return/expression value and does not cause any expansion of bignum data.
      Convert openssl code not to assume the deprecated form of BN_zero().
      Variety of belt-tightenings in the bignum code. (Please help test this!)
      Note my bignum hijinx in case app maintainers are using CHANGES for their     porting efforts. Also, add Richard's name to the prior change.
      Protect against gcc's "warning: cast does not match function type".
      Remove some warnings.
      Damn, I was a bit hasty with my fix and hadn't spotted the linker     dependency from asn1.
      By adding a BN_CTX parameter to the 'rsa_mod_exp' callback, private key     operations no longer require two distinct BN_CTX structures. This may put     more "strain" on the current BN_CTX implementation (which has a fixed limit     to the number of variables it will hold), but so far this limit is not     triggered by any of the tests pass and I will be changing BN_CTX in the     near future to avoid this problem anyway.
      ... and this should likewise fix up those RSA implementations that weren't     already built and tested.
      Adds warnings about two curves and fixes the "seed" value for two other     curves.
      Replace the BN_CTX implementation with my current work. I'm leaving the     little TODO list in there as well as the debugging code (only enabled if     BN_CTX_DEBUG is defined).
      Adjust various bignum functions to use BN_CTX for variables instead of     locally initialising their own.
      Avoid undefined results when the parameter is out of range.
      Reduce header interdependencies, initially in engine.h (the rest of the     changes are the fallout). As this could break source code that doesn't     directly include headers for interfaces it uses, changes to recursive     includes are covered by the OPENSSL_NO_DEPRECATED symbol. It's better to     define this when building and using openssl, and then adapt code where     necessary - this is how to stay current. However the mechanism exists for     the lethargic.
      (oops) Apologies all, that last header-cleanup commit was from the wrong     tree. This further reduces header interdependencies, and makes some     associated cleanups.
      header cleanup in apps/
      When generating dependencies in the makefiles, generate the reduced     dependencies of the OPENSSL_NO_DEPRECATED mode. This prevents dependencies     being reproduced for "deprecated" header behaviour when a developer doesn't     define the symbol (with the subsequent CVS wars that can ensue).
      More updates for the header cleanups (and apologies, again, for not having     consolidated these prior to committing).
      "make update" noticed a new function.
      make update
      Extend the index parameter checking from sk_value to sk_set(). Also tidy up     some similar code elsewhere.
      As far as I can tell, the bugfix this comment refers to was committed to     0.9.7-stable as well as HEAD (and doesn't apply to the 0.9.6-engine     variant).
      Allow RSA key-generation to specify an arbitrary public exponent. Jelte     proposed the change and submitted the patch, I jiggled it slightly and     adjusted the other parts of openssl that were affected.
      The problem of rsa key-generation getting stuck in a loop for (pointlessly)     small key sizes seems to result from the code continually regenerating the     same prime value once the range is small enough. From my tests, this change     fixes the problem by setting an escape velocity of 3 repeats for the second     of the two primes.
      With the new dynamic BN_CTX implementation, there should be no need for     additional contexts.
      The new BN_CTX code makes this sort of abuse unnecessary.
      Fix realloc usage in ec_curve.c
      This file implements various functions that have since been redefined as     macros. I'm removing this from the NO_DEPRECATED build.
      Make some more API types opaquely available from ossl_typ.h, meaning the     corresponding headers are only required for API functions or structure     details. This now includes the bignum types and BUF_MEM. Subsequent commits     will remove various dependencies on bn.h and buffer.h and update the     makefile dependencies.
      Moving opaque definitions to ossl_typ.h lets us reduce header dependencies.     Deprecate inclusion of crypto.h from ui.h.
      Reduce dependencies on crypto.h by moving the opaque definition of     CRYPTO_EX_DATA and the new/free/dup callback prototypes to ossl_typ.h.
      Deprecate some recursive includes from the store.h API header, and put back     required includes back via the internal header and str_lib.c.
      Deprecate quite a few recursive includes from the ssl.h API header and     remove some unnecessary includes from the internal header ssl_locl.h. This     then requires adding includes for bn.h in four C files.
      The inclusion of bn.h from the engine.h API header has been deprecated, so     the engine implementations need to include bn.h to manipulate bignums.
      I can't verify this directly, but recent changes will probably require that     the cryptodev implementation include bn.h directly (when building with     OPENSSL_NO_DEPRECATED that is).
      Because of recent reductions in header interdependencies, these files need     to include crypto.h directly.
      Remove some unnecessary recursive includes from the internal apps.h header,     and include bn.h in those C files that need bignum functionality.
      Deprecate the recursive includes of bn.h from various API headers (asn1.h,     dh.h, dsa.h, ec.h, ecdh.h, ecdsa.h, rsa.h), as the opaque bignum types are     already declared in ossl_typ.h. Add explicit includes for bn.h in those C     files that need access to structure internals or API functions+macros.
      After the latest round of header-hacking, regenerate the dependencies in     the Makefiles. NB: this commit is probably going to generate a huge posting     and it is highly uninteresting to read.
      This fixes the installation target for dynamic engines, which was trying to     install to a different location than it had created. (BTW, VMS will need a     matching fix in eng_list.c.) Note, these aren't ssl-specific, so I'm     putting "engines/" into the libs directory rather than at the "--prefix"     level or inside "ssl/".
      "no-engine" was being ignored, so remove it from the advertised syntax.     Also remove some commented-out lines of code that deny CVS its purpose.
      Correct the return codes for ecdsatest.
      BN_div_word() was breaking when called from BN_bn2dec() (actually, this is     the only function that uses it) because it would trip up an assertion in     bn_div_words() when first invoked. This also adds BN_div_word() testing to     bntest.
      As Nils put it;
      Tweak my debug target flags.
      Get rid of signed/unsigned warnings, and teach CVS about new things to     ignore.
      Actually, that last change to BN_get_word() was a little too simple.
      Minor change to group like functions together.
      Attempt to bring the 'engine' documentation up to date w.r.t missing     prototypes, etc. Also, some fairly significant edits were made to the text     (who wrote this crap anyway? oh wait ...), removing stuff which is     overkill, rewriting stuff that was opaque, correcting things that were just     downright false, etc.
      Deprecate unused cruft, and "make update".
      Incomplete initial sweep over the engine code. Mainly reducing some     comment-noise to managable levels and inverting the sense of the "uptodate"     boolean (which was counter-intuitive the way I'd left it).
      Tidy up, including;     - Remove unused and unuseful debug cruft.     - Remove unnecessary 'top' fudging from BN_copy().     - Fix a potential memory leak and simplify the expansion logic in       BN_bin2bn().
      Improve error handling if decompression of an ec point fails, and cleanup     ec_curve.c (unify comments, etc).
      Using Horner's algorithm to evaluate the ec polynomial     (suggested by Adam Young <ayoung at cigital.com>)
      Quick fix.
      Make a note of the new engine.
      Make -Werror happy again.
      Two TODO comments taken care of. Nils pointed out that one of them had already     been done, and took care of the other one (which hadn't).
      Remove distracting comments and code. Thanks to Nils for picking up on the     outstanding ticket.
      Nils Larsch reported that this include is required. Strange that this had     gone unnoticed ...
      Update ECDSA and ECDH for OPENSSL_NO_ENGINE.
      Fix typos in the ecparam doc.
      Handle differences between engine IDs and their dynamic library names (and     source files, for that matter) by tolerating the alternatives. It would be     preferable to also change the generated shared library names, but that will     be taken up separately.
      Change the source and output paths for 'chil' and '4758cca' engines so that     dynamic loading is consistent with respect to engine ids.
      Fix some signed/unsigned warnings.
      Fix 64-bit compilation when PQ_64BIT_IS_INTEGER isn't defined.
      Fix PEDANTIC compilation, using the same trick as elsewhere.
      Fix signed/unsigned warnings.
      Fix compilation when HAVE_LONG_LONG isn't defined.
      Change my debug build for amd64.
      "make update"
      add a .cvsignore
      Silence two more generated files.
      Fix my debug-geoff configuration.
      Fix a nasty cast issue that my compiler was choking on.
      Fix a variety of warnings generated by some elevated compiler-fascism,     OPENSSL_NO_DEPRECATED, etc. Steve, please double-check the CMS stuff...
      Fork my debug configuration into 32-bit and 64-bit versions.
      Comment out a (currently) unused CMS function. (Sorry Steve, but I need     -Werror right now to help me code-by-domino :-)
      Update tunala so it builds ok with OPENSSL_NO_DEPRECATED, and improve the     autoungunk.sh logic (autobits have grown since I last tried this...).
      There was a need to support thread ID types that couldn't be reliably cast     to 'unsigned long' (ie. odd platforms/compilers), so a pointer-typed     version was added but it required portable code to check *both* modes to     determine equality. This commit maintains the availability of both thread     ID types, but deprecates the type-specific accessor APIs that invoke the     callbacks - instead a single type-independent API is used.  This simplifies     software that calls into this interface, and should also make it less     error-prone - as forgetting to call and compare *both* thread ID accessors     could have led to hard-to-debug/infrequent bugs (that might only affect     certain platforms or thread implementations). As the CHANGES note says,     there were corresponding deprecations and replacements in the     thread-related functions for BN_BLINDING and ERR too.
      Paul Sheer optimised the OpenSSL to/from libGMP conversions for the case     where they both use the same limb size. I've tweaked his patch slightly, so     blame me if it breaks.
      Fix auto-discovery of ENGINEs. See the CHANGES entry for details (and/or     ticket #1668).
      Revert my earlier CRYPTO_THREADID commit, I will commit a reworked     version some time soon.
      If --prefix="C:\foo\bar" is supplied to Configure for a windows target,     then the backslashes need escaping to avoid being treated as switches in     the auto-generated strings in opensslconf.h. Perl users are welcome to     suggest a less hokey way of doing this ...
      Fix signed/unsigned warning.
      Remove the dual-callback scheme for numeric and pointer thread IDs,     deprecate the original (numeric-only) scheme, and replace with the     CRYPTO_THREADID object. This hides the platform-specifics and should reduce     the possibility for programming errors (where failing to explicitly check     both thread ID forms could create subtle, platform-specific bugs).
      Correct the FAQ and the threads man page re: CRYPTO_THREADID changes.
      Fix build warnings.
      Use of a 'top' var creates "shadow variable" warnings.
      Apparently '__top' is also risky, obfuscate further. (All this to     avoid inlines...)
      Revert the size_t modifications from HEAD that had led to more     knock-on work than expected - they've been extracted into a patch     series that can be completed elsewhere, or in a different branch,     before merging back to HEAD.
      Allow the CHIL engine to load even if dynamic locks aren't registered.
      Clarify a 'chil' engine param that is a little unintuitive.
      Fix compilation with -DOPENSSL_NO_DEPRECATED.

Lutz J?nicke (300):
      HP-UX shared libraries do not build any longer, as EX_LIBS contains     "-Wl,+s" instead of +s:     * Hardcoded necessary references to -ldld/-ldl into the build rules and       removed EX_LIBS.
      Some platforms (namely HP-UX) require the 'x' bit set for shared libraries.     For performance reasons, it is also recommended to make the (mmap'ed)     shared library 'read-only'.     -> New permissions for installed shared libraries = 555
      Fill in missing information about the string returned from     SSL_CIPHER_description(), as there is no other API function to find     out details about the cipher used besides the number of bits or protocol used.
      Store verify_result with sessions to avoid potential security hole.     For the server side this was already done one year ago :-(
      Log security relevant change.
      Add EXAMPLES for SSL_CIPHER_description() output.
      Typo and additional information about cert-chain building.
      Add manual pages for certficate/key loading and friends.
      Add description of SSL_[CTX_]_check_private_key().
      Don't cheat: when only getting several bytes from each source, n is incremented     correctly, but RAND_add(..,n) counts the increasing n several times.     Only RAND_add(..,n) once entropy collection is finished.
      Add automatic query of EGD sockets to RAND_poll(). The EGD sockets are     only queried when the /dev/[u]random devices did not return enough     entropy. Only the amount of entropy missing to reach the required minimum     is queried, as EGD may be drained.     Queried locations are: /etc/entropy, /var/run/egd-pool
      Documentation about SSL_get_ex_data_X509_STORE_CTX_idx and     SSL_get_ex_new_index() functionality. Extended verify_callback()     example to show the usage.
      Add entries for new manpages...
      Copy over just written manpage to the ones still missing.
      New manual page for a hardly known but important item :-)
      Document session caching, first step.
      If the source has already been succesfully queried, do not try to open it     again as file.
      Typo: on my screen it nicely wrapped around at 80 :-)
      Clarify why SSL_CTX_use_certificate_chain_file() should be preferred.
      Documenting session caching, 2nd step.
      Fix typo preventing correct usage of -out option.
      Change preferences for sockets of EGD-style entropy daemons to a more     reasonable selection.
      Modify access to EGD socket to deal with EINTR etc that can appear     during connect() and other calls. First seen on Unixware-7.
      Update documentation to match the state at 0.9.6 _and_ the recent changes.
      Fix "wierd" typo as submitted by Jeroen Ruigrok/Asmodai <asmodai at wxs.nl>.
      Typo
      New Option SSL_OP_CIPHER_SERVER_PREFERENCE allows TLS/SSLv3 server to override     the clients choice; in SSLv2 the client uses the server's preferences.
      Manual page for SSL_CTX_set_options(). Unfortunately for some of the     options someone much longer working with OpenSSL/SSLeay is needed.
      Update for 0.9.7 with SSL_OP_CIPHER_SERVER_PREFERENCE.
      Include information that automatic query is a new feature.
      More about session caching.
      New manual page: SSL_CTX_set_mode.
      Finish first round of session cache documentation.
      Add "-rand" option to s_client and s_server.
      Don't forget to mention minor change.
      Move entry to match chronologic orderering.
      SSL_get_version() was an easy one :-)
      Describe new callback for session id generation.
      Typo, spotted by "Greg Stark" <gstark at ethentica.com>.
      Add newly learned knowledge from yesterday's discussion.
      Forgot "cvs add", so only the surrounding changes made it... sigh.
      Add forgotten "-passin" option to smime.c usage help.
      OpenSSH 1.2.2p1 is dead and gone. Errors detecting the OpenSSL library     are however still common and are solved by checking config.log.
      Some clarifications about $RANDFILE usage.
      Typo (Jun-ichiro itojun Hagino <itojun at iijlab.net>)
      Fix wrong information with respect to CAs listed to the client     (follows from technical discussion with Amit Chopra <amitc at pspl.co.in>).
      Missing link ("Greg Stark" <gstark at ethentica.com>)
      Constify (Jason Molenda <jason at molenda.com>)
      Clarify request of client certificates. This is a FAQ.
      Typo (reported by Petr Lancaric <Petr.Lancaric at ips-ag.cz>)
      Update changelog to reflect additional changes made to the egd-locations.
      Clarify behaviour of SSL_write() by mentioning SSL_MODE_ENABLE_PARTIAL_WRITE     flag as discussed on the mailing list.
      Clarify behaviour with respect to SSL/TLS records.
      One more point to clarify, pointed out by "Greg Stark" <ghstark at pobox.com>
      Typos.
      Increase ENTROPY_NEEDED to support Rijndael's larger key size.
      Add missing item(s) SSL_ERROR_WANT_CONNECT, SSL_ERROR_WANT_ACCEPT.
      Don't forget responsible person so that its clear who is to blame.
      ERR_peek_error() returns "unsigned long".
      When only the key is given to "enc", the IV is undefined     (found by Andy Brown <logic at warthog.com>).
      Clarify! (based on recent mailing-list discussions)
      What is an '-engine' version?
      Typo...
      Clarify actual state.
      Some more documentation bits.
      Updated explanation.
      Documentation about ephemeral key exchange
      Add missing reference.
      Additional inline reference.
      Fix wrong information about SSL_set_connect_state()...
      Fix problem occuring when used from OpenSSH on Solaris 8.
      Another uninitialized static that may lead to problems on Solaris under some     circumstances.
      Forgot to mention second fix.
      Fix inconsistent behaviour with respect to verify_callback handling.
      Don't miss files...
      Indent.
      Reworked manual pages with a lot of input from Bodo Moeller.
      Remove SSL_OP_NON_EXPORT_FIRST:     It did not work, it was deactivated by #if 0/#endif anyway _and_ we now have     the working SSL_OP_CIPHER_SERVER_PREFERENCE.
      Mention removed option.
      Don't disable rollback attack detection as a recommended bug workaround.
      Oops, one SSL_OP_NON_EXPORT_FIRST was left.
      Fix typos (shinagawa at star.zko.dec.com)
      Better description of the behaviour of SSL_shutdown() as it is now, broken     or not.
      Bugfixes provided by "Stephen Hinton" <shinton at netopia.com>.
      Unidirectional shutdown is allowed according to the RFC.
      One more step on the way for complete documentation...
      SSL_shutdown() has even more properties...
      One more function documented.
      More details about session timeout settings.
      Alert description strings for TLSv1 and documentation.
      More interdependencies with respect to shutdown behaviour.
      Checked in from the wrong !@#$%&*() copy...
      Documentation on how to handle compression methods.     Hopefully it is clear enough, that it is currently not recommended.
      One more manual page...
      Make clear, that using the compression layer is currently not recommended.
      As discussed recently on openssl-users.
      More manual pages. Constify.
      Typo.
      -passin argument not used when actually loading the key     (found by Massimiliano Pala <madwolf at hackmasters.net>).
      More docs.
      Needed for build on SunOS 4.1.x with gcc (Jeffrey Hutzelman <jhutz at cmu.edu>).
      Wording of comment...
      Allow client certificate lists > 16kB ("Douglas E. Engert" <deengert at anl.gov>.)
      Build shared libaries for Unixware-7 and OpenUNIX-8 in old (pre 0.9.7)     style (Boyd Lynn Gerber <gerberb at zenez.com>).
      Support for shared libraries on Unixware-7 and OpenUNIX-8     (Boyd Lynn Gerber <gerberb at zenez.com>).
      Sort out mess of colons...
      Even more corrections for OpenUNIX 8
      Completely reworked SVR5 shared library support.
      Recognize OpenUNIX-8 with compiler
      Make maximum certifcate chain size accepted from the peer application     settable (proposed by "Douglas E. Engert" <deengert at anl.gov>).
      Rework section about return values another time (based on hints from     Bodo Moeller).
      One more manual page.
      Typo.
      Typos (Chris Pepper <pepper at mail.reppep.com>)
      Small documentation fixes (Howard Lum <howard at pumpkin.canada.sun.com>)
      Update information as a partial response to the post       From: "Chris D. Peterson" <cpeterson at aventail.com>       Subject: Implementation Issues with OpenSSL       To: openssl-users at openssl.org       Date: Wed, 22 Aug 2001 16:13:17 -0700     The patch included in the original post may improve the internal session     list handling (and is therefore worth a seperate investigation).     No change to the list handling will however solve the problems of incorrect     SSL_SESSION_free() calls. The session list is only one possible point of     failure, dangling pointers would also occur for SSL object currently     using the session. The correct solution is to only use SSL_SESSION_free()     when applicable!
      Flush buffers to prevent mixed output (Adam Back <adam at cypherspace.org>).
      Clarify reference count handling/removal of session     (shinagawa at star.zko.dec.com).
      Support for QNX (wrat at jump.net (the wharf rat)).
      HPUX 9.X on m68k with gcc     ("Anton J. Gamel" <gamel at anna.anatomie.uni-freiburg.de>)
      Add information as provided by Richard Levitte on openssl-users :-)
      Tsss, SSLeay_version() was already documented, it just was not linked in.
      Fix incorrect BIO_*_ctrl() macros (Shay Harding <sharding at ccbill.com>).
      Typos (jsyn <jsyn at openbsd.org>).
      Document the current behaviour of the DES interface.
      Remove blanks at begin of empty lines irritating epv_test.c
      Superflous '\' messes up with HP-UX make.
      Make SHLIB_TARGET available in subdirs (here: apps/)
      HP-UX 32bit:     * When linking against shared libraries, the absolute path is remembered.       - When linking against -L.., '..' is remembered inside the executable,         so it will fail after "make install" or when not called from inside the         "apps/" subdirectory of the build tree.       - When using the "+cdp" option of "ld", the ".." information can be         exchanged against $(INSTALL_TOP)/lib. In this case the executable         will however refuse to work before "make install" has been called.         This makes testing the 'openssl' executable a problem.     * Solution 1:       Relink the "openssl" executable, when "make install" is called.       This would however require significant changes to the toplevel Makefile       and the apps/ Makefile.     * Solution 2:       Statically link against libssl and libcrypto, so that the "openssl"       executable is no longer dependant on the openssl shared libraries.
      Shut up compiler warnings for inconsistent declarations.
      Do not store unneeded data.
      Make removal from session cache more robust.
      Even though it is not really practical people should know about it.
      Make sure to remove bad sessions in SSL_clear() (found by Yoram Zahavi).
      SSL_clear != SSL_free/SSL_new
      Fix the fix (Yoram Zahavi)...
      Add missing strength entries.
      Map new X509 verification errors to alert codes (Tom Wu <tom at arcot.com>).
      Remove superflous (and buggy) statement <justin.fletcher at ntlworld.com>.
      Fix buggy if-condition (thomas poindessous <poinde_t at epita.fr>).
      Fix typo (Craig Davison <cd at securityfocus.com>).
      Make short names of objects RFC2256-compliant.
      Fix buggy object definitions (Svenning Sorensen <sss at sss.dnsalias.net>).
      Apply OID fixes for elliptic curves as supplied by     Nils Larsch <nlarsch at compuserve.de>.
      Keep my own specially optimized HP-UX shared library building up to date.
      Synchronize with 0.9.7-stable branch
      Synchronize with 0.9.7-stable.
      Fix CRLF problem in BASE64 decode.
      Some more OID enhancements.
      Use the "mail" short name according to RFC2798 (Michael Bell     <michael.bell at rz.hu-berlin.de>).
      Document OID changes.
      Handle headings uniformly to allow automatic processing.
      Optimize: better shortcut evaluation ("Howard Chu" <hyc at highlandsun.com>).
      Missing "Configure" entry (Jean-Marc Desperrier <jean-marc.desperrier at certplus.com>).
      Add cygwin build script (Corinna Vinschen <vinschen at redhat.com>).
      ERR_file_name is no longer being used.
      Add generationQualifier OID (proposed by Fiel Cabral).
      Add information about -nameopt option for x509.
      Fix escaping when using the -subj option of "openssl req", document     'hidden' -nameopt support. (Robert Joop <joop at fokus.gmd.de>)
      Add missing ";" after fi     Submitted by: bryanh at giraffe-data.com     Reviewed by:     PR: [openssl.org #18]
      Recognize PPC64 target.     Submitted by:     Reviewed by:     PR: 26
      Add missing '"'     Submitted by: Boyd Gerber <gerberb at zenez.com>
      Use the indirect way to the actual request tracker, so that people     also are informed about the credentials required for guest access     and the operation instructions.
      Fix incorrect =over 4 location.     Submitted by: David Waitzman <djw at bbn.com>     Reviewed by: Lutz Jaenicke     PR: [openssl.org #38]
      Remove item listed twice <kromJx at crosswinds.net>.
      0.9.7-beta1 is just being released.
      Typo.     PR: 72
      The correct PERL interpreter is passed via commandline.
      On some systems the default "perl" may still be perl4, use the correct     version determined by "config" instead.
      There is no continuation at this point.
      New OID for X509 usage: pseudonym     Submitted by: Michael Bell <michael.bell at rz.hu-berlin.de>     Reviewed by: Lutz Jaenicke     PR: 83
      Make sure that settings are passed back and forth when walking around     in the tree during build.     Reinstall default PERL settings in Makefiles, as the real reason for the     failure was that the settings were not passed.
      For the main directory, Makefile.org is significant :-)
      Make sure that flags are passed to "make" subprocesses.
      Support building the distribution .tar file on platforms with limited     argument list length. This requires Gnu-tar. As we use the non-standard     "tardy" software anyway, it doesn't hurt too much to require Gnu-tar.     "make dist" will probably only be used by team-members anyway.
      Correct wrong usage information.     PR: 95
      Make change uniqueIdentifier -> x500UniqueIdentifier clearly visible.     Submitted by:     Reviewed by:     PR: 82
      Clarify formulation (proposed by Bodo Moeller).
      Add OIDs for Secure Electronic Transactions (SET)     Submitted by: Vadim Fedukovich <vf at unity.net>     Reviewed by: Lutz Jaenicke     PR: 80
      Add missing prototypes.     Submitted by: Goetz Babin-Ebell <babinebell at trustcenter.de>     PR: 89
      Some more prototype fixes.     Use DECLARE macros in asn1* instead of direct declaration.     Submitted by: Goetz Babin-Ebell <babinebell at trustcenter.de>     Reviewed by:     PR: 89
      Initial support for hpux64-parisc-gcc     Submitted by: ross.alexander at uk.neceur.com     Reviewed by:     PR: 96
      OpenSSL_add_all_algorithms has been replaced by configuration dependent     functions and is redirected by macros. Switch it off now, possible removal     later.
      Use -dumpversion to obtain gcc's version.     Submitted by: ross.alexander at uk.neceur.com, allenh at eecs.berkeley.edu     Reviewed by:     PR: 96
      Roll out OpenSSL-0.9.7-beta2
      beta2, not beta1
      load_netscape_key is static.
      AIX (V3) requires <sys/select.h> (included via e_os.h) for fd_set.     Submitted by: Bernhard Simon <bs at bsws.zid.tuwien.ac.at>     Reviewed by:     PR:
      Fix path to find util/pod2man.pl from the execution directory.     Make sure to use the predefined PERL.     Submitted by: Bernhard Simon <bs at bsws.zid.tuwien.ac.at>     Reviewed by:     PR:
      HP-UX: shared libraries MUST be +x and SHOULD be -w.
      <sys/select.h> is included for AIX, when USE_SOCKETS is defined.     Submitted by: Bernhard Simon <bs at bsws.zid.tuwien.ac.at>     Reviewed by:     PR:
      README and INSTALL should contain information about the request tracker     (noted by Jonathan Louie <jlouie at recourse.com>).
      Ciphers with NULL encryption were not properly handled because they were     not covered by the strength bit mask.     Submitted by:     Reviewed by:     PR: 130
      Reorder inclusion of header files:
      Minor typos     Submitted by: jufi at nerdnet.de     Reviewed by:     PR: 138
      Sun's official statement with respect to /dev/random support.     Submitted by: Garrett Anderson garrett at dirsec.com     Reviewed by:     PR: 120
      Typos in links between manual pages     Submitted by: Richard.Koenning at fujitsu-siemens.com     Reviewed by:     PR: 129
      Discussion about Redhat's specialties for the FAQ.     Submitted by: John.Airey at rnib.org.uk     Reviewed by:     PR: 128
      Rewording: some algorithms are also patented in Europe, so choose more     defensive phrases...
      Manual page for SSL_do_handshake().     Submitted by: Martin Sj?gren <martin at strakt.com>     PR: 137
      The behaviour is undefined when calling SSL_write() with num=0.     Submitted by:     Reviewed by:     PR: 141
      HP-UX shared libraries must be +x and should be -w. It doesn't hurt on     other platforms.     Submitted by:     Reviewed by:     PR: 134
      New cipher selection options COMPLEMENTOFALL and COMPLEMENTOFDEFAULT.     Submitted by:     Reviewed by:     PR: 127
      Only use DSA-functions if available.     Submitted by: "Hellan,Kim KHE" <KHE at kmd.dk>     Reviewed by:     PR: 167
      0.9.6e and 0.9.7-beta3 are out.
      "make update"
      OpenSSL Security Advisory [30 July 2002]
      Typo.     Submitted by: Jeffrey Altman <jaltman at columbia.edu>     Reviewed by:     PR: 169
      Reorder cleanup sequence in SSL_CTX_free() to leave ex_data for remove_cb().     Submitted by:     Reviewed by:     PR: 212
      Consequently use term URI instead of URL     Submitted by: TJ Saunders <tj at castaglia.org>     Reviewed by:     PR: 268
      Add missing brackets.     Submitted by: "Chris Brook" <cbrook at v-one.com>
      Corrected exchanged parameters in example for EVP_EncryptInit_ex()     Submitted by: "Marcus Carey" <marcus.carey at verizon.net>     Reviewed by:     PR: 265
      More information to the important issue of seeding the PRNG     Submitted by:     Reviewed by:     PR: 285
      Make sure permissions are friendly when building release tar file.     Submitted by:     Reviewed by:     PR: 171
      Typo.     Submitted by: assar <assar at kth.se>     Reviewed by:     PR:
      Missing =back     Submitted by:     Reviewed by:     PR:
      Correct reference to section name.     Submitted by:     Reviewed by:     PR:
      Opportunistic change to work around pod2latex bug: rename NAME OPTIONS     section to SUBJECT AND ISSUER NAME OPTIONS     Submitted by:     Reviewed by:     PR: 333
      Don't declare 2 WARNINGS sections     Submitted by:     Reviewed by:     PR:
      No such reference to link to (found running pod2latex).     Submitted by:     Reviewed by:     PR:
      Use =back to finish =over (found using pod2latex).     Submitted by:     Reviewed by:     PR:
      The pointer to the cipher object is not yet set, when session was reloaded     from external cache (using d2i_SSL_SESSION). Perform comparison based on     the cipher's id instead.     Submitted by: Steve Haslam <araqnid at innocent.com>     Reviewed by:     PR: 288
      Fix buggy #! magic and update ssleay->openssl     Submitted by:     Reviewed by:     PR: 305
      Better workaround to the "=head1 NAME OPTIONS" pod2latex problem:     NAME OPTIONS are a subset of OPTIONS, so just make it =head2!     Submitted by:     Reviewed by:     PR: 333
      Fix bug introduced by the attempt to fix client side external session     caching (#288): now internal caching failed (#351):     Make sure, that cipher_id is set before comparing.     Submitted by:     Reviewed by:     PR: 288 (and 351)
      Missing ")"     Submitted by: Christian Hohnstaedt <chohnstaedt at innominate.com>     Reviewed by:     PR:
      Fix wrong URI.     Submitted by: assar at kth.se     Reviewed by:     PR: 390
      Update -Olimit setting.     Submitted by: Bernhard Simon <simon at zid.tuwien.ac.at>     Reviewed by:     PR:
      Fix Kerberos5/SSL interaction     Submitted by: "Kenneth R. Robinette" <support at securenetterm.com>     Reviewed by:     PR:
      Some more adjustments     Submitted by: Jeffrey Altman <jaltman at columbia.edu>, "Kenneth R. Robinette" <support at securenetterm.com>
      Fix wrong handling of session ID in SSLv2 client code.
      Add information about AES cipher suites to ciphers manual page.
      Third argument to shl_load() is "long address", not a pointer.     (Didn't influence functionality, as on HP-UX 32bit the NULL pointer     is a 32bit 0-value and thus is identical to the required 0L.)
      Document hpux-parisc2-cc problems, probably due to optimizer bug.
      Really fix SSLv2 session ID handling
      Fix initialization sequence to prevent freeing of unitialized objects.     Submitted by: Nils Larsch <nla at trustcenter.de>
      ncr-scde target needs -lc89 for strcasecmp() and ftime() (Tim Rice, Martin     Megele).
      Armor against systems without ranlib...     Submitted by: Thierry Lelegard <thierry.lelegard at canal-plus.fr>
      Add SCO5 shared library scripts.     Upate SVR5 scripts for the upcoming 0.9.7b.     Submitted by: Boyd Lynn Gerber <gerberb at zenez.com>
      Add warning about unwanted side effect when calling SSL_CTX_free():     sessions in the external session cache might be removed.     Submitted by: "Nadav Har'El" <nyh at math.technion.ac.il>
      Fix ordering of compare functions: strncmp() must be used first, a     the cipher name in the list is not guaranteed to be at least "buflen"     long.     PR: 567     Submitted by: "Matt Harren" <matth at cs.berkeley.edu>
      Move header file inclusion to prevent irritation of users forgetting to     call "make depend" after enabling or disabling ciphers...     Submitted by: Tal Mozes <talm at cyber-ark.com>
      Add minimum POP3 STLS hack to s_client.c (as was provided for STARTTLS before)     Submitted by: dg at sunet.ru (Daniel Ginsburg)
      Clarify ordering of certificates when using certificate chains
      Clarify return value of SSL_connect() and SSL_accept() in case of the     WANT_READ and WANT_WRITE conditions.
      Clarify wording of verify_callback() behaviour.
      Provide ASFLAGS in the subdirectories handling assembler code.
      Catch error condition to prevent NULL pointer dereference.     Submitted by: Goetz Babin-Ebell <babin-ebell at trustcenter.de>
      Make sure to initialize AES counters to obtain proper results.     Submitted by: Kirill Kochetkov <kochet at ixbt.com>
      Free "engine" resource in case of failure to prevent memory leak     PR: #778     Submitted by: George Mitchell <george at m5p.com>
      Some more ASFLAGS settings required     PR: #735     Submitted by: Tim Rice <tim at multitalents.net>
      Restructure make targets to allow parallel make.     Submitted by: Witold Filipczyk <witekfl at poczta.gazeta.pl>
      unintptr_t and <inttypes.h> are not strictly portable with respect to     ANSI C 89.     Undo change to maintain compatibility.
      Update URI     Submitted by: Gertjan van Oosten <gertjan at West.NL>
      Add s_time manual page     Submitted by: "Martin Witzel" <MWITZEL at de.ibm.com>
      Updates to s_time manual page     PR: #570     Submitted by: Martin Witzel <MWITZEL at de.ibm.com>
      Cover all DSA setups when running tests     PR: #748     Submitted by: Kirill Kochetkov <kochet at ixbt.com>
      More precise explanation of session id context requirements.
      Fix hang in EGD/PRNGD query when communication socket is closed     prematurely by EGD/PRNGD.     PR: 1014     Submitted by: Darren Tucker <dtucker at zip.com.au>
      Fix typo on blowfish manual page     PR: 1010     Submitted by: Marc Balmer <mbalmer at openbsd.org>
      Typo
      Update to new home page
      Fix incorrect handling of special characters     PR: 1459     Submitted by: tnitschke at innominate.com     Reviewed by: steve at openssl.org
      Add support for m68k linux     PR: 1277     Submitted by: Mike Frysinger <vapier at gentoo.org>
      Add automatic detection for Linux on SuperH     PR: 1152     Submitted by: Mike Frysinger <vapier at gentoo.org>
      Extend SMTP and IMAP protocol handling to perform the required     EHLO or CAPABILITY handshake before sending STARTTLS
      Fix problem with multi line responses in -starttls by using a buffering     BIO and BIO_gets().
      Do not use uninitialized memory to seed the PRNG as it may confuse     code checking tools.     PR: 1499
      Initialize "buf" to 0 to make valgrind happy :-)     Note: the RAND_bytes() manual page says:      RAND_bytes() puts num cryptographically strong pseudo-random bytes into buf.     It does not talk about using the previous contents of buf so we are working     as documented.
      Port from 0.9.8-stable
      Typos     PR: 1578     Submitted by: Charles Longeau <chl at tuxfamily.org>
      Release OpenSSL 0.9.8g with various fixes to issues introduced with 0.9.8f
      Add OIDs by CMP (RFC 4210) and CRMF (RFC 4211)
      Typos in man pages: dependant->dependent
      Add missing colon in manpage
      Fix URI of OpenSSL Request Tracker information     PR: 1661
      Apply mingw patches as supplied by Roumen Petrov an Alon Bar-Lev     PR: 1552     Submitted by: Roumen Petrov <openssl at roumenpetrov.info>, "Alon Bar-Lev" <alon.barlev at gmail.com>
      Correctly handle case of bad arguments supplied to rsautl     PR: 1659
      Fix incorrect return value in apps/apps.c:parse_yesno()     PR: 1607     Submitted by: "Christophe Mac??" <mace.christophe at gmail.com>
      Another minor update from the mingw development     PR: 1552     Submitted by: Roumen Petrov <openssl at roumenpetrov.info>
      Add missing 'extern "C" {' to some _err.h files in crypto/engines/     PR: 1609
      Another occurance of possible valgrind/purify "uninitialized memory"     complaint related to the PRNG: with PURIFY policy don't feed uninitialized     memory into the PRNG.
      Typo. (From 0.9.8-stable/S. Henson)     PR: 1672
      Provide information about "openssl dgst" -hmac option.
      Document "openssl s_server" -crl_check* options
      Correctly adjust location of comment
      Remove all root CA files (beyond test CAs including private key)     from the OpenSSL distribution.
      Clear error queue when starting SSL_CTX_use_certificate_chain_file     PR: 1417, 1513     Submitted by: Erik de Castro Lopo <mle+openssl at mega-nerd.com>
      Reword comment to be much shorter to stop other people from complaining     about "overcommenting".
      Add README about removed root CA certificates.
      Refer to SSL_pending from the man page for SSL_read
      Fix incorrect command for assember file generation on IA64
      When the underlying BIO_write() fails to send a datagram, we leave the     offending record queued as 'pending'. The DTLS code doesn't expect this,     and we end up hitting an OPENSSL_assert() in do_dtls1_write().
      Half of the commit for 0.9.8 as the bitmap handling has changed.     (Firstly... ommitted)
      Remove the DTLS1_BAD_VER thing from 0.9.9-dev. It is present in 0.9.8     but has been omitted from HEAD (0.9.9), see commit       http://cvs.openssl.org/chngview?cn=16627     by appro.
      Add missing "-d" to option list of openssl version.
      Allow detection of input EOF in quiet mode by adding -no_ign_eof option     to s_client application.     PR: #1761     Submitted by: David Woodhouse <dwmw2 at infradead.org>
      Clarify (non-)blocking behavior of EGD socket interface used by RAND_egd().
      apps/speed.c: children should not inherit buffered I/O     PR: 1787     Submitted by: Artur Klauser <aklauser at google.com>
      Fix compilation with -no-comp by adding some more #ifndef OPENSSL_NO_COMP

Mark J. Cox (18):
      Fixes to BN code.  Previously the default was to define BN_RECURSION     but the BN code had some problems that would cause failures when     doing certificate verification and some other functions.
      fix typo
      Fix some more typos
      Add new function, EVP_MD_CTX_copy() to replace frequent use of memcpy.
      add what I'm doing and a vote
      Updates to the new SSL compression code          [Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
      Fix assembler for Alpha (tested only on DEC OSF not Linux or *BSD).  The     problem was that one of the replacement routines had not been working since     SSLeay releases.  For now the offending routine has been replaced with     non-optimised assembler.  Even so, this now gives around 95% performance     improvement for 1024 bit RSA signs.
      This corrects the reference count handling in SSL_get_session.     Previously, the returned SSL_SESSION didn't have its reference count     incremented so the SSL_SESSION could be freed at any time causing     seg-faults if the pointer was subsequently used. Code that uses     SSL_get_session must now make a corresponding SSL_SESSION_free() call when     it is done to avoid memory leaks (or blocked up session caches).
      I've still got one left; the backport of the Broadcom UBSEC driver to     0.9.6 that we've got - just waiting for clearance on that one     Submitted by:     Reviewed by:     PR:
      Phew, finished     Submitted by:     Reviewed by:     PR:
      Mention that the keys likely to have signed the distribution are now     listed on the web site for easy finding and downloading
      Make sure head CHANGES is up to date, we refer to this in announce.txt
      one time CAN->CVE update
      Avoid PKCS #1 v1.5 signature attack discovered by Daniel Bleichenbacher     (CVE-2006-4339)
      Fix buffer overflow in SSL_get_shared_ciphers() function.     (CVE-2006-3738) [Tavis Ormandy and Will Drewry, Google Security Team]
      Fix ASN.1 parsing of certain invalid structures that can result     in a denial of service.  (CVE-2006-2937)  [Steve Henson]
      Initialise ctx to NULL to avoid uninitialized free, noticed by     Steve Kiernan
      This entry was in 0.9.8m changelog but missing from here, since it's     security relevent we'd better list it.

Nils Larsch (197):
      some const fixes
      add new curves to the loop (with some cleanup from me)
      test, remove unnecessary const cast
      when building with OPENSSL_NO_DEPRECATED defined BN_zero is a macro     which cannot be evaluated in an if statement
      the second argument of EVP_SealInit is const
      update docs (recent constification)
      Makefile.ssl doesn't exist anymore
      fix header
      use SSL3_VERSION_MAJOR instead of SSL3_VERSION etc.
      really clear the error queue here
      use SHA-1 as the default digest for the apps/openssl commands
      remove unused recp method
      some const fixes and cleanup
      fix example in docu
      update progs.pl to reflect changes in progs.h
      some const fixes
      const fixes
      make sure error queue is totally emptied
      get rid of very buggy and very imcomplete DH cert support
      improve docu of SSL_CTX_use_PrivateKey()
      add support for DER encoded private keys to SSL_CTX_use_PrivateKey_file()     and SSL_use_PrivateKey_file()
      include limits.h for UINT_MAX etc.
      Makefile.ssl -> Makefile
      EVP_CIPHER_CTX_init is a void function + fix typo
      const fixes
      the pointer to the message digest is const
      - use BN_set_negative and BN_is_negative instead of BN_set_sign       and BN_get_sign     - implement BN_set_negative as a function     - always use "#define BN_is_zero(a) ((a)->top == 0)"
      make update
      more const
      change prototype of the ecdh KDF: make input parameter const and the outlen argument  more flexible
      make asn.1 field names const
      update
      remove false positive
      some updates for the blinding code; summary:     - possibility of re-creation of the blinding parameters after a       fixed number of uses (suggested by Bodo)     - calculatition of the rsa::e in case it's absent and p and q       are present (see bug report #785)     - improve the performance when if one rsa structure is shared by       more than a thread (see bug report #555)     - fix the problem described in bug report #827     - hide the definition ot the BN_BLINDING structure in bn_blind.c
      add docu for BN_BLINDING functions
      add missing parentheses
      no Makefile.ssl anymore
      get rid of Makefile.ssl in util/
      avoid warnings when building on systems where sizeof(void *) > sizeof(int)
      add reference to BN_BLINDING_new.pod
      add 192 bit prime curve to the command line options
      hide the definition of ECDSA_METHOD and ECDSA_DATA (and mutatis mutandis     for ecdh)
      remove some false positive
      check return value of RAND_pseudo_bytes; backport from the stable branch
      remove false positive
      don't let BN_CTX_free(NULL) segfault
      backport fix from the stable branch
      fix typo
      rewrite of bn_nist.c, disable support for some curves on 64 bit platforms     for now (it was broken anyway)
      remove BN_ncopy, it was only used in bn_nist.c and wasn't particular     useful anyway
      remove false positive
      fix compiler warning; pow10 is also in math.h
      give EC_GROUP_*_nid functions a more meaningful name     	EC_GROUP_get_nid -> EC_GROUP_get_curve_name     	EC_GROUP_set_nid -> EC_GROUP_set_curve_name
      improve command line argument checking
      give EC_GROUP_new_by_nid a more meanigful name:     EC_GROUP_new_by_nid -> EC_GROUP_new_by_curve_name
      use 'p' as conversion specifier for printf to avoid truncation of     pointers on 64 bit platforms. Patch supplied by Daniel Gryniewicz     via Mike Frysinger <vapier at gentoo.org>.
      ecc api cleanup; summary:     - hide the EC_KEY structure definition in ec_lcl.c + add       some functions to use/access the EC_KEY fields     - change the way how method specific data (ecdsa/ecdh) is       attached to a EC_KEY     - add ECDSA_sign_ex and ECDSA_do_sign_ex functions with       additional parameters for pre-computed values     - rebuild libeay.num from 0.9.7
      simplify EC_KEY_dup
      make the type parameter const when ID2_OF_const() is used
      fix "dereferencing type-punned pointer will break strict-aliasing rules"     warning when using gcc 4.0
      update ecdsa doc
      fix potential memory leak
      fix typo, add prototype
      include opensslconf.h if OPENSSL_NO_* is used
      changes from 0.9.8
      fix assertion
      clear error queue on success and return NULL if no cert could be read
      check return value
      ssl_create_cipher_list should return an error if no cipher could be     collected (see SSL_CTX_set_cipher_list manpage). Fix handling of     "cipher1+cipher2" expressions in ssl_cipher_process_rulestr.
      use "=" instead of "|=", fix typo
      - let SSL_CTX_set_cipher_list and SSL_set_cipher_list return an       error if the cipher list is empty     - fix last commit in ssl_create_cipher_list     - clean up ssl_create_cipher_list
      replace the deprecated "-m486" gcc option with "-march=i486"
      update FAQ
      update for the cswift engine:     - fix the problem described in bug report 825     - fix a segfault when the engine fails to initialize     - let the engine switch to software when keysize > 2048
      clear dso pointer in case of an error
      remove OPENSSL_NO_ASM dependency
      initialize newly allocated data
      the second argument of d2i_X509, d2i_X509_CRL and d2i_X509_REQ is const
      add missing entries for "-multivalue-rdn" and "-utf8" in ca.pod and req.pod
      make         	./configure no-deprecated [no-dsa] [no-dh] [no-ec] [no-rsa]         	make depend all test     work again
      bugfix: 0 - w (w != 0) is actually negative
      fix typo
      the final byte of a pkcs7 padded plaintext can never be 0
      set correct bn->top value
      fix BN_mod_word and give a more reasonable return value if an error occurred
      improved error checking and some fixes
      remove unused variable
      add comment
      fix potential memory leak + improved error checking
      avoid infinite recursion if dynamic engine isn't loaded
      remove unused internal foo_base_method functions
      a ssl object needs it's own instance of a ecdh key; remove obsolete comment
      Let the TLSv1_method() etc. functions return a const SSL_METHOD     pointer and make the SSL_METHOD parameter in SSL_CTX_new,     SSL_CTX_set_ssl_version and SSL_set_ssl_method const.
      add missing file
      initialize cipher/digest methods table in SSL_library_init() and hence remove the need for a lock
      Keep cipher lists sorted in the source instead of sorting them at     runtime, thus removing the need for a lock. Add a test to ssltest     to verify that the cipher lists are sorted.
      fix warnings when building openssl with the following compiler options:             -Wmissing-prototypes -Wcomment -Wformat -Wimplicit -Wmain -Wmultichar             -Wswitch -Wshadow -Wtrigraphs -Werror -Wchar-subscripts             -Wstrict-prototypes -Wreturn-type -Wpointer-arith  -W -Wunused             -Wno-unused-parameter -Wuninitialized
      don't try to load cert/key when the "-nocert" option is set
      fix typo in sbgp names
      fix function name in error
      bugfix: register engine as default engine in ENGINE_set_default_DSA
      fix typos
      add some doxygen comments
      cleanup doxygen comments
      protect BN_BLINDING_invert with a write lock and BN_BLINDING_convert     with a read lock
      successfully updating the db shouldn't result in an error message
      compile sstrsep only if HAVE_FORK is defined; patch supplied by Johan Gill <johane at lysator.liu.se>
      fix typo, pointed out by Patrick Guio
      2 is a prime
      fix comment
      support numeric strings in ASN1_generate_nconf
      recent changes from 0.9.8: fix cipher list order in s3_lib.c,     make "no-ssl2" work again
      add additional checks + cleanup
      fix if statement: call conn_state() if the BIO is not in the BIO_CONN_S_OK state
      p could be uninitialized
      remove unnecessary check
      fix typo: pass pre-computed parameters to the underlying signature function; thanks to Lucas Newman
      fix warning
      fix warning: add missing prototype
      use stricter prototypes, fix warnings
      don't use the l length modifier for int
      use asn1 callbacks for new, free and d2i
      fix typos
      make some internal functions static; patch supplied by Kurt Roeckx
      fix no-dh configure option; patch supplied by Peter Meerwald
      fix "#ifndef HZ" statement
      force C locale when using [a-z] in sed expressions
      make some parameters const
      no need to cast away the const
      constify some print and ts functions
      fix function name in error message
      add initial support for RFC 4279 PSK SSL ciphersuites
      make update
      fix signed vs. unsigned warning
      fix "missing initializer" warning
      fix signed vs. unsigned warning
      note that SSL_library_init() is not reentrant
      use BIO_snprintf() instead of snprintf + use BIO_FP_TEXT for text output
      fix comment
      remove unused variables
      signed vs. unsigned
      fix error found by coverity: check if ctx is != NULL before calling BN_CTX_end()
      fix error found by coverity: check if ctx is != NULL before calling BN_CTX_end()
      create BN_CTX object
      fix problems found by coverity: remove useless code
      fix for OPENSSL_NO_EC
      remove unnecessary code
      check if con != NULL before using it
      ensure the pointer is valid before using it
      fix last commit: return NULL is TS_RESP_CTX_set_status_info_cond() failed
      make local function static
      as we encrypt every bit separately we need to loop through the number     of bits; thanks to Michael McDougall <mmcdouga at saul.cis.upenn.edu>
      undo accidental commit
      return an error if the supplied precomputed values lead to an invalid signature
      fix OPENSSL_NO_foo defines
      update md docs
      remove SSLEAY_MACROS code
      fix warning
      register the engine as default engine in ENGINE_set_default()
      replace macros with functions
      add support for whirlpool in apps/speed
      add "Certificate Issuer" and "Subject Directory Attributes" OIDs
      allocate a new attributes entry in X509_REQ_add_extensions()     if it's NULL (in case of a malformed pkcs10 request)
      return 0 if 'noout' is used and no error has occurred
      avoid duplicate entries in add_cert_dir()
      fix documentation
      use const ASN1_TIME *
      properly initialize SSL context, check return value
      fix order
      remove trailing '\'
      add support for ecdsa-with-sha256 etc.
      update
      fix order
      update pkcs12 help message + manpage
      fix typos
      use OPENSSL_NO_DYNAMIC_ENGINE macro, disable debug messages
      fix return value of get_cert_chain()
      remove undefined constant
      fix potential memory leaks
      fix documentation
      add support for DSA with SHA2
      add note about 56 bit ciphers
      fix typo
      ensure that a ec key is used
      remove unused variable
      remove unreachable code
      use user-supplied malloc functions for persistent kssl objects
      avoid shifting input
      - use OPENSSL_malloc() etc. in zlib     - move zlib_stateful_ex_idx initialization to COMP_zlib()
      ensure that the EVP_CIPHER_CTX object is initialized
      remove dead code
      allow EVP_PKEY_CTX_free(NULL)
      remove unused file
      size_t -> int
      check if pointer is != NULL before dereferencing it (Coverity CID 40)
      check correct pointer before freeing it (Coverity CID 79,86)
      check return value of ASN1_item_i2d(), Coverity ID 55

Paul C. Sutton (11):
      Makefiles updated to exit if an error occurs in a sub-directory make     (including if user presses ^C)
      Make the installation documentation easier to follow.
      Add votes
      ssldir.pl did not correctly set the directory in utils/mk1mk.pl when     perl5 was used.
      Some more changes for renaming the binary from ssleay to openssl.     I wonder what eay.c is?
      A couple more ssleay.cnf to openssl.cnf changes
      Binary is now apps/openssl not apps/ssleay so use the new name when     rehashing the test certs
      Various ssleay to openssl fixups
      Reflect change from "ssleay" to "openssl" as the main binary name.     Also document "sh config" as an easier alternative to "./Configure     system".
      Update scripts to use "openssl" instead of "ssleay"
      The dir is named util/ and better to explicitly call the     perl interpreter because not everyone has it in /usr/local/bin/perl.

Ralf S. Engelschall (189):
      This commit was generated by cvs2svn to track changes on a CVS vendor     branch.
      Import of old SSLeay release: SSLeay 0.8.1b
      This commit was generated by cvs2svn to track changes on a CVS vendor     branch.
      Import of old SSLeay release: SSLeay 0.8.1b
      This commit was generated by cvs2svn to track changes on a CVS vendor     branch.
      Import of old SSLeay release: SSLeay 0.9.0b
      This commit was generated by cvs2svn to track changes on a CVS vendor     branch.
      Import of old SSLeay release: SSLeay 0.9.0b
      This commit was generated by cvs2svn to track changes on a CVS vendor     branch.
      Import of old SSLeay release: SSLeay 0.9.1b (unreleased)
      This commit was generated by cvs2svn to track changes on a CVS vendor     branch.
      Import of old SSLeay release: SSLeay 0.9.1b (unreleased)
      Various cleanups and fixed by Marc and Ralf to start the OpenTLS project
      *** empty log message ***
      Incorporation of RSEs assembled patches
      OpenTLS ready
      *** empty log message ***
      Fix unused variable warning of GCC
      Switch to OpenSSL name
      *** empty log message ***
      Switch version string to SSLeay/OpenSSL
      Add include dir
      *** empty log message ***
      *** empty log message ***
      *** empty log message ***
      Test for new CVS repository
      Test remote CVS commit...
      Import the first cut for manual pages.
      Fix an error message
      Replace AUTHOR with a better HISTORY as in FreeBSD's manpages
      Create a STATUS file to coordinate us. Feel free to edit
      Cleanup of doc/ directory: The old/obsolete SSLeay files are now assembled     together in a ssleay.txt file.
      Ops, forgot to commit the changes entry in recent commit...
      MIME encoding and ISO chars at the same time messes up the stuff
      Fix version stuff:
      Puhhh... now we've documented the prototypes of all 214 API "functions".  This     is a pain to do, because of the various macro definitions which I had to     expand manually to get their prototype :-(
      More structuring and sorting of the SSL API documentation.     And the first steps to descriptions in prosa.
      Some issues for voting
      A hint about the license
      Remove more old temporary files from CVS
      cleanup of apps/ and an answer
      Make GCC happy by removing an unused variable defintion.
      First cut of a cleanup for apps/. First the `ssleay' program is now named     `openssl' and second, the shortcut symlinks for the `openssl <command>' are no     longer created. This way we have a single and consistent command line     interface `openssl <command>', similar to `cvs <command>'.
      A few train of thoughts about the build procedure mess
      More .cvsignore stuff to make CVS quiet on our generated files.
      The dir is named util/ and better to explicitly call the     perl interpreter because not everyone has it in /usr/local/bin/perl.
      Make sure the already existing X509_STORE->depth variable is initialized     in X509_STORE_new(), but document the fact that this variable is still     unused in the certificate verification process.
      Start keeping track of wishes people make on our mailing lists to make sure we     don't forget them and this way we have them bundled together.
      Fix names in usage page of s_time, s_server and s_client
      One more incorrect name in usage page
      Fill in more contents for the openssl(1) manpage.
      Fixed ms/32all.bat script: `no_asm' -> `no-asm'
      Add CygWin32 platform information to Configure script.
      Change address now that we've the mailing lists established
      Update
      Ignore crypto/x509v3/lib
      Make sure `make rehash' target really finds the `openssl' program.
      Update README file a little bit...
      Reflect correct filename
      Ops, one more reference to 0.9.1c. Make sure we don't forget it...
      First cut for a very conservative source tree cleanup:
      Remember the cleanup
      Ignore mx86unix.cpp which is generated on Intel platforms
      Overhauled the Perl interface (perl/*):
      What is on my ToDo list...
      Remove three more bogus files (2x temp file, 1x trash)
      Remove one more totally bogus source file.     This one is exactly the same as ssl_sess.c.     Thanks to Adam Goodman <adam at a-domain.com> for hint.
      Make sure latest Perl versions don't interpret some generated C array as Perl     array code in the crypto/err/err_genc.pl script.
      Ok, propose a release date of March 15th with a code freeze a few days before     so we have enough time for final testing and tarball rolling.
      Remember some open issues and available patches
      Make gcc -Wall happy ("might be used uninitialized...")
      Fix usage message on gendsa:     1. The dsaparam argument is mandatory and not optional     2. Add a little text what this actually is: a filename
      Get rid of a nasty debugging message which was forgotten here...
      Make `openssl x509 -noout -modulus' functional also for DSA certificates (in     addition to RSA certificates) to match the behaviour of `openssl dsa -noout     -modulus' as it's already the case for `openssl rsa -noout -modulus'.  For RSA     the -modulus is the real "modulus" while for DSA currently the public key is     printed (a decision which was already done by `openssl dsa -modulus' in the     past) which serves a similar purpose.  Additionally the NO_RSA no longer     completely removes the whole -modulus option; it now only avoids using the RSA     stuff. Same applies to NO_DSA now, too.
      Remember good pointers to Montgomery multiplication algorithm     descriptions as pointed out by Dave Carman <carman at erols.com>
      Don't hard-code path to Perl interpreter on shebang line of Configure     script. Instead use the usual Shell->Perl transition trick.
      More CVS ignore stuff...
      Change type of another md_len variable in pk7_doit.c:PKCS7_dataFinal()     from `int' to `unsigned int' because it's a length and initialized by     EVP_DigestFinal() which expects an `unsigned int *'.
      Fix 'port' variable from `int' to `unsigned int' in crypto/bio/b_sock.c
      Fix the cipher decision scheme for export ciphers: the export bits are *not*     within SSL_MKEY_MASK or SSL_AUTH_MASK, they are within SSL_EXP_MASK.  So, the     original variable has to be used instead of the already masked variable.
      Typo
      Move s_server -dcert and -dkey options out of the undocumented feature area     because they are useful for the DSA situation and should be recognized by the     users. Thanks to Steve for the original hint.
      Add a bunch of SSL_xxx() functions for configuring the temporary RSA and DH     private keys and/or callback functions which directly correspond to their     SSL_CTX_xxx() counterparts but work on a per-connection basis. This is needed     for applications which have to configure certificates on a per-connection     basis (e.g. Apache+mod_ssl) instead of a per-context basis (e.g.     s_server).
      Remember one more wish from the users
      Use consistent and existing addresses
      Ops, the logic of the second argument has to be coupled with the != test to     work correctly for the SSL_CTX_xxx situations, too. Now "make test" passes     again fine.
      Get rid of remaining C++-style comments which strict C compilers hate.     (Pointed out by Carlos Amengual).
      Don't install bss_file.c under PREFIX/include/.  It was introduced by Eric     between SSLeay 0.8 and 0.9 and just looks useless and confusing.
      Remove confusing variables in function signatures in files     ssl/ssl_lib.c and ssl/ssl.h. At least the double ctx-variable     confused some compilers.
      Added the new `Includes OpenSSL Cryptography Software' button as     doc/openssl_button.{gif,html} which is similar in style to the old SSLeay     button and can be used by applications based on OpenSSL to show the     relationship to the OpenSSL project.
      Fix GCC warning...     t_req.c: In function `X509_REQ_print':     t_req.c:181: warning: suggest explicit braces to avoid ambiguous `else'
      General source tree makefile cleanups: Made `making xxx in yyy...' display     consistent in the source tree and replaced `/bin/rm' by `rm'.  Additonally     cleaned up the `make links' target: Remove unnecessary semicolons, subsequent     redundant removes, inline point.sh into mklink.sh to speed processing and no     longer clutter the display with confusing stuff. Instead only the actually     done links are displayed.
      Ralf is now using FreeBSD 3.1 which runs ELF instead of a.out...
      Cleaned up the LICENSE document: The official contact for any license     questions now is the OpenSSL core team under openssl-core at openssl.org.  And     add a paragraph about the dual-license situation to make sure people recognize     that _BOTH_ the OpenSSL license _AND_ the SSLeay license apply to the OpenSSL     toolkit.
      Bring the README file in sync and shape a little bit more...
      Add a first cut for a NEWS document similar to what other packages (mostly GNU     packages) provide.  The idea is that because of the large number of CHANGES     entries, this file summarizes the major changes for a brief overview.
      just a little typo
      Reshape the README file out of the existing README stuff     into a single file. Need more cleanup for final release IMHO.
      Move the SSL_CTX_xxx defines at the top of ssl.h to the location of other     SSL_CTX_xxx defines. What was the reason to move them to the top, even before     the copyright and #ifdef HEADER_SSL_H? Hmmm...  when there was and still is a     good reason feel free to reverse this patch, but please document why it is     needed this way.
      Allow DSO flags like -fpic, -fPIC, -KPIC etc. to be specified on the `perl     Configure ...' command line. This way one can compile OpenSSL libraries with     Position Independent Code (PIC) which is needed for linking it into DSOs.
      Typo :-)
      Add a useful kludge to allow package maintainers to specify compiler and other     platforms details on the command line without having to patch the Configure     script everytime: One now can use ``perl Configure <id>:<details>'', i.e.     platform ids are allowed to have details appended to them (seperated by     colons). This is treated as there would be a static pre-configured entry in     Configure's %table under key <id> with value <details> and ``perl Configure     <id>'' is called.  So, when you want to perform a quick test-compile under     FreeBSD 3.1 with pgcc and without assembler stuff you can use ``perl Configure     "FreeBSD-elf:pgcc:-O6:::"'' now, which overrides the FreeBSD-elf entry     on-the-fly.
      Notice freeze state and update my entry
      Two more .cvsignore files for the assembler stuff
      Second round of fixing the OpenSSL perl/ stuff. It now at least compiled fine     under Unix and passes some trivial tests I've now added. But the whole stuff     is horribly incomplete, so a README.1ST with a disclaimer was added to make     sure no one expects that this stuff really works in the OpenSSL 0.9.2 release.     Additionally I've started to clean the XS sources up and fixed a few little     bugs and inconsistencies in OpenSSL.{pm,xs} and openssl_bio.xs.
      Fix Win32 symbol export lists for BIO functions: Added BIO_get_ex_new_index,     BIO_get_ex_num, BIO_get_ex_data and BIO_set_ex_data to ms/libeay{16,32}.def.     I'm not a Win32 hacker, but I think I've done it correctly.
      Let us start with some platform test list...
      Start with some more tarball rolling preparation to make sure it's not     overlooed next Monday:     - rmlinks is no longer existing     - use openssl as the name and not rse     - don't roll the STATUS file into the tarball
      Make `openssl version' output lines consistent.
      typo
      Solaris 2.6 makes still problems.     Details were posted.
      Make it more clear what option -WWW to s_server does.
      Update to current state...
      Two more things we should look at before release
      Update platform test list
      Update
      Let util/clean-depend.pl work also with older Perl 5.00x versions.
      Be less restrictive and allow also `perl util/perlpath.pl /path/to/bin/perl'     in addition to `perl util/perlpath.pl /path/to/bin', because this way one can     also use an interpreter named `perl5' (which is usually the name of Perl 5.xxx     on platforms where an Perl 4.x is still installed as `perl').
      Just cosmetics: replace a tab with a normal space because     the tab always looked too estoeric to my eyes while building... ;)
      Some more source tree cleanups (removed obsolete files crypto/bf/asm/bf586.pl,     test/test.txt and crypto/sha/asm/f.s; changed permission on "config" script to     be executable) and a fix for the INSTALL document.
      Remove confusing hint to non-existing file.  Instead make it clear that one     shouldn't change it manually just here. The util/ssldir.pl script does more     and has to be used for this.  Pointed out by Jacques Supcik     <supcik at inf.ethz.ch>.
      Add missing pipe char to "make dist" target.     Found by Richard Levitte <levitte at stacken.kth.se>
      Print a little bit more information
      Remove obsolete references to SSLeay and change default PLATFORM from     "FreeBSD" to the generic "dist" as it's done implicitly by "make dist".
      Be consistent: 0.9.2b
      More 0.9.2 -> 0.9.2b
      up_ver.pl is now obsolete
      Remove up_ver.pl call
      Bring style of INSTALL* documents in sync with README file     and fix some inconsistencies.
      Add latest changes to NEWS file
      Final polishing for README file
      One more 0.9.2b
      function names recently changed - consistency.
      Add two recently added functions
      Merge ext-conf.txt and buffer.txt into a global openssl.txt because we     shouldn't again start with thousend little text files or we quickly come back     to the old SSLeay days ;-)
      update list
      Ops, interrupted commit. Fixed
      Typo
      Update after release...
      Move definitions of IS_SET/IS_SEQUENCE inside crypto/asn1/asn1.h     so they no longer are missing under -DNOPROTO.
      Make sure the RSA OAEP test is skipped under -DRSAref because     OAEP isn't supported when OpenSSL is built with RSAref.
      Add .cvsignore in new pkcs12 directory
      Fix a typo in the X.509v3 docs: cRLSign instead of cRLCertSign is correct     according to the sources.... found by Steffen Dettmer <steffen at tfh-berlin.de>.
      Fix a few typos and tabs while I'm poking around in ca.c...
      Make sure a corresponding plain text error message exists for the     X509_V_ERR_CERT_REVOKED/23 error number which can occur when a     verify callback function determined that a certificate was revoked.
      Fix `openssl crl -noout -text' combination where `-noout' killed the `-text'     option at all and this way the `-noout -text' combination was inconsistent in     `openssl crl' with the friends in `openssl x509|rsa|dsa'.
      Add `openssl ca -revoke <certfile>' facility which revokes a certificate     specified in <certfile> by updating the entry in the index.txt file.     This way one no longer has to edit the index.txt file manually for     revoking a certificate. The -revoke option does the gory details now.
      SSL_ALLOW_ENULL was renamed to SSL_FORBID_ENULL some time ago by Ben.
      Start with some plans...
      Start assembling some NEWS entries....
      Better to not have blanks in .cvsignore files
      consistency cosmetics
      Convert casted X509_INFO stacks to type-safe STACK_OF(X509_INFO).
      Add missing sk_<type>_unshift() function to safestack.h
      Bundle stack'ification entries on Bens request
      Fix various things to let OpenSSL even pass ``egcc -pipe -O2 -Wall -Wshadow     -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations     -Wnested-externs -Winline'' with EGCS 1.1.2+
      Ok, give us more time....
      Don't forget that it's freeze time now...
      Protect applications from failing to compile when they     try to directly include opensslv.h.
      Puhhh... today is a very hot day.
      Fix determination of Perl interpreter: A perl or perl5     _directory_ in $PATH was also accepted as the interpreter.
      First cut for a proposed code freeze and release dates (from Steve and me).     All OpenSSL developers: Please feel free to adjust the dates if they still do     not fit into your personal scheduling.
      typo while I poke around...
      consistent style
      A few more ``#ifndef NO_FP_API / #endif'' pairs for consistency.     Hint from: Andrija Antonijevic <TheAntony2 at bigfoot.com>
      I don't think this is a real showstopper.  Our internal verify procedure lacks     even more and I consider this more a useful feature request than a release     showstopper.
      Let us prepare for tomorrow...
      Remove the perl stuff also optically from the build procedure,     because it could confuse people (which then send us bug reports)...
      Fix two remaining prototype-related warnings
      Backout the following change:
      Install libRSAglue.a when OpenSSL is build with RSAref.     This should now finally make the RSAref users happy...
      Ok, final fix for `config' script to detect all flavors of FreeBSD     in a more general way.
      Ok, I'll do a few more final platform tests and then I'll roll the 0.9.4     tarball baby for us. PLEASE DO NOT COMMIT ANYTHING UNTIL YOU SEE MY FINAL     COMMITS TO `STATUS' INDICATING THAT WE'VE REACHED 0.9.5-dev.
      Bump version to 0.9.4
      Bump after tarball rolling.     Friends, feel free to start again hacking for 0.9.5... ;)
      Add prototypes for new DSA functions Steve added recently.
      Make gcc 2.95.2 happy again, even under ``-Wall -Wshadow -Wpointer-arith -Wcast-align     -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline''.
      Add an evil cast, because POSIX/SUSv2 define connect(2) require     the second argument to be of type ``struct sockaddr *''.
      Make gcc 2.95.2 happy here, too.
      Add missing prototypes for new functions
      Added configuration support for Linux/IA64
      Fix Blowfish URL.
      test blank-line commit after migration -- just ignore
      test commit (removing trailing blanks) after migration
      test commit (just removing tailing blanks) #2 after migration
      Fix prime generation loop in crypto/bn/bn_prime.pl by making     sure the loop does correctly stop and breaking ("division by zero")     modulus operations are not performed. The (pre-generated) prime     table crypto/bn/bn_prime.h was already correct, but it could not be     re-generated on some platforms because of the "division by zero"     situation in the script.
      small cosmetics: align title with the other similar manual page
      ignore a few additionally generated files
      remove a doubled entry for '-binary' in the usage message

Richard Levitte (2321):
      Make sure installed files are world readable
      adjust to changes in test/testssl
      adjust to changes in test/Makefile.ssl
      DIFFERENCE doesn't handle long (>255 chars) lines well.  Use BACKUP instead.  No, I'm not joking.
      Adjust to changes in apps/Makefile.ssl
      Adjust to changes in apps/openssl.cnf
      Some new names in asn1.h are longer than 31 chars, which disturbs the VMS C compilers...
      Avoid silly compiler warnings about functions not being declared and an int missing.
      It's possible that considering the configuration file as a binary file     works on Unix and MS-DOS/Windows.  It does not under VMS, so open it     as text.
      Some crypto applications are now being built on Unix, so they should on VMS as well.  Not by default, however.
      Two changes have been made:
      Avoid some silly compiler warnings, and add the change log I forgot :-)
      The info removal code was overcomplicated, and error-prone (references being wrongly decreased).  Fixed.
      Add compilation of x509_trs
      Synchronise VMS scripts with Unix Makefiles
      Use MemCheck_start() instead of CRYPTO_mem_ctrl(), and generate a small leak to test (conditional)
      Rebuild of the OpenSSL memory allocation and deallocation routines.     With this change, the following is provided and present at all times     (meaning CRYPTO_MDEBUG is no longer required to get this functionality):
      Clear out license confusion.
      - Made sure some changed behavior is documented in CHANGES.      - Moved the handling of compile-time defaults from crypto.h to        mem_dbg.c, since it doesn't make sense for the library users to try        to affect this without recompiling libcrypto.      - Made sure V_CRYPTO_MDEBUG_TIME and V_CRYPTO_MDEBUG_THREAD had clear        and constant definitions.      - Aesthetic correction.
      - Added more documentation in CHANGES.      - Made CRYPTO_MDEBUG even less used in crypto.h, giving        MemCheck_start() and MemCheck_stop() only one possible definition.      - Made the values of the debug function pointers in mem.c dependent        on the existence of the CRYPTO_MDEBUG macro, and made the rest of        the code understand the NULL case.
      Synchronising
      Make sure that generated files are labeled as such (except in dofile(), for now)
      Add more info to the memory allocation change log.     Suggested by Bodo.
      Added a comment about Win32.
      Typo...
      Typo
      Tell the truth about list separators.
      Synchronise with the makefiles.
      Cut'n'paste error
      Another name longer than 31 chars
      Beautification and a few entries added.
      It doesn't make sense to try see if these variables are negative, since they're unsigned.
      Give the user the possibility to ask for compilation of only the files     that are directly in crypto/, and prepare for a possible disabling of     certain messages that DEC C spews out.
      Prepare for a possible disabling of certain messages that DEC C spews out.
      Build the crypto test applications as well.
      SOCKETSHR is showing bad declarations again.  However, a simple cast     which does no harm fixes that problem.
      Build the test apps after all of the library has been built.
      A test script to check on the header files
      Avoid converting void * to a function pointer when NULL is defined as     ((void *)0), by have a 0 instead.
      Compaq C 6.2 for VMS will complain when we want to convert     non-function pointers to function pointers and vice versa.     The current solution is to have unions that describe the     conversion we want to do, and gives us the ability to extract     the type of data we want.
      Correct indentation
      Let's make all the example formated the same, shall we?
      Add the PID to the output on Win32.
      Man page section forgotten...
      Update all links so they will be rendered better.
      Made link of reference
      Update all links so they will be rendered better.
      Since pod2man is still evolving, and some sites (among others dev.openssl.org)     don't have a version that will handle the L<foo(1)|foo(1)> construct yet, here     is a copy from my laptop (slightly modifed to work independently of the place     where perl itself resides).
      Use the pod2man that comes with OpenSSL.  Make it so config(5) really     ends up in section 5.
      Added a configuration for myself...
      It works much better when you don't press shift at the wrong moment...
      Declare BN_pseudo_rand().
      Put config in section 5, where it belongs.
      Synchronise with Unix code
      Finally found a form that I like...
      Reimplement so only one synchronous stack is used.  The benefit is     that function pointers are nicely tucker in their structure.
      Synchronise
      Correct one link.
      Typo corrected...
      A proposed freeze and release time has come up.
      First try at documenting the DES (and other algorithms) modes
      des_modes is a section 7 manual, so let's make sure that's where it ends up
      Constify
      Move down the attributions
      Add references to the new passwd utility.
      Add compilation of the new passwd utility.
      A hack to make sure access() will give us the correct answer about the     accessability of an "empty" directory.  Thsi *is* weird, and a better     solution will be provided in apps/ca.c, when I get time to hack at it.
      Add a couple of forgotten $(PERL), and make the code to run pod2html a     tad more readable.
      Time ran away...
      Remove the access() call altogether for VMS, since it doesn't quite     work for directory specifications (this will be reported as a bug to     DEC^H^H^HCompaq).  It could as well be removed for all others as well,     since stat() and open() will return appropriate errors as well, but I     leave that to someone else to decide.
      Cosmetic change.  No, openssl.h.in is not autogenerated :-)
      Make Configure add the configuration options that it was copmiled     with.
      Move the registration of callback functions to special functions     designed for that.  This removes the potential error to mix data and     function pointers.
      Blowfish docs.
      Sync with Unix
      Avoid saving any macros starting with a _, since that can create     trouble if header files are included in some "impropper" order.     It's much better if the application programmer has to specify on his     or her own if _REENTRANT shall be defined and when.
      make update
      Correct a couple of command errors.
      Make it possible to have differing tar versions.
      0.9.5beta1
      Remove structures that are no longer used.
      Status update
      Changes to synchronise with Unix.     (actually, much more is needed, like a real config script)
      Enhance consistency by using BIO_flush() instead of fflush().
      Another test passed
      Some time in history, SSL_CTX_sessions() disappeared.  It is now     restored, but not as a macro this time...
      Update the two threads modules to conform to our recommendations (use     CRYPTO_num_locks() instead of CRYPTO_NUM_LOCKS!), and correct all the     inconsistencies with the rest of OpenSSL.
      New script to compile on systems that already have pthreads in the     system.
      Adjust all the old scripts to deal with the new location.
      Small error fix.
      Since a stack with quite long name is declared here, vms_idhacks.h is     also needed to get around C compilers on VMS that set the symbol limit     to 31 characters.  Bot the macros VMS and __VMS are checked, since     there's no real way to know if e_os.h has been included yet.
      Correct small typo
      For safety, check __VMS as well.
      Compile rand_egd.c on VMS as well.
      Let's avoid compiler warnings over types.
      ftruncate() and fileno() are not supported on all versions of OpenVMS     (they don't really exist before version 7), so that solution was toast.     Instead, let's do it the way it's done on Unix, but then remove older     versions of the file.
      Add support for Unixware 7.  Thanks to Ron Record <rr at sco.com> for the     patch.
      The OpenVMS library is most definitely not built for anything but     files, unless it's all in unixly syntax.  We can't guarantee that     right now, so let's skip the whole test suit.  There are other places     (like the open()) where errors are detected anyway.
      Don't include sys/types.h if NO_SYS_TYPES_H is defined.
      Typo corrected.
      Just as in Unix, make sure to generate some kind of "random data".
      Move to using the same perl code as Makefile.ssl
      Make sure that all test files are gone before starting the tests, or     backup will complain about some version not existing.  Perhaps.
      make update
      Make sure there's some entropy, and log a few more errors.
      A small script to compile mttest.c on VMS as well.
      Add and change docs for the changes that have been made.
      New "target": CONFIG.  This will build the opensslconf.h file from     what is known about VAX and Alpha running VMS, and from the     opensslconf.h.in (in VMS often named OPENSSLCONF.H_IN) file.
      New logical names to skip algorithms are now supported.     Also, on Alpha, vms.mar is no longer used (it produced a lot of     confusing messages) for BN.  Instead, the assembler part of bn_lcl.h     is used.
      New logical names to skip algorithms are now supported.
      Stop logging all the files that are copied all over the place...
      Change version string to reflect the release of beta 2.
      For lack of a better name, this is now called 0.9.5beta3-dev until the     release.
      OpenVMS often has problems with files with more than on period in it.     Here's instructions on what to do if you get into trouble because of     that.
      A new beta has been released, and one test is documented.
      One test passed for VMS.
      OpenSSL doesn't compile well on OpenVMS/VAX, it seems.
      AIX and HP-UX are passing the tests.
      Update config for the unixware targets by looking at what was done in     Apache's GuessOS (from Apache 1.3.1).
      Make sure to catch UnixWare 7, even if the version is 7.1.1 or     something like that.
      No, the VAX is not a 64 bit architecture.
      Works with gcc 2.8.0 as well.
      Update the OpenVMS/VAX status
      More platforms passed the test.
      Include rand.h so RAND_pseudo_bytes may be declared.     Remove one ampersand so the compiler may complain less.     Make rand() static so it will not conflict with the C RTL.     Make bug() static too, for good measure.
      Short is always promoted to int when passed as a function argument.     This is especially true when it's part of a '...'.
      Typo corrected.
      A few more tests were reported.
      Time for a release
      Tagging has been done, time to switch to 0.9.6-dev.
      Forgot to check correctly for the new options
      I'm experimenting with a hack in dopr() and friends b_printf.c to make     it work like asprintf().
      It started with finding a misplaced #endif.  Then I wanted to see the     structure better.  I hope noone minds, and that it still works.  Steve?
      Make bss_log.c a bit more readable, and implement it for VMS as well.
      Hack b_print.c to implement asprintf() functionality.  Not enabled by     default yet, I wanna play with it a bit more.
      Synchronise
      Let's care about the compiler warnings for both cases, shall we?
      Beautifying.  Sorry, but code that's slammed to the far left is not     very readable in my opinion.
      Let's not lie to the people.
      Check that a password was actually passed, or the user will just get     mysterious crashes.
      Protect variables from potential misinterpretations, for example a     colon which may bite the lesser knowleged...
      Add the possibility (with -ign_eof) to ignore end of file on input but     still not be quiet.  Also make it clear that -quiet implicitely means     -ign_eof as well.
      Correct a potential bug.
      Synchronise with Unix.
      Synchronise with Unixly tests
      Make sure strcmp() gets declared.
      Typo corrected
      bss_log has dollars, so compile it with that warning flag disabled.
      Typo corrected
      Bugs corrected, and a couple of include files to get declarations for     lib$-functions and sys$-functions.
      Target added.
      Make it possible top build just a part of the crypto library.
      Typos corrected.
      Typo corrected.
      The previous exit code handling was completely bogus for VMS.
      Bugs corrected
      Make sure to complete the cleanup of names.
      e_os.h: don't do double work with status codes.     openssl.c: make damn sure e_os.h knows about OPENSSL_C
      Small bugs in the test scripts removed.
      Keep in sync with Unix code, and prepare for a misfeature fix.
      Change the notation and coding of the version to be able to contain     both a patch level and a beta status.  IMHO, it also makes more sense     to have beta status be part of the development status than to have it     be an alternate name for patch levels under special conditions.
      Make sure an error condition is returned if, for some reason, the file     couldn't be opened.
      Change the version text, it's time to release the first beta of 0.9.5a.
      make update
      Beta 1 of 0.9.5a building.
      Tagging done, we move to the next possible.
      New status
      There are a few new features in 0.9.5a...  And I've probably     forgotten a few.
      I just got a not very pleasant report.
      Ref: Message-ID: <20000320070111.A90876 at wiz.Sendmail.COM>
      Jaenick Lutz reports that hpux-parisc-cc with +02 passed.
      Ulf M??ller reports OpenBSD-x86 and solaris-sparcv9-cc passed.
      A quick hack to have ssize_t work with gcc under SunOS 4 (tested on     SunOS 4.1.4).
      Corrected.  It said before that ivec had to be initialised to zero,     which isn't true.  What is true, however, is that SSH assumes it is.
      Clean up context, even if an error occured.
      New FAQ for the OpenSSH configuration problem.
      Time for version 0.9.5a beta2
      I almost forgot...
      Tagging has been done, update to next probable version...
      Update status
      Surround the diff with the new snippage delimiters
      VMS on Alpha passed
      Another VMS/Alpha with a much more evil compiler passed as well...
      Geoff Thorpe reports a whole bunch of tests passing.
      A couple of corrections concerning HPUX 10 and shared libraries.     Contributed by Lutz Jaenicke.
      More info in the Win32 test
      One VAX environment passed
      VI gave me 4-space tabs...  Corrected
      Another VAX environment passed
      Info on proposed release date
      Vi, again
      Beautifying code.
      Removed, especially since it conflicts with des.pod on     case-insensitive file systems.
      Don't force the use of GNU make with Borland C++ Builder.  Contributed by Joon Radley <jradley at vps.co.za>
      Add a default banner.  Contributed by Joon Radley <jradley at vps.co.za>
      Since ssleay_rand_initialize() unlocks then locks CRYPTO_LOCK_RAND,     it's a good thing if ssleay_rand_status() would do the corresponding     lock and unlock as everyone else...
      _lrotl and _lrotr are defined in MSVC but nowhere else that we know     off.
      Building version 0.9.5a
      Version and name changes, and a last minute changelog
      Tagging has now been done, update to the next possible version (I keep     a low profile, so we don't get discontinuity in the numbering...)
      Tagging has now been done, update to the next version (it's not quite     as important to keep a low profile here :-))
      Release done, change status.
      I've always wanted to make the CONF library more adaptable.  Here's     the result.
      "make update"
      I forgot to update the change log
      OpenVMS, not OpenVSM...
      Clarifications and removal of double declaration...
      Use CONFerr, not RSAerr, in the conf library...
      In Message-ID: <003201bfb332$14a07520$0801a8c0 at janm.transactionsite.com>,     "Jan Mikkelsen" <janm at transactionsite.com> correctly states that the     OpenSSL header files have #include's and extern "C"'s in an incorrect     order.  Thusly fixed.
      In Message-ID: <003201bfb332$14a07520$0801a8c0 at janm.transactionsite.com>,     "Jan Mikkelsen" <janm at transactionsite.com> correctly states that the     OpenSSL header files have #include's and extern "C"'s in an incorrect     order.  Thusly fixed.
      In Message-ID: <003201bfb332$14a07520$0801a8c0 at janm.transactionsite.com>,     "Jan Mikkelsen" <janm at transactionsite.com> correctly states that the     OpenSSL header files have #include's and extern "C"'s in an incorrect     order.  Thusly fixed.
      Initialise.
      Being sick and tired of the hogging Efence does on my laptop, I     decided to provide an alternative...
      Add a new file where all the standards and other documents that we try     to adhere to are listed.  It should be regarded as a complement to     whatever is out on the web, including the docs in http://www.openssl.org/
      Add a note about the new document.
      Add a couple of macros that make OpenSSL compilable on SunOS 4.1.4.     Contributed by SAKAI Kiyotaka <ksakai at kso.netwk.ntt-at.co.jp>
      Remove extra comma (creates a unnessecary null element, right?).
      'make update'
      Add the target system linux-m68k
      Configuration for linux on ARM (contributed by Jeremy Norris     <jeremy.norris at rebel.com>)
      You must have an empty line between =item's
      config can now detect ARM Linux automagically.     Contributed by Jeremy Norris <jeremy.norris at rebel.com>
      This seems to become a FAQ...
      Result of "make update"
      Small fix to enable reading from stdin as well.     Contributed by Yoichiro Okabe <okabe at wizsoft.co.jp>
      Small documentation bug, probably a cut'n'paste, corrected.
      There have been a number of complaints from a number of sources that names     like Malloc, Realloc and especially Free conflict with already existing names     on some operating systems or other packages.  That is reason enough to change     the names of the OpenSSL memory allocation macros to something that has a     better chance of being unique, like prepending them with OPENSSL_.
      Typo...
      According to Gordon Atwood <gordon at cs.ualberta.ca>, stdlib.h is     needed, or size_t won't be defined on SunOS 4.1.4.
      According to Gordon Atwood <gordon at cs.ualberta.ca>, GNU C on SunOS     4.1.4 uses libiberty to define strtoul and strerror.
      Using checks of the existence of HEADER_{foo}_H in other header files     was a really bad idea.  For example, the following:
      Add info on what some other people are currently working on.
      Make sure that bs is not getting free'd again.     Reported by Robert Eiglmaier <robert.eiglmaier at ixos.de>
      This seems to work better with enums...
      Change to have a single library that works on both Win9x and WinNT.     As far as I understand, it still needs to be compiled on NT...     Contributed by Arne Ansper <arne at ats.cyber.ee>
      First of all, with the current macros, we should never get any     type-specific stack function.  Second, even when we don't build any of     those functions, DECLARE_STACK_OF lines should not find themselves     into $def.
      Add support for dynamically created and destroyed mutexes.  This will     be needed in some ENGINE code, and might serve elsewhere as well.     Note that it's implemented in such a way that the locking itself is     done through the same CRYPTO_lock function as the static locks.
      Modifications for VMS.
      With the new stack hack macros, there's no need to shorten the names     any more.
      Redo the support for dynamic locks.  First of all, it was terribly     insecure, so a static lock is added to isolate the sensitive parts.     Also, to avoid one thread freeing a lock that is used by another, a     reference counter is added.
      The dynamic thread API changed, and so does the documentation.
      Add the missing callback pointer handling functions.     Also, make sure empty slots of the dynamic lock stack are used.     Actually, I'm not really sure this is the right thing to do, and may     remove it, with an endlessly growing stack as result...
      'make update'
      Small change to accept the command line parameter '-rand file'.  This     parameter takes precedence over the RANDFILE option in the     configuration file.
      Document the change in req.
      Forgot the self-documentation within req.
      Move the certificate and key loading functions to apps.c, so they can     be shared by several applications.
      On case-insensitive systems, the 'install' target gets matched against     the 'INSTALL' file, which means that 9 times of 10, the BlowFish     headers won't get installed.  Avoid this in the same way it's done in     crypto/des/Makefile.ssl, where someone apparently has thought of this...
      Change req so the new parameter '-rand file' uses the given file in     addition to the file given through the RANDFILE option or environment     variable.
      Document the change in req.
      Move add_oid_section to apps.c, so it can be shared by several     applications.  Also, have it and the certificate and key loading     functions take a BIO argument for error output.
      Added references to RFCs 1421 to 1424, that describe PEM.     Suggested by Randolph Bentson <bentson at grieg.holmsjoen.com>
      Make sure we use /usr/sbin/sysctl, especially since /usr/sbin is not     always in the users $PATH...
      That's it, I've seen questions about this one time too many for     today.  Time to add extra info so the poor users know where to     go with their troubles.
      Make it possible for people to tell where the EGD socket is through     the RANDEGD environment variable.
      Make it possible for users of the openssl applications to specify the     EGD should be used as seeding input, and where the named socket is.
      Document my latest changes.
      Undo the changes I just made.  I'm not sure what I was thinking of.     The message to everyone is "Do not hack OpenSSL when stressed"...
      Give the user the option to measure real time instead of user CPU time.
      Add a blurb on how to solve the problem with failing compiltaion of sha_dgst.c on Alpha True64 Unix
      Beautification
      I got sick and tired of having to keep track of NIDs when such a thing     could be done automagically, much like the numbering in libeay.num and     ssleay.num.  The solution works as follows:
      Document the change.
      Change the FAQ entry a bit, giving the details as I observed them.
      More experiments show that you can set your data segment size soft     limit higher and thereby get through compilation of sha_dgst.c.
      Corrected small bug that could add ',L' when it shouldn't
      FAQ about ar "missing" on Solaris.
      We do PKCS8 as well
      Redo and enhance the support for building shared libraries.  Currently     there's support for building under Linux and True64 (using examples     from the programming manuals), including versioning that is currently     the same as OpenSSL versions but should really be a different series.
      Show the running line count and definition cont in debug mode.  That     has helped me a bit when I ran into trouble.
      Add a note on installation under Win32.
      "make update"
      This isn't entirely necessary if you do everything right from the     start, but can save you some trouble.  Just ignore "shared" if it     comes up among the given options, at least for now...
      Avoid loops, and make sure that it's possible to still build shared     libraries even if the "shared" configuration option wasn't chosen.
      Add support for solaris shared libraries, currently just experimental     (there's no way to get it through configuration yet).
      Avoid a race condition if another thread happens to remove the error     state at the same time.
      Darrel Hankerson <dhankers at cacr.math.uwaterloo.ca> correctly discovered     that of the result pointer to bn_mul was the same as one of the two arguments,     That argument might have it's sign destroyed.  He provided this fix.
      There's a deadlock when ssleay_rand_bytes is called the first time, since     it wants to stir the pool using ssleay_rand_add.  This fix provides the     possibility to call ssleay_rand_add inside a locked state by simply telling     it not to do any locking through a static variable.  This isn't the most     elegant way one could do this, but it does retain thread safety during the     stirring process.
      When data are written out in very small blocks (less than 3 bytes in     size) through the base64 filter, b64_write() messes up it's parameters     in such a way that instead of writing correct base64 output, the first     4 characters of that output is repeated over and over.  This fix     corrects that problem.
      Add the possibility to get hexdumps of unprintable data when using     'openssl asn1parse'.  As a side effect, the functions ASN1_parse_dump     and BIO_dump_indent are added.
      Looks like Win32 builds do not define THREADS.  However, they're still     supporting threads, which means that th assertion is supperbly     dangerous, so make sure it's not compiled under Win32, period.
      In the case where a < 0 and |a| < w, the result (assigned to a) from     BN_add_word becomes wrongly negative...     This was discovered by Darrel Hankerson <dhankers at cacr.math.uwaterloo.ca>
      There's a slight possibility that a is 0 in BN_sub_word(), and might     therefore have unallocated parts.  Therefore, a check for the 0 case     is needed, resulting with the same thing as when a is negative.
      If a ip address is successfully parsed, the WSA structure under Win32 wasn't     properly initialised.  Fixed.     Bug reported by DeJuan Jackson <djackson at inverge.com>
      Remove casts that are no longer needed.
      Make it so we can dynamically enable memory allocation debugging through the     environment variable OPENSSL_DEBUG_MEMORY (existence is sufficient).  At the     same time, it makes sure that CRYPTO_malloc_debug_init() gets expanded some-     where and thereby tested for compilation.
      A few corrections with the shared library support:
      Add support for shared libraries on Solaris.
      I had completely forgotten that print_table_entry also needed to read the two     "shared" variables on it's own...
      "make update"
      It's probably a good idea to make the shared libraries depend in EX_LIBS.
      We've now covered the shared library support for Solaris, so the -shared hack     in config is no longer needed.
      Added and corrected documentation for the 'shared' option
      *mumble* unicos 10.0.0.3 with Cray Standard C Version 6.2.0.0 has a syslog.h     where the openlog() is declared like this:
      Unicos doesn't have sys/timeb.h.  Fix it by defining the TIMEB macro unless on Unicos.
      On Unicos, openlog() isn't constified, so let's not do that in xopenlog()
      On Unicos, shorts are 8 bytes, so instead, use a structure with 2 32-bit ints, just as in destest.c
      For n > 7, we might get uninitialized (unzeroed) data.     Spotted by "Kyoungho Jeon" <k.h.jeon at securesoft.co.kr>.
      Make sure that 'initialized' is zeroed as well when cleaning up.
      Duplicate names detected...
      Abdelilah Essiari <aes at george.lbl.gov> reports that for very small     records, EVP_EncodeUpdate() may misbehave.  This happens when there's     a record boundary between the two ending b64 equal signs, which makes     EVP_EncodeUpdate think there has been more than one EOF, and therefore     add an extra NUL at the end of the output buffer.  This fix corrects     that problem.
      The pkcs12 had no way of getting a CA file or path to be used when     building a complete chain.  Now added through the -CAfile and -CApath     arguments.
      Memory leaks fix.  There seems to be more in other parts of OpenSSL...
      Memory leaks fix.  It now looks like all memory leaks, at least around     building complete chains, are gone.
      MD4 implemented.  Assar Westerlund provided the digest code itself and the test utility, I added the bits to get a EVP interface, the command line utility and the speed test
      I forgot this file that Assar provided as well...
      IBMcxx complains that maxmem is as low as 2048 for certain modules     (like all the digests).  Setting maxmem to 16K seems to give the     compiler enough space to do all the optimization it wants.
      Correct the title.  This also fooled the automatic documentation builder     that this was actually the pkcs7 document...
      Allow reconfiguration.  This can be useful if some source update     requires that you configure again, but you don't want to reenter all     those configuration arguments again.
      Document the reconfiguratoin option for Configure.
      New option 'ctestall' for mkdef.pl, that makes it not only generate     existing functions, but really all functions that exist in libeay.num     and ssleay.num.  This is a good check on how much we should actually     clean up the number files.
      make update
      Added md4 to the VMS compilation
      Add more diversity to the possible log levels.  Now we have full     coverage for all syslog level.
      Document the added diversity to the possible log levels.
      NULL is not an integer...
      Added BIO_vprintf() and BIO_vsnprintf().  The former because I've     found myself needing it a number of times, the latter for completeness.
      Assar wanted an address change.
      Added OIDs from RFC 2247, 1155, and a few from 1700
      Change the printing mahine used by BIO_printf() and friends so it can     handle an externally provided "static" buffer as well a a dynamic     buffer.  The "static" buffer is filled first, but if overflowed, the     dynamic buffer is used instead, being allocated somewhere i the heap.
      Another thing I'm working on.
      It's not just VMS that needs some symbols to be hacked.  Let's     centralise those hacks in crypto/symhacks.h and use it everywhere it's     needed.
      Major hack of mkdef.pl.  There should be no more need to redo the     process when some symbols are missing.  Instead, all needed info is     saved in the .num files, including what conditions are needed for a     specific symbol to exist.
      *.num rewitten to include the extra information.
      'make update'
      Two places where I forgot to change vms_idhacks to symhacks.
      Synchronise the VMS build with the Unix one.
      Clarify how one should behave when make fails.  The fault is not     necessarely ours.
      More VMS synchronisation
      Marin Kraemer <Martin.Kraemer at MchP.Siemens.De> sent us patches to make     the OpenSSL commands x50 and req work better on a EBCDIC system.
      A cast is needed or Borland C will complain.
      I started with a make update, but a rewrite was actually needed.     Perhaps we should make rewrites the default thing to do?
      Time to release a beta.  Change the version numbers and dates     accordingly.
      Time to release a beta.  Change the status accordingly.
      Last minute update, in time to make it to 0.9.6-beta1
      Reports for OpenBSD 2.7 and HP-UX 10.20
      Don't include e_os.h before the system headers
      OpenBSD doesn't support timeb.
      linux-elf passed
      mkdef.pl has erroneous conditions to check if a symbol is excluded     from the given target.  Fixed, I hope.
      mkdef.pl still needed better logic.  Also, the semantics of the     platforms list is clarified (it's however not quite followed in the     RSAREF case...).
      Failure on Solaris when using the CSwift card.
      debug-linux-elf and debug-linux-elf-efence need to be linked with     libdl just as linux-elf...
      A couple more HP-UX targets tested.
      DSA_verify() and DSA_sign() might return -1...
      SCO 5.0.5 with both gcc and cc passed
      Linux in Sparc v7 passed
      Better error checking for RSA and DSA signature and verification speed     tests.  This was required to not get mysterious errors when they     wouldn't quite want to work.
      FreeBSD and solaris with gcc passed
      Note the failure on Win32
      Holger Reif reports a few more Solaris successes.
      A few more systems reported successfull.
      3 changes:     - Make sure PCURSORINFO is defined even on systems that do not provide it.     - Change the reference to Peter Gutmann's paper.     - Make sure we don't walk the whole heap lists for performance reasons.       Jeffrey Altman suggests following Peter Gutmann's advice to keep it       to 50 heap entries per heap list.
      Make sure that Configure will defined DSO_WIN32 for the Win32 targets.  I feel a bit unsure if this should really be done for Mingw32 and CygWin32
      Update info on what has been fixed, and switch format for failure data
      Update info on what has been fixed
      One more passed test
      Jeffrey Altman convinced me this patch was really needed, or there is     no way to make sure GetCursorInfo will give us a valid answer.
      rsa_num2 is no longer used, so remove it.
      Remove indentation in the NAME section.  There's really no need to     indent there, especially since the pod2* scripts will regard that as     preformated text.  In one case, indent a code section one step.
      Add a configuration for Sony News 4.     Submitted by NAKAJI Hiroyuki <nakaji at tutrp.tut.ac.jp>
      Add a number of documentation files, mostly for SSL routines, but also     for a few BIO routines.     Submitted by Lutz Jaenicke <Lutz.Jaenicke at aet.TU-Cottbus.DE>
      Remove indentation in the NAME section.  There's really no need to     indent there, especially since the pod2* scripts will regard that as     preformated text.  In one case, indent a code section one step.
      Add Damien Miller's RPM specification file with a few modifications.
      Remove engine stuff that was erroneously put in the main trunk.
      Items without a =over and a =back are ignored.
      BIO_seed() and BIO_tell() were documented in two other documents,     which is redundant.  Instead, move them to their own page.
      BIO_seed() and BIO_tell() were documented in two other documents,     which is redundant.  They are now in their own document.
      Update the info on version numbering
      In the name section, all the functions described shoud be enumerated.     This will also make it much simpler to generate softlinks name like     each function to man-pages containing the info.
      Later, Jeffrey changed his mind.  Apparently, GetCursorInfo exists but     doesn't quite work on WinNT 4 earlier than SP6.  It works fine on     Windows 98 and Windows 2000.
      Add a flag for OpenVMS.
      'make update'
      Move up inclusion of conf.h, so non-MONOLITH programs can benefit from     it as well, especially in apps.c.
      A DSO method for VMS was missing, and I had the code lying around...
      Make sure dso_vms.c compiles on other operating systems as well.
      'make update'
      Compile all dso files on VMS as well.
      Add BIO_seek() and BIO_tell() to the BIO control functions manual.
      Move text that isn't really descriptions of the functions in the page     to the NOTES section, and add references to the functions mentioned     (and perhaps a few more).
      VMS didn't work out too well...
      Inform the VMS people that RSAref is no longer needed
      Make sure Compaq C doesn'r complain about dollars, and go around the     incompatibility between function and data pointers.
      A couple of more names need to be shortened for VMS on VAX.
      Some platforms define NULL as ((void *)0).  Unfortunately, a void*     can't be used as a function pointer according the the standards.  Use     a 0 instead and there will be no trouble.
      Tell users that a rewrite might be a good idea.
      Oops, no engine in the main trunk.
      siglen is unsigned, so comparing it to less than 0 is silly, and     generates a compiler warning with Compaq C.
      Use sk_*_new_null() instead of sk_*_new(NULL), since that takes care     of complaints from the compiler about data pointers and function     pointers not being compatible with each other.
      Jeffrey Altman <jaltman at columbia.edu> sent me a patch that fixes the     problems with GetCursorInfo, but also adds network statistics and     performance statistics where available.
      Restore the descriptions to conform with the rest of the     documentation.  We'll work on better documents after the release of     0.9.6.
      A patch from HP for better performance.     Submitted by Kevin Steves <ks at hp.se> 3 months ago...
      make update
      A new beta is being released.  Change the version numbers     accordingly.
      Declare the availability of beta 2 in STATUS.
      Jeffrey Altman reminds us to initialize some variables and ercommends the use of LOadLibrary instead of GetModuleHandle
      Unless we cast, thorough compilers will complain
      The test status as it has been reported so far
      Typo in the added hpux targets.  -ldl should be -ldld.
      HP-UX didn't go through
      Disable the net statistics gathering code, since different compilers     disagree on the proper syntax and type names.
      cyclecount is only used when __GNUC__ isn't defined.
      Going through performance statistics sometimes generates an exception,     so disable that part.     Reported by Jeffrey Altman <jaltman at columbia.edu>
      A few more reports
      A few more reports
      No engine stuff in the main trunk.
      A few more reports
      HP-UX 64-bit has dlfcn, so let's use that instead of the old dl.
      New documentation about things related to SSL_CIPHER.  Submitted by Lutz Jaenicke <Lutz.Jaenicke at aet.TU-Cottbus.DE>
      ftime() is not supported on SGI.     Reported by Steve Robb <steve at eu.c2.net>
      A couple more reports.
      Reorder the Blowfish documentation so the low-level routines do not get so prominent, and make sure to say out loud what they expect.
      A few more HP-UX reports.  Reported by Kevin Steves <stevesk at sweden.hp.com>
      FreeBSD only supports ftime() through libcompat, which means it's     better not to use it.
      It seems like all HP-UX are successes as soon as the -ldl vs. -ldld     quirk is fixed.
      Extend the docs on setting the cipher list.  Lutz Jaenicke <Lutz.Jaenicke at aet.TU-Cottbus.DE>
      Type correction.  Lutz Jaenicke <Lutz.Jaenicke at aet.TU-Cottbus.DE>
      Document SSL_library_init() and it's aliases.  Lutz Jaenicke <Lutz.Jaenicke at aet.TU-Cottbus.DE>
      BSDI only supports ftime() through libcompat, which means it's     better not to use it.
      make update
      On VMS, stdout may very well lead to a file that is written to in a     record-oriented fashion.  That means that every write() will write a     separate record, which will be read separately by the programs trying     to read from it.  This can be very confusing.
      Wrong variable used.  It's funny how some bugs take a long time     getting triggered...
      AIX doesn't like ftime() either.
      Reports about a few old systems.     Reported by Bernhard Simon <bs at bsws.zid.tuwien.ac.at>
      Add news and a description of the ENGINE part and how it's currently     distributed.
      Mistakes corrected.  Lutz Jaenicke <Lutz.Jaenicke at aet.TU-Cottbus.DE>
      New documents.  Lutz Jaenicke <Lutz.Jaenicke at aet.TU-Cottbus.DE>
      Portability patch for HP MPE/iX.  Submitted by Mark Bixby <mark_bixby at hp.com>
      Clarifications and new documents.     Submitted by Lutz Jaenicke <Lutz.Jaenicke at aet.TU-Cottbus.DE>
      Changes by Jeffrey Altman <jaltman at columbia.edu> to make RAND_poll()     work better in Win32.  Verified by zhu qun-ying <qyzhu at krdl.org.sg>.
      I'm using GNU tar...
      make update
      Time to build beta 3.  Bump the version numbers accordingly.
      Prepare STATUS for the beta 3 reports.
      Tests so far.
      Tests so far.
      More reports.
      Ugly hack to make sure static libraries are usable.  Without this,     anything that just links with libeay32.lib or libssl32.lib will get an     error saying the __imp__RegQueryValueEx is unresolved.
      Oops, if the target only had USE_TOD, an error message was issued...
      More reports
      Change IMPORTANT to WARNING for greater emphasis.
      More reports
      More reports
      More reports
      Kris Kennaway <kris at FreeBSD.org> tells us that FreeBSD/Alpha shouldn't     use an optimization higher than -O.
      Problem on FreeBSD/Alpha fixed.
      Catch V_ASN1_NULL.
      Change the Windows building scripts to enable DSO_WIN32.
      make update
      Time to build the release.  Bump the version info accordingly.
      Forgot to change the STATUS file...
      Update the status and version number to 0.9.7-dev.
      Make the algorithm implementations depend on the corresponding     selection macros.
      'ranlib' doesn't always run on some systems.  That's actually     acceptable, since all that happens if it fails is a library with     an index, which makes linking slower, but still working correctly.
      echo=off works on NT, but not on W2K.
      When creating a .def file, be a bit more selective so disabled     algorithms do not get in...
      Update
      Document the change.
      A compiler warning removed.  Thanks to the folks at HP!
      Include arpa/inet.h, since that's where htons() and friends are     supposed to be defined according to XPG4.2.     Found by Evan <n2xjk at ulster.net> for the MVS platform.
      Remove what was described by someone as "an EAY hack for compiling     SSLeay with Colin Plumb's MD5 implementation instead of his one".
      Document...
      More SSL functions documented.  Submitted by Lutz Jaenicke <Lutz.Jaenicke at aet.TU-Cottbus.DE>
      Linux on Alpha has the configuration name linux-alpha-gcc, not     linux-alpha.
      Linux on Alpha with gcc knows about shared libraries.
      Make sure that shareable libraries are turned off if we don't know how     to make them...
      Make sure ranlib is only used on .a libraries.
      A few small corrections to the SSL documentation.     Submitted by Lutz Jaenicke <Lutz.Jaenicke at aet.TU-Cottbus.DE>
      Do a favor to those who get weird compiles and report if RAND_pseudo_bytes     returns -1...
      New docs and new facts in older docs.     Submitted by Lutz Jaenicke <Lutz.Jaenicke at aet.TU-Cottbus.DE>
      make update
      Make the new conf implementatoin bug-compatible with the old one.     Actually, it's a feature that it goes looking at environment     variables.  It's just a pity that it's at the cost of the error     checking...  I'll see if I can come up with a better interface for     this.
      Bump the shared library version (should have been done a while ago).
      Rework the system to generate shared libraries:
      Even when you don't want to create shared libraries, it's a good idea     to have the full extension information, so residual shared libraries     can be removed so the applications and test programs do not get linked     against them by mistake...
      The experimental Rijndael code moved to the main trunk.     make update done.
      CRYPTO_get_ex_new_index would never return an error.
      Two questions have been asked quite often lately.
      John Denney <jdenney at ca.mdis.com> reports that we forgot to convert     Free to OPENSSL_free in the SSL demos.
      NCONF_get_number() has no error checking at all.  As a replacement,     NCONF_get_number_e() is defined (_e for "error checking") and is     promoted strongly.  The old NCONF_get_number is kept around for     binary backward compatibility.
      Make it possible for methods to load from something other than a BIO,     by providing a function pointer that is given a name instead of a BIO.     For example, this could be used to load configuration data from an     LDAP server.
      Keep binary backward compatibility by putting new method function     pointers at the end of the structure.
      Document the change to NCONF.
      make update
      Add what's needed to get shared libraries on HP-UX.
      FreeBSD-elf can do threads.  However, there seems to be confusion if     you should defined _THREAD_SAFE (I found that in an include file, and     that's what everybody tells me) or _THREADSAFE (that's what the gcc     manual says in the FreeBSD-specific section), so I defined both, just     to be safe.
      Krister Walfridsson <cato at df.lth.se> tells us sysctl lives in /sbin     since NetBSD 1.5.
      There's no reason why app_RAND_load_file() should return 0 when     RAND_status() hasn't.     Reported by Dale Stimson <dale at accentre.com>.
      Document
      On some operating systems, MAX is defined.  Call ours OSSL_MAX instead
      If the functions get_dh*() are declared static, they should be defined the same way
      Pointer error corrected
      It seems like grep isn't as capable as I thought on some Unix systems.     Use egrep instead.
      When building shared libraries on HP-UX 10.20 and HP-UX 11.00 (32bit),     ld warns that -Fl "may not be supported in future releases".  We know     that, and are doing things in HP-UX 11 (64bit), so turn off that     warning with +vnocompatwarnings.
      For the operating systems where it matters, it is sometimes good to     translate library names by only adding ".so" to them without     prepending them with "lib".  Add the flag DSO_FLAG_NAME_TRANSLATION_EXT_ONLY     for that purpose.
      On HP-UX, at least when shl_* are used, the libraries have the     extension .sl instead of .so.
      Merge the engine branch into the main trunk.  All conflicts resolved.     At the same time, add VMS support for Rijndael.
      The majority of the OCSP code from CertCo.
      make update
      Document the OCSP addition.
      NetBSD doesn't use ftime().
      Small documentation change
      Add the possibility to use keys handled by engines in more     applications.
      Document the change.
      Make flag variables int instead of char.  This avoids getting into trouble on systems where char is unsigned by default
      Add configuration option to build on Linux on both big-endian and     little-endian MIPS.     Submitted by Ralf Baechle <ralf at uni-koblenz.de>
      Improvements to openssl.spec.     Submitted by Damien Miller <djm at mindrot.org>     This change has been CC:ed to crypt at bxa.doc.gov
      Rename true64 to the correct tru64.     Suggested by Albert Chin-A-Young <china at thewrittenword.com>
      Add support for shared libraries under Irix.     Submitted by Albert Chin-A-Young <china at thewrittenword.com>
      Add application to enumerate, list and test engines with.
      -t is supported, so display some help about it.
      make update
      Better error reporting in 'openssl engine'
      'openssl engine' can now list engine capabilities.  The current     implementation is contained in the application, and the capability     string building part should really be part of the engine library.     This is therefore an experimental hack, and will be changed in the     near future.
      Change the engine library so the application writer has to explicitely     load the "external" built-in engines (those that require DSO).  This     makes linking with libdl or other dso libraries non-mandatory.
      Update the standards list to the current status
      Instead of just STACK, use STACK_OF(ASN1_OBJECT).
      Make sure that shared libraries get the internal name engine with the     full version number and not just 0.  This should mark the shared     libraries as not backward compatible.  Of course, this should be     changed again when we can guarantee backward binary compatibility.
      mode used too early in EVP_PKEY_save_parameters.     Spotted by Ken Lalonde <ken at torus.ca>
      Constify the BIGNUM routines a bit more.  The only trouble were the     two functions that did expansion on in parameters (BN_mul() and     BN_sqr()).  The problem was solved by making bn_dup_expand() which is     a mix of bn_expand2() and BN_dup().
      Make all engines available in the openssl application.
      As a consequence of the BIGNUM constification, the ENGINE code needs a     few small constifying changes, and why not throw in a couple of extras     while I'm at it?
      Constify the RSA library.
      Constify the RSA library.
      Constify the RSA parts of the ASN.1 library.  Note some ugly casts     that are needed in the ASN.1 macros.  Hopefully, we can get rid of     those in an elegant way in the future.
      Constify the RSAref glue code.
      The consequence of constification is that to pass the address to a     pointer to a const double pointe parameter, the pointer must point to     const data as well.
      Constification of CRYPTO_get_ex_data() needed for the sake of     RSA_get_ext_data().
      Document recent constifications.
      shl_load() also needs to load along a path given through an     environment variable, SHLIB_PATH.  This change makes that possible.
      When ENGINE_by_id() couldn't find the given engine id, it generates an     error.  When checking like engine_add() is, those errors are actually     good, so remove them.
      Lutz tells me HP cc uses the same syntax for flags that should be     passed down to ld as GNU cc.
      A few more constifications of some RSA routines that I forgot     yesterday.
      Make sure ERR_get_error() is declared.
      Constify DSA-related code.
      Constify DH-related code.
      Document that the Nuron hardware has been added and remove the     requirement for an engine utility since we now have that.
      Constification of LHASH.  Contributed by "Paul D. Smith" <psmith at gnu.org>     I didn't apply all his patches yet, since I have some hesitance about     unconstifying.  To be pondered.
      Remove references to RSAref.  The glue library is but a memory to fade     away now...
      Really stupid glitch (a comment not properly ended) fixed.
      Update my own debugging configuration entry
      Enhance granularity on what I want to debug for the moment by changing     LEVITTE_DEBUG to LEVITTE_DEBUG_MEM.
      For a long time, I've wanted to be able to easily run one or a few     individual tests.  I finally got myself to implement it...
      Add Rijndael as things to look through.
      Typo, was "time" instead of "tim".     Caught by Jeffrey Altman <jaltman at columbia.edu>
      Detect and mark functions that no longer exist.
      Get the Rijndael function declarations.
      make update
      Two OCSP functions that aren't yet implemented.
      Modify () to (void), since that's what is actually defined in the     engine structure, and some ANSI C compilers will complain otherwise.
      /proc/cpuinfo can have several lines containing the word "type".  We want the one that is "type", plain and simple.  Caught by Raoul Borenius <borenius at shuttle.de>
      I've checked again and again.  There really is no need to expand a to     4 times it's size when bn_sqr_recursive() won't look farther than the     original length.  Thereby, constification is no longer a problem.
      Oops, when I clean, I should do it thoroughly.
      Make sure to print the BN counting (BN_COUNT) to stderr instead of     stdout.  bc gets so confused by bean counts.
      More constification of the BN library.
      Make sure BN_DIV2W is not defining when defining it, and remove the     declarations of bn_add_part_words() and bn_sub_part_words() since they     do not exist.
      I might want to debug the assembler modules...
      Make the definition of bn_add_words() match the definition.
      Remove a declaration for a function that does not exist.
      Remove two bn_wexpand() from BN_mul(), which is a step toward getting     BN_mul() correctly constified, avoids two realloc()'s that aren't     really necessary and saves memory to boot.  This required a small     change in bn_mul_part_recursive() and the addition of variants of     bn_cmp_words(), bn_add_words() and bn_sub_words() that can take arrays     with differing sizes.
      Add news items early.  Please fill in with what I have forgotten.
      I wonder if I do too much...
      Make sure bs is assigned NULL when it's free'd, or there will be an     (incorrect) attempt to free it once more...
      'echo on' works better all over than 'echo=on'.  We had the same     problem in some other file, but I can't recall which.
      Avoid getting warnings about unary - being used on unsigned integer.
      Reimplement bn_div_words, bn_add_words and bn_sub_words for VAX.     I'm a little bit nervous about bn_div_words, as I don't know what it's     supposed to return on overflow.  For now, I trust the rest of the     system to give it numbers that will not cause any overflow...
      Addapt the VMS scripts to the changes in the Makefiles.
      Addapt the VMS scripts to the changes in the Makefiles.
      Correct a number of syntax errors.
      Addapt to added files in the BIGNUM section
      Copy and paste error...  bn_add_part_words() should of course call     bn_add_words(), not bn_sub_words()...
      Changes to c_zlib.c to make ZLIB.DLL dynamically loadable under     Windows.  Really, this should probably be done on Unix as well, but     that will be a later story...
      Change c_zlib further to allow loading a shared zlib on all operating     systems where such an operation is supported.
      Make it possible to test SSL compression
      COMP_METHOD has a new argument since some time back...
      Turn off memory checking when loading new compression algorithms.
      comp_methods in a SSL_CTX points at an internal database.  Do *not*     free that, since it's shared by all SSL_CTX's, present and future.
      Simplify and provide the possibility to clean a compression method.
      The compression method may be undefined for some reason that has     generated errors.  Therefore, print whatever error there may be...
      New format for the FAQ.  We now have different sections for different     types of questions.  Hopefully, that'll make them easier to spot, and     specially, easier to refer to.
      A few bug fixes for Windows.
      First tentative impementation of Kerberos 5 cryptos and keys for SSL/TLS.  Implemented by Vern Staats <staatsvr at asc.hpc.mil>, further hacked and distributed by Jeffrey Altman <jaltnab at columbia.edu>
      Recognise Darwin as well.  For now, have it do exactly the same thing as for Rhapsody
      Typo corrected.
      Document the addition of Kerberos stuff.
      Correct a mail address...
      Write a first HOWTO on how to create certificates.  This is currently     a draft.
      Add a comment to explain the purpose of bn_cmp_part_words().
      Remove the last bn_wexpand()s that made us break constness.  Of     course, that means we need to handle the cases where the two arrays to     bn_mul_recursive() and bn_mul_part_recursive() differ in size.
      It's completely unnecessary to add a compression algorithm that is     really undefined.     Spotted by Jeffrey Altman <jaltman at columbia.edu>
      On Windows, Rainbow uses _stdcall convention under Windows.     Spotted by plin <plin at rainbow.com>
      Update the internal docs.
      Have the self test use bctest to check that bc is sane.
      During the self test, we only want to know what bctest says on     stderr...
      Make TYPE_RSA the default type instead of just setting it when -new is     given.  That also allows the arguments to come in any order (-new     last, for example).
      SSL_new() may potentially add a certfificate.  Therefore, wen     duplicating the certificate that is in the original SSL, remove the     one that SSL_new() provided, if any.     Spotted by: Mike Zeoli <zeoli at roguewave.com>
      When using -pedantic, it's a good thing to define PEDANTIC as well.     Also, define a second debugging configuration without assembler.
      In bn_mul_recursive(), make sure the comba routines are only called     when both a and b are of the exact right size.  This may change to     something better later.
      Problem: bn_mul_normal() misbehaves if the size of b is 0.     Solution: multiply a with 0, putting the result in r, and return.
      Constification of the data of a hash table.  This means the callback     functions need to be constified, and therefore meant a number of easy     changes a little everywhere.
      Make sure each FAQ item has an index entry.
      Do not poll DEVRANDOM if we?re building without an file pointer API.     Spotted by "David Schwartz" <davids at webmaster.com>.
      Update VMS build procedures to match the current status.
      Enhancements to mkdef.pl:
      "make update" plus a rewrite of both .num files.
      Correct a typo.
      Check for deselection of KRB5.  In fact, skip it completely on VMS for now...
      Uhmm, the keyword TRUE does not exist of course...
      Remove anything connected to RSAref, since that's gone by now.     Add the C macros OPENSSL_BUILD_SHLIBCRYPTO and OPENSSL_BUILD_SHLIBSSL     to the build of the object files as appropriate for each library.
      Define OPENSSL_EXPORT and OPENSSL_IMPORT and give OPENSSL_EXTERN the     default value OPENSSL_IMPORT.  Explain the use of all those macros.
      If OPENSSL_BUILD_SHLIBCRYPTO (for files that end up as libcrypto     objects) or OPENSSL_BUILD_SHLIBSSL (for files that end up as libssl     objects) is defined, redefine OPENSSL_EXTERN to be OPENSSL_EXPORT.     This is actually only important on Win32, and can safely be ignored in     all other cases, at least for now.
      Document.
      Remove RSAref-related things.
      Since asn1.h gets included recursively from many places, the easiest     is to have asn1.h include e_os.h and e_os2.h.  Of course, this makes     the unofficial "non-export" status of e_os.h a bit delicate...
      Temporary measure: if no KRB5 is defined, add "no-krb5" to the     options.  This is so mk1mf.pl can pick it up from Makefile.
      Look for no-krb5 and add the definition of NO_KRB5 if it's there.     I've no idea were the KRB5 header files and libraries are placed on     Win32.  When there's better knowledge, we might be able to process the     other KRB5-related arguments as well...
      The option line may start with a space, which gives an empty option.     Make sure those are purged...
      Make the DSO code for VMS work again.  First attempt.
      Keep up with the Unixly changes.
      Change RAND_poll for Unix to try a number of devices and only read     them for a short period of time (actually, poll them with select(),     then read() whatever is there), which is about 10ms (hard-coded value)     each.
      Because /dev/urandom has a better chance of giving us a good and     quick answer, take that one first.
      Keep up with Unix code.  It's beginning to be  time to rethink the VMS     build system...
      As response to a user request to be able to use external memory     handling routines that need file name and line number information,     I've added a call level to our memory handling routines to allow that     kind of hooking.
      Add configuration for GNU Hurd.
      Keep up with Unix
      Make the change log on the RAND_poll change a bit more explicit.  Suggested by Bodo Moeller.
      Documentation language corrections, contributed by Chris Pepper <pepper at mail.reppep.com>
      Increase consistency of header data (some mail readers really do not     like spaces before the semicolon, and besides, other parts of this     file makes the values without those spaces), and move spacing of     continuation lines to support BIO's that break lines after each     write.
      Document the change.
      Fix a memory leak in BIO_get_accept_socket().  This leak was small and     only happened when the port number wasn't parsable ot the host wasn't     possible to convert to an IP address.     Contributed by Niko Baric <Niko.Baric at epost.de>
      Add the -VAfile option to 'openssl ocsp'.  This option will give the     client code certificates to use to only check response signatures.     I'm not entirely sure if the way I just implemented the verification     is the right way to do it, and would be happy if someone would like to     review this.
      The check for request including a nonce and response not having it was     inversed.  Corrected.  Hopefully, this will make it work without     dumping core.
      Update of linux-ppc.  Contributed by MATSUURA Takanori     <t-matsuu at protein.osaka-u.ac.jp>
      Include the newly reported problem with bc on FreeBSD 4.2.
      Make it possible to use gcc to generate the dependency tables.
      Perl code patch contributed by "Kurt J. Pires" <kjpires at iat.com>     His own words are:
      VMS follows suit.
      Make the choice of "makedepend" program choosable through a switch.
      Do not insert things in syms{} and kind{} when parsing the header     files.  Instead, insert proper information in the $def string, which     will be properly munged later on.
      An obvious but hard-to-see cut'n'paste error corrected.
      make update
      Remove temporary files when done.
      Make all configuration macros available for application by making     sure they are available in opensslconf.h, by giving them names starting     with "OPENSSL_" to avoid conflicts with other packages and by making     sure e_os2.h will cover all platform-specific cases together with     opensslconf.h.
      I forgot to document the system identification macros
      Use the new-style system-identity macros.
      Make sure time() is properly declared.
      I'm sick of the warnings about long long...
      Use new-style system-id macros.
      Use new-style system-id macros everywhere possible.  I hope I haven't     missed any.
      Use 0 instead of NULL, at least for function casts, since there are     variants of stdio.h that define NULL in such a way that it's "unsafe"     to use for function pointer casting.
      Include string.h so mem* functions get properly declared.
      Include OpenSSL header files earlier so macros like OPENSSL_SYS_VMS     get a chance to be defined.
      Include string.h so mem* functions get properly declared.
      Use sk_*_new_null() instead of sk_*_new(NULL).  That avoids getting     lots of silly warnings from the compiler.
      DEC C on VMS is pedantic by definition.
      Let VMS catch up.
      Include opensslconf.h or the like early to make sure system macros get     correctly defined.
      Include OpenSSL header files earlier so macros like OPENSSL_SYS_VMS     get a chance to be defined.
      Include OpenSSL header files earlier so macros like OPENSSL_SYS_VMS     get a chance to be defined.     Make a batter file name translator (uhm, no, that's not the finished     variant :-)).
      DEC C on VMS is pedantic by definition.
      A new bunch of too long symbols to hack.     OCSP_CRLID_new and OCSP_crlID_new clash on case-insensitive systems.
      Include string.h so mem*() functions get properly declared.
      Get the right cast for lhash callback functions.
      Get e_os2.h to get all the system definitions correctly.
      OpenVMS catches up.
      I forgot there was a reason why the inclusions and definition of u_int     was made in a certain sequence.  This change restores the earlier     "chain of command".
      Some functions, like strdup() and strcasecmp(), are defined in     strings.h according to X/Open.
      With later version of DEC C on VMS, some functions (strcmp(), for     example) are declared with some extra linkage information.  This     generates a warning when using the function name as a value to a     regular function pointer with the "correct" definition of the     function.  Therefore, use a macro to cast the appropriate function on     VMS.
      strdup() is a X/Open extension.
      I had forgotten to change mkerr.pl to use the new macro system.
      Modify mkdef.pl to recognise and parse prprocessor conditionals of the     form '#if defined(...) || defined(...) || ...' and '#if !defined(...)     && !defined(...) && ...'.  This also avoids the growing number of     special cases it was previously handling (some of them wrongly).
      'make update'
      Include e_os2.h instead of opensslconf.h.     SSL_add_dir_cert_subjects_to_stack is not implemented on WIN32 and     VMS, so declare it the same way.
      Since SSL_add_dir_cert_subjects_to_stack isn't impemented on VMS,     there's no point creating an alias for it.
      When inside a #if 0..#endif, do not define anything.
      Always include opensslconf.h, even if it's already been done before.     The reason is that some parts are only included when certain other     include files have been included.
      Windows does not know of strigs.h or strcasecmp, so when in Windows,     make strcasecmp a macro to _stricmp.
      One indirection level too little compared to the     pre-CRYPTO_MEM_LEAK_CB time.
      Since opensslconf.h might be included over and over, undefine     OPENSSL_UNISTD before redefining it, to avoid compiler warnings.
      Exported header files should not include e_os.h.
      Use e_os2.h rather than opensslconf.h, since some needed macros are     defined there.
      Since RAND_file_name() uses strlen, make sure the number that's     compared to it has the type size_t.  Included the needed headers to     make that happen.
      e_os.h does not belong with the exported headers.  Do not put it there     and make all files the depend on it include it without prefixing it     with openssl/.
      Define the OPENSSL_NO_* macros as NO_* macros for the sake of applications thathaven't yet been changed
      CONF_METHOD is one of the few places where you find MS_FAR.  I can't     really see why we need to define these function pointers with MS_FAR     if it's not done cosistently everywhere.
      e_os.h defines Getenv()
      Define the right macro for Linux and other GNU-based systems to get a correct declaration of strdup()
      make depend.
      Add the CCITT pilot directory OIDs.
      make update     Note that all *_it variables are suddenly non-existant according to     libeay.num.  This is a bug that will be corrected.  Please be patient.
      MacOSX doesn't have ftime().     Spotted by Pieter Bowman <bowman at math.utah.edu>
      Introduce the possibility to access global variables through     functions on platform were that's the best way to handle exporting     global variables in shared libraries.  To enable this functionality,     one must configure with "EXPORT_VAR_AS_FN" or defined the C macro     "OPENSSL_EXPORT_VAR_AS_FUNCTION" in crypto/opensslconf.h (the latter     is normally done by Configure or something similar).
      Spelling corrected.
      Sort platforms lexicographically as well.  Also, support more than two     variants of a symbol.
      For SSLv2, return the SSLv2 method, not the SSLv23 method.  This way,     it's possible to reuse an SSLv2 session.
      Add the possibility for option macros and start using it to indicate     for Windows compilations if DLL linkage is required or not.
      Document the SSLv2 session reuse fix.
      Update the VMS build scripts for EC
      Code for better build under Darwin (MacOS X).     Submitted by Brad Dominy <jdominy at darwinuser.org>
      VMS catches up on the EC modifications.
      Some EC function names are really long.  Make aliases for VMS on VAX.
      Build ectest too.
      Write a small comment so we know...
      Too many dollars...
      Bug fixes.
      Use 32bit longs on Alpha as well, because that's what the VMS     assembler code works with.
      For some experiments, it is sometimes nice to serve files with complete     HTTP responses.
      Document the change.
      We need to build MINFO.
      make update.
      It is a good thing to prepare the .def files.
      For AIX 4.3 or above, allow the use of dlfcn.
      bsdi-elf needs to link with -ldl.
      Minimise the amount of -L. when linking the shared libraries.  It     seems like some Unixen (SCO) have opinions about too many -L.
      An enhanced bctest submitted by Tim Rice <tim at multitalents.net>.     It now looks along $PATH for a working bc and returns the absolute     path to one that does work.
      Correct a typo which might have lead to a dump.     Noted by Martin Kraemer <Martin.Kraemer at Fujitsu-Siemens.com>
      New cofiguration for Unixwre and SCO,with slightly better granularity.  Contributed by Tim Rice <tim at multitalents.net>
      avoid linking problems when OpenSSL is built with no-dsa.  Spotted by Hellan,Kim KHE <khe at kmd.dk>
      Since they aren't implemented yet, EC_GFp_{recp,nist}_method() need to     be "#if 0"'d, or they will (re)appear as existing functions in     util/libeay.num.
      Use stdlib.h to get size_t.
      Remove redundant operations and update version info.
      We really have no need for PEX_LIBS, so empty it.
      A lot of reports.
      Small AIX problems solved.
      ln on Solaris expects -f to come before -s.     The linux-shared method is actually gcc-specific, so call it     gnu-shared as well.
      gcc uses collect2, not ld, to link things.  Therefore, when using gcc     there's no need fooling ourselves, it's the gnu-shared method that we     should use.  Do it for Solaris to begin with.
      When using the native tools on Solaris, make damn sure the native ld     is used, even if the user has GNU ld earlier in his $PATH.
      make update
      For mips3 and alpha, put the assembler file directives in separate     variables and disable the Alpha assembler for now, since it has been     shown to fail.
      Reports seem to show that asm/mips3.s has faults.  To be investigated, but let's avoid using it in the mean time
      Include bn.h so we get BN_LLONG properly defined.  Otherwise, we can forget things like %lld
      Restore asm/mips3.s to be compiled and linked in, since the bug has     (at least hopefully :-)) been fixed.
      Add news section for OpenSSL 0.9.6a.  Please add what's missing
      Since there has been reports of clashes between OpenSSL's     des_encrypt() and des_encrypt() defined on some systems (Solaris and     Unixware and maybe others), we rename des_encrypt() to des_encrypt1().     This should have very little impact on external software unless     someone has written a mode of DES, since that's all des_encrypt() is     meant for.
      I forgot to rename des_encrypt to des_encrypt1 in libeay.num.
      Stress the news about the name change.
      One des_encrypt to des_encrypt1 I forgot to commit...
      Complete the des_encrypt to des_encrypt1 rename in the main     development line as well.
      Beta 3 has been released and announced.
      linux-elf verified.
      Note reports.
      A few more reports.
      Reports on VMS.
      Remove a typo in dgux-R4-gcc.
      libfisdef.h and LIB do not exist on older VMS versions
      Reports on Windows, DG-UX and older OpenVMS.
      Plug a memory leak.  Spotted by "Shijin" <shijin at comex.com>
      Make do_bsd-gcc-shared depend on do_gnu-shared instead of the non-existent linux-shared
      OpenVMS/Alpha should use 64 bits.  If nothing else, there's     performance to gain.
      Since vms.mar handles 32-bit integers, do not use it on Alpha, that's     just a slowdown.
      Incorporate some changes that make OpenSSL compilable in CygWin.
      Correct a typo.  linux != linus.
      Unixware config.
      Fix couple of memory leaks in PKCS7_dataDecode().     (provided by Stephen)
      Add the possibility to have AES removed in Windows as well.     Spotted by Harald Koch <chk at pobox.com>
      Resize a local buffer to accomodate the size requirements of AES.     Protect against future mistakes with an assert().
      Correct info in the FAQ.
      NetBSD and OpenBSD use TOD as well
      Make it possible to move the emailAddress object to the subjectAltName     extension instead of just copying it.  That makes a certificate comply     even more with PKIX recommendations according to RFC 2459.
      Show an example of moving the emailAddress object from the subkect DN     to subjectAltName when signing a certificate.
      Add -keyform.
      Correct typo.
      VMS was behind when it comes to OCSP.
      Script to create shareable images (shared libraries in Unixly terms)     on VMS.
      User OPENSSL_UNISTD instead of <unistd.h>.     Spotted by Mark Crispin <MRC at Panda.COM>
      We shouldn't skip over header files to avoid functions of disabled algorithms.  The selection is done in a different way
      engine.h includes all the needed header files, so don't do it again     here.
      Check for OPENSSL_NO_RSA, OPENSSL_NO_DSA and OPENSSL_NO_DH and disable     appropriate code if any of them is defined.
      gcc warns when certain values of an enumeration aren't taken care of,     unless there's a default clause.
      Provide the possibility to clean up internal ENGINE structures.  This     takes care of what would otherwise be seen as a memory leak.
      Clean up ENGINE before exiting.
      make update
      Linux shared libraries can be linked with debug symbols.     Tru64 shared libraries can be linked with static libraries.
      Make proper use of all disabling variables.
      make update
      A method to create shared libraries on AIX, and according to     "Howard Chu" <hyc at highlandsun.com>, it may be general enough     to work on any Unixly system.
      Remove part conflict indicator...
      Add support for Sun C on Solaris x86.  Contributed by Ben <mouring at etoh.eviladmin.org>
      Some platforms (most notably Windows) do not have a $HOME by default.     For those, unless the environment variables RANDFILE or HOME are     defined (the default case!), RAND_file_name() will return NULL.     This change adds a default HOME for those platforms.
      Add a general user interface API.  This is designed to replace things     like des_read_password and friends (backward compatibility functions     using this new API are provided).  The purpose is to remove prompting     functions from the DES code section as well as provide for prompting     through dialog boxes in a window system and the like.
      make update
      Clarify the license and copyright, make preprocessor dirctives a     little bit clearer and use the new OPENSSL_SYS_* macros.
      Don't forget crypto/ui...
      There is no uitest
      e_os2.h defines things like OPENSSL_SYS_MSDOS, not opensslconf.h...     (basically: whooops :-))
      Put back a removed "extern", or many compilers will complain about     redefined variables.
      Move the password reading functions completely away from the DES     section.
      When doing rewrites on ssleay.num, the file was prematurely closed.     Make rewrites the default, since it works, and people get confused if     changed information doesn't get rewritten automagically.
      des_read_password() and des_read_2passwords() can only appear if DES     is compiled.
      Win16 too :-).
      make update
      Define `ok' and better error detection.
      A randomizer for OpenVMS, using the statistics that are easily     reachable.
      Document the addition.
      It seems like the removal of "extern" before "static" wasn't a     mistake.
      Make it so the compiler doesn't inform me about the dollars in some     symbols.
      Use ui_compat.h to get the password reading functions.
      len is a size_t, which is an unsigned integer.  Therefore, some     compilers will complain against the check for less than zero.
      Make more short aliases for symbols that are longer than 31     characters.
      Remove the password reading objects from LIB_DES.
      ui_compat.h was forgotten in the "symlinking" routine.
      ui was forgotten when installing libcrypto and it's headers.
      Make sure memset() is properly declared.
      Make sure strdup() is properly declared.
      branch on equal is beql, not beq...
      Low-case the names of the system routines, since some versions of     DEC C only have them declared that way (it doesn't really matter,     since the linker is case-insensitive by default)
      Do not forget to increment the pointers...
      New internal function OPENSSL_gmtime, which is intended to do the same     as gmtime_r() on the systems where that is defined.
      Add a few more details on what one might need.  make and a development     environment were a part of a Unix operating systems, but these days     you see an increasing number of installations that do not necessarely     have these crucial parts by default, so it's needs mentioning.
      Add a requirements section for OpenVMS.
      VMS doesn't support more than on period in a file name
      We had the password callback for ENGINEs pretty much wrong.  And     passwords that were given to the key loading functions were completely     ignored, at least in the ncipher code, and then we made the assumption     that the callback wanted a prompt as user argument.
      Document the latest change in ENGINEs.
      A wish was expressed.
      Extend all the loading functions to take an engine pointer, a pass     string (some engines may have certificates protected by a PIN!) and     a description to put into error messages.
      Don't decrement the reference counter twice when destroying dynamic     links.
      Stop mishandling the type number in dynlock locking
      nCipher callbacks shall return 0 on success, something else otherwise.
      Confusion between algorithms resolved.
      Added more info in SRP.
      More info on SRP.
      Accept digits in symbol names.  Spotted by Brian Havard <brianh at kheldar.apana.org.au>
      Small detail about AIX forgotten...
      A good use of the UI interface is as a password callback replacement     (for new functions...).  One might still want to be able to pass down     a user-data pointer to be used by the UI.  However, ex_data doesn't     quite cut it, since that means the appropriate index to it might need     to be shared between parts that aren't really related in that sense,     and would require the currently hidden (static) index holders to be     uncovered.  Not a good thing.  Therefore, add the possibility to add a     user-data pointer to a UI.
      Defining __USE_XOPEN_EXTENDED was the wrong thing.  Instead, define     _XOPEN_SOURCE.
      'make update'
      Don't forget to initialise.
      Use memmove() instead of memcpy() on areas that may overlap.     Spotted by Nalin Dahyabhai <nalin at redhat.com>
      Provide an application-common setup function for engines and use it     everywhere.
      One feature wasn't quite commited yet
      Enhance the user interface with better support for dialog box     prompting, application-defined prompts, the possibility to use     defaults (for example default passwords from somewhere else) and     interrupts/cancelations.
      The default flag should be for default passwords only.  Otherwise,     someone having a default that is not a password will be confused.
      - Add the possibility to control engines through control names but       with arbitrary arguments instead of just a string.     - Change the key loaders to take a UI_METHOD instead of a callback       function pointer.  NOTE: this breaks binary compatibility with       earlier versions of OpenSSL [engine].     - Addapt the nCipher code for these new conditions and add a card       insertion callback.
      Change the common application routines to use a UI_METHOD for password     prompting, even when done through the callback.
      Do a proof of concept.  "openssl genrsa" will make the name of the     file part of the password prompt unless it's standard input...
      cp is only used when DSA is built.
      Modify "openssl engine" to handle and display internal control     commands appropriately.
      Since there is a way to create UI_METHODs, implement a destructor as     well.
      Update my status.
      For the UI functions that return an int, 0 or any positive number is a     success return, any negative number is a failure.  Make sure we check     the return value with that in mind.
      Include the UI error strings.
      New error printing function that gives the possibility to print the     errors through an arbitrary function.
      Implement boolean (yes/no or OK/Cancel, ...) input.
      make update
      Do not loop i the OpenSSL UI method any more.  Instead, letthe     application do that.
      Document recent changes.
      Oops, applies to 0.9.7 only.
      Make use of new features in UI's.  Among others, the application     password callbak doesn't need to check for sizes any more.
      apps_startup() needs a corresponding apps_shutdown().
      Use apps_shutdown() in all applications, in case someone decides not     to go the monolith way (does anyone do that these days?).
      make update
      Including stdio.h before setting _XOPEN_SOURCE and     _XOPEN_SOURCE_EXTENDED wasn't very smart...
      Use the new UI features, among others the new boolean input.
      Make sure we don't return 0 on error.
      Call apps_shutdown() to take down what apps_startup() set up.
      Make better use of load_cert, load_certs and load_key.
      Make get_ip() a bit more strict in it's parsing of IP addresses, and     at the same time a bit more accepting with host names.
      Make better use of load_cert, load_certs and load_key.
      Make better use of load_cert, load_certs and load_key.
      Changes to have OpenSSL compile on OS/2.     Contributed by "Brian Havard" <brianh at kheldar.apana.org.au>
      Insuline shot
      [Forgotten commits?]     Changes to have OpenSSL compile on OS/2.     Contributed by "Brian Havard" <brianh at kheldar.apana.org.au>
      Let's include cryptlib.h *before* things like NO_SYSLOG are tested or     used.
      Make an extra note about shared libraries and backward compatibility.
      Change info to correct values.
      Use one address consistently.
      Patches from Vern Staats <staatsvr at asc.hpc.mil> to get Kerberos 5 in     SSL according to RFC 2712.  His comment is:
      If I define _XOPEN_SOURCE before including *any* system header file,     things will work much more smoothly.
      EVP_Digest() takes one more parameter.
      make update
      One forgotten function.
      Make sure crypto/krb5/krb5_asn.h becomes part of libeay.num.
      Make sure crypto/krb5/krb5_asn.h is copied to the directory of     exported header files.
      make update
      The implementation of the TKTBODY ASN.1 functions was missing.
      Changes to the Kerberos SSL code by Jeffrey Altman <jaltman at columbia.edu>     His comments are:
      Code to avoid the use of non-standard strptime().  By     Jeffrey Altman <jaltman at columbia.edu>
      Changes to the Kerberos SSL code by Jeffrey Altman <jaltman at columbia.edu>     His comments are:
      Private functions do not belong in an exported header file, so move     them to one that won't get exported.
      Include kssl_lcl.h where needed.
      make update
      Document the recent Kerberos SSL changes.
      Some of the Kerberos code had dissapeared.  Reapply.
      Add the possibility to specify the use of zlib compression and     decompression.  It can be set up to link at link time or to load the     zlib library at run-time.
      Clarify that zlib-dynamic is the default choice.
      paddr may be NULL.  Do not crash if it is.
      Prevent KSSL server from requesting a client certificate.     Submitted by Jeffrey Altman <jaltman at columbia.edu>
      SSL_get_[rw]fd were documented but not implemented.
      SSL_get_rfc were documented but not implemented.
      More Kerberos SSL patches from Vern Staats <staatsvr at asc.hpc.mil>.     His comments are:
      Not all platforms have the OpenBSD crypto device.
      Addapt VMS script to the latest changes in the makefiles.
      make update
      More Kerberos SSL changes from Jeffrey Altman <jaltman at columbia.edu>     His comments are:
      Whoops, my fault, a backslash got converted to a slash...
      Correct most of the unsigned vs. signed warnings (or int vs. size_t),     and rename some local variables to avoid name shadowing.
      Make as sure as possible that gethostname() will be properly declared.
      Vade retro C++ comments!
      Make sure the source file is included among the dependencies.  This is     the norm for 'gcc -M' but not for 'makedepend', and is merely     introduced here to avoid commit wars.
      make update
      Make sure memcpy() gets properly declared by including string.h.
      Apply the Tru64 patch from Tim Mooney <mooney at dogbert.cc.ndsu.NoDak.edu>
      gcc 3.0 tells me that -m486 is deprecated.  The gcc 2.95 manual tells     me the same and that the correct option is -mcpu=i486.  I'm assuming     -mcpu has been around for some time, and that it's therefore safe to     change all occurences of -m486 to -mcpu=i486.
      Make sure evil file name characters, like spaces or ampersands (!),     don't disturb the rehashing process.     Spotted and suggested patch from Rudo Thomas <rudo at internet.sk>
      In case of memory problems, the va_start() wasn't cleaned with a va_end().     Noticed by Thomas Klausner <wiz at danbala.ifoer.tuwien.ac.at>.
      Two changes:
      The #error message must match a very specific regexp (see mkdef.pl,     currently line 470).
      'make update'
      Apparently, Linux is identified with __linux__ as well.
      Stop thinking arguments starting with - are algorithm identifiers.     Show timing parameters and timing functions used.     It looks like some Linuxen have very weird settings for CLK_TCK.  I'm     very unsure about this change and will investigate further.
      Synchronise with Unixly build.
      Change HZ in speed to rely on sysconf() if the clock tick is available     that way.  Synchronise s_time with these changes.
      o_time.c contains symbols with dollar signs in them, so we must tell     the compiler not to warn about that.
      Some new symbols have very long names...
      Addapt seldom compiled code to new semantics of the key schedule (not     a pointer any more).
      sk_ENGINE_CLEANUP_ITEM_pop_free() is duplicated in ENGINE_cleanup().     Let's use sk_ENGINE_CLEANUP_ITEM_pop_free() instead.
      'make update'
      Woopsie...
      Hmm, everything "open" isn't necessarely "openssl" :-).     *sigh* habit...
      A lot of things are undeclared unless x509.h is included.
      sch isn't an array, how did this pass through gcc?
      Because there's chances we clash with the system's types.h, rename our     types.h to ossl_typ.h.
      Because there's chances we clash with the system's types.h, rename our     types.h to ossl_typ.h.     Also, it seems like krb5 was forgotten in some places.
      Since ossl_typ.h is an exported header, we sure need to export it on     VMS as well :-).
      'make update'
      SSL_add_dir_cert_subjects_to_stack for Win32 finally implemented.     Submitted by Massimo Santin <msantin at santineassociati.com>.
      Typo...
      Copy evptests.txt to the right place.
      A few more OIDs, contributed by Peter Sylvester <Peter.Sylvester at EdelWeb.fr>
      makedepend sometimes produces duplicates.  Remove them.
      To avoid commit wars over dependencies, let's make it so things that     depend on the environment, like the presence of the OpenBSD crypto     device or of Kerberos, do not change the dependencies within OpenSSL.
      'make update'
      It seems like gcc does canonicalisation of file names.  More     specifically, a starting './' is removed.  makedepend doesn't do this,     resulting in another possible commit war, so let's fix that by doing a     poor mans canonicalisation of file names that gives the same effect as     doing dependencies through gcc.
      'make update'
      For systems where gcc is used and where we don't know if GNU ld is     used or not, let's ask collect2 which ld it uses and choose to use the     target do-gnu_shared if GNU ld is used.
      Add support for md4WithRSAEncryption.
      'make update'
      In certain cases, no encoding has been set up for the b64 filter.  In     such cases, a flush should *not* attempt to finalise the encoding, as     the EVP_ENCODE_CTX structure will only be filled with garbage.  For     the same reason, do the same check when a wpending is performed.
      The EVP_*Init_ex() functions take one extra argument.  Let's default     it to NULL.
      Wrong place...
      Correction of the id-pda OID's.     Submitted by Frederic.Giudicelli at INTRINsec.com
      make update
      make update
      Deprecate the macro MAC_OS_pre_X.
      Due to an increasing number of clashes between modern OpenSSL and     libdes (which is still used out there) or other des implementations,     the OpenSSL DES functions are renamed to begin with DES_ instead of     des_.  Compatibility routines are provided and declared by including     openssl/des_old.h.  Those declarations are the same as were in des.h     when the OpenSSL project started, which is exactly how libdes looked     at that time, and hopefully still looks today.
      A C file is a C file is a C file!
      Have the removal warnings very high up in the source.
      Remove DES_random_seed() but retain des_random_seed() for now.  Change     the docs to reflect this change and correct libeay.num.
      Make sure openssl speed is compilable on systems where fork() doesn't     exist.  For now, that's all the ones we "support" except Unix.
      Change the DES documentation to reflect the current status.  Note that     some password reading functions are really part of the UI     compatibility library...
      Correct some links...
      Addapt VMS scripts to the newer disk layout system ODS-5, which allows more than one period and mixed size characters in file names
      Change the shared library support so the shared libraries get built     sooner and the programs get built against the shared libraries.
      DOS and Windows do not like unistd.h
      No need to include anything on systems that do not have /dev/crypt
      Place the OpenSSL-specific headers back so they always get included,     or we get a dependency war in Makefile.ssl
      des_old.h doesn't really need to include des.h, so don't.  That will     avoid clashes with other code that have their own DES_ functions but     really only use OpenSSL's old des_ functions.
      Exclude .out files
      unsigned int vs. int.
      Remove temporary files
      Implement STARTTLS for certain protocols, currently only supporting SMTP.
      Change the order of events so the capabilities of loaded engines can     get listed as well.
      After loading a dynamic engine, reset the command definitions to the     empty set.  This prevents engines that do not set the command     definitions themselves to inherit the ones from "dynamic", which would     otherwise be very confusing.
      Add a demo that reimplements the RSAref glue in form of a dynamically     loadable engine.
      In a Debian Linux environment, it's not a good idea, apparently, to     manually declare the include directory /usr/include at the same time     as the macro PROTOTYPES is defined with the value 1.  Besides,     /usr/include is the standard include directory anyway, so there's no     need to specify it explicitely.
      Make use of RSAref's header files instead of EAY's crafted rsaref.h.
      make update     perl util/mkerr.pl -recurse -write -rebuild
      Make it possible to build completely static, independent error C     files.
      Add a local error code configuration file for the rsaref dynamic     engine.
      Add targets to update the error code files.
      'make update' + some touches.
      Use the generated error code files.
      At least for the two common Unixly DSO loading methods, include the     system error in the error text.
      If an engine isn't built in, try loading it as a shareable library     instead.  This also makes it possible for users to simply give said     shareable library as argument for the -engine option.
      Add DES functions.     Restructure the code and comment it a bit.     Prepare for the presence of digests.
      Make it possible to give digest names as -evp arguments.
      Add MD digests.
      make update
      A missing comma added.
      Make sure evp_locl.h can be included (hw_openbsd_dev_crypto.c needs that).
      On systems that don't do too well including headers from a different     directory, trust the building scripts to handle it properly.
      End assembler macro correctly.
      Build dynamic rsaref engine on VMS.  Tested on VAX so far.
      On VMS, the norm is still that symbols are uppercased, so for now it's better      to trust that norm.  I might implement a control for this later on
      Extentions of the explanations to the linking problem on Win32.  Provided by Andrew Gray <agray at iconsinc.com>
      Certain missing algorithms make some SSL versions or TLS impossible to     build.
      I was recently informed that some people wrongly use ssleay.txt as     main documentation, so let's warn them a little more, so the word     "OBSOLETE" really gets understood.
      UID was never a lable for uniqueIdentifier.  However, LDAP and certain     RFCs concerning X.500 directories use UID as a shorter name for the     attribute type userId, which is defined by CCITT and available through     RFCs 1274 and 2247.
      make update
      Implement failover for ubsec.  Submitted by Subramanian Ramamoorthy     <sram at broadcom.com> with the following comment:
      Change pkcs12 so the certificates coming from -in do not get tossed if     -certfile is given as well.
      Synchronise with the 0.9.6 branch.
      Do not forget to compile comp_err.c
      Better use the same number in all branches, to avoid confusion
      And just for the sake of completeness, let's add some standard macros...
      Status update
      Add support for Linux on HP/PA.     Submitted by "Bryan W. Headley" <bheadley at interaccess.com>
      On Solaris64, cc needs the flag -xarch=v9 when linking shared     libraries.  Make a general change to support shared library     linking flags in general.     Noted by Nick Briggs <briggs at parc.xerox.com>
      Allow 8-bit characters.  This is not really complete, it only marks     characters with the highest bit set as HIGHBIT.  We need to expand     this to support the UTF-8 character set properly.  However, this     solves the problem that the character 0x80 (which is common in UTF-8)     gets masked to 0x00.     Patch submitted by "Huang Yuzhen" <huangyuzhen at bj.tom.com>
      Say that recent CygWin perl versions work as well.     Submitted by Eric Hanchrow <erich at votehere.net>
      Allow verification of other types than DATA.     Submitted by Leonard Janke <leonard at votehere.net>
      RSA counter should only be defined of RSA is available.
      make update
      When RSA or DSA are disabled, do not include the stuff that's specific     to them.
      The block size may be something other than 8!
      Because Rijndael is more known as AES, use crypto/aes instead of     crypto/rijndael.  Additionally, I applied the AES integration patch     from Stephen Sprunk <stephen at sprunk.org> and fiddled it to work     properly with the normal EVP constructs (and incidently work the same     way as all other symmetric cipher implementations).
      Implement speed measurement for AES.     Submitted by Stephen Sprunk <stephen at sprunk.org> as part of his AES     integration patch.
      make update
      Better clarification on perl
      Patches to make OpenSSL compilable on MacOS/X.     Submitted by Pier Fumagalli <pier at betaversion.org>
      Bring VMS up to date with development.
      Add more of the NIST test vectors for AES.
      Use FIPS-197 vectors for AES.  The NIST vectors were constructed by     reencrypting or redecrypting the ciphertext 10000 times, which of     course gives higly different results.
      To avoid all kinds of link-level clashes, rename all old des_*     functions to _old_des_*.
      To avoid all kinds of link-level clashes, rename all old des_*     functions to _old_des_*.
      Because of recent changes, there's no need to hack the des symbols any     more.
      make update     libeay.num got tweaked so the old des symbols would retain their     positions.
      Keep the NIST AES vectors that were there previously.
      There is no aestest currently.  The EVP tester is used to check the     AES algorithm.
      Add -keyform.  Document -engine.
      Document the change in rsautl.
      I must learn to compile before I commit...
      Apply a change by Toomas Kiisk <vix at cyber.ee>:
      Apply the following changes by Toomas Kiisk <vix at cyber.ee>:
      Apply Neale Ferguson's patch to add a configuration target for linux-s390x
      I got a request to make the "old des" symbols more closely tied to     OpenSSL.  Adding '_ossl' in the name seems to be a good way to do     this.
      Add old patch from Robert Dahlem <Robert.Dahlem at ffm2.siemens.de> to     make it possible to produce shared libraries on ReliantUNIX.
      GCC uses __i386__.
      Apply a small patch from Diego R. Lopez <diego.lopez at rediris.es>,     making X509_check_issued() properly match an issuer that's found in a     Authority Key Identifier.
      It looks like I didn't remove everything that has to do with the     non-existant aestest.c.
      Apply a small patch from Oscar Jacobsson <oscar at jacobsson.org> that     makes things more compilable with VC++.
      Apply a small patch from Dan Lanz <lanz at zolera.com> to get shared     libraries with debug-linux-elf.
      Update SCO5 targets.
      I got some reports that some targets have weird dso_schemes.     Therefore, I've added a sanity checker.
      Detect one-step shifts of the dso_scheme.
      Correct the number of colons for the targets aix43-cc, aix43-gcc,     alpha-cc, alpha-cc-rpath, alpha-gcc, alpha164-cc and alphaold-cc.
      Spelling correction.
      Apply patch from Toomas Kiisk <vix at cyber.ee> and complete it.
      ASN1_BIT_STRING_set_bit() didn't clear previously set bits
      Apply three patches from Assar Westerlund <assar at kth.se>:
      Apply one patch from Assar Westerlund <assar at sics.se>:
      With the changed des_old API, let's complete the work by renaming the     functions in ui_compat.  This gave reason to rework that part more     thoroughly, so here are the changes made:
      'make update'
      If the intended header file doesn't exist, create it.
      Generate the individual engines' error strings and macros     automatically.
      Certain reasons aren't really part of the engine framework, so let's     make them ubsec-specific in the ubsec implementation.
      Add aep and sureware implementations and clean up some error reasons     that were never part of the engine framework.
      Because AEP and we used the same AEP_R_ prefix for error reasons,     lets change our prefix to AEPHK_R_.  Otherwise, we get very mysterious     errors because we happen to redefine AEP_R_OK and AEP_R_GENERAL_ERROR.
      I forgot to include the aep and sureware vendor header files.
      Oops, do not unlock CRYPTO_LOCK_DYNLOCK when we locked     CRYPTO_LOCK_RAND...
      Remove an unused variable.
      Add notes on the added support for aep and sureware crypto cards in     0.9.7.
      Make link-shard a little bit more efficient.  If there are no     extensions to link together, there's no point looping at all.
      Move teh silencer to the right place.
      Update the configuration of CygWin32 to use the new capabilities of     CygWin 1.3.x, which includes thread and shared library support.
      Modify the main trunk version to 0.9.8-dev.     0.9.7 now lives in the branch OpenSSL_0_9_7-stable.
      Correct sh, please
      At Corinna Vinschen's request, change CygWin32 to Cygwin
      The Cygwin shared extension was shifted.
      make update, with libeay.num remade to match the 0.9.7-stable one.
      For some reason, getting the topmost error was done the same way as     getting the bottommost one.  I hope I understood correctly how this     should be done.  It seems to work when running evp_test in an     environment where it can't find openssl.cnf.
      Make sure memset() is defined by including string.h     Notified by Oscar Jacobsson <oscar at jacobsson.org>
      Add the configuration target VxWorks.
      Give the linux-sparv9 target shared capability.     Submitted by Ian Marsh <mushypea at dominion.net.uk>
      gcc chokes on C++ comments in C code.
      Missing #endif
      Local `time' shadows the global function `time()'.  Rename the local     variable to `tim' (and, as a matter of consequence, `time_d' to `tim_d').
      The macro IMPLEMENT_ASN1_FUNCTIONS_const already contains an ending ;,     so do not add one after the expansion, since ANSI C doesn't allow ;;     at this level (or at least, so tells me gcc).
      Adjust the NID names for the AES modes OFB and CFB to contain the number     of feedback bits
      Add the modes OFB128, CFB128 and CTR128 to AES.     Submitted by Stephen Sprunk <stephen at sprunk.org>
      The AES modes OFB and CFB are defined with 128 feedback bits.  This     deviates from the "standard" 64 bits of feedback that all other     algorithms are using.  Therefore, let's redo certain EVP macros to     accept different amounts of feedback bits for these modes.
      Since Cygwin is the proper spelling, let's change to that everywhere.     Also, with the change in Configure, it now knows on it's own if     threads are supported or not.
      Oh, and since config figures out that we run Cygwin and what versions,     let's recommend running config instead of a manual Configure.
      Don't shadow already defined variables
      With Compaq make, it seems like # inside an action becomes part of the command, not a comment at all
      Comparing a pointer (data) with 0 using > is incorrect.  The changed     comparison doesn't look right, but at least it compiles.  It would be nice     if the one who knows what this is supposed to do changed it to do it correctly
      Instead of just checking for OpenVMS, check if DEC C is used, since it's as     picky on all platforms
      With Compaq make, it seems like # inside an action becomes part of the command, not a comment at all
      Add reports on checked 64-bit platforms and make space to add platforms that need to be checked
      Update the status on 64-bit thingy.
      Instead of casting a lvalue, let's constify meth.
      gcc figures that the format specifier %2x means unsigned int, so let's     make n unsigned.
      Including openssl/e_os.h in the OpenSSL 0.9.6 branch is legal, since     it's exported.  Changing that is a BIG step, which has been done in     0.9.7-dev.
      Stop assuming the IV is 8 bytes long, use the real size instead.     This is especially important for AES that has a 16 bytes IV.
      Add comfy aliases for AES in CBC mode.
      Add AES support in the applications that support -des and -des3.
      We have AES support in openssl speed
      make update, after moving around symbols in libeay.num to match     0.9.7-stable.
      Document the added modes for AES
      Updated AEP engine, submitted by Diarmuid O'Neill <Diarmuid.ONeill at aep.ie>
      Increase internal security when using strncpy, by making sure the resulting string is NUL-terminated
      Make sure aep_close_connection() is declared and has a prototype that's     consistent with the rest of the AEP functions
      VMS addaptation, including a few more long names that needed hacking.
      make update
      Remove the perl/ subdirectory.  It hasn't been worked on for ages, is     very broken, and there are working modules in CPAN, which makes our     module even more moot.
      This change was only made in 0.9.7-stable.  Synchronise
      Make it so one can select tests from within the test directory
      Rename des_SPtrans to DES_SPtrans to differentiate from libdes and avoid certain linkage clashes.
      Typo.  In DCL, the continuation character is a dash at the end of the     line, which I forgot when spliting one.
      New configuration targets for OpenBSD, handed to me by Bob Beck <beck at openbsd.org>
      Provide a pre 0.9.7 compatibility mapping if     OPENSSL_DES_PRE_0_9_7_COMPATIBILITY is defined.  NOT AT ALL TESTED YET!     Add a comment as to the libdes compatibility.
      OpenSSL currently fails on certain pure 64-bit architectures.  This is a showstopper
      Change des_old.c to use types prefixed with _ossl_old_des_.
      When closing, do not use close().  Also, if the closing call fails, do     not return immediately since that leaves a locked lock.
      Synchronise the AEP engine in all branches.  For 0.9.6-stable [engine], implement software fallback
      Merge in DES changed from 0.9.7-stable.
      Merge in DES changed from 0.9.7-stable.
      Merge changes from 0.9.7-stable
      Merge changes from 0.9.7-stable
      Make the change to strong keys in the string to key(s) functions experimental in the main trunk as well
      Correct the mapping for des_read_pw()
      Add the mapping of des_random_seed() for 0.9.6 compatibility.     Make sure DES_cblock is defined at all times (meaning one shouldn't include     openssl/des_old.h directly any more).
      Add the possibility to enable olde des support, not just disable it, for future support.  Redocument
      A forgotten file
      Fix of mixup bwtween SOMAXCONN and SO_MAXCONN.     Furthermore, make SO_MAXCONN the first choice, since that's the standard     (as far as I know).
      Cast the pointers to the BIGNUM data to unsigned long *.  This would be     harmful if we didn't also pass the exact number of bytes of that data
      Forgot one of the casts
      Make shared libraries resolve global symbols within themselves first.     Currently only on GNUish linkers...     Submitted by Steven Bade <sbade at austin.ibm.com>
      Use recv() and send() for socket communication on VMS instead of read()     and write().  The reason is that read() and write() make additional record     level locking which causes hangs of Compaq Secure Web Server (Apache) with     SSL.     Submitted by Compaq.
      Recognise DEC C++ as equivalent to DEC C for the definitions of OPENSSL_EXTERN and OPENSSL_GLOBAL.     Submitted by Compaq.
      Oops, the system macro for VMS is OPENSSL_SYS_VMS, not VMS
      Allow longer program names (VMS allows up to 39 characters).     Submitted by Compaq.
      make update (libeay.num has been edited to match 0.9.7-stable)
      Allow longer program names (VMS allows up to 39 characters).     Submitted by Compaq.
      Change the date to XX xxx XXXX in development versions.
      Check error code from a2d_ASN1_OBJECT().
      Avoid emacs backup files when making a snapshot
      Make sure the opened directory is closed on exit.     Notified by Lorinczy Zsigmond <lzsiga at mail.ahiv.hu>
      Do not free p if it hasn't been used yet.     Notified by Bernd Matthes <bernd.matthes at gemplus.com>
      No point constifying an int.     Notified by Bernd Matthes <bernd.matthes at gemplus.com>
      The callback must have (void) as argument list.     Notified by Bernd Matthes <bernd.matthes at gemplus.com>
      Signedness mismatch.     Notified by Bernd Matthes <bernd.matthes at gemplus.com>
      Make sure ec and ecdsa is properly handled in Windows.     Notified by Bernd Matthes <bernd.matthes at gemplus.com>
      Uhmmm, if we use && after having tested for the presence of the certificate,     we just *might* stand a certain chance of actually getting it written     to file...
      Potential memory leak removed.  Notified by <threaded at totalise.co.uk>
      Synchronise with 0.9.7-stable.
      Synchronise with 0.9.7-stable.
      Fix unsigned vs. signed clash
      Make sure that date is run under the C locale, so dates are given in the     default format.     PR: 16
      Generate an error if rewinding wasn't possible.     Notified by Ken Hirsch <kenhirsch at myself.com>.     PR: 23
      Small documentation fix for EVP_CipherFinal or EVP_CipherFinal_ex.     Notified by Stella Power <snpower at maths.tcd.ie>.     PR: 24
      Move an assert() to avoid core dumps when a static buffer hasn't been given.     Notified by Verdon Walker <VWalker at novell.com>
      One place where VMS wasn't changed to OPENSSL_SYS_VMS...
      Make the huge buffer smaller, so the size becomes reasonable for small-stack environments.     Notified by Verdon Walker <VWalker at novell.com>
      Synchronise the FAQ
      Updating status for 0.9.6d
      Use OPENSSL_SYS_VMS instead of just VMS
      Allow the use of the TCP/IP stack keyword TCPIP and NONE
      Make sure ECDSA is built and tested on VMS.
      Make sure ECDSA is built and tested on VMS.     Avoid loops if linking an application fails.
      Define a short alias for another long EC symbol.
      Make sure short aliases are used where required.
      make update
      Recover from errors
      There is a chance that the input string is larger than size, and on VMS,     this wasn't checked and could possibly be exploitable (slim chance, but still)
      Set DLOPEN_FLAG the same way on NetBSD as on OpenBSD.     PR: 58, submitted by andrew at cis.uoguelph.ca
      Remove the duplicate description of -out.     PR: 28
      Add more warnings for my debug targets.
      Our copy of pod2man.pl is old and comparatively broken, so lets remove it.     PR: 30
      Some shlib extensions were in the wrong field
      Correct darwin shared library support.     PR: 39
      Correct AES counter mode, which incorrectly incremented the counter before     using it.     PR: 56
      Apparently, there are still chances we have to deal with buggy pod2man versions.     Deal with that by testing any available pod2man and using it if appropriate,     and falling back to util/pod2man.pl if none was found.
      pod2man.pl would only remove the first LF from the name.
      Make sure that MS_STATIC isn't defined to 'static' under Win32.     PR: 51
      CAformat should not be used for CA key format.
      Check the return values where memory allocation failures may happen.     PR: 49
      a B< that wasn't properly ended.
      Support shared libraries properly on linux-sparcv[89].     PR: 60
      Support the newly release gcc 3.1 on 64-bit Solaris.  Not automatic.     PR: 57
      Reformat the CFLAG string so it can be made part of a C string.     Incidently, this works pretty well on the command line as well.     PR: 52
      In CFB mode, the iv is always encrypted.
      Declare the CFB and OFB modes for AES, and prepare for a declaration     of CTR mode.
      For CFB and OFB modes, always create the encryption key.
      Make it possible to give vectors only for decryption or encryption.
      Add the AES test vectors from NIST document SP800-38A.
      Document the AES changes.
      use sstrsep() to get the proper type to aoti().     Remove unneeded cast in ustrsep().     PR: 69
      make update (including adjusting libeay.num in HEAD to the changes in the     0.9.7-stable libeay.num
      Update the recognision of GCC version numbers to handle the prefix text     that GCC 3.1 adds to the --version output
      Since there's no continuation, the ; can go as well :-)
      Documentation bug corrected.     PR: 70
      Check errors when parsing a PKCS8INF PEM FILE, or there will be a core dump on error.     PR: 77
      It's not good to have a pointer point at something in an inner block.     PR: 66
      Make perl replacement for dirname, for system that lack the latter.     PR: 81
      Merge from 0.9.7-stable.
      Making a softlink from crypto/des/asm/perlasm to crypto/perlasm isn't     strictly necessary, so let's not do that.
      Parse directory using both slashes and backslashes as separators.     Do file copying in term of perl statements instead of using cp.     Part of PR: 75
      Check for the executable $openssl, not just the file.     Part of PR: 75
      Add support for DJGPP.     PR: 75
      Add support for DJGPP.
      Make sure that any dash in the prefix before the version number is removed.     PR: 96
      Tentatively add support for UWIN, a Unix-like environment on top of Windows.     PR: 62
      make update (adapt libeay.num to the 0.9.7-stable branch)
      For some reason, we need to return the full path to perl
      A number of includes were removed from evp.h some time ago.  The reason     was that they weren't really needed any more for EVP itself.  However,     it seems like soma applications (I know about OpenSSH, but there may     be more) used evp.h as the 'load all' header file, which makes sense     since we try our best to promote the use of EVP instead of the lower     level crypto algorithms.  Therefore, I put the inclusions back so     the application authors don't get too shocked by all the errors they     would otherwise get.
      The general debug target must specify that it doesn't use assembler routines.     PR: 105
      There is no RSAREF any more, so do not ty to install it.     PR: 106
      Use bg instead of bag as argument to macros, to avoid clashes with     structure field names.     PR: 112
      gcc requires -m64 to link 64-bit shared libraries on Solaris.     PR: 117
      have 'openssl pkcs7' exit with code 1 on error instead of 0.     PR: 119
      Use 32-bit sections instead of the default, 16-bit ones.     Part of PR 123
      When compiling for Windows, make sure we have the windows definitions declared.     Part of PR 123
      Use underscores instead of dashes in temporary file names.     This is due to weird Borland compilers.     Part of PR 123
      Document the new way of building with Borland Builder.     This concludes the changes from PR 123
      The new stuff is for Borland Bulider 5, so document it appropriately
      Forgot to change the second $ENV{DJDIR} to /dev/env/DJDIR.     Part of PR 75
      Update the information on Cygwin.     Part of PR 75
      DJGPP has some needed header files that other MSDOS/Windows compilers don't have.     Part of PR 75
      Pass CFLAG to dependency makers, so non-standard system include paths are     handled properly.     Part of PR 75
      A few changes to BC-32.pl didn't get properly applied.     This completes PR 123
      Try to avoid double declaration of ERR_load_PEM_strings().     PR 71
      opensslconf.h doesn't define what we want, e_os2.h does.     PR 123
      Do not define crypt() on OpenBSD.  Notified by Bob Beck of OpenBSD.
      In UI_UTIL_read_pw(), we should look at the size parameter, not at BUFSIZ.     Submitted by G?tz Babin-Ebell <babinebell at trustcenter.de>
      There's an ongoing project to bring some kind of path selection     mechanism to the ENGINE framework.  This means there there are going     to be new functionality for the DSO part, and ultimately some way of     merging two file specifications together.
      Set up the engine before doing anything random-related, since engine randomness     is only used for seeding and doing it in the wrong order will mean seeding     is done before the engine randomness is hooked in.     Notified by Frederic DONNAT <frederic.donnat at zencod.com>
      Using -Wtraditional took it a little far.  After all, we expect ANSI C, so     we don't need to care about traditional compilers
      Let's not forget the second -Wtraditional
      Some older code (never committed) wasn't converted to the new format.     Corrected.
      For those wanting to build for several platforms with the same source     directory, making a separate directory tree with lots of symbolic links     seems to be the solution.  Unfortunatelt, Configure doesn't take appropriate     steps to support this solution (as in removing a file that's going to be     rewritten).  This change corrects that situation.  Now I just have to     find all other places where there's lack of support for this.
      For those wanting to build for several platforms with the same source     directory, making a separate directory tree with lots of symbolic links     seems to be the solution.  Unfortunately, Configure doesn't take appropriate     steps to support this solution (as in removing a file that's going to be     rewritten).  This change corrects that situation.  Now I just have to     find all other places where there's lack of support for this.
      There are problems on certain platforms, and possible answers on how to (temporarly) solve them.
      Actually, the "bug" is really documented in the man-page for ld, so     it's really a misfeature according to the jargon file (4.0.0)     definition:
      The default C compiler on MacOS X doesn't like empty object files
      We had some experimental options in the Darwin entries.  They are no longer needed
      Add the usually recommended solution to the linking problem entry for MacOS X
      On MacOS X, you're not allowed to have common objects in shared libraries
      On MacOS X, the shared library editor uses DYLD_LIBRARY_PATH
      If OpenSSL is built with shared library support on MacOS X,      everything works fine.  Note: this is only true for 0.9.7 and on
      Add a few FAQ entries for the various ways building OpenSSL on MacOS X     can fail, and point at the text in the PROBLEMS file
      Add support for shared libraries with OS/2.     PR: 124
      Make mkdir failsafe in case the directories are already present
      OPENSSL_SYS_WIN32 is important so util/mkdef.pl can detect it
      Unixware doesn't have strings.h, so we need to declare strcasecmp()     differently.     Unixware 2 needs to link with libresolv.     PR: 148
      Make S/MIME output conform with the mail and MIME standards.     PR: 151
      Reverse the change with the following log, it needs further investigation:
      Further enhance assembler support on Cygwin and DJGPP.     Make pod2mantest useable on DOS-based systems.     Part of PR 75, the rest is still under investigation.
      Allow subjects with more than 255 characters to be properly printed.     PR: 147
      Add history for documented new functions.     PR: 59
      Explain why RSA_check_key() doesn't work with hard keys.     PR: 86
      Two more names that are a little too long for the standard VMS linker.
      The first compile of the new merger method for VMS *almost* got     through.  That's not enough, is it?  :-)
      If DH is disabled, don't define the DH functions.     Notified by Kim Hellan <KHE at kmd.dk>
      Make dummy tests to make it easier to physically remove unwanted algorithms.     This should complete PR 75
      Document the recent DJGPP-related changes
      Don't clobber loop variable.     PR: 159
      The version of the shared library should, for now, reflect the version     of OpenSSL.     Part of PR 181.
      ln -f -s doesn't always work, so do a rm -f followed by a ln -s.     Part of PR 181
      Make sure to use $(MAKE) everywhere instead of make.     Part of PR 181
      If the email address is moved from the subject to the subject alternate name,     the subject in the certificate would differ from the subject in the index file,     which has quite bad concequences.     PR: 180
      If CRYPTO_realloc() is called with a NULL pointer, have it call     OPENSSL_malloc().     PR: 187
      Cut'n'paste error with other reposnder certificates cleared.     PR: 190
      Linux on s390 really knows about loading dynamically.     PR: 183
      OCSP and KRB5 Makefil.ssl should be consistent with all the others
      Make it possible to load keys from stdin, and restore that     functionality in the programs that had that before.     Part fo PR 164
      Avoid yet another name clash with libdes, and make the declaration consistent     with the definition.
      Add the CBC flag for cbc ciphers
      make update
      Add aix64-cc, and make sure that ar gets proper flags for 64-bit libraries
      Don't try testing with parallell make, that will just fail.     PR: 175
      We don't need to find out which pod2man to use more than once
      Certain flag macros were tested with #if instead if #ifdef...
      make update
      0.9.6f is released
      Parse version numbers prefixed with text (egcs does that, even with     -dumpversion).     PR: 203, part 1
      When we want to give a -f argument to $(MAKE), we'd better make sure the     variable doesn't already contain a -f argument.     PR: 203, part 4
      More long names to shorten.
      Synchronise with Unix.     (I expect the next run will generate lots of errors on VMS :-)).
      A new header.
      Synchronise tests with Unix.
      mem* functions are declared in string.h.
      More long symbols to shorten.
      Remove clashes between symbols that have the same name except for     casing.
      One more file to compile on VMS as well.
      In case of shared libraries, we might run one version of the     application with a different version of the library.  Detect if there     is a difference of versions, and print both versions in that case.     This might prove to be a good enough debugging tool in case of doubt.
      Update with the status for 0.9.6g.
      A few files in the ENGINE and EVP sections forgotten.
      Do not use the word 'modulus', which is a class template name in VC++ 6.0/SP5.     PR: 216, point 3
      Do not include openssl/ripemd.h when the RIPEMD algorithm has been deselected.     PR: 216, point 1
      Oh, ec2_smpt.c is #included by ec2_smpl.c!
      Comma forgotten.
      Merge in demo engines from 0.9.7-stable.
      Some files deserve to be ignored
      Make sure that the test input file comes in the same record format as the     typical output from a program in C.     PR: 222
      The applications 'ecdsa' and 'ecparam' were missing from the VMS     build.
      Instead of returning errors when certain flags are unusable, just ignore them.     That will make the test go through even if DH (or in some cases ECDH) aren't     built into OpenSSL.     PR: 216, part 2
      Sometimes, the value of the variable containing the compiler call can     become rather large.  This becomes a problem when the default 1024     character large buffer that WRITE uses isn't enough.  WRITE/SYMBOL     uses a 2048 byte large buffer instead.
      Yet a couple of modules forgotten.  These weren't important for     OpenSSL itself, since they aren't used there (yet).  It became quite     visible qhen building a shared library, however...
      Add a FAQ entry for yet another bc failure.     PR: 199
      Missing =back.     Part of PR 196
      It seems like sun4u doesn't always have a sparcv9 inside.  Trust isalist.     PR: 220
      q may be used uninitialised
      Add -lz to the ld flags when the user has chosen to link in zlib *statically*.     Notified by Doug Kaufman <dkaufman at rahul.net>
      isalist was less trustable than I thought (or rather, one can trust it to     come up with all kinds of names we don't have in our targets).     Besides, our sparcv9 targets currently generate sparcv8 code, I'm told.
      So, I discovered that if you have your $PATH set so a ld different from     GNU ld comes first, checking the usage of collect2 gives that instead of     GNU ld, even if GNU ld would be the one that would get used if we link using     gcc.  It's much better, apparently, to ask gcc directly what the path to     GNU ld is (provided it's there at all and gcc knows about it), and ask     the result if it's a GNU or not.  The bonus is that our GNU ld detection     mechanism got shorter and easier to understand...
      Typo, I assigned the variable ld instead of my_ld...
      -elapsed is also useful when using gettimeofday
      Missing ;
      Incorrect argument order to memset()
      It makes more sense to refer to specific function manuals than the concept     manual when the specific function is refered to in the current manual text.     This correction was originally introduced in OpenBSD's tracking of OpenSSL.
      Remove reference to RSA_PKCS1_RSAref, since it doesn't exist any more.     This correction was originally introduced in OpenBSD's tracking of OpenSSL.
      Remove *all* references to RSA_PKCS1_RSAref, since it doesn't exist any more.     This correction was originally introduced in OpenBSD's tracking of OpenSSL.
      It makes more sense to refer to specific function manuals than the concept     manual when the specific function is refered to in the current manual text.     This correction was originally introduced in OpenBSD's tracking of OpenSSL.
      Make sure that the signal storage is regarded as volatile.     This correction was originally introduced in OpenBSD's tracking of OpenSSL.
      The OpenBSD project has replaced the first implementation of the /dev/crypto     engine with something they claim is better.  I have nothing to compare to,     and I assume they know what they're talking about.  The interesting part with     this one is that it's loaded by default on OpenBSD systems.     This change was originally introduced in OpenBSD's tracking of OpenSSL.
      Removal missing
      Add a small note saying the 'debug' option should come before the platform in     the arguments to mk1mf.pl.     PR: 298
      Document should match reality :-).     PR: 255
      If we're loading libz dynamically, and COMP_zlib() is called more than once,     only the first call would provide the correct result.     PR: 277
      Add random number generation capability to the cswift engine.     Should this be added to 0.9.6-stable as well?     PR: 275
      Installed libraries should not be overwritten, especially shared ones.     Use mv to make sure the old copy is unlinked instead of overwritten.     PR: 273, and probably others...
      For some reason, the random number support removed the destructor
      Do not define crypt().  The supported function is DES_crypt() (an des_crypt()     when backward compatibility is desired).
      Please do not use C++ comments in C code.
      Since crypt() isn't defined anywhere, define it locally in destest.c
      Add missing LF
      Use double dashes so makedepend doesn't misunderstand the flags we     give it.     For 0.9.7 and up, that means util/domd needs to remove those double     dashes from the argument list when gcc is used to find the     dependencies.
      Add a few more VxWorks targets.     Correct misspelled VXWORKS macros.     Add VXWORKS identifying macros to e_os2.h.     Add required inclusions and mappings for VxWorks in e_os.h.     A few small modifications to make OpenSSL build and work on VxWorks.     PR: 253, except for the  change that was handled in an earlier              commit, and a request for easy build of just parts of OpenSSL.
      Don't fuss with the demo binaries
      Change the main Makefile to have "mini-build" targets.     PR: 253, last part.
      Keep the sub_all symbol so all the algorithm Makefiles won't break.
      Remove redundancy and use the main makefile better
      Make sure that the 'config' variable is correctly defined and declared     for monolithic as well as non-monolithic biuld.     More work is probably needed in this area.     PR: 144
      RFC 2712 redefines the codes for use of Kerberos 5 in SSL/TLS.     PR: 189
      Typo
      VMS below version 7 doesn't have strcasecmp, so let's roll our own on VMS.     PR: 184
      Add a few more target platforms, to see how well the shared library     linking works on them.
      Rhapsody had ftime, Darwin doesn't (any longer?)
      Move the shared library construction stuff to Makefile.shared, a     helper makefile that generalises our way of building shared libraries     and is designed to take care of almost anything (I hope).
      Add a suffix for Darwin's sake, since it seems like .dylib comes after     the version in the file name.
      Fix inconsistencies in the Darwin targets.     Add a variant of SHLIB_SOVER without the preceding period.
      BN_bn2hex() returns "0" instead of "00" for zero.  This disrputs the     requirement that the serial number always be an even amount of characters.     PR: 248
      Make sure $fname will not give us any surprises with any funny characters.     PR: 256
      Make sure it's properly detected when there's no version information     at all, and in all other cases, make sure foo.so is linked to     foo.so.{soversion}.
      There may be more than one single quote to fix.     PR: 256
      make update
      Add a configuration target for A/UX.     PR: 271
      Step 2 of move of engines: copy engines to new directory and rename them     to be prefixed with e_ instead of hw_.  They aren't necessarely hardware     engines.  The files commited here are exact copies of the corresponding     hw_ files found in crypto/engine/.
      Step 3 of move of engines: copy the corresponding vendor header files.
      Step 4 of move of engines: Split e.ec into individual files for each     engine.
      Step 5 of move of engines: Add a makefile (and a .cvsignore).
      That wasn't supposed to be there...
      Step 6 of move of engines: rename the macro ENGINE_DYNAMIC_SUPPORT to     OPENSSL_NO_DYNAMIC_ENGINE and make sure that gets defined unless     shared library support has been specifically requested.
      Typo.
      Step 7 of move of engines: Engines should not depend on private     OpenSSL header files.
      We didn't copy the cryptodev engine here, darn it!
      Step 8 of move of engines: Remove the last little quirks.     DECIMAL_SIZE is copied from crypto/cryptlib.h.
      Typo
      Step 9 of move of engines: rename crypto/engine/hw_cryptodev.c to     eng_cryptodev.c.  This is an engine that (at least currently) has     to be built in.
      Step 10 of move of engines: Change crypto/engine/Makefile.ssl so we     don't build any "built-in" engines in that directory any more, except     fo the cryptodev one.
      Step 11a of move of engines: Time to make the changes to support     automatic load of dynamic engines.  Unless we don't have shared     library support, do not try to load any "built-in" engines except for     cryptodev.
      Step 11b of move of engines: Time to make the changes to support     automatic load of dynamic engines.  Add functionality to the dynamic     engine to handle engine directories and loading from those.  This     is currently NOT compatible with the use of LD_LIBRARY_PATH and     similar environment variables.
      Step 11c of move of engines: Time to make the changes to support     automatic load of dynamic engines.  Change the iterator to try to load     the requested engine dynamically.  The environment variable     OPENSSL_ENGINES can be used to override the internal default directory     where one can expect to find dynamically loadable engines.
      Step 12 of move of engines: Time to make the changes to support     automatic load of dynamic engines.  Make the changes in the main     Makefile so the engines are built, but now in the engines/ directory.
      Step 13 of move of engines:  Remove old files.
      For the platforms where version info is inserted separately into the     shared library, set those flags conditionally.
      Oh, there were *two* places where we needed to protect the file     name...
      And if the path has a space, we definitely need to protect $openssl.
      make update.
      Step 14 of move of engines:  Final step, document the change.
      The AES CTR API was buggy, we need to save the encrypted counter as well     between calls, or that will be lost if it returned with *num non-zero.
      Add more commentary.  Check that *num is smaller than the block size.
      Chase down the missing backslashes.
      Clarify where the engines are by default.
      Targeting the solaris platform for specific tests.  Something is going     wrong, and my test engine doesn't show it.  The verbosity will be     temporary for about a day.
      Add missing quotes.     Make sure test doesn't barf because of missing spaces before the     closing ].     Add -lc to the list of libraries we depend upon.  Not always     necessary, but never hurts.
      Add needed libraries as per configuration to the list of libraries we     depend upon.
      libs is a timestamp that we don't really need to know about.
      Complete the VxWorks fix by implementing a NULL RAND_poll() for it.     PR: 253
      makedepend complains when a header file is included more than once in     the same source file.
      When BN_add_word() reaches top, it shouldn't try to add the the corresponding     word, since that word may not be zero.
      Makefile.shared needs to know how it can reach itself.
      A much better idea, of course, is not to do a submake at all...
      Typos.     PR: 189
      Typos.     PR: 189
      Eh, -Wl,--whole-archive disappeared from the GNU targets.  I've no     idea why, but that was definitely wrong...
      In my extreme debug mode, gcc complains that 'static' doesn't come     first.
      Signal an error if the entered output password didn't match itself.     PR: 314
      On certain platforms, we redefine certain symbols using macros in     apps.h.  For those, it's better to include apps.h after the system     headers where those symbols may be defined, since there's otherwise a     chance that the C compiler will barf when it sees something that looks     like this after expansion:
      There's a name clash between OpenSSL and RSAref.  Since this engine handles     RSAref data, pretend we don't care for OpenSSL's MD2 and MD5 structures or     implementation.     Remove all kinds of silly warning
      For the mkdef.pl to recognise if the "external" engines are inserted     into libcrypto, we need the "algorithm" STATIC_ENGINE.
      make update
      External engines aren't in crypto/engine/ any more, so don't try to     build them there.
      Make sure toupper() is declared
      A small detail: since 0.9.7, DH_new_method() and DSA_new_method()     don't take an ENGINE* as parameter any more.     PR: 156
      Revert, that was an incorrect change.     PR: 156
      The #else part of the conditionals have two statements, so they need     to be surrounded with braces, or the surrounding if..else will fail     miserably in case the #else part is compiled.
      synchronise util/libeay.num with the 0.9.7-stable variant (guys, this     is something we really need to keep track of!).     make update
      Plug potential memory leak.     Identified by Goetz Babin-Ebell <babinebell at trustcenter.de>
      New files have appeared, tell VMS.
      Add the command procedure to build external engines on VMS.     Currently, we simply assume that they shall always be built as     shareable images.
      Add all that is needed to build external engines on VMS.     Currently, we simply assume that they shall always be built as     shareable images.
      Remove all referenses to RSAref, since that's been gone for more than     a year.
      Depend on OPENSSL_NO_STATIC_ENGINE rather than OPENSSL_NO_DYNAMIC_ENGINE.     Make sure to include openssl/opensslconf.h to make sure we get the     definition of those macros.
      Since we're currently assuming VMS can deal with dynamic engines,     don't include the static engine entry points in libcrypto.exe.
      Cosmetic change
      Off-by-one-error corrected.     PR: 235
      some people just can't read the instructions
      Stupid bug fixes.  I've forgotten my DCL...
      Generate openssl.pc so pkg-config can return proper data.     PR: 163
      Keep on using ${CC}, since gcc may act in disguise.
      Windows doesn't know sys/file.h
      -CAcreateserial doesn't take a filename argument.     PR: 332
      -CAserial does take a filename argument.     PR: 332
      X509_NAME_cmp() now compares PrintableString and emailAddress with a value of type     ia5String correctly.     PR: 244
      Make the programs link against the static library on MacOS X.     PR: 335
      Variables on the stack must be initialized or we can't depend on any     initial value.  For errline/errorline, we did depend on that, erroneously
      Make the CBC mode od AES accept lengths that aren't multiples of 16.     PR: 330
      Make it possible to run individual tests even when linked with libcrypto.so and libssl.so
      Synchronise...
      Name the flag files correctly.
      Make internal functions static.
      When build as dynamic engines, the loading functions should be defined     static.
      Correct support for SunOS 4.1.3_U1.     PR: 227
      This didn't get to the 0.9.8-dev thread...
      Merge from 0.9.7-stable.
      free() -> OPENSSL_free()
      Constification needed.     PR: 241
      Handle last lines that aren't properly terminated.     PR: 308
      Make the Windows test scripts consistent in their echoing
      When AES is skipped because the option 'no-rijndael' was given,     make sure it's skipped from SDIRS as well.
      The directory 'rijndael' doesn't exist any more, let's check the aes     directory instead (this should have been done long ago...).
      Fix to build better with DJGPP.     PR: 338
      Cygwin fixes
      Add a FAQ on how to check the authenticity of the openSSL distribution.     PR: 292
      It seems like gcc 2.9aix5.1 doesn't do will with optimization level 3.     PR: 115
      DCL logic bugs fixed.
      Remove warnings.
      Add Tandem OSS target.     PR: 192
      Close the implicitely opened registry key.     PR: 264
      make update
      We need to read one more byte of the REQUEST-CERTIFICATE message.     PR: 300
      Add -Wstrict-prototype and -Wmissing-prototype to my debugging targets
      Spell prototypes correctly :-).
      I know ANSI C doesn't like 'long long', and I don't want to see it
      -Wid-clash-n isn't support in gcc 3, and I get better result from continuously     rebuilding on a VMS box.
      The architecture name is i486, not just 486
      A few more Microsoft OIDs added
      make update
      Document the change to remove the 'done' flag variable in the     OpenSSL_add_all_*() routines
      Changes to make shared library building and use work better with Cygwin
      Add the INHIBIT_SYMLINKS flag variable to help Cygwin.     Add missing semicolons.     Add a comment explaining a bunch of targets without any action lines.
      WinCE patches
      Mention ActiveState Perl much earlier in INSTALL.WCE.
      We don't want TARGETCPU expanded here.
      I forgot this is compiled in test/, not crypto/ec/...
      Add the file openssl.pc that I forgot a while ago.
      Adding openssl.pc to the repository was a mistake,     since it's generated.
      Ignore openssl.pc.  This way, there's no risk that I'll add it again :-).
      Make it possible to build for more than one CPU.     Clarify what the CE tests do.
      A variable of type time_t is supposed to be a time measurement starting at     Epoch.  offset isn't such a measurement, so let's stop pretend it is.
      Make sure sysconf exists (it doesn't in the VMS C RTL lesser than version 7).
      Determine HZ exactly as in apps/speed.c.
      Add the ASN.1 structures and functions for CertificatePair, which is     defined as follows (according to X.509_4thEditionDraftV6.pdf):
      Document the addition of certificate pairs.
      Add news items for 0.9.6h and expand on the 0.9.7 news as well.
      Update STATUS
      Fix an unsigned/signed mismatch.
      make update
      It works on my laptop :-).
      Mention a current showstopper
      Typo.  OPENSSL_NO_ECDH, not NO_OPENSSL_ECDH
      Disable this module if OPENSSL_NO_SOCK is defined.
      Heimdal isn't really supported right now.  Say so, and offer a possibility     to force the use of Heimdal, and warn if that's used.     PR: 346
      Small bugfixes to the KSSL implementation.     PR: 349
      Heimdal isn't really supported right now.  Say so, and offer a possibility     to force the use of Heimdal, and warn if that's used.     PR: 346
      The logic in the main signing and verifying functions to check lengths was     incorrect.  Fortunately, there is a second check that's correct, when adding     the pads.     PR: 355
      I forgot that @ in strings must be escaped in Perl
      Add OPENSSL_cleanse() to help cleanse memory and avoid certain compiler     and linker optimizations.     PR: 343
      Extra ; removed.
      Unused variable removed.
      Cleanse memory using the new OPENSSL_cleanse() function.     I've covered all the memset()s I felt safe modifying, but may have missed some.
      Make sure EXIT() can always be used as one statement.
      Have all tests use EXIT() to exit rather than exit(), since the latter doesn't     always give the expected result on some platforms.
      A few more memset()s converted to OPENSSL_cleanse().     I *think* I got them all covered by now, bu please, if you find any more,     tell me and I'll correct it.     PR: 343
      Correct some names.
      Make it so all names mentioned in the NAME section of each manpage becomes a     symlink to said manpage.     PR: 242
      Remove incorrect assert.     PR: 360
      Redo the VAX assembler version of bn_div_words().     PR: 366
      EXIT() needs to be in a function that returns int.
      Small bugfix: even when r == d, we need to adjust r and q.     PR: 366
      Through some experimentation and thinking, I think I finally got the     proper implementation of bn_div_words() for VAX.
      Make some names consistent.
      I think I got it now.  Apparently, the case of having to shift down     the divisor was a bit more complex than I first saw.  The lost bit     can't just be discarded, as there are cases where it is important.     For example, look at dividing 320000 with 80000 vs. 80001 (all     decimals), the difference is crucial.  The trick here is to check if     that lost bit was 1, and in that case, do the following:
      define USE_SOCKETS so sys/param.h gets included (and thusly, MAXHOSTNAMELEN     gets defined).     PR: 371
      Windows CE updates, contributed by Steven Reddie <smr at essemer.com.au>
      Make CRYPTO_cleanse() independent of endianness.
      EXIT() may mean return().  That's confusing, so let's have it really mean     exit() in whatever way works for the intended platform, and define     OPENSSL_EXIT() to have the old meaning (the name is of course because     it's only used in the openssl program)
      A gcc 3.0 bug is triggered by our code.  Add a section about it in PROBLEMS.     PR: 375
      Add support for x86_64.     PR: 348
      DJGPP patches.     PR: 347
      Correct a few typos that I introduced after applying DJGPP patches.
      gethostname() is more a BSD feature than an XOPEN one.     PR: 379
      Do not implement RC4 stuff if RC4 is disabled.  Concequently, apply the same     rule for SHA stuff.     PR: 381
      Only check for a result buffer if the allocated string is a prompt string.     PR: 381
      PR: 381
      If an application supports static locks, it MUST support dynamic locks as     well to be able to use the CHIL engine.     PR: 281
      Make sure using SSL_CERT_FILE actually works, and has priority over system defaults.     PR: 376
      Allow users to modify /MD to /MT.     PR: 380
      Declare another general file.
      make update
      Make sure to implement the cryptodev engine only when /dev/crypto exists.
      Corrected DJGPP patch
      SSL_CERT_FILE should be used in place of the system default file, not as     a first alternative to try
      Merge in relevant changes from the OpenSSL 0.9.6h release.
      Keep STATUS in HEAD up to date.
      Keep NEWS in HEAD up to date.
      Apparently, bash is more forgiving than sh.  To be backward     compatible, don't use ==, use = instead...
      Some compilers are quite picky about non-void functions that don't return     anything.
      Add a few items I intend to work on for 0.9.8 and on.
      Forgot one.
      Implement a stateful variant if the ZLIB compression method.  The old     stateless variant is kept, but isn't used anywhere.
      Since it's defined in draft-ietf-tls-compression-04.txt, let's make     ZLIB a known compression method, with the identity 1.
      Since it's defined in draft-ietf-tls-compression-04.txt, let's make     ZLIB a known compression method, with the identity 1.
      Hmm, Geoff's change made things quite interesting.  We can now give     users the option of disabling deprecated functions, which should of     course be reflected in libeay.num and .def files.  Quite nice,     actually.
      make update
      A memset() too many got converted into a OPENSSL_cleanse().     PR: 393
      Since HEADER_DES_H has been the protector of des.h since libdes     (before SSLeay, maybe?), it's better to have that macro protect     the compatibility header des_old.h.  In the new des.h, let's use     a slightly different protecting macro.
      Let's not forget the other places where HEADER_DES_H and HEADER_DES_OLD_H     were defined.
      Let's not forget the other places where HEADER_DES_H and HEADER_DES_OLD_H     were defined.
      sk_*_push() returns the number of items on the stack, not the index of the     pushed item.  The index is the number of items - 1.  And if a NULL item was     found, actually use it.     Finally, provide a little bit of safety in CRYPTO_lock() by asserting the a     requested dynamic lock really must exist, instead of just being silent about it
      In CRYPTO_lock(), check that the application cares about locking (provided     callbacks) before attempting to lock.
      Document the modifications in 0.9.7 that will make the hw_ncipher.c     engine work properly even in bad situations.
      Skip DH-specific tests when no-dh has been configured.     PR: 353
      I forgot one item I intend to work on.
      BIO_set_nbio() is enumerated, but not explained.  Remove it from enumeration     since it's both enumerated and explained in BIO_s_connect.pod.     PR: 370
      BIO_new_bio_pair() was unnecessarily described in it's own page as well as in     BIO_s_bio.pod.  The most logical is to move everything needed from     BIO_new_bio_pair.pod to BIO_s_bio.pod (including the nice example)     and toss BIO_new_bio_pair.pod.  I hope I got all the info over properly.     PR: 370
      OK, there's at least one application author who has provided dynamic locking     callbacks
      Bring des_locl.h at the same level as in the 0.9.7 branch.     Don't define macros in terms of asm() when __STRICT_ANSI is defined.
      Don't define macros in terms of asm() when __STRICT_ANSI is defined.
      Update the make system for installations:
      Make sure manual pages are properly linked to on systems that have case     insensitive file names, as well as those that do not have symlinks.     Incidently, both these cases apply on DOS/Windows...
      Synchronise with Makefiles.
      Protect loading routines with a lock.     PR: 373
      Transfer the Solaris shared library building changes from     0.9.7-stable.
      Update the current status
      It was pointed out to me that .pc files are normally stored in     ${prefix}/lib/pkgconfig, not ${prefix}/lib/pkginfo.
      It was pointed out to me that .pc files are normally stored in     ${prefix}/lib/pkgconfig, not ${prefix}/lib/pkginfo.
      If _XOPEN_SOURCE_EXTENDED or _XOPEN_SOURCE are defined, _POSIX_C_SOURCE gets     defined in DECC$TYPES.H.  If _POSIX_C_SOURCE is defined, certain types do     not get defined (u_char, u_int, ...).  DECC.H gets included by assert.h     and others.  Now, in6.h uses the types u_char, u_int and so on, and gets     included as part of other header inclusions, and will of course fail because     of the missing types.
      I have no idea what possesed me to compile s_socket.c as POSIXly code.     Incidently, it now compiles so much better without _POSIX_C_SOURCE.
      To avoid any future programming glitches, let's make each and every     assignment (modulo those I missed) individual statements.
      Small tweaks for code consistency.
      Because the contents of openssl.pc may have to change when a configuration     has been performed (and possibly changed), have it depend on Makefile.ssl.
      We stupidly had a separate LIBKRB5 variable for KRB5 library dependencies,     and then didn't support it very well.  And that when there already is a     useful variable for exactly this kind of thing; EX_LIBS...
      There was a mixup between INSTALLTOP and OPENSSLDIR...
      Be consistent with capitalisation of object names.
      Be consistent with capitalisation of object names.
      Keep the internal lowercase 'surname', for programmer's sake.
      Propagate MAKEDEPPROG to the subdirs under crypto/.
      A little debugging.
      More accurate comments.
      Make AES_ENCRYPT and AES_DECRYPT macros instead of static constants.     PR: 411
      Stop a possible memory leak.     (I wonder why s2_connect() handles the initial buffer allocation slightly     differently...)     PR: 416
      Finally, a bn_div_words() in VAX assembler that goes through all tests.     PR: 413
      All VMS-specific problems have been solved.     Confirmed by Mark Daniel <Mark.Daniel at wasd.vsm.com.au>
      Cygwin needs the library locatin for .DLLs to be set in PATH.  Unfortunately,     the conditional was set to add the library directory to PATH when the     platform is NOT Cygwin.  Corrected.     PR: 404
      Updates
      Avoid double definition of config.     PR: 420
      Spelling error.     This patch was taken from the OpenBSD copy of OpenSSL 0.9.7 beta3 with patches
      Update our list of implemented and related standards.
      Update our list of implemented and related standards.
      Updates
      Add SPKM among the related stanrds.
      Can't find the referense to errors on XP with Kerberos
      Kenneth R. Robinette just told me the latest snapshot works well with     MIT Kerberos.
      Merge from 0.9.7-stable.
      make update
      Finally get rid of all the algorithm inclusions that were done from     evp.h.
      make update
      OS/2 does binary by default, apparently.     Reported by Brian Havard <brianh at kheldar.apana.org.au>.
      Since we're including Kerberos 5 headers in our exported header files (when     OpenSSL is configured to use Kerberos), we'd better tell pkg-config users     where they can be found.     PR: 421
      Merge in changes from 0.9.7-stable.
      Merge in changes from 0.9.7-stable.
      It's rather silly to believe we'd release 0.9.7a in 2002 :-).     It's even more silly to pretend we know which year 0.9.8 will be     released.
      Make sure the last character of the ASN.1 time string (the 'Z') is copied.     PR: 429
      Adjust the parameter lists in some not commonly used files.     PR: 428
      Link engines against libcrypto, even when a TCP/IP implementation is     specified...
      Rijndael should be called AES everywhere
      gcc wants character constants to be correct.  Before this change, the     following would happen on Solaris:
      The naming scheme wasn't quite correct for Cygwin
      Typos corrected.     PR: 445
      Make sure everything that may be freed is allocated or initiated.     PR: 446
      Certain files must be removed before generating them, in case they point     into a read-only source tree.     PR: 437
      Force the removal.     PR: 437
      When preparing a separate build tree, don't make softlinks to softlinks.     Add instructions in INSTALL, for easy access.     PR: 437
      It's recommended to do 'make clean' after having prepared a new build tree.     PR: 437
      CFLAG, not CFLAGS
      Name the flag file correctly
      Add documentation on how to handle the shared libaries.     PR: 423
      Double the dollars that are intended for the command line.     PR: 423
      If the user said 'shared' and we haven't included support for shared libraries,     warn him or her.     Reminder by Andrew Marlow <apm35 at student.open.ac.uk>
      Add better support for FreeBSD on non-x86 machines.     Add specific support for FreeBSD on sparc64.     PR: 427
      tty_in will never be stderr, so it will always be closed, which means stdin     might get closed...     Reported by Mark Daniel <Mark.Daniel at wasd.vsm.com.au>
      UI_UTIL_read_pw() misinterpreted the values returned from UI functions.     PR: 456
      Revert: the names of the cygwin distribution will not be named openssl2-*.     Requested by Corinna Vinschen <vinschen at redhat.com>
      Correct a misleading comment.     PR: 456
      DJGPP doesn't have DLLs, so skip adding to %PATH% in that environment.     PR: 453
      Make sure not to declare a clashing read() for DJGPP.     PR: 440
      Merge from 0.9.7-stable.
      Correct an example that has a few typos.     PR: 458
      Extend the HOWTO on creating certificates, and add a HOWTO in creating keys.     PR: 422
      Add verbosity
      Fix possible NULL dereferencial.     Notified by Verdon Walker <VWalker at novell.com>
      make update
      Add some debugging output.
      FreeBSD has /dev/crypto as well.     PR: 462
      make update
      A few more files to ignore
      Ingore the correct flag file.
      Missing 0 broke FreeBSD build.     PR: 470
      DVCS (see RFC 3029) was missing among the possible purposes.     Notified privately to me by Peter Sylvester <Peter.Sylvester at EdelWeb.fr>,     one of the authors of said RFC
      cert_sk isn't always allocated, so freeing it may cause a crash.     PR: 481
      Fix a memory leak in SSL.     PR: 477
      Small typo, OENSSL should really be spelled OPENSSL.     PR: 476
      Add the possibility to build without the ENGINE framework.     PR: 287
      make update
      The OPENSSL_NO_ENGINE has small problem: it changes certain structures.  That's     bad, so let's not check OPENSSL_NO_ENGINE in those places.  Fortunately, all     the header files where the problem existed include ossl_typ.h, which makes     a 'forward declaration' of the ENGINE type.
      For VC++7 and up, the file is VSVARS32.BAT.     PR: 327
      The MASM situation is more difficult than described so far.  It is part of VC++ 7.     PR: 327
      The util scripts need to handled no-hw.     PR: 327
      A few small bugs with BIO popping.     PR: 364
      Document -engine where missing.     PR: 424
      We can't say in advance what the argument to BIO_socket_ioctl() should be, so     let's make that a void *.  Also, BIO_socket_nbio() should send it an int     argument, not a long.     PR: 457
      PKCS#1 has a new RFC, which we do implement
      Make sure memcpy() is properly declared by including string.h.
      Adjust DES_cbc_cksum() so the returned value is the same as MIT's     mit_des_cbc_cksum().  The difference was first observed, then verified by     looking at the MIT source.
      Oh, the destest program did look at the return value...
      Another long name to deal with
      Add full support for -rpath/-R, both in shared libraries and     applications, at least on the platforms where it's known how     to do it.
      Make it possible to disable OCSP, the speed application, and the use of sockets.     PR: 358
      Change no_rmd160 to no_ripemd for consistency.     PR: 500
      Pay attention to disabled SSL versions.     PR: 500
      Update linux-mips and linux-mipsel to support threads and shared libraries.     I also updated the bn_ops field with values taken from OpenBSD-mips.     PR: 498
      Handle krb5 libraries separately and make sure only libssl.so depends     on it.
      Add support for IA64.     PR: 454
      Make the no-err option work properly
      Borland C++ Builder 5 complains about unreachable statements.
      Make sure the memory allocation routines check for negative sizes
      Security fix: Vaudenay timing attack on CBC.     An advisory will be posted to the web.  Expect a release within the hour.
      Update release information
      Allow building applications against static libraries with Makefile.shared.
      Remove duplication and have clean depend on libclean
      Add the target linux-ia64-ecc, suggested by Keith Thompson <kst at sdsc.edu>.     PR: 516
      Shut up an ANSI compiler about uninitialised variables.     PR: 517
      hinv may generate more than one line (1 line per CPU).     PR: 520
      Make sure that all the library paths are modified in prepend mode, not     replace mode.     PR: 528
      Spelling errors.     PR: 538
      Some shells (ksh in this case) don't say 'command not found'.     PR: 540
      Add documentation for -starttls (s_client) and -id_prefix (s_server).     PR: 542
      Because it may be needed in public header files, move the definition     of OPENSSL_NO_FP_API on existence of OPENSSL_SYS_MSDOS to e_os2.h.
      Make sure we get the definition of OPENSSL_NO_AES.
      Make sure we get the definition of OPENSSL_NO_BIO and OPENSSL_NO_RSA.
      Make sure we get the definition of OPENSSL_NO_BF.
      Make sure we get the definition of OPENSSL_NO_FP_API.
      Make sure we get the definition of OPENSSL_NO_SOCK.
      Make sure we get the definition of OPENSSL_NO_ERR.
      Make sure we get the definition of OPENSSL_NO_CAST.
      Make sure we get the definition of OPENSSL_EXTERN, OPENSSL_NO_DES,     DES_LONG and OPENSSL_NO_DESCBCM.
      Make sure we get the definition of OPENSSL_NO_DH.
      Make sure we get the definition of OPENSSL_NO_DSA and OPENSSL_NO_SHA.
      Make sure we get the definition of OPENSSL_NO_EC.
      Make sure we get the definition of OPENSSL_NO_ECDH.
      Make sure we get the definition of OPENSSL_NO_ECDSA.
      Make sure we get the definition of OPENSSL_NO_HMAC.
      Make sure we get the definition of OPENSSL_NO_IDEA and IDEA_INT.
      Make sure we get the definition of OPENSSL_NO_FP_API.
      Make sure we get the definition of OPENSSL_NO_MD2.
      Include e_os.h correctly.
      Make sure we get the definition of OPENSSL_NO_BIO.
      Make sure we get the definition of a number of OPENSSL_NO_* macros.
      Make sure we get the definition of OPENSSL_NO_AES.
      Make sure we get the definition of OPENSSL_NO_BF.
      Make sure we get the definition of OPENSSL_NO_CAST.
      Make sure we get the definition of OPENSSL_NO_IDEA.
      Make sure we get the definition of OPENSSL_NO_RC2.
      Make sure we get the definition of OPENSSL_NO_RC4.
      Make sure we get the definition of OPENSSL_NO_RC5.
      Make sure we get the definition of OPENSSL_NO_DES.
      Make sure we get the definition of OPENSSL_NO_MD2.
      Make sure we get the definition of OPENSSL_NO_MD4.
      Make sure we get the definition of OPENSSL_NO_MD5.
      Make sure we get the definition of OPENSSL_NO_MDC2.
      Make sure we get the definition of OPENSSL_NO_RIPEMD.
      Make sure we get the definition of OPENSSL_NO_SHA.
      Make sure we get the definition of OPENSSL_NO_HMAC and OPENSSL_NO_SHA.
      Make sure we get the definition of OPENSSL_NO_RSA.
      Sometimes, we have partial comments on the same line as other stuff we     parse.  Make sure to read in the whole comment, so it can be entirely     removed.
      Don't put configuration macro definitions on the command line, we're     just fooling ourselves and then screwing up for other applications.
      make update
      Make sure to declare mem*() properly.
      Define COMP method function prototypes properly.
      To define OPENSSL_NO_FP_API for all MSDOS type targets was unfair     against DJGPP, and much more restricted than previous definitions.
      Missed a few dollars.     PR: 528
      Let's limit the extent of the definition of _XOPEN_SOURCE.
      Update VMS building system
      OpenUNIX 8 has some problems using -G with gcc.  Maybe using gnu-shared works better (will be tested tonight).
      Add usage string for -fingerprint.     PR: 560
      Don't feil when indent is 0.     PR: 559
      No need to test -setalias twice.     PR: 556
      It seems like gcc-drivven shared library building on OpenUnix 8 requires     -shared rather than -G.
      Make it possible to have multiple active certificates with the same     subject.
      Conditionalise all debug strings.
      Reset the version number of the issuer certificate?  I believe this     hasn't been tested in a long while...
      Remove unused variable.
      Reindent for readability.
      Don't try to free NULL values...
      Typo correction
      It's recommended to use req rather than x509 to create self-signed certificates
      Add functionality to help making self-signed certificate.
      Implement self-signing in 'openssl ca'.  This makes it easier to have     the CA certificate part of the CA database, and combined with     'unique_subject=no', it should make operations like CA certificate     roll-over easier.
      Add a CA section, to make sure the test will work with the changes in     CA.sh.
      One more debug line to conditionalise.
      Counter for GCC attributes.
      Add GCC attributes when compiled with gcc.  This helps find out if     we're using the printing functions correctly or not.
      Make %p and %# work properly, at least with pointers and floats.
      Correct a lot of printing calls.  Remove extra arguments...
      There's no need to check for __attribute__ with ANSI functions, since     we only check to the opening parenthesis anyway...
      make update
      Add documentation on the added functionality in 'openssl ca'.
      Convert save_serial() to work like save_index(), and add a     rotate_serial() that works like rotate_index().
      Do not call ENGINE_setup_bsd_cryptodev() when OPENSSL_NO_ENGINE is defined.     PR: 564
      Constify
      Correct a typo.     Have EVP_PKEY_cmp() call EVP_PKEY_cmp_parameters(), and make a note     about the lack of parameter comparison for EC.
      What was I smoking?  EVP_PKEY_cmp() should return with 0 if     EVP_PKEY_cmp_parameters() returned 0, otherwise it should     go on processing the public key component.  Thia has nothing     to do with the proper handling of EC parameters or not.
      RSA_FLAG_SIGN_VER indicates the special rsa_sign and rsa_verify function     pointers should be used.  It doesn't necessarely mean it should go through     the ENGINE framework.
      We seem to carry some rests of the 0.9.6 [engine] ENGINE framework in form     of unneeded includes of openssl/engine.h.
      We seem to carry some rests of the 0.9.6 [engine] ENGINE framework, here in     form of unneeded direct calls through the engine pointer..
      It seems like OpenUnix's ld uses LD_LIBRARY_PATH to search for     libraries.  What's worse, the directories given in LD_LIBRARY_PATH are     checked first!  Therefore, we need a hack to prepend all the     directories we give with -L to the current value of LD_LIBRARY_PATH,     thereby temporarly forming a hacked value.
      I forgot to continuation mark.
      A single quote too many.
      Correct a few typos.
      Include rand.h, so RAND_status() and friends get properly declared.
      Explicitely tell the compiler we're mips3 for the target irix-mips3-cc.
      There's a problem building shared libraries on the sco5-gcc target.  However,     it's time for a release, so I'm just adding an enty in PROBLEMS, and will     hopefully solve this for a later release
      Remove all those infernal stupid CR characters
      New NEWS
      make update
      Add the 0.9.6j news.
      Memory leak fix: local blinding structure not freed in rsa_eay_private_decrypt()
      Memory leak fix: RSA_blinding_on() didn't free Ai under certain circumstances.     Memory leak fix: RSA_blinding_on() would leave a dangling pointer in                      rsa->blinding under certain circumstances.     Double definition fix: RSA_FLAG_NO_BLINDING was defined twice.
      Make it possible to affect the extension of man pages.     PR: 578
      Add an extended variant of OBJ_bsearch() that can be given a few     flags.
      Add an extended variant of sk_find() which returns a non-NULL pointer     even if an exact match wasn't found.
      Correct documentation.  sk_find_ex() doesn't return a pointer, it     returns an index.
      Some variables were uninitialised...
      Include objects.h to get a correct declaration of OBJ_bsearch_ex(),     not to mention the OBJ_BSEARCH_* macros.
      make update
      Add BUF_strndup() and BUF_memdup().  Not currently used, but I've code     that uses them that I'll commit in a few days.
      make update
      Define the OPENSSL_ITEM structure.
      Define a STORE lock (the STORE type will be committed later).
      Define a STORE type.  For documentation, read the entry in CHANGES,     crypto/store/README, crypto/store/store.h and crypto/store/str_locl.h.
      Add STORE support in ENGINE.
      make update
      Provide some extra comments about the STORE_Memory STORE method.
      Get the year right...
      STORE was created 2003, darnit!
      It's usually best if the function name matches everywhere...
      Yeah, right, an object file ending with .c, that'll work!
      Constify RSA_sign() and RSA_verify().     PR: 602
      Add the possibility to store arbitrary data in a STORE.     Suggested by G?tz Babin-Ebell <babin-ebell at trustcenter.de>.
      DO NOT constify RSA* in RSA_sign() and RSA_verify(), since there are function     called downstream that need it to be non-const.  The fact that the RSA_METHOD     functions take the RSA* as a const doesn't matter, it just expresses that     *they* won't touch it.     PR: 602
      /usr/lib/pkgconfig/openssl.pc was never installed in the RPM.     Notified by Bennett Todd <bet at rahul.net>.
      Add the possibility to hand execution parameters (for example     authentication material) to the STORE functions.     Suggested by G?tz Babin-Ebell <babin-ebell at trustcenter.de>.
      Define the two authentication parameter types for passphrase and     Kerberos 5 authentications.
      Remove certain functions
      Make the function STORE_new_engine() public.
      Some misspelled function names.
      Misspelled functions.
      make update
      I don't remember what my thinking was with str_compat.h.  Maybe it'll     come back to me...
      I have no idea how I cut away that piece of text...
      Make sure EC_window_bits_for_scalar_size() returns a size_t
      Correct signedness
      Fix sign bugs.     PR: 621
      Brackets are now allowed, after a small hack in the processing of the     docs-on-web.
      Make sure to compare unsigned against unsigned.
      PR: 630
      Have ASFLAGS be defined the same way as CFLAGS
      Include openssl/e_os.h so OPENSSL_SYSNAME_ULTRASPARC and other configuration     macros get properly defined.
      Make sure debug-solaris-sparcv9-gcc is consistent with solaris-sparcv9-gcc.
      Make sure that size_t matches size_t.
      Make sure the function definitions match their declaration.
      Remove extra ;
      Make sure the sigaction structure and fileno function are properly declared with an ANSI compiler on Solaris (and possibly others).
      Typo
      The output from AES_cbc_encrypt() should be exact multiple blocks when encrypting
      Document the AES_cbc_encrypt() change
      Add crypto/store to the directories to look through.
      Make sure to NUL-terminate the string on end-of-file (and error)     PR: 643
      Handle des_modes.pod properly.     PR: 634
      Add functionality to set marks on the error stack and to pop all errors to the next mark.
      Add documentation for ERR_set_mark() and ERR_pop_to_mark().
      Add an entry for X509_TRUST_OBJECT_SIGN in trstandard[].     PR: 617
      Remove unused variable
      Avoid warnings saying that the format takes a void*.
      make update
      Add the possibility to have symbols loaded globally with DSO.
      Typo.     PR: 593
      Make sure DSO-dlfcn works properly on SunOS4.     PR: 585
      Make sure ssize_t is defined on SunOS4.     PR: 585
      Do not try to use non-existent gmtime_r() on SunOS4.     PR: 585
      Typo.     PR: 584
      Beautify
      Slightly better check of attributes.  Now, mem_list_next can actually stop when the searched for key doesn't have it's attributes within the range of the checked key.
      Missing string and potential memory leaks.     Notified by Goetz Babin-Ebell <goetz at shomitefo.de>
      Add the application data type to the README.
      EXIT() should mainly be exit(n), not return(n).  OPENSSL_EXIT() will     take care of returning if necessary.
      Unsigned vs. signed fixed.
      dynamic_ctrl() didn't have exactly the same prototype as defined by     ENGINE_CTRL_FUNC_PTR.
      Implement CRL numbers.     Contributed in whole by Laurent Genier <Laurent.Genier at intrinsec.com>     PR: 644
      Typo.
      Add documentation for the new crlnumber configuration option.
      We set the export flag for 512 *bit* keys, not 512 *byte* ones.     PR: 587
      Prepare for changes in the 0.9.6 branch
      Prepare for changes in the 0.9.6 branch
      Document the last change.     PR: 587
      make update
      Make sure the compiler knows we run with pedantic settings.
      The definition of dynamic_ctrl() should change along with the     declaration :-).
      Scan through the engines directory as well.
      Conform with the standard prototype for engine control functions.
      "Remove" unused variable
      Implement missing functions.     Have the f parameter to _ctrl functions have the prototype (*)(void)     rather than (*)(), for the sake of C++ compilers.     Disable unimplemented functionality.
      make update
      Nils Larsch told me I could remove that variable entirely.
      Only remove old files if they exist.  [Maing32].     Notified by Michael Gerdau <mgd at technosis.de>
      Change AES-CTR to increment the IV by 1 instead of 2^64.
      The 'counter' is really the IV.
      The convenience argumetn for -nameopt and -certopt is ca_default, not     default_ca.     PR: 653
      Add -issuer_hash and make -subject_hash the default way to get the     subject hash, with -hash a synonym kept around for backward     compatibility reasons.     PR: 650
      Oops, I forgot to replace 'counter' with 'ivec' when used...
      The counter is big-endian.  Since it comes as an array of char,     there's absolutely no need to special-case it on little-endian     machines.
      Make sure openssl.pc is readable by everyone.     PR: 654
      Replace CCITT with ITU-T.  Keep CCITT around as an alias.     make update
      A document that has a very rough description of the X509     functionality.  This is mostly so there's a way to get from the     crypto.html page to the function descriptions.
      Inclusion of openssl/engine.h should always be wrapped with a check that     OPENSSL_NO_ENGINE is not defined.
      Correct two problems, found by Martin Kochanski <cardbox at easynet.co.uk>:
      Generalise the definition of strcasecmp() and strncasecmp() for     platforms that don't (necessarely) have it.  In the case of VMS, this     means moving a couple of functions from apps/ to crypto/ and make them     general (although only used privately).
      Add necessary changes to be able to build on VxWorks for PPC860.     Contributed by Bob Bradley <bob at chaoticsoftware.com>
      Free the Kerberos context upon freeing the SSL.     Contributed by Andrew Mann <amann at tccgi.com>
      Correct small documentation error.     PR: 698
      Include the instance in the Kerberos ticket information.     In s_server, print the received Kerberos information.     PR: 693
      Have ssl3_send_certificate_request() change the state to SSL3_ST_SW_CERT_REQ_B.     PR: 680
      Have ssl3_ssl3_send_client_verify() change the state to SSL3_ST_SW_CERT_VRFY_B.     PR: 679
      Add reference counting around the thread state hash table.     Unfortunately, this means that the dynamic ENGINE version just went up, and     isn't backward compatible.     PR: 678
      Selected changes for MSDOS, contributed by Gisle Vanem <giva at bgnett.no>.     PR: 669
      Make MD5 assembler code able to handle messages larger than 2GB on 32-bit     systems and above.     PR: 664
      Change the indentation from 12 to indent+4.     PR: 657
      Uhmm, It seem to have forgotten one file when I committed the MSDOS     change yesterday.     PR: 669
      Synchronise util/libeay.num with the 0.9.7-stable one.     make update
      Further VxWorks changes from Bob Bradley <bob at chaoticsoftware.com>, this     time involving VxWorks on MIPS
      Correct buggy PODs (missing commas and a prepended space).
      Correct incorrect mode bits change.
      Use correct case for manual page references
      Avoid 'file names' with spaces
      Remove leading and trailing spaces and tabs
      Corrected misplacement of one of the greps...
      Include e_os.h to get a proper definition of memmove on the platforms     that do not have it.
      Correct a mixup of return values
      Check for errors from SSL_COMP_add_compression_method().     Notified by Andrew Marlow <AMARLOW1 at bloomberg.net>
      Remove unused code, don't use zlib functions that are really macros     and provide missing prototypes.
      Setting the ex_data index is unsafe in a threaded environment, so     let's wrap it with a lock.
      Make sure int SSL_COMP_add_compression_method() checks if a certain     compression identity is already present among the registered     compression methods, and if so, reject the addition request.
      Add functionality to get information on compression methods (not quite complete).
      s_client should inform the user of any compression/expansion methods used.
      make update
      In realloc, don't destroy the old memory area if a new one couldn't be     allocated.     Notified by Daniel Lucq <daniel at lucq.org>
      The object file is o_str.o, not o_str.c.
      Correct serious bug in AES-CBC decryption when the message length isn't     a multiple of AES_BLOCK_SIZE.     Optimize decryption of all complete blocks in AES-CBC by removing an     unnecessary memcpy().
      Removing those memcpy()s also took away the possibility for in and out to     be the same.  Therefore, the removed memcpy()s need to be restored.
      Let exit codes propagate from within for loops.
      Engines are usually binary, and should therefore be in INSTALLTOP     rather than OPENSSLDIR.
      Less restrictive debugging build.
      Change my debugging entries to do fierce BIGNUM debugging.
      Netware-specific changes,
      Allow multi-valued rdns in subjects.  This adds the -multivalue-rdn option     to 'openssl req' and 'openssl ca'.
      Move do_subject() to apps.c and rename it to parse_name().  The     rationale behind the move is that it's use by several applications.     The rationale behind the name change is that it describes what the     function does a bit better.
      Forgot to change the declaration of do_subject() to one of parse_name()...
      Let's use text/plain in the example instead of crapy HTML.     PR: 777     Submitted by: Michael Shields <mshields at sunblocksystems.com>
      Move another common functionality (reproduced so far with cut'n'paste)     to apps.c, and give it the hopefully descriptive name parse_yesno().
      Make a number of changes to the OS/2 build.  Submitter's comment below.
      1024 is the export key bits limit according to current regulations, not 512.     PR: 771     Submitted by: c zhang <czhang2005 at hotmail.com>
      RSA_size() and DH_size() return the amount of bytes in a key, and we     compared it to the amount of bits required...     PR: 770     Submitted by: c zhang <czhang2005 at hotmail.com>
      Damnit, I'm sick of having to do something special every time a module     that gets built before objects barfs all over the place because it     uses a new NID that hasn't had a chance of getting defined yet (in     this case, it was about a couple of new EC curves, and therefore a     couple of new corresponding NIDs).
      Add IPSec/IKE/Oakley curves.
      We're getting a clash with C++ because it has a type called 'list'.     Therefore, change all instances of the symbol 'list' to something else.
      Make sure the documentation matches reality.
      CRYPTO_malloc(), CRYPTO_realloc() and variants of them should return NULL     if the give size is 0.
      Check that OPENSSL_malloc() really returned some memory.
      It was pointed out to me that if the requested size is 0, we shouldn't     ty to allocate anything at all.  This will allow eNULL to still work.
      Document that you need to include x509.h (to get [i2d|d2i]_DSA_PUBKEY()).     Correct the typo PUKEY...
      Document that you need to include x509.h (to get [i2d|d2i]_RSA_PUBKEY()).     Correct the typo PUKEY...
      To figure out if we're going outside the buffer, use the size of the buffer,     not the size of the integer used to index in said buffer.
      Add a newline at the end of the last line.     This is part of a large change submitted by Markus Friedl <markus at openbsd.org>
      Use BUF_strlcpy() instead of strcpy().     Use BUF_strlcat() instead of strcat().     Use BIO_snprintf() instead of sprintf().     In some cases, keep better track of buffer lengths.     This is part of a large change submitted by Markus Friedl <markus at openbsd.org>
      Include strings.h so strcasecmp() and strncasecmp() get properly declared.
      Use sh explicitely to run point.sh     This is part of a large change submitted by Markus Friedl <markus at openbsd.org>
      OpenBSD-internal changes.     This is part of a large change submitted by Markus Friedl <markus at openbsd.org>
      Correct documentation typos.     This is part of a large change submitted by Markus Friedl <markus at openbsd.org>
      Check if a random "file" is really a device file, and treat it     specially if it is.     Add a few OpenBSD-specific cases.     This is part of a large change submitted by Markus Friedl <markus at openbsd.org>
      Only use environment variables if uid and gid are the same as euid and egid.     This is part of a large change submitted by Markus Friedl <markus at openbsd.org>
      Avoid including cryptlib.h, it's not really needed.     Check if IDEA is being built or not.     This is part of a large change submitted by Markus Friedl <markus at openbsd.org>
      Fix Perl problems on sparc64.     This is part of a large change submitted by Markus Friedl <markus at openbsd.org>
      Adding a slash between the directoryt and the file is a problem with     VMS.  The C RTL can handle it well if the "directory" is a logical     name with no colon, therefore ending being 'logname/file'.  However,     if the given logical names actually has a colon, or if you use a full     VMS-syntax directory, you end up with 'logname:/file' or     'dev:[dir1.dir2]/file', and that isn't handled in any good way.
      Typo...
      We're passed p, so let's use p instead of making assumptions.
      S_IFBLK and S_IFCHR may not exist in some places (like Windows), so     let's check for those macros, and if they aren't defined, let's assume     there aren't Unixly devices on this platform.
      Avoid signed vs. unsigned warnings (which are treated like errors on     Windows).
      Unsigned vs. signed problem removed
      make update
      Add the missing parts for DES CFB1 and CFB8.     Add the corresponding AES parts while I'm at it.     make update
      make update
      In the development branch, it feels quite all right to warn on a lot     more stuff.
      Typo
      -Wtraditional was a little too much...
      Remove typos
      Document the AES options for 'openssl smime'.     PR: 834
      Make sure the given EVP_PKEY is updated in the PEM_STRING_PKCS8INF case also.     PR: 833
      AES is spelled AES, not ASE.  Oops...
      Avoid a memory leak in OCSP_parse_url().     Notified by Paul Siegel <psiegel at corestreet.com>
      Make our page with pointers to binary distributions visible in the FAQ
      Make sure we use unsigned constants, or come compilers may complain.
      Make sure that the last argument to RAND_add() is a float, or some     compilers may complain.
      It was just pointed out to me that it's better to cast to double...
      Constify d2i, s2i, c2i and r2i functions and other associated     functions and macros.
      Make sure fd is defined where it should.     PR: 849
      Remove a warning for conversion double->long.  This has impacts on Windows.     PR: 849
      Change \t to real tab in echo argument.     PR: 847
      Correct minor spelling error.     PR: 845
      Sync the VMS build with Unix.
      make update
      Make it clear that for RSA_NO_PADDING, flen must be RSA_size(rsa)
      Make sure toupper() is properly declared.
      Typo...
      o_str.h isn't a public header file.
      o_str.h isn't a public header file, so make sure it will still be     included.
      Add store.h among the exported headers on VMS.
      Only build the PKCS#7 test applications if "pkcs7" is present in     SDIRS.
      Make it easier to buld test applications...
      Correct constness problems.
      Don't define fd for platforms that do not use it, as some may not declare fileno() properly
      RAND_add() wants a double as it's last argument.
      A couple more cases where RAND_add() gets an integer instead of a     doule as last argument.
      Make prototypes for some callback pointers.
      Change spaces to symbols in names.     PR: 856
      Wrap code starting with a definition.     PR: 854
      Move the definition of Win32_rename(), since the macro rename gets undefined     in the middle of the code on Windows, and that disrupts operations in functions     later that use rename()...     PR: 853
      SSL_COMP_get_compression_method is a typo (a missing 's' at the end of     the symbol name).
      Add symbol hacks for some long names.     make update
      Print the debug thingies on stderr instead of stdout.  If for nothing     else then at least so bc doesn't have problems parsing the output from     bntest :-).
      Whooaaaaa, the BN_CTX_DEBUG macro really produces output these     days...  A little too much for my tests, currently...
      When the pointer 'from' changes, it's stored length needs to change as     well.
      Remove the creation of $(INSTALL_PREFIX)$(OPENSSLDIR)/lib, since we don't     use it.
      Let's make life easier and have the VMS version of the configuration be     generated from the Unixly configuration file.
      make update
      Synchronise o_str.c between 0.9.8-dev and 0.9.7-stable.
      Reimplement old functions, so older software that link to libcrypto     don't crash and burn.
      X509_policy_lib_init is declared but not defined, so it raises havoc     when trying to build a shared library on VMS or Windows...
      Move some COMP functions to be inside the #ifndef OPENSSL_NO_COMP     wrapping preprocessor directive.  This also removes a duplicate     declaration.
      make update
      Synchronise VMS with the Unixly Malefiles.
      Since num is now a size_t, it's not necssary to check for less than 0,     AND it avoids warnings on certain systems.
      SHA224_Update() and SHA224_Final() aren't implemented, and since     SHA224() uses SHA256_Update() and SHA256_Final() instead, let's just     create aliases in form of macros.
      make update
      Typo, setting the first element of nids[] to NULL instead of setting     *cnids.
      Making some values explicitely unsigned was derived from ongoing work     that isn't yet committed.  It wasn't meant to be committed already, so     I'm removing it for now.
      Linux on ARM needs -ldl     PR: 905
      NetWare fixes provided by Verdon Walker for OpenSSL 0.9.8-dev.     The changes have been mailed to <crypt at bis.doc.gov> as well.
      Make sure that the buffers are large enough to contain padding.     PR: 904
      Make the tests of EVP operations without padding.  As a consequence,     there's no need for a larger BUFSIZE any more...
      Changes for VOS, submitted by Paul Green <Paul.Green at stratus.com>.
      Explain a little better what BN_num_bits() and BN_num_bits_word() do.     Add a note as to how these functions do not always return the key size, and     how one can deal with that.
      o_str.c: Windows doesn't have <strings.h>, and since we use _strnicmp() and     _stricmp() on that platform, use the appropriate header file for it,     <string.h>.     o_str.h: we only want to get size_t, which is defined in <stddef.h>.
      Copy a few files from LPlib (a new project of mine), add a wrapper.     Now we have directory reading capabilities for VMS as well, and all     of it in a fairly general manner.
      Use the new directory reading functions.
      make update
      In some cases, EVMSERR isn't visible (that's fairly new...).
      o_dir needs to be compiler with the warnings about dollar signs in     identities disabled.
      'SSL_add_dir_cert_subjects_to_stack' is longer than 31 characters.     Lucky me, I had prepared for this :-).
      Some test programs in crypto/sha were named differently than usual...
      Because it's one of our libraries calling new functions in the other,     we need to have them among the symbols that should appear in the     transfer table, at least on VMS (and it wouldn't surprise me if     Windows would whine as well).
      make update
      I think it could be a good thing to know what went wrong with the tests...
      Since version 7.0, The C RTL in VMS handles time in terms of UTC     instead of local time.
      Imported from LPlib, making sure the entry name (at least on Unix) is     NUL-teminated at all times, and that we don't make unneeded calls to     free().
      From LPlib:
      From LPlib:
      From LPlib:
      From LPlib:
      The compiler may complain about what looks like a double definition of a     static variable
      We build the crypto stuff, not the ssl stuff, in this command procedure...
      DJGPP has opendir() and friends, according to Gisle Vanem <giva at bgnett.no>.
      Stupid casts...
      Basically, I wanted to be able to make a dump to a FILE*, and not have     to bother creating a BIO around it.  So here's a few more functions to     make it possible to make the dump using a printing callback, and to     print to a FILE* (based on the callback variant), done in the same     style as the functions in crypto/err/err_prn.c.
      On systems that use case-insensitive symbol names (i.e. they're all     converted to upper case or something like that), the application-     level bio_dump_cb() has a name clash with the new library function     BIO_dump_cb().  The easiest fix is to rename the function at the     application level.
      'compatibility', not 'computability' :-)...
      Another symbol longer than 31 characters...
      Synchronise VMS build files with Unixly Makefiles.
      make update
      Synchronise with Unix build.
      - There's no more need for the snprintf macro.     - Move the inclusion of malloc.h until after all other includes, so we       can do proper tests of system macros.     - Make sure the correct header file is included to get the builtin       "alloca" under VMS, and define a macro to map the symbol 'alloca' to       it.
      Import changed files from LPlib.  The changes are logged as follows     for LPdir_unix.c in LPlib.  For the other files, only the last log     entry applies.
      Move the declaration of alloca() so it's ony declared when really     necessary.
      usr/doc has recently changed to usr/share/doc on Cygwin.     Notified by Corinna Vinschen <vinschen at redhat.com>
      Because libraries on Windows lack useful version information, the zlib     guys had to change the name to differentiate with older versions when     a backward incompatibility came up.  Of course, we need to adapt.     This change simply tries to load the library through the newer name     (ZLIB1) first, and if that fails, it tries the good old ZLIB.
      Make sure memmove() is defined, even on SunOS 4.1.4.     PR: 963
      Because -rpath/-R may have been used, our settings of LD_LIBRARY_PATH     and friends may be entirely useless.  In such a case, LD_PRELOAD is     the answer, at least on platforms using LD_LIBRARY_PATH.  There might     be other variables to set on other platforms, please fill us in...
      Don't use $(EXHEADER) directly in for loops, as most shells will break     if $(EXHEADER) is empty.
      Make sure LD_PRELOAD is only set when we build shared libraries (and     therefore link with them).  Add LD_PRELOAD setting code where it was     still missing.
      Some find it confusing that environment variables are set when shared     libraries aren't built or used.  I can see the point, so I'm     reorganising a little for clarity.
      Whoops, syntactic mistake...
      Cut'n'paste mistake.  All tested OK now...
      Make an explicit check during certificate validation to see that the     CA setting in each certificate on the chain is correct.  As a side-     effect always do the following basic checks on extensions, not just     when there's an associated purpose to the check:     - if there is an unhandled critical extension (unless the user has       chosen to ignore this fault)     - if the path length has been exceeded (if one is set at all)     - that certain extensions fit the associated purpose (if one has been       given)
      Document the change.
      Split X509_check_ca() into a small self and an internal function     check_ca(), to resolve constness issue.  check_ca() is called from the     purpose checkers instead of X509_check_ca(), since the stuff done by     the latter (except for calling check_ca()) is also done by     X509_check_purpose().
      Propagate a few more variables to Makefile.shared when linking     programs.
      Change libeay.num so it's synchronised with additions in 0.9.7-stable.     make update
      make update (oops, missed this file)
      Add functionality needed to process proxy certificates.
      Forgot to synchronise the VMS build scripts.
      iv needs to be const because it sometimes takes it's value from a     const.
      Correct a faulty address assignment, and add a length check (not     really needed now, but may be needed in the future, who knows?).
      Small typo, `mask' got the same value ORed to it twice instead of     `mask' and `emask' getting that operation done once each.
      Changes concering RFC 3820 (proxy certificates) integration:
      Small thing.  It seems like we have to defined _XOPEN_SOURCE to get     isascii() on DEC/Compaq/HP C for VMS.
      Apparently, at least with my VMS C environment, defining _XOPEN_SOURCE     gets _POSIX_C_SOURC and _ANSI_C_SOURCE defined, which stops u_int from     being defined, and that breaks havock into the rest of the standard     headers...  *sigh*
      The mix of CFLAGS and LDFLAGS is a bit confusing in my opinion, and     Makefile.shared was a bit overcomplicated.
      Get rid if the annoying warning
      Check for errors from EVP_VerifyInit_ex(), or EVP_VerifyUpdate might     cause a segfault...  This was uncovered because EVP_VerifyInit() may fail     in FIPS mode if the wrong algorithm is chosen...
      Oops, == should really be = when used with test ([ and ]).
      The first argument to load_iv should really be a char ** instead of an     unsigned char **, since it points at text.
      Added HOWTO about proxy certificates.
      There are cases when there are no files left to verify.  Make sure to     handle that properly.
      Change the memory leak FAQ entry to describe the levels of thread safety in each function
      Add a file with fingerprints that have recently been used to sign     OpenSSL distributions, or are about to.  This has been requested a     little now and then by users, for years :-/...
      Added restrictions on the use of proxy certificates, as they may pose     a security threat on unexpecting applications.  Document and test.
      Add emacs cache files to .cvsignore.
      Add a NEWS item for 0.9.7g.
      Synchronise with ec/Makefile.
      Avoid compiler complaint about mismatched function signatures     (void * != RSA *)
      Type mismatch detected by DEC C compiler.  void* != void**
      Resolve signed vs. unsigned.
      Avoid compiler complaint about mismatched function signatures     (void * != char *)
      signed vs. unsigned.
      Make sure id2_func is properly cast as well...
      signed vs. unsigned.
      Provide a default OPENSSL_ia32cap_loc for non-Intel platforms where     util/libeay.num is important when building shared libraries, like     VMS.
      Synchronise with Unix build system.
      From branch OpenSSL_0_9_7-stable, revision 1.1.4.1, 2002-05-23 17:25:
      Remove a bunch of false positives, fix one true positive.
      From branch OpenSSL_0_9_7-stable, 2002-11-13 15:30:
      Remove a bunch of false positives, and fix some true positives.
      This one deserves a note.  In the change to CHANGES, there's the     following:
      All kinds of changes from branch OpenSSL_0_9_7-stable
      From branch OpenSSL_0_9_7-stable, 2004-08-11 22:34:
      From branch OpenSSL_0_9_7-stable, 2004-09-11 11:45:
      Some true positives fixed, toss some false positives.
      A few more fingerprints...
      Actually, C on VMS/Alpha knows very well what a long long is, and     knows how to make use of it.  So let's stop pretending the Alpha     doesn't know long long...
      Since BN_LLONG will only be defined for Alpha/VMS and not VAX/VMS,     there's no need to undefine it here.  Then, let's get a bit paranoid     and not define BN_ULLONG on THIRTY_TWO_BIT machines when BN_LLONG     isn't defined.
      I was incorrect about VMS/Alpha.  Defining BN_LLONG with     SIXTY_FOUR_BIT could cause havoc, so don't (it's lucky bn.h undefines     BN_LLONG when SIXTY_FOUR_BIT is defined).
      I just branched 0.9.8, so HEAD needs to be bumped to 0.9.9-dev.
      Version changes where needed.
      Update status information
      Patches for Cygwin, provided by Corinna Vinschen <vinschen at redhat.com>
      When _XOPEN_SOURCE is defined, make sure it's defined to 500.  Required in     http://www.opengroup.org/onlinepubs/007908799/xsh/compilation.html.
      DEC C complains about bad subscript, but we know better, so let's shut it up.
      Typo correction
      It seems like mkdef.pl couldn't quite understand that #ifdef OPENSSL_NO_SHA512     was still active when it came down to the functions.  mkdef.pl should really     be corrected, but that'll be another day...
      Typo
      We have some source with \r\n as line ends.  DEC C informs about that,     and I really can't be bothered...
      Change all relevant occurences of 'ncipher' to 'chil'.  That's what nCipher always wanted...
      Synchronise with Unixly build
      pqueue and dtls uses 64-bit values.  Unfortunately, OpenSSL doesn't     have a uniform representation for those over all architectures, so a     little bit of hackery is needed.
      DJGPP changes.  Contributed by Doug Kaufman <dkaufman at rahul.net>
      Merge in the new news from 0.9.8-stable.
      Merge from 0.9.8-stable.
      Synchronise more with the Unix build.
      Synchronise yet a little more with the Unixly build
      From 0.9.8-stable:
      The macro THREADS was changed to OPENSSL_THREADS a long time ago.
      Updated support for NetWare, submitted by Verdon Walker <VWalker at novell.com>.
      Old typo...
      Add support for the new Intel compiler, icc.     Submitted by Keith Thompson <kst at sdsc.edu>
      Correct typo ia64.o -> bn-ia64.o.
      gcc 2.95.3 on Ultrix supports long long.
      Change pq_compat.h to trust the macros defined by bn.h a bit more, and thereby     provide better generic support for environments that do not have 64-bit     integers.  Among others, this should solve PR 1086
      Remove the incorrect installation of '%{openssldir}/lib'.
      Document the change and update the version number (d'oh!).
      Further change pq_compat.h to generate the flag macros PQ_64BIT_IS_INTEGER     and PQ_64BIT_IS_BIGNUM with the values 0 (for false) and 1 (for true),     depending on which is true.  Use those flags everywhere else to provide     the correct implementation for handling certain operations in q PQ_64BIT.
      Update from 0.9.8-stable.
      _GNU_SOURCE needs to be defined before any standard header.
      Skipping all tests just because one algorithm is disabled seems a bit harsch.
      Pass INSTALL_PREFIX in BUILDENV.
      Avoid endless loops.  Really, we were using the same variable for two     different conditions...
      When the return type of the function is int, it's better to return an     in than NULL, especially when an error is signalled with a negative     value.
      Show what the offending target was.
      Netware patch submitted by Verdon Walker" <VWalker at novell.com> in PR     1107.  He says:
      Status update
      0.9.8-beta5 works on VMS/Alpha
      0.9.8-beta5 works on Cygwin
      0.9.8-beta5 works on SuSE 9.3
      Data about which Cygwin versions 0.9.8-beta5 work on
      0.9.8-beta5 works on Gentoo/arml but not /armb, and works on Linux AMD64
      Do not undefine _XOPEN_SOURCE.  This is currently experimental, and     will be firmed up as soon as it's been verified not to break anything.
      Have pod2man.pl accept '=for comment ...' before the '=head1 NAME' line.
      Only define ZLIB_SHARED if it hasn't already been defined (on the command     line, for example).
      Move the definition of DEVRANDOM for DJGPP from Configure to e_os.h.     That should solve the issues with propagating it through the Makefiles.
      Add better documentation on how id_function() should be defined and what     issues there are.
      Undefine DECRANDOM before redefining it.
      With DJGPP, it seems like the return code from grep, even when in the     middle of a pipe, is noted.  Counter that by forcing a true return code     when the return code has no importance.
      Add crypto/bn/bn_prime.h to the collection of generated files.  In the     update target, place the dependency on depend last, so all necessary files     are generated *before* the dependencies are figured out.
      Check for 'usage' and 'Usage'.     Submitted by Tim Rice <tim at multitalents.net>.  His comment is:
      Do no try to pretend we're at the end of anything unless we're at the end     of a 4-character block.
      Strip the engine shared libraries as well.
      Change dir_ctrl to check for the environment variable before using the default     directory instead of the other way around.
      Configure update for Stratus VOS.
      Update for Stratus VOS.
      DCC doesn't like argument names in returned function pointers.
      The NAME section of a man page is required to have a dash followed by a     short description, at least according to pod2man.
      Initialise dir to avoid a compiler warning.
      Do not defined des_crypt(), since it clashes with Solaris crypt.h.
      Wrap the inclusion of openssl/engine.h with a protective check for     the absence of OPENSSL_NO_ENGINE.
      Wrap the inclusion of openssl/engine.h with a protective check for     the absence of OPENSSL_NO_ENGINE.
      Someone did some cutting and pasting and didn't quite finish the job :-).
      Updated status from 0.9.8-stable.
      There are a few showstoppers.  Unfortunately, I only remember one.  Please fill this in.
      asn1parse doesn't support any TXT format, so let's stop pretending     it does.
      Actually, the 64bit format specifier differs between SIXTY_FOUR_BIT and     SIXTY_FOUR_BIT_LONG
      The private key should never have ended up in newreq.pem.     Now, it ends up in newkey.pem instead.
      Add libcrypto.pc and libssl.pc, and install them along with openssl.pc.
      Changes from the 0.9.8 branch.
      Changes from the 0.9.8 branch.
      On case insensitive systems, 'install' gets mixed up with the existing file     'INSTALL', so we need to put some force into installing
      I'm reversing this change, as it seems the error is somewhere else.
      bytes_to_long_long isn't used anywhere any more, so let's remove it     entirely.
      Synchronise with Unix changes.
      More synchronisation with the Unixly build.
      Last synchronisationn with Unixly build.  I hope...
      Synchronise with Unixly build.
      Synchronise VMS build with Unixly build.
      Remove warnings about signed vs. unsigned...
      Change a comment so it corresponds to reality.  Put back a character that     was previously replaced with a NUL for parsing purposes.  This seems to     fix a very weird parsing bug involving two variable references in the same     value.
      Renumber to follow what happens with 0.9.8.
      Add in CHANGES for 0.9.7i.
      A slight change in documentation that makes it so much more comprehensible
      Fix numerous bugs in the Win32 path splitter
      Document it
      Synchronise with the Unix build.
      When using POSIXly functions, we need to define _POSIX_C_SOURCE, at     least when the source is compiled with ANSI settings.
      Build Whirlpool on VMS as well
      Whirlpool was added to EVP, so let's build it on VMS as well.
      wq instead of wp?  That's gotta be among the more amazing typos I've     made...
      Whoops, we were copying instead of comparing at the end of trying to     find a queue element.
      Missing files in the VMS installation
      Fix signed/unsigned char clashes.
      The VMS I run on doesn't know socklen_t and uses size_t instead.
      Disable the Mixed Linkage warning for some selected modules.  This is     because the Compaq C compiler will not accept that a variable be     declared extern then defined static without a warning.
      Typo...
      Forgot to initialize CC6DISABLEWARNINGS properly...
      signed vs. unsigned clash.
      As an effect of revisions 1.261, BUILD_CMD was changed so $(DIRS)     wasn't respected when using it to build different parts of OpenSSL.     1.269 was an attempt to correct that, but unfortunately meant that we     built every part that was given i $(DIRS) 7 times.  This change puts     back the original intent with BUILD_CMD via the new macro     BUILD_ONE_CMD while keeping the intent with RECURSIVE_BUILD_CMD.
      Document the building macros.
      Break out deltree in its' own command procedure.
      Add TS to the VMS build.
      Add a TSA test.  testtsa.com is a manual sh to dcl translation of     testtsa.
      Synchronise with openss.cnf
      Forgot the TSA application...
      Make shorter TS symbols for OpenVMS.     Don't convert a function pointer to a void*, ISO C doesn't like that.
      The actual whirlpool test was missing on VMS...
      Remember to *build* WP_TEST on VMS, as well :-)
      Resolve signed vs. unsigned issues
      Oh, now I noticed Bodo's change that made tlsext_ecpointformatlist     unsigned...
      tlsext_ecpointformatlist_length is unsigned, so check if it's less     than zero will only result in pissing of some compilers...
      Typo...
      Synchronise with recent changes
      VMS doesn't support includes of paths very well.
      Keep up with the changes in the Unix build system.
      Only try to remove the tsa.dir subdirectory if it actually exists.
      Since we're moving between directories, let's get an absolute path to     openssl.exe.
      Small bug.  apps/CA.sh and apps/CA.com look at SSLEAY_CONFIG, not     OPENSSL_CONF.
      The -config option flag needs to be in the SSLEAY_CONFIG value.
      Synchronise with recent changes
      If we declare a function, like d2i_TS_MSG_IMPRINT_bio(), we'd better     *define* it too, or things like shared libraries might be a bit sad.
      Change chop to chomp when reading lines, so CRLF is properly processed on     the operating systems where they are the normal line endings
      Synchronise with the Unix build
      Synchronise what what's happening with the Unix build
      Got sick and tired of duplicating...  Too error-prone (i.e. I forget     to update both...)!
      Synchronise
      Synchronise with Unixly build.     (Geez, a lot is happening right now, eh? :-))
      Make sure obj_xref.h is updated during a "make update"
      Someone made a mistake, and some function and reason codes got     duplicate numbers.  Renumbering.
      make update
      Keep in sync with Unix
      There was a problem with too long command lines, so I rebuilt to make     it work better.
      Signed vs. unsigned conflict
      rslen is unsigned, so it can never go below 0.
      Deal with another name that's longer than 31 characters.
      Use a new signed int ii instead of j (which is unsigned) to handle the     return value from sk_SSL_CIPHER_find().
      Because all object files are now in a file, we don't need to mention     any of them on the linker command line.  Besides, OBJECT_FILE now     represents the last compiled file, and using it here only results in     getting warnings about multiple definitions of the symbols in that     file.
      Synchronise with the Unixly build.
      Synchronise with Unix
      A few more ENGINE strings that need shortening.
      Keep synchronised with the Unix build
      Keep synchronised with Unix
      Use poll() when possible to gather Unix randomness entropy
      Correct warnings about signedness.
      According to documentation, including time.h declares select() on     OpenVMS, and possibly more.
      Complete the change for VMS.
      Fixes for the following claims:
      Synchronise with Unixly build
      Synchronise with Unixly build, again ;-)
      Replace strdup() with BUF_strdup().
      Needed definition of _XOPEN_SOURCE_EXTENDED so DEC C on VMS will see     the declarations of fd_set, select() and so on.
      Synchronise a bit more with Unixly build
      After objects have been freed, NULLify the pointers so there will be no double     free of those objects
      Add STARTTLS support for IMAP and FTP.     Submitted by Kees Cook <kees at outflux.net>
      Synchronise the VMS build with recent movements in the Unix build.
      Apply a more modern way to get the definition of select(), except for VMS.     Submitted by Corinna Vinschen <vinschen at redhat.com>
      Synchronise VMS with Unix.
      VAX C can't handle 64 bit integers, making SHA512 impossible...
      Change submitted by Doug Kaufman.  He writes:
      Synchronise with Unix build
      Provide other forms for symbols that are too long or that clash with others
      Further synchronisation with Unix build.  I hadn't noticed pq_compat.h     was gone...
      Synchronise with Unix.
      Synchronise VMS build system with the Unixly one
      A few more symbols that are a little bit long for VMS
      Stack changes made dso_vms.c not compile properly.
      Remove extraneous semicolons
      Constify where needed
      Further synchronisation with Unix
      In BIO_write(), update the write statistics, not the read statistics.     PR: 1803
      More synchronisation with Unix
      VMS stuff I forgot...
      Synchronise with Unix build
      Do the Camellia part right
      Hopefully resolve signed vs unsigned issue.
      Because DEC C - sorry, HP C - is picky about features, we need to     define _XOPEN_SOURCE_EXTENDED to reach fd_set and timeval types and     functionality.
      Data not initialised.     Notified by Gerardo Ganis <gerardo.ganis at cern.ch>
      Reference bug.
      Make it possible to disable STORE.
      Make STORE an experimental feature.
      A DTLS1 symbol needs to be chopped off a bit.
      Include sys/time.h to declare gettimeofday().
      Cast to avoid signedness confusion
      Add local symbol hacks for OpenVMS
      Add padlock data     Redo the loop so it really compiles all objects for one engine, then     links the engine (until now, it still thought every file was an engine     of its own...).
      Stupid typo
      Reimplement time check for VMS to mimic the way it's done on Windows.     Reason: gettimeofday() is deprecated.
      Make the NULL definition of OPENSSL_ia32cap_loc() compatible with the     declaration in crypto.h.
      Move the time fetching code to its own static function, and thereby     make sure that BOTH instances of said code get the VMS modification.
      Synchronise VMS with Unixly build.
      Make sure the padlock code compiles correctly even on hardware that     doesn't have padlocks.
      Do not try to link the support file(s), as they aren't a complete     engine ;-)
      Forgotten comma...
      Add a comment about libeay.num and ssleay.num
      Have mkdef.pl also handle VAX and Non-VAX differences for VMS
      Functional VMS changes submitted by sms at antinode.info (Steven M. Schweda).     Thank you\!     (note: not tested for now, a few nightly builds should give indications though)
      Stupid typo
      Update from 1.0.0-stable
      A few more macros for long symbols.     Submitted by Steven M. Schweda <sms at antinode.info>
      Compile t1_reneg on VMS as well.     Submitted by Steven M. Schweda <sms at antinode.info>
      It seems like sslroot: needs to be defined for some tests to work.     Submitted by Steven M. Schweda <sms at antinode.info>
      Forgot to correct the definition of __arch in this file.     Submitted by Steven M. Schweda <sms at antinode.info>
      There's really no need to use $ENV::HOME
      size_t doesn't compare less than zero...
      Apparently, test/testtsa.com was only half done
      Have the VMS build system catch up with the 1.0.0-stable branch.
      If opensslconf.h and buildinf.h are to be in an architecture specific     directory, place it in the same tree as the other architecture     specific things.
      Architecture specific header files need special handling.
      The previous take went wrong, try again.
      Typo.
      We redid the structure on architecture dependent source files, but     apparently forgot to adapt the copying to the installation directory.
      Synchronise with Unix tests
      We expect these scripts not to bail on error, so make sure that's what happens.
      Tell the user what test is being performed.
      Taken from OpenSSL_1_0_0-stable:
      Synchronise with Unix and do all other needed modifications to have it     build on VMS again.
      Better way to build tests.  Taken from OpenSSL-1_0_1-stable
      * tests.com: Add the symbol openssl_conf, so the openssl application       stops complaining about a missing configuration file.  Define the logical       name PERL_ENV_TABLES with values to Perl considers the DCL symbol table       as part of the environment (see 'man perlvms' for details), so cms-test.pl       can get the value of EXE_DIR from tests.com, among others.     * cms-test.pl: Make changes to have it work on VMS as well.  Upper or mixed       case options need to be quoted and the openssl command needs a VMS-specific       treatment.  It all should work properly on Unix, I hope it does on Windows       as well...
      Don't define an empty CFLAGS, it's much more honest not to defined it at all.     Make sure to remove any [.CRYTO]BUILDINF.H so it doesn't get used instead of     [.''ARCH'.CRYPTO]BUILDINF.H
      Give the architecture dependent directory higher priority
      Print openssl version information at the end of the tests
      Implement bc test strategy as submitted by Steven M. Schweda <sms at antinode.info>.     Make sure we move to '__here' before trying to use it to build local sslroot:
      Use the same directory for architecture dependent header files as in     the branches OpenSSL-1_0_0-stable and OpenSSL-1_0_1-stable.
      Better method for creating SSLROOT:.     Make sure to include the path to evptest.txt.
      First attempt at adding the possibility to set the pointer size for the builds on VMS.     PR: 2393
      Part of the IF structure didn't get pasted here...     PR: 2393
      PR: 2407     Fix fault include.     Submitted by Arpadffy Zoltan <Zoltan.Arpadffy at scientificgames.se>
      PR: 2425     Synchronise VMS build with Unixly build.
      Add rsa_crpt
      After some adjustments, apply the changes OpenSSL 1.0.0d on OpenVMS     submitted by Steven M. Schweda <sms at antinode.info>
      Add missing source.  Also, have the compile also use [.MODES] as     include directory, as other parts (notably, EVP) seem to need it.
      A few more long symbols need shortening.
      * apps/openssl.c: For VMS, take care of copying argv if needed much earlier,       directly in main().  'if needed' also includes when argv is a 32 bit       pointer in an otherwise 64 bit environment.     * apps/makeapps.com: When using /POINTER_SIZE=64, try to use the additional       =ARGV, but only if it's supported.  Fortunately, DCL is very helpful       telling us in this case.
      * apps/makeapps.com: Forgot to end the check for /POINTER_SIZE=64=ARGV       with turning trapping back on.     * test/maketests.com: Do the same check for /POINTER_SIZE=64=ARGV       here.     * test/clean-test.com: A new script for cleaning up.
      * apps/makeapps.com: Add srp.
      * util/mkdef.pl: Add crypto/o_str.h and crypto/o_time.h.  Maybe some       more need to be added...
      * crypto/crypto-lib.com: Add a few more missing modules.
      make update (1.1.0-dev)
      Implement FIPS CMAC.
      Implement FIPS CMAC.
      make update
      * Makefile.fips: Update and add details about cmac.
      * fips/cmac/fips_cmactest.c: Changed to accept all the ciphers we       support (Two Key TDEA is not supported), to handle really big       messages (some of the test vectors have messages 65536 bytes long),       and to handle cases where there are several keys (Three Key TDEA)
      * fips/cmac/fips_cmactest.c: Some say TDEA, others say TDES.  Support       both names.
      * fips/fipsalgtest.pl: Test the testvectors for all the CMAC ciphers       we support.
      * fips/cmac/fips_cmac_selftest.c: Because the examples in SP_800-38B       aren't trustworthy (see examples 13 and 14, they have the same mac,       as do examples 17 and 18), use examples from official test vectors       instead.
      * Configure, crypto/ec/ec.h, crypto/ec/ecp_nistp224.c, util/mkdef.pl:       Have EC_NISTP224_64_GCC_128 treated like any algorithm, and have       disabled by default.  If we don't do it this way, it screws up       libeay.num.     * util/libeay.num: make update
      make update
      For VMS, implement the possibility to choose 64-bit pointers with     different options:     "64"		The build system will choose /POINTER_SIZE=64=ARGV if     		the compiler supports it, otherwise /POINTER_SIZE=64.     "64="		The build system will force /POINTER_SIZE=64.     "64=ARGV"	The build system will force /POINTER_SIZE=64=ARGV.
      Corrections to the VMS build system.     Submitted by Steven M. Schweda <sms at antinode.info>
      Error discrepancy corrected.
      fips_check_dsa_prng() should only be built when OPENSSL_FIPS is defined.
      No spaces in assignements in a shell script...
      Add symbols for the parameters on a couple more functions.
      Add a symbol for the first parameter to OPENSSL_showfatal().
      Add a tool that (semi)automatically created the API documentation     required for FIPS.

Ulf M?ller (661):
      New switch "386" to generate 80386 code (emulate bswap).
      Typo.
      Remove file that is to be auto-generated by sha1-586.pl.
      New option to generate 80386 code.
      pre-0.9.3 development version.
      New Makefile variables $(RANLIB) and $(PERL).
      Pointer to Ariel Glenn's SSLeay documentation.
      Remove obsolete files.
      Include bn.h instead of defining BIGNUM as char.
      Remove obsolete files from SSLeay 0.8.
      Bug fix for X.509 two-digit year.
      More assembler problems; new OCSP patch; obsolete patches removed from     list.
      bn_div_words has been added to alpha.s (Hannes Reinecke's patch).
      Fix linux-mips entry.
      Test RSA after the BN library it is based on.
      Bad dependencies.
      Avoid error message about missing gcc.
      Bugs.
      Separate DSA functionality from ASN.1 encoding.     New functions DSA_do_sign and DSA_do_verify to provide access to     the raw DSA values.
      Use Perl 5 even if Perl 4 comes first in the search path.
      Test PKCS#1 v1.5 padding as well.
      recent changes.
      New Configure option "rsaref".
      Write random seed file in binary mode.
      Another bug.
      Pass $PERL on make errors.
      SPARC v8 assembler BIGNUM code.
      Defunct assembler files removed; various cleanups.
      Definition did not match prototype.
      Fix typos in error codes.
      Error in comment.
      Document additional Configure flags.
      Clean up prototypes (prepare for removing NOPROTO).
      Change functions to ANSI C.
      Missing #endif.
      Arguments are des_cblock.
      Problems with 64-bit long.     Pointed out by Andy Polyakov <appro at fy.chalmers.se>.
      Remove useless defines.
      Problems with 64-bit long.
      -Wall implies -Wuninitialized.
      Fix some warnings.
      Fix lots of warnings.
      Move all autogenerated header file parts to crypto/opensslconf.h.
      New header file opensslconf.h contains the macros set by Configure.
      Ultrix compatibility.
      Be more specify about system requirements.
      Set the 386 flag automatically when building on i386.
      Pass the $PROCESSOR variable through.
      Remove references to .org header file names.
      Recognize CPU version on NetBSD and FreeBSD.
      Function didn't get ANSIfied because of unusual formatting.
      Undo evil cast! <g>
      Andy Polyakov points out that BF_PTR2 is slower than the generic case.
      *.org files are gone for good.
      Remove header files from .cvsignore.
      ANSIfy, fix typo in error message, and remove redundant statement from     my code.
      Replaced by mkerr.pl
      New Configure option --openssldir to replace util/ssldir.pl.
      New Configure option --openssldir to replace ssldir.pl.
      *** empty log message ***
      exit on error.
      Submitted by:     Reviewed by:     PR:
      Remove NOPROTO definitions and error code comments.
      Ignore autogenerated file.
      Last week I proposed to increase the version number to 1.0.     So far nobody complained...
      Remove NOPROTO-related macros.
      New Configure option no-<cipher> (rsa, idea, rc5, ...).
      Add missing DEPFLAG.
      New Configure option no-<cipher> (rsa, idea, rc5, ...).
      Message digest stuff.
      Undo.
      Update NO_* macros.
      *** empty log message ***
      More portable blowfish macros.
      Typo.
      Remove autogenerated file.
      Do make rehash automatically at make test.
      Linux shared libraries.
      Linux shared libraries (now in Makefile.ssl).
      Pass $PERL on make dclean.
      Decrypt test vector data even if previous decryption failed to get     better diagnostics.
      Ignore autogenerated assembler files.
      Autogenerated files.
      Change error message for consistency.
      Missing "else".
      exptest dumps core. Optimizer bug?
      Ignore Makefile.save
      Compare with BN_mod_exp_simple, too.
      Close files.
      Bug fix.
      OAEP bug fix.
      Unused file.
      Typo.
      $perl should never be empty.
      More information about installing.
      Better Sun config.
      Typo. (You ought to trademark "Configurion". :)
      Update HPUX config, work around HPUX library incompatibility.
      c_rehash doesn't work at that point of the installation, so don't even     try.
      Sparc v8plus assembler.
      Andy Polyakov points out there are default rules in make in gmake for this.
      solaris64 entry.
      Recognise Ultra Sparc and compiler version number.
      SHA-1 cleanups and performance enhancements.
      Fix problem with /usr/ccs/lib/cpp.
      C++ bug fix.
      Use ANSI stdarg.
      Note about required SC5.0 patches.
      v8plus must be specified.
      Remove unreachable return statements.
      Info on how to submit patches.
      Support additional Win32 compilers.
      Borland C++ builder.
      Typo.
      Add missing semicolon.
      config is Unix specific.
      Get the Mingw32 makefiles right.
      Generate DLLs with Mingw32.
      Superseded by sparcv8.S and sparcv8plus.s.
      pass $PERL on make files.
      Mingw32.
      The libssl32.dll definition file is called ssleay32.def. (why?)
      no-xxx option to exclude ciphers.
      Fix for +xxx options.
      Update.
      Move openssl.cnf out of lib/.
      Move openssl.cnf out of lib/.
      Use ifndef PEDANTIC for all inline assembler.
      Missing argument in prototype.
      Caldera OpenLinux passes test now.
      mk1mf.pl and mkdef.pl read OPTIONS from toplevel Makefile.     Configure no longer changes files in place.
      VMS support.
      Reorganize and speed up MD5.
      VMS support.
      VMS support bug fixes.
      Remove redundant ifdef.
      Oops. Close the file.
      Cut&paste error.
      Missed one line.
      mk1mf.pl syntax has been changed.
      Mention Andy's assembler stuff.
      Mention "make depend".
      Move prototypes to the right place.
      BC now compiles crypto/des
      Spelling error.
      BSD alpha config.
      no-xxx options.
      gcc < 2.8 does not support ultrasparc.
      Small corrections.
      Oops.
      Typos.
      Bignum library bug fix. IRIX 6 passes "make test" now!     This also avoids the problems with SC4.2 and unpatched SC5.
      Declare test key data as static.
      Avoid a warning.
      Detect Siemens platforms.
      NeXT doesn't have dirent.
      Bring VMS in sync with the recent changes.
      Borland C fix.
      Remove redundant line.
      gcc dumps core on HPUX.
      Define a macro to avoid name conflicts.
      Avoid type conflict on Unix with DEC C.
      Hint about unresolved symbols when mixing compilers.
      Test apps.
      Generate no-xxx options for missing ciphers.
      Support the EBCDIC character set and BS2000/OSD-POSIX (work in progress).
      Support the EBCDIC character set and BS2000/OSD-POSIX (work in progress).
      Support the EBCDIC character set and BS2000/OSD-POSIX (work in progress).
      Prevent name conflicts.
      Fix to compile the des app.
      Don't #define _, and eliminate casts.
      Warnings and casts.
      Casts.
      Call our crypt implementation des_crypt(). crypt() now is a wrapper if     there is no system crypt() available.
      crypt(), demos patched.
      The des app.
      Remove old libdes version number.
      "extern" is a C++ reserved word.
      Don't define _ANSI_SOURCE for NetBSD.
      Circumvent bug in SC5 without patch #107357-01.
      Put SC5 warning back in, future changes might trigger the compiler bug again.
      Recognize CPU on BSD/OS.
      Typo.
      Use the same CPU recogition method for FreeBSD 3 as for the other FreeBSD     versions. (The FreeBSD and FreeBSD-elf Configure entries were identical.)
      Use "long long" for all Win32 gcc ports.
      Fix no-hmac and no-ripemd.
      More no-xxx option tweaks.
      Broken HPUX cc.
      Obsolete/experimental code.
      NO_HMAC.
      RSA private keys without dmp1/dmq1/iqmp are also valid (but slower).
      More DES library cleanups: remove references to srand/rand     and delete an unused file.
      Did not check the last SDIR line for excluded algorithms.
      DES library changes.
      Make the perl module compile and eliminate some of the warnings.     Still doesn't work (the destructor on BIO and SSL is called immediately     after creating the object. Why that??)
      Remove obsolete files.
      VMS updates.     Submitted by: Richard Levitte <levitte at stacken.kth.se>
      Restore compability with kerberos/des.h (I had deleted some seemingly useless     definitions such as C_Block earlier).
      obj_dat.h is autogenerated (it was in the CVS because old versions of     Configure didn't generate the file in Windows builds).
      *** empty log message ***
      No use in naming the cblock _; the structure still is incompatible     to Kerberos.
      Avoid path separator problems.
      Compile pkcs7 and des apps.
      Add pkcs7 and des apps to "make all".
      Fix faulty base64 decoding of data that was 46 or 47 bytes long.
      Honor $PERL environment variable in Configure.
      editing error.
      Undo base64 decoding change (was not a bug fix).
      make update.
      make testapps after the library.
      Check the as version on Solaris x86. People don't read INSTALL anyway. :)
      *** empty log message ***
      Correct address in a comment.
      Use proper flags to build the testapps (default CC value causes confusion     on Solaris)
      Correction for the testapps lines.
      Parantheses not needed.
      note a few things that need to be done
      More patches.
      Generate obj_dat.h in "make update".
      VC++ warning.
      Cosmetic changes.
      HPUX 11 flags.     Contributed by: Peter Huang <PETER_HUANG at HP-Cupertino-om8.om.hp.com>
      More patches.
      *** empty log message ***
      Missing #ifdef NO_DES
      Circumvent an exploitable buffer overrun error in RSA Security's RSAREF     library. See: http://www.CORE-SDI.COM/english/ssh/index.html
      Oops!
      CORE SDI proposed patch doesn't make any sense. Undo.
      Don't use inline assembler on x86 Solaris (would need a different syntax).
      Solaris x86 assembler problem is already addressed in ./config     (bug reports keep coming in because that was still missing in 0.9.4)
      Update contact information (openssl-bugs, openssl-security).
      Add some newlines needed for pod2man, and run ispell.
      ispell.
      Remove obsolete SSLeay instructions.
      Honor the no-xxx Configure options when creating .DEF files.
      Submitted by:     Reviewed by:     PR:
      Minor format changes.
      Install man pages.
      Add missing =back.
      dep/ directory is not needed.
      Document the RSA library.
      Dummy page superseded by crypto/crypto.pod
      corrections
      PKCS#1 signatures don't use randomness.     Add a note about the padding functions.
      Precautions against using the PRNG uninitialized: RAND_bytes() now     returns int (1 = ok, 0 = not seeded). New function RAND_add() is the     same as RAND_seed() but takes an estimate of the entropy as an additional     argument.
      minor change for the prng
      RAND_seed
      New function RAND_pseudo_bytes() generated pseudorandom numbers that     are not guaranteed to be unpredictable.
      remove debug modification that I checked in accidentally
      Header for RAND_seed()
      Add missing #ifndefs that caused missing symbols when building libssl     as a shared library without RSA.  Use #ifndef NO_SSL2 instead of     NO_RSA in ssl/s2*.c.
      Rename rsa_oaep_test to the more appropriate name rsa_test for the     benefit of MS-DOS users.
      WINDOWS is defined in e_os.h. The problem was WIN32 (the new egcs uses _WIN32).
      AFAICS lst1 stands for "lshift test" not "list".
      Don't build the testapps automatically because the openssl program now     has s/mime functionality.
      Some more ifdefs for no-xxx options.
      Check RAND_bytes() return value or use RAND_pseudo_bytes().
      Move ssl.pod to doc/ssl
      Document RAND library.
      Use comment from md_rand.c in rand.pod
      Use comment from md_rand.c (part 2, as well).
      Move ssl.pod to doc/ssl
      Document the DH library, and make some minor changes along the way.
      fail on all errors.
      config string comment
      dh renamed to dhparam
      Document the BN library.
      Rename asn1/pkcs8.c to asn1/p8_key.c to avoid name conflict.
      RSA_print etc
      Documented in the RSA_print page
      Run ispell.     Clean up bn_mont.c.
      New manpage.
      Increase the year by one.
      New news.
      Document DSA and SHA.     New function BN_pseudo_rand().     Use BN_prime_checks_size(BN_num_bits(w)) rounds of Miller-Rabin when     generating DSA primes (why not use BN_is_prime()?)
      Update comment from bn.h
      comment was wrong.
      fix link
      Update docs: corrections, turn buffer docs into manpage, fold SHA1     pages into one for improved readability, add lhash manpage
      Source code cleanups: Use void * rather than char * in lhash,     eliminate some of the -Wcast-qual warnings (debug-ben-strict target)
      Typos.
      Seek out and destroy another evil cast.
      Note changes.
      Checked in some junk. Sorry.
      Print a reassuring message when Configure is done.
      spelling
      Document ERR library.
      EBCDIC support.
      undo. I keep confusing my directories. :(
      dhgen is gone.
      link to SSL_get_error(3)
      Remove an =over that never ends
      match the prototype
      Bug fix: BN_is_prime() would fail with a high probability for small     primes (negligible for larger ones).
      Document hash functions.
      ispell (and minor modifications)
      a short page for "speed"
      *** empty log message ***
      Replace ridiculous libdes PRNG with RAND_bytes. These functions are not     used anywhere in OpenSSL, but might be used by libdes applications.
      Document RC4.
      md2 is documented in the md5 page. lets see if this works...
      New functions BN_CTX_start(), BN_CTX_get(), BN_CTX_end() to access     temporary BIGNUMs. BN_CTX still uses a fixed number of BIGNUMs, but     the BN_CTX implementation could now easily be changed.
      Use MONT_WORD macro to control if the word-based or the bignum     algorithm is used.
      BN_div bugfix. The q-- loop should not be entered in the n0==d0 case.
      Improve bntest slightly, and fix another bug in the BN library.
      put missing line back in.
      BN bug fixes
      Refer to EVP_DigestInit() in the hash function descriptions.
      "print" is GNU bc specific.
      Create the man directories where the manpages will be put.
      Install manpages below OPENSSLDIR (I think it was meant to be this way?).     New variable for man directory.
      Make excluded cipher entry in opensslconf.h a bit more descriptive.
      Fix gcc warnings.
      Document OPENSSL_VERSION_NUMBER
      More compact Configure usage message.
      Correction for RSA_padding_check_xxx() documentation.
      Correction to RSA_padding_check_xxx() docs (this time for real).
      Check tlen size in all padding_check functions. As called within the rsa     library, the output buffer always is large enough, but if the tlen     parameter is there, it should be checked in the interest of clarity,     as proposed by David Sacerdote <das33 at cornell.edu>.
      Don't list prototypes for internal functions.
      warning.
      Frequently asked questions.
      minor docs changes (added links is the openssl(1) text)
      threads mapage.
      another faq.
      add missing names.
      Run the test suite and generate a report.
      *** empty log message ***
      correct macro.
      yet another faq.
      New make target "report" to run util/selftest.pl
      CRYPTO_num_locks()
      Support EGD.
      remove test "goto err"
      EGD info, as requested.
      Fix NO_RSA (misplaced #endif).
      nicer manpages
      remove some (apparently) obsolete entries.     please put them back in if they're still valid, and remove others     that are outdated
      EGD socket info.
      mention that EGD is used in non-blocking mode.
      Use public domain snprintf() implementation by Patrick Powell to avoid     potential buffer overrun in BIO_printf().     ----------------------------------------------------------------------     crypto/bio/b_print.c CVS:     ----------------------------------------------------------------------
      Yet another "unixware" spelling.
      some test results.
      BIO_printf() change
      work around a bug in BN_div_recp or BN_reciprocal
      divide the correct number...
      different snprintf version.
      signed/unsigned mismatch (VC++)
      linux-ppc
      ispell
      EGD bugfix.
      *** empty log message ***
      VC++ problem
      mt contained an old copy of mttest.c. remove it and move the other     files to crypto/threads
      mention RAND_egd()
      links
      The main() return value is a program's exit code.
      Test the division functions.
      flush output.     Looks like it fails when b is a power of 2, but I never get incorrect     results.
      Make clear which naming convention is meant.
      minor clarification
      Reorganize bn_mul.c (no bugfix yet), remove obsolete files in BN library.
      remove
      workaround no longer needed
      *** empty log message ***
      Bug fix!
      Overly long lines look ugly in the DOS editor. :)
      put function names in the title.
      remove obsolete BN_CTX info
      corrections
      works on solaris
      Shared library support for Solaris and HPUX     by Lutz Behnke and by Lutz Jaenicke.
      Support assembler for Mingw32.
      Fix for non-monolithic build.
      Switch for turning on the predictable "random" number generator.
      Mingw32 can now use assembler.
      Bug fix.
      how to recognize assembler problems
      change wording
      some people can't read :)
      Keep the references to other INSTALL files short. These are the Unix     instructions.
      check for WIN32 (needed by Mingw32)
      change info text (as on the web site)
      add RAND_status() to title
      pseudo-seed for the PRNG before testing DSA
      Note bug fix for the DSA infinite loop
      Bug fix.
      add comment.
      gcc warnings
      new component
      The selftest sometimes lacked important information
      bug fix release planned
      bug fix.     Submitted by: "Yoram Meroz" <yoram at mail.idrive.com>
      clarify.
      Repair bss_log.
      Don't generate asm files for no-asm.
      Use L for all constants.
      ssize_t
      NO_SYSLOG is defined for MSDOS anyway. just don't include the Unix     header...
      make update
      asm workaround for SuSE Linux     proposed by Holger Reif
      change manpages to pod. Contents are not up to date!
      superseded by des_modes.pod
      DES in Perl was incomplete and not very useful
      add =cut
      des_quad_cksum() byte order bug fix.     See http://www.pdc.kth.se/kth-krb/
      libdes manpage.
      cleanup.
      make update
      Integrate podd.h sk.h into set_key.c
      FLAT_INC is not needed; we use -I.. all the time
      New function RAND_event() collects entropy from Windows events.
      oops. don't use "entropy" directly.
      Bug fix: RAND_write_file() failed to write to files created by open()     on Win32.
      Sample application using RAND_event() to collect entropy from mouse     movements, keyboard etc. and write it to a seed file.
      Mention the bug fixes.
      Problems with the Windows build.
      In some of the Makefiles CPP was not defined.
      OpenBSD complains.
      More failures.
      more failures
      RAND_event()
      ssize_t for Ultrix
      Test results.
      Add pointer to EGD manpage.     Update the "randomness" section for the upcoming 0.9.5a release.
      Submitted by:     Reviewed by:     PR:
      linux-elf bugfix
      MacOS changes.
      Missing cases when no_rsa is defined
      Make sure that NO-RSA applications etc can include evp.h
      prototype.
      Get rid of more non-ANSI declarations.
      #include <stdlib.h> is not needed.
      #include <stdio.h> not needed.
      is needed.
      Bug fix for 64 bit HP-UX.
      Don't include <stdlib.h>. In the NO_FP_API case, don't include <stdio.h>.
      Use NO_FP_API.
      Yet another bc FAQ.
      CygWin32 support.
      Increased consideration for stupid Linux users.
      Option "no-symlinks" to configure without creating the links (e.g.     for use with makefile.one)
      typo
      protoypes
      use faster version
      Add PRNGD link.
      Randomness polling function for Win9x.
      Move RNG initialization to RAND_poll(), and shared definitions to     rand_lcl.h
      don't print debug output
      oops.
      Profiling option for mk1mf.pl
      Fix some CygWin problems.
      bug: RAND_poll().
      Don't set the two top bits to one when generating a random number < q.:wq
      Not the DSA change.
      More Windows failures reported
      The other log message should have read "Note the DSA change".
      Point to Peter Gutmann's revised paper.     The copy at www.usenix.org is the old version.
      Bug fix: Montgomery multiplication could produce results with the wrong     sign.
      Jeffrey Altman points out that GetQueueStatus() crashes on NT.
      add links to the new BIO and SSL manpages to make them visible on the web.
      ispell and some other nit-picking
      Note the BN_mod_exp_word bug. (Markus Friedl provided a test program.)
      ispell
      Note about contribtions from the US
      ispell.
      The RSA patent will have expired when the next version is released...
      Malloc() -> OPENSSL_malloc() etc.
      ispell.
      URL to "latest" Mingw release (which is almost a year old :()
      tlhelp32.h is currently missing in Mingw32 (release 2.95.2 and 2.95.2-1)
      Add some missing info.
      Workaround for tlhelp32.h: place the missing header file in outinc
      tlhelp32.h
      more manpage links.
      stop perlpod from complaining.
      update info to match the README.
      spelling
      print the perlasm rule only for linux-elf (it seems it confuses some     version of make for Mingw32)     ----------------------------------------------------------------------     ----------------------------------------------------------------------
      typo
      The des_modes manpage is in section 7.
      fix problems in the selftest
      cosmetic change
      cosmetic changes
      Add short overview, move header files section further down.
      correction from Lutz
      "DESCRIPTION" is required.
      give pseudo prototypes instead of macro definitions for better clarity
      Correction from Tani Hosokawa <unknown at riverstyx.net>
      s_server not s_client
      .
      -engine is gone.
      _lrotl() is a call to the C runtime library!
      Minor corrections (HPUX).     From: Lutz Jaenicke <Lutz.Jaenicke at aet.TU-Cottbus.DE>
      increase the value a bit
      Set the CryptoAPI randomness estimate back to 0.     The randomness may not actually be very good (we don't know).
      looks like a cut&paste error
      in some new file names the first 8 characters were not unique
      ignore
      Remove RSAREF (not used).
      use standard C
      fix for Borland C
      Add a warning about the usage of the montgomery functions (if the inputs     are not reduced modulo m, the outputs won't be either).
      typo
      Borland C fix.
      GPL FAQ.
      remove unused static function
      Fix bn_cmp_part_words() and move it to bn_lib.c.
      New function BN_bntest_rand() to detect more BN library bugs.
      Note the bntest change.
      Move the rijndael "test" to the bf and cast tests.
      Loops like this one:
      forgot to remove the loop variable
      remember the problem with ftime()
      argl
      last commit was wrong. Now it works. :)
      Use assert as in the rest of the BN library.
      PERLASM - the wierdest programming language since Intercal.
      minor modification to the previous change
      more of the same: add printf() for perlasm.
      save registers in the debug output code (return value is overwritten too)
      looks like it works now
      push the flags too
      move constants for debug functions to end of file
      test_mod_mul is useful, let's run it more often.
      another fix for the debug print
      Intel assembler version for bn_sub_part_words().  I haven't got     reliable timings yet, please try it out!
      remove useless instruction
      remove a comment that shouldn't have been there any more
      Don't check for bc at all. We can now run a meaningful test even if     it is missing.
      bn_part_sub_word prototype.
      Test for SCO bc bug
      *** empty log message ***
      Stop on bntest error.
      c&p error spotted by Martin Forssen
      "Andrew W. Gray" <agray at iconsinc.com> says /GD is no longer a valid     compiler switch.
      Stop build when an error occurs.     "Peter 'Luna' Runestig" <peter+openssl-dev at runestig.com>
      branches have been merged.
      rsa_num is not used with NO_RSA
      link to the new manpage.
      Mention the ./config script fixes.
      Use the correct number of arguments in the example.
      Definition of NO_KRB5 in ssl.h for external applications.
      There is no C version of bn_div_3_words
      new year
      Fix potential buffer overrun for EBCDIC.
      format strings
      Bleichenbacher's DSA attack
      cleanup
      Note that EGD is used automatically.
      point out that RAND_load_file() etc are only for seed files, not for     entropy devices or sockets.
      use <= instead of ==
      IRIX bugfix
      New function OPENSSL_issetugid(). Needs more work.
      That was misleading. The problem won't happen with 0.9.6a anyway.
      pod format error
      ispell
      Temporary fix for build break.     It's still inconsistent - probably better to undo the whole OPENSSL_NO_* thing.
      note OPENSSL_issetugid().
      BN_rand_range() needs a BN_rand() variant that doesn't set the MSB.
      Fix warning.
      Use BN_rand_range().
      make it a loop as in dsa
      autoconf would be useful...
      That statement seems to be not true. In fact, I have said that I would     like to use libtool, but not automake.
      run self-test with no-krb5
      don't read from tty in test mode
      %f conversion bug fix     Submitted by: Henrik Eriksson <henrik.eriksson at axis.com>
      DEC
      Forgot a '$'.
      old MSVC versions don't have rdtsc     use _emit instead
      note the rand_win.c change
      mips
      check CRT
      check CRT
      Note the Alpha asm change
      the backslash is significant...
      make sure we don't write to seed[-1]
      move check to avoid memory leak.
      more error codes fixed
      typo.
      zlib default was broken on most platforms.
      make update
      strsep implementation to allow the file to compile on non-BSD systems
      *** empty log message ***
      undo, didn't work
      strsep implementation to allow the file to compile on non-BSD systems
      Use GCC 2.95/3.0 optimization
      Eric Hanchrow points out that Cygwin perl works.
      bug fix: bn_sqr_recursive output is twice its input size.
      double definition
      include the proper header file
      unused function
      make engine file names unique in 8.3
      ispell
      ispell
      missed one file
      openbsd-x86 macros
      remove compatibility notes that no longer apply
      name confusion with HP library function prototype (?)
      Cygwin patch. Submitted by Michael Kobar <mkobar at lymeware.com>
      ssl3_read_bytes bug fix
      *** empty log message ***
      Cygwin target name has been changed!
      error reported by Karsten Braaten
      another error discovered by Karsten Braaten. The number was not even     prime!
      updated Mingw32 instructions.
      values were reset for no reason.
      Use assembler implementations with Cygwin.     This also fixes the bn_sub_part_word problem.
      Cygnus correction. (I thought I had tested that...)
      make files didn't work on case insensitive filesystems
      use OPENSSL_SYS_MSDOS rather than __DJGPP__ to disable egd, this is not     compiler specific
      update mingw info
      clean up MinGW build. MinGW make now supports the Windows path name     conventions.
      avoid duplicate definiton of bn_sub_part_words
      add test
      more mingw related cleanups.
      remove some more useless code. The mingw target can now be built     under cygwin.
      Copy rather than symlink the test data.     This is needed because Windows doesn't support symlinks.
      Add instructions for building the MinGW target in Cygwin, and     rearrange some of the other text for better readability.
      Cygwin debugging
      cleanup as discussed with Geoff
      typo in comment
      oops... the description of ->top was inaccurate (the example is correct though)
      Geoff suggested a more succinct description for "top".
      BN_set_bit() etc should use "unsigned int".     Keep it as is to avoid an API change, but check for negativ values.
      The x9.62 tests replace the PRNG with specific numbers,     so don't run them if BN_DEBUG_RAND is defined.
      re-enable the test, keeping the original method for RAND_pseudo_bytes     which is used by BN_DEBUG_RAND     Submitted by: Nils Larsch
      Avoid segfault if ret==0.
      Skip a curve with generator of non-prime order.
      Add "dif" variable to clean up the loop implementations.
      typo
      typo
      fix breakage for Perl versions that do boolean operations on long words
      Use Windows randomness code on Cygwin
      undo Cygwin change
      comments
      RFC 3161 compliant time stamp request creation, response generation     and response verification.
      time stamp Makefile, test files     Submitted by: Zoltan Glozik <zglozik at opentsa.org>
      make update
      *** empty log message ***
      shorter filenames
      wrap shlib for testtsa     Submitted by: David Somers <dsomers at omz13.com>
      oops
      message style
      ignore
      TS bugfixes: Do not hardcode message digest algorithms; fix ASN1 decoding.
      unused function
      Clarification for CPU specific config options.
      *** empty log message ***
      improve make dclean to remove files generated during build
      uncomment; that one slipped through
      Use Dl_info only on systems where it is known to exist. It does not     exist on AIX 4.3.3, AIX 5.1, SCO 5, or Cygwin.
      manual pages as HTML     Submitted by: Oliver Tappe <zooey at hirschkaefer.de>
      Add BeOS support.
      declare as in prototype     Submitted by: Gisle Vanem
      Bug fix.
      bug fix.     PR: 1326     Submitted by: John Skodon
      Add includes in synopsis.     Submitted by: Mike Frysinger <vapier at gentoo.org>
      Correct punctuation.     PR: 1367
      Use gmtime on cygwin     Submitted by: Corinna Vinschen
      wording (can't really call shared libs experimental after several years in the major Linux distributions)

cvs2svn (1):
      This commit was manufactured by cvs2svn to create branch 'OpenSSL-fips-     2_0-stable'.

stephen (5):
      external error lib number now global and allow error lib to have a name
      fix pk7_doit.c for new i2d_ASN1_SET argument
      Fix for sk_insert bug: it never worked properly.     Allow explicit tag asn macros to handle indefinite length constructed stuff:     without this certain "certificates" can't be read in.
      Update CHANGES file for latest additions
      This is a quick hack conversion of the 'CA.sh' script to perl. It fixes one     bug in the original but is otherwise just as horrible :-)

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

From matt at openssl.org  Thu Mar 19 14:06:58 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 19 Mar 2015 14:06:58 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2a create
Message-ID: <1426774018.583878.31831.nullmailer@dev.openssl.org>

The annotated tag OpenSSL_1_0_2a has been created
        at  ab2de707f72a82e0294bae08cca97455b635a656 (tag)
   tagging  3df69d3aefde7671053d4e3c242b228e5d79c83f (commit)
  replaces  OpenSSL_1_0_2
 tagged by  Matt Caswell
        on  Thu Mar 19 13:31:16 2015 +0000

- Log -----------------------------------------------------------------
OpenSSL 1.0.2a release tag

Andy Polyakov (9):
      modes/gcm128.c: fix OPENSSL_SMALL_FOOTPRINT compile failure     on affected platforms (PowerPC and AArch64).
      cms-test.pl: "localize" /dev/null even further [as follow-up to VMS].
      Harmonize objects.pl output with new format.
      Bring objects.pl output even closer to new format.
      objects/obj_xref.h: revert reformat.
      sha/asm/sha1-586.pl: fix typo.
      Fix crash in SPARC T4 XTS.
      evp/e_aes.c: fix SPARC T4-specific problem:
      Avoid reading an unused byte after the buffer

Carl Jackson (1):
      Fix regression in ASN1_UTCTIME_cmp_time_t

David Woodhouse (1):
      Wrong SSL version in DTLS1_BAD_VER ClientHello

Dmitry-Me (1):
      Fix wrong numbers being passed as string lengths

Doug Hogan (1):
      Avoid a double-free in an error path.

Dr. Stephen Henson (20):
      FIPS build fixes.
      Check PKCS#8 pkey field is valid before cleansing.
      Preliminary ASN1_TIME documentation.
      Make objxref.pl output in correct format
      Fix memory leak reporting.
      typo
      Document -no_explicit
      Fix format script.
      Check public key is not NULL.
      Additional CMS documentation.
      Cleanse PKCS#8 private key components.
      fix warning
      update ordinals
      ASN.1 print fix.
      additional configuration documentation
      Add support for ServerInfo SSL_CONF option.
      Free up ADB and CHOICE if already initialised.
      Reject invalid PSS parameters.
      Fix for CVE-2015-0291
      Fix ASN1_TYPE_cmp

Edgar Pek (1):
      Fix null-pointer dereference

Emilia Kasper (5):
      Fix hostname validation in the command-line tool to honour negative return values.
      Harmonize return values in dtls1_buffer_record
      Fix undefined behaviour in shifts.
      PKCS#7: avoid NULL pointer dereferences with missing content
      Fix reachable assert in SSLv2 servers.

Eric Dequin (1):
      Missing OPENSSL_free on error path.

Graeme Perrow (1):
      RT3670: Check return from BUF_MEM_grow_clean

Kurt Cancemi (1):
      Use constants not numbers

Kurt Roeckx (3):
      Fix segfault with empty fields as last in the config.
      Fix memory leak
      Remove export ciphers from the DEFAULT cipher list

Matt Caswell (49):
      Prepare for 1.0.2a-dev
      Make DTLS always act as if read_ahead is set. The actual value of read_ahead     is ignored for DTLS.
      Remove explicit setting of read_ahead for DTLS. It never makes sense not to     use read_ahead with DTLS because it doesn't work. Therefore read_ahead needs     to be the default.
      Provide documentation for all SSL(_CTX)?_(get|set)(_default)?_read_ahead     functions.
      Fix error handling in ssltest
      Import evp_test.c from BoringSSL. Unfortunately we already have a file     called evp_test.c, so I have called this one evp_extra_test.c
      Fix a failure to NULL a pointer freed on error.
      Provide documentation for i2d_ECPrivateKey and d2i_ECPrivateKey
      Add dire warnings about the "reuse" capability of the d2i_* functions.
      Remove pointless free, and use preferred way of calling d2i_* functions
      Fix some minor documentation issues
      Update the SHA* documentation     Updates to include SHA224, SHA256, SHA384 and SHA512. In particular note     the restriction on setting md to NULL with regards to thread safety.
      Fix evp_extra_test.c with no-ec     When OpenSSL is configured with no-ec, then the new evp_extra_test fails to     pass. This change adds appropriate OPENSSL_NO_EC guards around the code.
      Fix missing return value checks.
      Fixed missing return value checks.
      Fix d2i_SSL_SESSION for DTLS1_BAD_VER
      Unchecked malloc fixes
      Update mkerr.pl for new format
      Fix DTLS1_BAD_VER regression
      Prevent handshake with unseeded PRNG
      Cleanse buffers
      Fix seg fault in ASN1_generate_v3/ASN1_generate_nconf
      Fix error handling in bn_exp
      Fix EVP_DigestInit_ex with NULL digest
      ASN1_primitive_new NULL param handling
      Fix asn1_item_print_ctx
      Fix dh_pub_encode
      Fix dsa_pub_encode
      Fix missing return checks in v3_cpols.c
      SSL_check_chain fix
      Add malloc failure checks
      Move malloc fail checks closer to malloc
      Fix memset call in stack.c
      Add sanity check to PRF
      Fix seg fault in s_time
      Remove dead code from crypto
      Dead code removal from apps
      Multiblock corrupted pointer fix
      Fix Seg fault in DTLSv1_listen
      Fix DHE Null CKE vulnerability
      Remove overlapping CHANGES/NEWS entries
      Fix CHANGES discrepancies
      Fix discrepancy in NEWS file
      Update CHANGES for release
      Update NEWS file
      Fix a failure to NULL a pointer freed on error.
      Fix unsigned/signed warnings
      make update
      Prepare for 1.0.2a release

Rainer Jung (1):
      Fix NAME section of d2i_ECPKParameters to prevent broken symlinks when using     the extract-names.pl script.

Rich Salz (5):
      Make OPENSSL_config truly ignore errors.
      Remove unused eng_rsax and related asm file
      Remove obsolete support for old code.
      Fixed bad formatting in crypto/des/spr.h
      RT3684: rand_egd needs stddef.h

Richard Godbee (1):
      BIO_debug_callback: Fix output on 64-bit machines

Richard Levitte (5):
      dso_vms needs to add the .EXE extension if there is none already
      VMS exit codes weren't handled well enough and were unclear
      Transfer a fix from 1.0.1
      Assume TERMIOS is default, remove TERMIO on all Linux.
      Restore -DTERMIO/-DTERMIOS on Windows platforms.

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

From matt at openssl.org  Thu Mar 19 14:06:58 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 19 Mar 2015 14:06:58 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_0r create
Message-ID: <1426774018.416628.31796.nullmailer@dev.openssl.org>

The annotated tag OpenSSL_1_0_0r has been created
        at  0416b12edd91830f4b61ffd6fb2b0360367379bd (tag)
   tagging  81741de632c9952d8b25afd15a280ff6424931b3 (commit)
  replaces  OpenSSL_1_0_0-post-reformat
 tagged by  Matt Caswell
        on  Thu Mar 19 13:43:00 2015 +0000

- Log -----------------------------------------------------------------
OpenSSL 1.0.0r release tag

Andy Polyakov (2):
      Harmonize objects.pl output with new format.
      Bring objects.pl output even closer to new format.

Dr. Stephen Henson (12):
      Check PKCS#8 pkey field is valid before cleansing.
      Make objxref.pl output in correct format
      Document -no_explicit
      Fix format script.
      Check public key is not NULL.
      Cleanse PKCS#8 private key components.
      Fix warnings.
      fix warning
      update ordinals
      ASN.1 print fix.
      Free up ADB and CHOICE if already initialised.
      Fix ASN1_TYPE_cmp

Emilia Kasper (2):
      PKCS#7: avoid NULL pointer dereferences with missing content
      Fix reachable assert in SSLv2 servers.

Kurt Roeckx (1):
      Remove export ciphers from the DEFAULT cipher list

Matt Caswell (13):
      Fix formatting error in pem.h
      Fix for reformat problems with e_padlock.c
      Fix error handling in ssltest
      Fix a failure to NULL a pointer freed on error.
      Update mkerr.pl for new format
      Cleanse buffers
      Remove overlapping CHANGES/NEWS entries
      Update CHANGES for release
      Update NEWS file
      Fix a failure to NULL a pointer freed on error.
      Fix unsigned/signed warnings
      make update
      Prepare for 1.0.0r release

Rich Salz (1):
      Fixed bad formatting in crypto/des/spr.h

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

From matt at openssl.org  Thu Mar 19 14:06:58 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 19 Mar 2015 14:06:58 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_0_9_8zf create
Message-ID: <1426774018.343508.31774.nullmailer@dev.openssl.org>

The annotated tag OpenSSL_0_9_8zf has been created
        at  63ff23059a0387aeec0e5efc70e4a9089bd2fdaa (tag)
   tagging  db8334be06a6573203f29d12f00f45ed69a987cc (commit)
  replaces  OpenSSL_0_9_8-post-reformat
 tagged by  Matt Caswell
        on  Thu Mar 19 13:47:27 2015 +0000

- Log -----------------------------------------------------------------
OpenSSL 0.9.8zf release tag

Andy Polyakov (2):
      Harmonize objects.pl output with new format.
      Bring objects.pl output even closer to new format.

Dr. Stephen Henson (7):
      Check PKCS#8 pkey field is valid before cleansing.
      Fix format script.
      Check public key is not NULL.
      Fix warnings.
      Tolerate test_sqr errors for FIPS builds.
      Free up ADB and CHOICE if already initialised.
      Fix ASN1_TYPE_cmp

Emilia Kasper (2):
      PKCS#7: avoid NULL pointer dereferences with missing content
      Fix reachable assert in SSLv2 servers.

Kurt Roeckx (1):
      Disable export and SSLv2 ciphers by default

Matt Caswell (12):
      Fix formatting error in pem.h
      Fix for reformat problems with e_padlock.c
      Fix error handling in ssltest
      Fix a failure to NULL a pointer freed on error.
      Update mkerr.pl for new format
      Cleanse buffers
      Update CHANGES for release
      Update NEWS file
      Fix a failure to NULL a pointer freed on error.
      Fix unsigned/signed warnings
      make update
      Prepare for 0.9.8zf release

Rich Salz (1):
      Fixed bad formatting in crypto/des/spr.h

Richard Levitte (1):
      VMS build fix

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

From matt at openssl.org  Thu Mar 19 14:06:58 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 19 Mar 2015 14:06:58 +0000
Subject: [openssl-commits] [openssl]  OpenSSL-fips-2_0_4 create
Message-ID: <1426774018.259932.31756.nullmailer@dev.openssl.org>

The annotated tag OpenSSL-fips-2_0_4 has been created
        at  4d4c2a522e55ac95267a8eb252ffce3a942770f2 (tag)
   tagging  b0ee17ad475c97f068c7314efafdd8a53d92af54 (commit)
  replaces  OpenSSL-fips-2_0_3
 tagged by  Dr. Stephen Henson
        on  Mon Dec 16 18:22:59 2013 +0000

- Log -----------------------------------------------------------------
OpenSSL FIPS 2.0.4 release tag

Dr. Stephen Henson (1):
      Add MIPS support.

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

From matt at openssl.org  Thu Mar 19 14:06:58 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 19 Mar 2015 14:06:58 +0000
Subject: [openssl-commits] [openssl]  OpenSSL-fips-2_0_3 create
Message-ID: <1426774018.188401.31740.nullmailer@dev.openssl.org>

The annotated tag OpenSSL-fips-2_0_3 has been created
        at  6f385d783328b7467f5644352209ea6e13e5978d (tag)
   tagging  4f6c4c1896f1fea63053468bfc599d3cf7da93f5 (commit)
  replaces  OpenSSL-fips-2_0_2
 tagged by  Dr. Stephen Henson
        on  Wed Apr 10 15:39:33 2013 +0100

- Log -----------------------------------------------------------------
OpenSSL FIPS 2.0.3 release tag

Dr. Stephen Henson (1):
      Support for WinEC7.

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

From matt at openssl.org  Thu Mar 19 14:06:58 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 19 Mar 2015 14:06:58 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1m create
Message-ID: <1426774018.488358.31815.nullmailer@dev.openssl.org>

The annotated tag OpenSSL_1_0_1m has been created
        at  40cafb764479e2e1b2348b6c5f63815043f6b303 (tag)
   tagging  506c1068801fdeef5cb00f2053854bf56150fb6d (commit)
  replaces  OpenSSL_1_0_1-post-reformat
 tagged by  Matt Caswell
        on  Thu Mar 19 13:38:37 2015 +0000

- Log -----------------------------------------------------------------
OpenSSL 1.0.1m release tag

Andy Polyakov (3):
      Harmonize objects.pl output with new format.
      Bring objects.pl output even closer to new format.
      Avoid reading an unused byte after the buffer

Dmitry-Me (1):
      Fix wrong numbers being passed as string lengths

Doug Hogan (1):
      Avoid a double-free in an error path.

Dr. Stephen Henson (14):
      Check PKCS#8 pkey field is valid before cleansing.
      Make objxref.pl output in correct format
      Fix memory leak reporting.
      Document -no_explicit
      Fix format script.
      Check public key is not NULL.
      Additional CMS documentation.
      Cleanse PKCS#8 private key components.
      fix warning
      update ordinals
      ASN.1 print fix.
      additional configuration documentation
      Free up ADB and CHOICE if already initialised.
      Fix ASN1_TYPE_cmp

Edgar Pek (1):
      Fix null-pointer dereference

Emilia Kasper (4):
      Harmonize return values in dtls1_buffer_record
      Fix undefined behaviour in shifts.
      PKCS#7: avoid NULL pointer dereferences with missing content
      Fix reachable assert in SSLv2 servers.

Eric Dequin (1):
      Missing OPENSSL_free on error path.

Graeme Perrow (1):
      RT3670: Check return from BUF_MEM_grow_clean

Kurt Cancemi (1):
      Use constants not numbers

Kurt Roeckx (3):
      Fix segfault with empty fields as last in the config.
      Fix memory leak
      Remove export ciphers from the DEFAULT cipher list

Matt Caswell (43):
      Fix formatting error in pem.h
      Fix for reformat problems with e_padlock.c
      Make DTLS always act as if read_ahead is set. The actual value of read_ahead     is ignored for DTLS.
      Remove explicit setting of read_ahead for DTLS. It never makes sense not to     use read_ahead with DTLS because it doesn't work. Therefore read_ahead needs     to be the default.
      Provide documentation for all SSL(_CTX)?_(get|set)(_default)?_read_ahead     functions.
      Fix error handling in ssltest
      Import evp_test.c from BoringSSL. Unfortunately we already have a file     called evp_test.c, so I have called this one evp_extra_test.c
      Fix a failure to NULL a pointer freed on error.
      Provide documentation for i2d_ECPrivateKey and d2i_ECPrivateKey
      Add dire warnings about the "reuse" capability of the d2i_* functions.
      Remove pointless free, and use preferred way of calling d2i_* functions
      Fix some minor documentation issues
      Fix evp_extra_test.c with no-ec     When OpenSSL is configured with no-ec, then the new evp_extra_test fails to     pass. This change adds appropriate OPENSSL_NO_EC guards around the code.
      Fix no-ec warning
      Fix warning with no-ec
      Fix missing return value checks.
      Fixed missing return value checks.
      Fix d2i_SSL_SESSION for DTLS1_BAD_VER
      Unchecked malloc fixes
      Update mkerr.pl for new format
      Cleanse buffers
      Fix seg fault in ASN1_generate_v3/ASN1_generate_nconf
      Fix error handling in bn_exp
      Fix EVP_DigestInit_ex with NULL digest
      ASN1_primitive_new NULL param handling
      Fix asn1_item_print_ctx
      Fix dh_pub_encode
      Fix dsa_pub_encode
      Fix missing return checks in v3_cpols.c
      Add malloc failure checks
      Move malloc fail checks closer to malloc
      Fix memset call in stack.c
      Add sanity check to PRF
      Fix seg fault in s_time
      Remove dead code from crypto
      Dead code removal from apps
      Remove overlapping CHANGES/NEWS entries
      Update CHANGES for release
      Update NEWS file
      Fix a failure to NULL a pointer freed on error.
      Fix unsigned/signed warnings
      make update
      Prepare for 1.0.1m release

Rich Salz (5):
      Make OPENSSL_config truly ignore errors.
      Remove engine_rsax and its asm file.
      Revert "Remove engine_rsax and its asm file."
      Fixed bad formatting in crypto/des/spr.h
      RT3684: rand_egd needs stddef.h

Richard Godbee (1):
      BIO_debug_callback: Fix output on 64-bit machines

Richard Levitte (3):
      dso_vms needs to add the .EXE extension if there is none already
      Assume TERMIOS is default, remove TERMIO on all Linux.
      Restore -DTERMIO/-DTERMIOS on Windows platforms.

Rob Stradling (1):
      Use inner algorithm when printing certificate.

Viktor Dkhovni (1):
      Replace exit() with error return.

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

From levitte at openssl.org  Thu Mar 19 21:50:01 2015
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 19 Mar 2015 21:50:01 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426801801.663948.28263.nullmailer@dev.openssl.org>

The branch master has been updated
       via  21ab123770ff42d8c5b8e6b1372ecef4881b786d (commit)
      from  5e5d53d341fd9a9b9cc0a58eb3690832ca7a511f (commit)


- Log -----------------------------------------------------------------
commit 21ab123770ff42d8c5b8e6b1372ecef4881b786d
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 19 22:35:12 2015 +0100

    If the target is an old style debug- target, it will not have debugging [cl]flags
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

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

Summary of changes:
 Configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Configure b/Configure
index c038f85..35f8f8b 100755
--- a/Configure
+++ b/Configure
@@ -1196,6 +1196,7 @@ if ($d) {
 &usage if (!defined($table{$target})
 	   || $table{$target}->{template}
 	   || ($build_prefix eq "debug_"
+	       && $target !~ /^debug-/
 	       && !($table{$target}->{debug_cflags}
 		    || $table{$target}->{debug_lflags})));
 

From matt at openssl.org  Fri Mar 20 13:17:45 2015
From: matt at openssl.org (Matt Caswell)
Date: Fri, 20 Mar 2015 13:17:45 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1426857465.939501.12708.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  b0b723287761ae1b267d6935dc28eb83b6d31d22 (commit)
       via  ece8574ae6d2b3a06bd13e6142ab9f3c555c890f (commit)
       via  3edf1b98e0b713f1655341572e2ac878a2e553f6 (commit)
      from  0d6d10d97d67a30fcfec029a0c90d1ae30c68b0b (commit)


- Log -----------------------------------------------------------------
commit b0b723287761ae1b267d6935dc28eb83b6d31d22
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 3 16:08:58 2015 +0000

    Add DTLS tests to make test
    
    Updated test/testssl script to include the new DTLS capability in ssltest.
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>
    (cherry picked from commit 3c381e54233be3d0dcbce7cc853c4767d979fe90)

commit ece8574ae6d2b3a06bd13e6142ab9f3c555c890f
Author: David Woodhouse <dwmw2 at infradead.org>
Date:   Tue Mar 3 15:47:08 2015 +0000

    Add DTLS support to ssltest
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>
    (cherry picked from commit 98b8cdd32277cea829c31034a53f2487f750615d)
    
    Conflicts:
    	ssl/ssltest.c

commit 3edf1b98e0b713f1655341572e2ac878a2e553f6
Author: David Woodhouse <dwmw2 at infradead.org>
Date:   Tue Mar 3 15:39:26 2015 +0000

    Add DTLS to SSL_get_version
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>
    (cherry picked from commit 504e643e0996fb842ac183023c3a6b9049af50ea)
    
    Conflicts:
    	ssl/ssl_lib.c

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

Summary of changes:
 ssl/ssl_lib.c |  6 ++++++
 ssl/ssltest.c | 31 ++++++++++++++++++++++++++-----
 test/testssl  | 24 ++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index e9ad2bc..38426b4 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2832,6 +2832,12 @@ const char *SSL_get_version(const SSL *s)
         return ("SSLv3");
     else if (s->version == SSL2_VERSION)
         return ("SSLv2");
+    else if (s->version == DTLS1_BAD_VER)
+        return ("DTLSv0.9");
+    else if (s->version == DTLS1_VERSION)
+        return ("DTLSv1");
+    else if (s->version == DTLS1_2_VERSION)
+        return ("DTLSv1.2");
     else
         return ("unknown");
 }
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 9f5d586..8a6f00f 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -716,6 +716,10 @@ static void sv_usage(void)
 #ifndef OPENSSL_NO_TLS1
     fprintf(stderr, " -tls1         - use TLSv1\n");
 #endif
+#ifndef OPENSSL_NO_DTLS
+    fprintf(stderr, " -dtls1        - use DTLSv1\n");
+    fprintf(stderr, " -dtls12       - use DTLSv1.2\n");
+#endif
     fprintf(stderr, " -CApath arg   - PEM format directory of CA's\n");
     fprintf(stderr, " -CAfile arg   - PEM format file of CA's\n");
     fprintf(stderr, " -cert arg     - Server certificate file\n");
@@ -877,7 +881,7 @@ int main(int argc, char *argv[])
     int badop = 0;
     int bio_pair = 0;
     int force = 0;
-    int tls1 = 0, ssl2 = 0, ssl3 = 0, ret = 1;
+    int dtls1 = 0, dtls12 = 0, tls1 = 0, ssl2 = 0, ssl3 = 0, ret = 1;
     int client_auth = 0;
     int server_auth = 0, i;
     struct app_verify_arg app_verify_arg =
@@ -1037,6 +1041,16 @@ int main(int argc, char *argv[])
             no_protocol = 1;
 #endif
             ssl3 = 1;
+        } else if (strcmp(*argv, "-dtls1") == 0) {
+#ifdef OPENSSL_NO_DTLS
+            no_protocol = 1;
+#endif
+            dtls1 = 1;
+        } else if (strcmp(*argv, "-dtls12") == 0) {
+#ifdef OPENSSL_NO_DTLS
+            no_protocol = 1;
+#endif
+            dtls12 = 1;
         } else if (strncmp(*argv, "-num", 4) == 0) {
             if (--argc < 1)
                 goto bad;
@@ -1172,8 +1186,8 @@ int main(int argc, char *argv[])
         goto end;
     }
 
-    if (ssl2 + ssl3 + tls1 > 1) {
-        fprintf(stderr, "At most one of -ssl2, -ssl3, or -tls1 should "
+    if (ssl2 + ssl3 + tls1 + dtls1 + dtls12 > 1) {
+        fprintf(stderr, "At most one of -ssl2, -ssl3, -tls1, -dtls1 or -dtls12 should "
                 "be requested.\n");
         EXIT(1);
     }
@@ -1190,10 +1204,10 @@ int main(int argc, char *argv[])
         goto end;
     }
 
-    if (!ssl2 && !ssl3 && !tls1 && number > 1 && !reuse && !force) {
+    if (!ssl2 && !ssl3 && !tls1 && !dtls1 && !dtls12 && number > 1 && !reuse && !force) {
         fprintf(stderr, "This case cannot work.  Use -f to perform "
                 "the test anyway (and\n-d to see what happens), "
-                "or add one of -ssl2, -ssl3, -tls1, -reuse\n"
+                "or add one of ssl2, -ssl3, -tls1, -dtls1, -dtls12, -reuse\n"
                 "to avoid protocol mismatch.\n");
         EXIT(1);
     }
@@ -1271,6 +1285,13 @@ int main(int argc, char *argv[])
         meth = SSLv3_method();
     else
 #endif
+#ifndef OPENSSL_NO_DTLS
+    if (dtls1)
+        meth = DTLSv1_method();
+    else if (dtls12)
+        meth = DTLSv1_2_method();
+    else
+#endif
 #ifndef OPENSSL_NO_TLS1
     if (tls1)
         meth = TLSv1_method();
diff --git a/test/testssl b/test/testssl
index e3b342b..64e22b9 100644
--- a/test/testssl
+++ b/test/testssl
@@ -101,6 +101,30 @@ $ssltest -bio_pair -ssl3 -server_auth -client_auth $CA $extra || exit 1
 echo test sslv2/sslv3 via BIO pair
 $ssltest $extra || exit 1
 
+echo test dtlsv1
+$ssltest -dtls1 $extra || exit 1
+
+echo test dtlsv1 with server authentication
+$ssltest -dtls1 -server_auth $CA $extra || exit 1
+
+echo test dtlsv1 with client authentication
+$ssltest -dtls1 -client_auth $CA $extra || exit 1
+
+echo test dtlsv1 with both client and server authentication
+$ssltest -dtls1 -server_auth -client_auth $CA $extra || exit 1
+
+echo test dtlsv1.2
+$ssltest -dtls12 $extra || exit 1
+
+echo test dtlsv1.2 with server authentication
+$ssltest -dtls12 -server_auth $CA $extra || exit 1
+
+echo test dtlsv1.2 with client authentication
+$ssltest -dtls12 -client_auth $CA $extra || exit 1
+
+echo test dtlsv1.2 with both client and server authentication
+$ssltest -dtls12 -server_auth -client_auth $CA $extra || exit 1
+
 if [ $dsa_cert = NO ]; then
   echo 'test sslv2/sslv3 w/o (EC)DHE via BIO pair'
   $ssltest -bio_pair -no_dhe -no_ecdhe $extra || exit 1

From matt at openssl.org  Fri Mar 20 13:17:53 2015
From: matt at openssl.org (Matt Caswell)
Date: Fri, 20 Mar 2015 13:17:53 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426857473.161716.13007.nullmailer@dev.openssl.org>

The branch master has been updated
       via  3c381e54233be3d0dcbce7cc853c4767d979fe90 (commit)
       via  98b8cdd32277cea829c31034a53f2487f750615d (commit)
       via  504e643e0996fb842ac183023c3a6b9049af50ea (commit)
      from  21ab123770ff42d8c5b8e6b1372ecef4881b786d (commit)


- Log -----------------------------------------------------------------
commit 3c381e54233be3d0dcbce7cc853c4767d979fe90
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 3 16:08:58 2015 +0000

    Add DTLS tests to make test
    
    Updated test/testssl script to include the new DTLS capability in ssltest.
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>

commit 98b8cdd32277cea829c31034a53f2487f750615d
Author: David Woodhouse <dwmw2 at infradead.org>
Date:   Tue Mar 3 15:47:08 2015 +0000

    Add DTLS support to ssltest
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>

commit 504e643e0996fb842ac183023c3a6b9049af50ea
Author: David Woodhouse <dwmw2 at infradead.org>
Date:   Tue Mar 3 15:39:26 2015 +0000

    Add DTLS to SSL_get_version
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>

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

Summary of changes:
 ssl/ssl_lib.c |  6 ++++++
 ssl/ssltest.c | 31 ++++++++++++++++++++++++++-----
 test/testssl  | 24 ++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index a5eb3db..1e9b34f 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2735,6 +2735,12 @@ const char *SSL_get_version(const SSL *s)
         return ("TLSv1");
     else if (s->version == SSL3_VERSION)
         return ("SSLv3");
+    else if (s->version == DTLS1_BAD_VER)
+        return ("DTLSv0.9");
+    else if (s->version == DTLS1_VERSION)
+        return ("DTLSv1");
+    else if (s->version == DTLS1_2_VERSION)
+        return ("DTLSv1.2");
     else
         return ("unknown");
 }
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 12d3efb..a57d505 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -788,6 +788,10 @@ static void sv_usage(void)
     fprintf(stderr, " -ssl3         - use SSLv3\n");
 #endif
     fprintf(stderr, " -tls1         - use TLSv1\n");
+#ifndef OPENSSL_NO_DTLS
+    fprintf(stderr, " -dtls1        - use DTLSv1\n");
+    fprintf(stderr, " -dtls12       - use DTLSv1.2\n");
+#endif
     fprintf(stderr, " -CApath arg   - PEM format directory of CA's\n");
     fprintf(stderr, " -CAfile arg   - PEM format file of CA's\n");
     fprintf(stderr, " -cert arg     - Server certificate file\n");
@@ -958,7 +962,7 @@ int main(int argc, char *argv[])
     int badop = 0;
     int bio_pair = 0;
     int force = 0;
-    int tls1 = 0, ssl3 = 0, ret = 1;
+    int dtls1 = 0, dtls12 = 0, tls1 = 0, ssl3 = 0, ret = 1;
     int client_auth = 0;
     int server_auth = 0, i;
     struct app_verify_arg app_verify_arg =
@@ -1136,6 +1140,16 @@ int main(int argc, char *argv[])
             no_protocol = 1;
 #endif
             ssl3 = 1;
+        } else if (strcmp(*argv, "-dtls1") == 0) {
+#ifdef OPENSSL_NO_DTLS
+            no_protocol = 1;
+#endif
+            dtls1 = 1;
+        } else if (strcmp(*argv, "-dtls12") == 0) {
+#ifdef OPENSSL_NO_DTLS
+            no_protocol = 1;
+#endif
+            dtls12 = 1;
         } else if (strncmp(*argv, "-num", 4) == 0) {
             if (--argc < 1)
                 goto bad;
@@ -1309,8 +1323,8 @@ int main(int argc, char *argv[])
         goto end;
     }
 
-    if (ssl3 + tls1 > 1) {
-        fprintf(stderr, "At most one of -ssl3, or -tls1 should "
+    if (ssl3 + tls1 + dtls1 + dtls12 > 1) {
+        fprintf(stderr, "At most one of -ssl3, -tls1, -dtls1 or -dtls12 should "
                 "be requested.\n");
         EXIT(1);
     }
@@ -1327,10 +1341,10 @@ int main(int argc, char *argv[])
         goto end;
     }
 
-    if (!ssl3 && !tls1 && number > 1 && !reuse && !force) {
+    if (!ssl3 && !tls1 && !dtls1 && !dtls12 && number > 1 && !reuse && !force) {
         fprintf(stderr, "This case cannot work.  Use -f to perform "
                 "the test anyway (and\n-d to see what happens), "
-                "or add one of -ssl3, -tls1, -reuse\n"
+                "or add one of -ssl3, -tls1, -dtls1, -dtls12, -reuse\n"
                 "to avoid protocol mismatch.\n");
         EXIT(1);
     }
@@ -1403,6 +1417,13 @@ int main(int argc, char *argv[])
         meth = SSLv3_method();
     else
 #endif
+#ifndef OPENSSL_NO_DTLS
+    if (dtls1)
+        meth = DTLSv1_method();
+    else if (dtls12)
+        meth = DTLSv1_2_method();
+    else
+#endif
     if (tls1)
         meth = TLSv1_method();
     else
diff --git a/test/testssl b/test/testssl
index 9c790e3..71b4d2a 100644
--- a/test/testssl
+++ b/test/testssl
@@ -73,6 +73,30 @@ $ssltest -bio_pair -ssl3 -server_auth -client_auth $CA $extra || exit 1
 echo test sslv2/sslv3 via BIO pair
 $ssltest $extra || exit 1
 
+echo test dtlsv1
+$ssltest -dtls1 $extra || exit 1
+
+echo test dtlsv1 with server authentication
+$ssltest -dtls1 -server_auth $CA $extra || exit 1
+
+echo test dtlsv1 with client authentication
+$ssltest -dtls1 -client_auth $CA $extra || exit 1
+
+echo test dtlsv1 with both client and server authentication
+$ssltest -dtls1 -server_auth -client_auth $CA $extra || exit 1
+
+echo test dtlsv1.2
+$ssltest -dtls12 $extra || exit 1
+
+echo test dtlsv1.2 with server authentication
+$ssltest -dtls12 -server_auth $CA $extra || exit 1
+
+echo test dtlsv1.2 with client authentication
+$ssltest -dtls12 -client_auth $CA $extra || exit 1
+
+echo test dtlsv1.2 with both client and server authentication
+$ssltest -dtls12 -server_auth -client_auth $CA $extra || exit 1
+
 if [ $dsa_cert = NO ]; then
   echo 'test sslv2/sslv3 w/o (EC)DHE via BIO pair'
   $ssltest -bio_pair -no_dhe -no_ecdhe $extra || exit 1

From mark at openssl.org  Sat Mar 21 09:44:25 2015
From: mark at openssl.org (Mark J. Cox)
Date: Sat, 21 Mar 2015 09:44:25 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1426931065.229956.9877.nullmailer@dev.openssl.org>

The branch master has been updated
       via  d7576bdb40be362dc3f67b36abfff794a7251538 (commit)
      from  acaa6ccdfffc2e4e3fbeb40e932db2e1bfbb3c3c (commit)


- Log -----------------------------------------------------------------
commit d7576bdb40be362dc3f67b36abfff794a7251538
Author: Mark J. Cox <mark at awe.com>
Date:   Sat Mar 21 09:43:55 2015 +0000

    Remove some broken links; people can probably figure out how to find out
    what SSL and TLS now anyway without links

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

Summary of changes:
 about/index.wml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/about/index.wml b/about/index.wml
index 570126d..ba912e5 100644
--- a/about/index.wml
+++ b/about/index.wml
@@ -10,9 +10,8 @@
 The OpenSSL Project is a collaborative effort to develop a robust,
 commercial-grade, full-featured, and <a
 href="http://www.opensource.org/">Open Source</a> toolkit implementing the
-<a href="http://www.netscape.com/eng/ssl3/">Secure Sockets
-Layer</a> (SSL v2/v3) and <a
-href="http://www.ietf.org/html.charters/tls-charter.html">Transport Layer Security</a> (TLS
+Secure Sockets Layer (SSL v2/v3) and
+Transport Layer Security (TLS
 v1) protocols as well as a full-strength general purpose cryptography library
 managed by a worldwide community of volunteers that use the Internet to
 communicate, plan, and develop the OpenSSL toolkit and its related

From steve at openssl.org  Sat Mar 21 20:05:15 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sat, 21 Mar 2015 20:05:15 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426968315.265857.27721.nullmailer@dev.openssl.org>

The branch master has been updated
       via  77e127ea6e4801a0bb584717f966fa17adabc45f (commit)
       via  5724bd49a2f11e1e9663ac82f4b5e63e18da65e6 (commit)
       via  e6abba3ad6107d35a6e8b01a1a145902edf0062d (commit)
       via  1062ecfc53622ff42edef5af63ace39c23dd3b49 (commit)
      from  3c381e54233be3d0dcbce7cc853c4767d979fe90 (commit)


- Log -----------------------------------------------------------------
commit 77e127ea6e4801a0bb584717f966fa17adabc45f
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Fri Mar 20 22:53:16 2015 +0000

    Add AES unwrap test with invalid key.
    
    This tests the unwrap algorithm with an invalid key. The result should
    be rejected without returning any plaintext.
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>

commit 5724bd49a2f11e1e9663ac82f4b5e63e18da65e6
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Fri Mar 20 23:08:30 2015 +0000

    Fix memory leak.
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>

commit e6abba3ad6107d35a6e8b01a1a145902edf0062d
Author: Richard Godbee <richard at godbee.net>
Date:   Fri Mar 13 21:23:21 2015 -0700

    CRYPTO_128_unwrap(): Fix refactoring damage
    
    crypto/modes/wrap128.c was heavily refactored to support AES Key Wrap
    with Padding, and four bugs were introduced into CRYPTO_128_unwrap() at
    that time:
    
    - crypto_128_unwrap_raw()'s return value ('ret') is checked incorrectly,
      and the function immediately returns 'ret' in (almost) all cases.
      This makes the IV checking code later in the function unreachable, but
      callers think the IV check succeeded since CRYPTO_128_unwrap()'s
      return value is non-zero.
    
      FIX: Return 0 (error) if crypto_128_unwrap_raw() returned 0 (error).
    
    - crypto_128_unwrap_raw() writes the IV to the 'got_iv' buffer, not to
      the first 8 bytes of the output buffer ('out') as the IV checking code
      expects.  This makes the IV check fail.
    
      FIX: Compare 'iv' to 'got_iv', not 'out'.
    
    - The data written to the output buffer ('out') is "cleansed" if the IV
      check fails, but the code passes OPENSSL_cleanse() the input buffer
      length ('inlen') instead of the number of bytes that
      crypto_128_unwrap_raw() wrote to the output buffer ('ret').  This
      means that OPENSSL_cleanse() could potentially write past the end of
      'out'.
    
      FIX: Change 'inlen' to 'ret' in the OPENSSL_cleanse() call.
    
    - CRYPTO_128_unwrap() is returning the length of the input buffer
      ('inlen') instead of the number of bytes written to the output buffer
      ('ret').  This could cause the caller to read past the end of 'out'.
    
      FIX: Return 'ret' instead of 'inlen' at the end of the function.
    
    PR#3749
    
    Reviewed-by: Stephen Henson <steve at openssl.org>
    Reviewed-by: Emilia K?sper <emilia at openssl.org>

commit 1062ecfc53622ff42edef5af63ace39c23dd3b49
Author: Richard Godbee <richard at godbee.net>
Date:   Fri Mar 13 20:54:39 2015 -0700

    wrap128.c: Fix Doxygen comments
    
    Reviewed-by: Stephen Henson <steve at openssl.org>
    Reviewed-by: Emilia K?sper <emilia at openssl.org>

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

Summary of changes:
 crypto/evp/evp_test.c   | 20 ++++++++++++++++----
 crypto/evp/evptests.txt |  9 +++++++++
 crypto/modes/wrap128.c  | 49 +++++++++++++++++++++++++------------------------
 3 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/crypto/evp/evp_test.c b/crypto/evp/evp_test.c
index 1b17f64..1524658 100644
--- a/crypto/evp/evp_test.c
+++ b/crypto/evp/evp_test.c
@@ -247,16 +247,27 @@ static void hex_print(const char *name, const unsigned char *buf, size_t len)
     fputs("\n", stderr);
 }
 
+static void free_expected(struct evp_test *t)
+{
+    if (t->expected_err) {
+        OPENSSL_free(t->expected_err);
+        t->expected_err = NULL;
+    }
+    if (t->out_expected) {
+        OPENSSL_free(t->out_expected);
+        OPENSSL_free(t->out_got);
+        t->out_expected = NULL;
+        t->out_got = NULL;
+    }
+}
+
 static void print_expected(struct evp_test *t)
 {
     if (t->out_expected == NULL)
         return;
     hex_print("Expected:", t->out_expected, t->out_len);
     hex_print("Got:     ", t->out_got, t->out_len);
-    OPENSSL_free(t->out_expected);
-    OPENSSL_free(t->out_got);
-    t->out_expected = NULL;
-    t->out_got = NULL;
+    free_expected(t);
 }
 
 static int check_test_error(struct evp_test *t)
@@ -313,6 +324,7 @@ static int setup_test(struct evp_test *t, const struct evp_test_method *tmeth)
             OPENSSL_free(t->expected_err);
             t->expected_err = NULL;
         }
+        free_expected(t);
     }
     t->meth = tmeth;
     return 1;
diff --git a/crypto/evp/evptests.txt b/crypto/evp/evptests.txt
index 8bf90d0..26d371c 100644
--- a/crypto/evp/evptests.txt
+++ b/crypto/evp/evptests.txt
@@ -2002,6 +2002,15 @@ Key = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F
 Plaintext = 00112233445566778899AABBCCDDEEFF000102030405060708090A0B0C0D0E0F
 Ciphertext = 28C9F404C4B810F4CBCCB35CFB87F8263F5786E2D80ED326CBC7F0E71A99F43BFB988B9B7A02DD21
 
+# Same as previous example but with invalid unwrap key: should be rejected
+# without returning any plaintext
+Cipher = id-aes256-wrap
+Operation = DECRYPT
+Key = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E00
+Plaintext = 00112233445566778899AABBCCDDEEFF000102030405060708090A0B0C0D0E0F
+Ciphertext = 28C9F404C4B810F4CBCCB35CFB87F8263F5786E2D80ED326CBC7F0E71A99F43BFB988B9B7A02DD21
+Result = CIPHERUPDATE_ERROR
+
 # AES wrap tests from RFC5649
 Cipher = id-aes192-wrap-pad
 Key = 5840df6e29b02af1ab493b705bf16ea1ae8338f4dcc176a8
diff --git a/crypto/modes/wrap128.c b/crypto/modes/wrap128.c
index 73718ae..fe33a98 100644
--- a/crypto/modes/wrap128.c
+++ b/crypto/modes/wrap128.c
@@ -81,9 +81,9 @@ static const unsigned char default_aiv[] = {
  *
  *  @param[in]  key    Key value.
  *  @param[in]  iv     IV value. Length = 8 bytes. NULL = use default_iv.
- *  @param[in]  in     Plain text as n 64-bit blocks, n >= 2.
+ *  @param[in]  in     Plaintext as n 64-bit blocks, n >= 2.
  *  @param[in]  inlen  Length of in.
- *  @param[out] out    Cipher text. Minimal buffer length = (inlen + 8) bytes.
+ *  @param[out] out    Ciphertext. Minimal buffer length = (inlen + 8) bytes.
  *                     Input and output buffers can overlap if block function
  *                     supports that.
  *  @param[in]  block  Block processing function.
@@ -127,19 +127,19 @@ size_t CRYPTO_128_wrap(void *key, const unsigned char *iv,
 }
 
 /** Unwrapping according to RFC 3394 section 2.2.2 steps 1-2.
- *  IV check (step 3) is responsibility of the caller.
+ *  The IV check (step 3) is responsibility of the caller.
  *
  *  @param[in]  key    Key value.
  *  @param[out] iv     Unchecked IV value. Minimal buffer length = 8 bytes.
- *  @param[out] out    Plain text without IV.
+ *  @param[out] out    Plaintext without IV.
  *                     Minimal buffer length = (inlen - 8) bytes.
  *                     Input and output buffers can overlap if block function
  *                     supports that.
- *  @param[in]  in     Ciphertext text as n 64-bit blocks
+ *  @param[in]  in     Ciphertext as n 64-bit blocks.
  *  @param[in]  inlen  Length of in.
  *  @param[in]  block  Block processing function.
  *  @return            0 if inlen is out of range [24, CRYPTO128_WRAP_MAX]
- *                     or if inlen is not multiply of 8.
+ *                     or if inlen is not a multiple of 8.
  *                     Output length otherwise.
  */
 static size_t crypto_128_unwrap_raw(void *key, unsigned char *iv,
@@ -174,21 +174,22 @@ static size_t crypto_128_unwrap_raw(void *key, unsigned char *iv,
     return inlen;
 }
 
-/** Unwrapping according to RFC 3394 section 2.2.2 including IV check.
- *  First block of plain text have to match supplied IV otherwise an error is
- *  returned.
+/** Unwrapping according to RFC 3394 section 2.2.2, including the IV check.
+ *  The first block of plaintext has to match the supplied IV, otherwise an
+ *  error is returned.
  *
  *  @param[in]  key    Key value.
- *  @param[out] iv     Unchecked IV value. Minimal buffer length = 8 bytes.
- *  @param[out] out    Plain text without IV.
+ *  @param[out] iv     IV value to match against. Length = 8 bytes.
+ *                     NULL = use default_iv.
+ *  @param[out] out    Plaintext without IV.
  *                     Minimal buffer length = (inlen - 8) bytes.
  *                     Input and output buffers can overlap if block function
  *                     supports that.
- *  @param[in]  in     Ciphertext text as n 64-bit blocks
+ *  @param[in]  in     Ciphertext as n 64-bit blocks.
  *  @param[in]  inlen  Length of in.
  *  @param[in]  block  Block processing function.
  *  @return            0 if inlen is out of range [24, CRYPTO128_WRAP_MAX]
- *                     or if inlen is not multiply of 8
+ *                     or if inlen is not a multiple of 8
  *                     or if IV doesn't match expected value.
  *                     Output length otherwise.
  */
@@ -200,26 +201,26 @@ size_t CRYPTO_128_unwrap(void *key, const unsigned char *iv,
     unsigned char got_iv[8];
 
     ret = crypto_128_unwrap_raw(key, got_iv, out, in, inlen, block);
-    if (ret != inlen)
-        return ret;
+    if (ret == 0)
+        return 0;
 
     if (!iv)
         iv = default_iv;
-    if (CRYPTO_memcmp(out, iv, 8)) {
-        OPENSSL_cleanse(out, inlen);
+    if (CRYPTO_memcmp(got_iv, iv, 8)) {
+        OPENSSL_cleanse(out, ret);
         return 0;
     }
-    return inlen;
+    return ret;
 }
 
 /** Wrapping according to RFC 5649 section 4.1.
  *
  *  @param[in]  key    Key value.
  *  @param[in]  icv    (Non-standard) IV, 4 bytes. NULL = use default_aiv.
- *  @param[out] out    Cipher text. Minimal buffer length = (inlen + 15) bytes.
+ *  @param[out] out    Ciphertext. Minimal buffer length = (inlen + 15) bytes.
  *                     Input and output buffers can overlap if block function
  *                     supports that.
- *  @param[in]  in     Plain text as n 64-bit blocks, n >= 2.
+ *  @param[in]  in     Plaintext as n 64-bit blocks, n >= 2.
  *  @param[in]  inlen  Length of in.
  *  @param[in]  block  Block processing function.
  *  @return            0 if inlen is out of range [1, CRYPTO128_WRAP_MAX].
@@ -282,14 +283,14 @@ size_t CRYPTO_128_wrap_pad(void *key, const unsigned char *icv,
  *
  *  @param[in]  key    Key value.
  *  @param[in]  icv    (Non-standard) IV, 4 bytes. NULL = use default_aiv.
- *  @param[out] out    Plain text. Minimal buffer length = inlen bytes.
+ *  @param[out] out    Plaintext. Minimal buffer length = inlen bytes.
  *                     Input and output buffers can overlap if block function
  *                     supports that.
- *  @param[in]  in     Ciphertext text as n 64-bit blocks
+ *  @param[in]  in     Ciphertext as n 64-bit blocks.
  *  @param[in]  inlen  Length of in.
  *  @param[in]  block  Block processing function.
  *  @return            0 if inlen is out of range [16, CRYPTO128_WRAP_MAX],
- *                     or if inlen is not multiply of 8
+ *                     or if inlen is not a multiple of 8
  *                     or if IV and message length indicator doesn't match.
  *                     Output length if unwrapping succeeded and IV matches.
  */
@@ -308,7 +309,7 @@ size_t CRYPTO_128_unwrap_pad(void *key, const unsigned char *icv,
     static unsigned char zeros[8] = { 0x0 };
     size_t ret;
 
-    /* Section 4.2: Cipher text length has to be (n+1) 64-bit blocks. */
+    /* Section 4.2: Ciphertext length has to be (n+1) 64-bit blocks. */
     if ((inlen & 0x7) != 0 || inlen < 16 || inlen >= CRYPTO128_WRAP_MAX)
         return 0;
 

From levitte at openssl.org  Sat Mar 21 23:57:21 2015
From: levitte at openssl.org (Richard Levitte)
Date: Sat, 21 Mar 2015 23:57:21 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1426982241.205671.21935.nullmailer@dev.openssl.org>

The branch master has been updated
       via  9b956beccd552372276e396a40930779cc8d12fb (commit)
      from  77e127ea6e4801a0bb584717f966fa17adabc45f (commit)


- Log -----------------------------------------------------------------
commit 9b956beccd552372276e396a40930779cc8d12fb
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Mar 22 00:27:48 2015 +0100

    Refer to $table{$target} rather than $table{$t}.
    
    Using $t is an artifact from the earlier changes in Configure and was
    unfortunately forgotten as is.
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

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

Summary of changes:
 Configure | 70 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/Configure b/Configure
index 35f8f8b..a574f5a 100755
--- a/Configure
+++ b/Configure
@@ -1303,47 +1303,47 @@ $openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]:[\\\/]
 print "IsMK1MF=$IsMK1MF\n";
 
 # Allow environment CC to override compiler...
-my $cc = $ENV{CC} || $table{$t}->{cc};
+my $cc = $ENV{CC} || $table{$target}->{cc};
 
 # For cflags and lflags, add the debug_ or release_ attributes
 # Do it in such a way that no spurious space is appended (hence the grep).
 my $cflags = join(" ",
-		  grep { $_ } ($table{$t}->{cflags},
-			       $table{$t}->{$build_prefix."cflags"}));
+		  grep { $_ } ($table{$target}->{cflags},
+			       $table{$target}->{$build_prefix."cflags"}));
 my $lflags = join(" ",
-		  grep { $_ } ($table{$t}->{lflags},
-			       $table{$t}->{$build_prefix."lflags"}));
-
-my $unistd = $table{$t}->{unistd};
-my $thread_cflag = $table{$t}->{thread_cflag};
-my $sys_id = $table{$t}->{sys_id};
-my $bn_ops = $table{$t}->{bn_ops};
-my $cpuid_obj = $table{$t}->{cpuid_obj};
-my $bn_obj = $table{$t}->{bn_obj};
-my $ec_obj = $table{$t}->{ec_obj};
-my $des_obj = $table{$t}->{des_obj};
-my $aes_obj = $table{$t}->{aes_obj};
-my $bf_obj = $table{$t}->{bf_obj};
-my $md5_obj = $table{$t}->{md5_obj};
-my $sha1_obj = $table{$t}->{sha1_obj};
-my $cast_obj = $table{$t}->{cast_obj};
-my $rc4_obj = $table{$t}->{rc4_obj};
-my $rmd160_obj = $table{$t}->{rmd160_obj};
-my $rc5_obj = $table{$t}->{rc5_obj};
-my $wp_obj = $table{$t}->{wp_obj};
-my $cmll_obj = $table{$t}->{cmll_obj};
-my $modes_obj = $table{$t}->{modes_obj};
-my $engines_obj = $table{$t}->{engines_obj};
-my $perlasm_scheme = $table{$t}->{perlasm_scheme};
-my $dso_scheme = $table{$t}->{dso_scheme};
-my $shared_target = $table{$t}->{shared_target};
-my $shared_cflag = $table{$t}->{shared_cflag};
-my $shared_ldflag = $table{$t}->{shared_ldflag};
-my $shared_extension = $table{$t}->{shared_extension};
-my $ranlib = $ENV{'RANLIB'} || $table{$t}->{ranlib};
+		  grep { $_ } ($table{$target}->{lflags},
+			       $table{$target}->{$build_prefix."lflags"}));
+
+my $unistd = $table{$target}->{unistd};
+my $thread_cflag = $table{$target}->{thread_cflag};
+my $sys_id = $table{$target}->{sys_id};
+my $bn_ops = $table{$target}->{bn_ops};
+my $cpuid_obj = $table{$target}->{cpuid_obj};
+my $bn_obj = $table{$target}->{bn_obj};
+my $ec_obj = $table{$target}->{ec_obj};
+my $des_obj = $table{$target}->{des_obj};
+my $aes_obj = $table{$target}->{aes_obj};
+my $bf_obj = $table{$target}->{bf_obj};
+my $md5_obj = $table{$target}->{md5_obj};
+my $sha1_obj = $table{$target}->{sha1_obj};
+my $cast_obj = $table{$target}->{cast_obj};
+my $rc4_obj = $table{$target}->{rc4_obj};
+my $rmd160_obj = $table{$target}->{rmd160_obj};
+my $rc5_obj = $table{$target}->{rc5_obj};
+my $wp_obj = $table{$target}->{wp_obj};
+my $cmll_obj = $table{$target}->{cmll_obj};
+my $modes_obj = $table{$target}->{modes_obj};
+my $engines_obj = $table{$target}->{engines_obj};
+my $perlasm_scheme = $table{$target}->{perlasm_scheme};
+my $dso_scheme = $table{$target}->{dso_scheme};
+my $shared_target = $table{$target}->{shared_target};
+my $shared_cflag = $table{$target}->{shared_cflag};
+my $shared_ldflag = $table{$target}->{shared_ldflag};
+my $shared_extension = $table{$target}->{shared_extension};
+my $ranlib = $ENV{'RANLIB'} || $table{$target}->{ranlib};
 my $ar = $ENV{'AR'} || "ar";
-my $arflags = $table{$t}->{arflags};
-my $multilib = $table{$t}->{multilib};
+my $arflags = $table{$target}->{arflags};
+my $multilib = $table{$target}->{multilib};
 
 # if $prefix/lib$multilib is not an existing directory, then
 # assume that it's not searched by linker automatically, in

From matt at openssl.org  Sun Mar 22 20:35:06 2015
From: matt at openssl.org (Matt Caswell)
Date: Sun, 22 Mar 2015 20:35:06 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1427056506.332774.10348.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  b5dc90121c74968cd789cba05829fbf3499f4b6d (commit)
      from  b0b723287761ae1b267d6935dc28eb83b6d31d22 (commit)


- Log -----------------------------------------------------------------
commit b5dc90121c74968cd789cba05829fbf3499f4b6d
Author: Matt Caswell <matt at openssl.org>
Date:   Sun Mar 22 15:58:00 2015 +0000

    Fix no-ec with no-ec2m
    
    Fix builds config'd with no-ec and no-ec2m. Technically this combination is
    redundant - but the fix is straight forward. Fix from OpenWrt.
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

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

Summary of changes:
 ssl/t1_lib.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index d85d26e..a59fe82 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -113,9 +113,11 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
+#ifndef OPENSSL_NO_EC
 #ifdef OPENSSL_NO_EC2M
 # include <openssl/ec.h>
 #endif
+#endif
 #include <openssl/ocsp.h>
 #include <openssl/rand.h>
 #include "ssl_locl.h"

From appro at openssl.org  Mon Mar 23 12:38:56 2015
From: appro at openssl.org (Andy Polyakov)
Date: Mon, 23 Mar 2015 12:38:56 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427114336.669599.16075.nullmailer@dev.openssl.org>

The branch master has been updated
       via  2ecd32a1f8f0643ae7b38f59bbaf9f0d6ef326fe (commit)
      from  9b956beccd552372276e396a40930779cc8d12fb (commit)


- Log -----------------------------------------------------------------
commit 2ecd32a1f8f0643ae7b38f59bbaf9f0d6ef326fe
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Mar 23 13:34:03 2015 +0100

    sha/asm/sha256-armv4.pl: adapt for use in Linux kernel context.
    
    In cooperation with Ard Biesheuvel (Linaro) and Sami Tolvanen (Google).
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/sha/asm/sha256-armv4.pl | 74 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 63 insertions(+), 11 deletions(-)

diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl
index f14c9c3..4fee74d 100644
--- a/crypto/sha/asm/sha256-armv4.pl
+++ b/crypto/sha/asm/sha256-armv4.pl
@@ -5,6 +5,8 @@
 # project. The module is, however, dual licensed under OpenSSL and
 # CRYPTOGAMS licenses depending on where you obtain it. For further
 # details see http://www.openssl.org/~appro/cryptogams/.
+#
+# Permission to use under GPL terms is granted.
 # ====================================================================
 
 # SHA256 block procedure for ARMv4. May 2007.
@@ -151,10 +153,24 @@ ___
 }
 
 $code=<<___;
-#include "arm_arch.h"
+#ifndef __KERNEL__
+# include "arm_arch.h"
+#else
+# define __ARM_ARCH__ __LINUX_ARM_ARCH__
+# define __ARM_MAX_ARCH__ 7
+#endif
 
 .text
+#if __ARM_ARCH__<7
 .code	32
+#else
+.syntax unified
+# ifdef __thumb2__
+.thumb
+# else
+.code   32
+# endif
+#endif
 
 .type	K256,%object
 .align	5
@@ -177,7 +193,7 @@ K256:
 .word	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
 .size	K256,.-K256
 .word	0				@ terminator
-#if __ARM_MAX_ARCH__>=7
+#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
 .LOPENSSL_armcap:
 .word	OPENSSL_armcap_P-sha256_block_data_order
 #endif
@@ -186,9 +202,12 @@ K256:
 .global	sha256_block_data_order
 .type	sha256_block_data_order,%function
 sha256_block_data_order:
+#if __ARM_ARCH__<7
 	sub	r3,pc,#8		@ sha256_block_data_order
-	add	$len,$inp,$len,lsl#6	@ len to point at the end of inp
-#if __ARM_MAX_ARCH__>=7
+#else
+	adr	r3,sha256_block_data_order
+#endif
+#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
 	ldr	r12,.LOPENSSL_armcap
 	ldr	r12,[r3,r12]		@ OPENSSL_armcap_P
 	tst	r12,#ARMV8_SHA256
@@ -196,6 +215,7 @@ sha256_block_data_order:
 	tst	r12,#ARMV7_NEON
 	bne	.LNEON
 #endif
+	add	$len,$inp,$len,lsl#6	@ len to point at the end of inp
 	stmdb	sp!,{$ctx,$inp,$len,r4-r11,lr}
 	ldmia	$ctx,{$A,$B,$C,$D,$E,$F,$G,$H}
 	sub	$Ktbl,r3,#256+32	@ K256
@@ -213,6 +233,9 @@ for($i=0;$i<16;$i++)	{ &BODY_00_15($i, at V); unshift(@V,pop(@V)); }
 $code.=".Lrounds_16_xx:\n";
 for (;$i<32;$i++)	{ &BODY_16_XX($i, at V); unshift(@V,pop(@V)); }
 $code.=<<___;
+#if __ARM_ARCH__>=7
+	ite	eq			@ Thumb2 thing, sanity check in ARM
+#endif
 	ldreq	$t3,[sp,#16*4]		@ pull ctx
 	bne	.Lrounds_16_xx
 
@@ -429,16 +452,19 @@ $code.=<<___;
 .arch	armv7-a
 .fpu	neon
 
+.global	sha256_block_data_order_neon
 .type	sha256_block_data_order_neon,%function
 .align	4
 sha256_block_data_order_neon:
 .LNEON:
 	stmdb	sp!,{r4-r12,lr}
 
+	sub	$H,sp,#16*4+16
+	adr	$Ktbl,K256
+	bic	$H,$H,#15		@ align for 128-bit stores
 	mov	$t2,sp
-	sub	sp,sp,#16*4+16		@ alloca
-	sub	$Ktbl,r3,#256+32	@ K256
-	bic	sp,sp,#15		@ align for 128-bit stores
+	mov	sp,$H			@ alloca
+	add	$len,$inp,$len,lsl#6	@ len to point at the end of inp
 
 	vld1.8		{@X[0]},[$inp]!
 	vld1.8		{@X[1]},[$inp]!
@@ -490,11 +516,13 @@ $code.=<<___;
 	ldr		$t0,[sp,#72]
 	sub		$Ktbl,$Ktbl,#256	@ rewind $Ktbl
 	teq		$inp,$t0
+	it		eq
 	subeq		$inp,$inp,#64		@ avoid SEGV
 	vld1.8		{@X[0]},[$inp]!		@ load next input block
 	vld1.8		{@X[1]},[$inp]!
 	vld1.8		{@X[2]},[$inp]!
 	vld1.8		{@X[3]},[$inp]!
+	it		ne
 	strne		$inp,[sp,#68]
 	mov		$Xfer,sp
 ___
@@ -526,10 +554,12 @@ $code.=<<___;
 	str	$D,[$t1],#4
 	stmia	$t1,{$E-$H}
 
+	ittte	ne
 	movne	$Xfer,sp
 	ldrne	$t1,[sp,#0]
 	eorne	$t2,$t2,$t2
 	ldreq	sp,[sp,#76]			@ restore original sp
+	itt	ne
 	eorne	$t3,$B,$C
 	bne	.L_00_48
 
@@ -548,13 +578,26 @@ my ($W0,$W1,$ABCD_SAVE,$EFGH_SAVE)=map("q$_",(12..15));
 my $Ktbl="r3";
 
 $code.=<<___;
-#if __ARM_MAX_ARCH__>=7
+#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
+
+# ifdef __thumb2__
+#  define INST(a,b,c,d)	.byte	c,d|0xc,a,b
+# else
+#  define INST(a,b,c,d)	.byte	a,b,c,d
+# endif
+
 .type	sha256_block_data_order_armv8,%function
 .align	5
 sha256_block_data_order_armv8:
 .LARMv8:
 	vld1.32	{$ABCD,$EFGH},[$ctx]
-	sub	$Ktbl,r3,#sha256_block_data_order-K256
+# ifdef __thumb2__
+	adr	$Ktbl,.LARMv8
+	sub	$Ktbl,$Ktbl,#.LARMv8-K256
+# else
+	adrl	$Ktbl,K256
+# endif
+	add	$len,$inp,$len,lsl#6	@ len to point at the end of inp
 
 .Loop_v8:
 	vld1.8		{@MSG[0]- at MSG[1]},[$inp]!
@@ -607,6 +650,7 @@ $code.=<<___;
 
 	vadd.i32	$ABCD,$ABCD,$ABCD_SAVE
 	vadd.i32	$EFGH,$EFGH,$EFGH_SAVE
+	it		ne
 	bne		.Loop_v8
 
 	vst1.32		{$ABCD,$EFGH},[$ctx]
@@ -619,11 +663,19 @@ ___
 $code.=<<___;
 .asciz  "SHA256 block transform for ARMv4/NEON/ARMv8, CRYPTOGAMS by <appro\@openssl.org>"
 .align	2
-#if __ARM_MAX_ARCH__>=7
+#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
 .comm   OPENSSL_armcap_P,4,4
 #endif
 ___
 
+open SELF,$0;
+while(<SELF>) {
+	next if (/^#!/);
+	last if (!s/^#/@/ and !/^$/);
+	print;
+}
+close SELF;
+
 {   my  %opcode = (
 	"sha256h"	=> 0xf3000c40,	"sha256h2"	=> 0xf3100c40,
 	"sha256su0"	=> 0xf3ba03c0,	"sha256su1"	=> 0xf3200c40	);
@@ -638,7 +690,7 @@ ___
 	    # since ARMv7 instructions are always encoded little-endian.
 	    # correct solution is to use .inst directive, but older
 	    # assemblers don't implement it:-(
-	    sprintf ".byte\t0x%02x,0x%02x,0x%02x,0x%02x\t@ %s %s",
+	    sprintf "INST(0x%02x,0x%02x,0x%02x,0x%02x)\t@ %s %s",
 			$word&0xff,($word>>8)&0xff,
 			($word>>16)&0xff,($word>>24)&0xff,
 			$mnemonic,$arg;

From appro at openssl.org  Mon Mar 23 12:38:56 2015
From: appro at openssl.org (Andy Polyakov)
Date: Mon, 23 Mar 2015 12:38:56 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1427114336.540218.16052.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  c45dfdc68a4d84c5a7c2a346ea335052cb2755a1 (commit)
      from  b5dc90121c74968cd789cba05829fbf3499f4b6d (commit)


- Log -----------------------------------------------------------------
commit c45dfdc68a4d84c5a7c2a346ea335052cb2755a1
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Mar 23 13:34:03 2015 +0100

    sha/asm/sha256-armv4.pl: adapt for use in Linux kernel context.
    
    In cooperation with Ard Biesheuvel (Linaro) and Sami Tolvanen (Google).
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 2ecd32a1f8f0643ae7b38f59bbaf9f0d6ef326fe)

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

Summary of changes:
 crypto/sha/asm/sha256-armv4.pl | 74 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 63 insertions(+), 11 deletions(-)

diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl
index f14c9c3..4fee74d 100644
--- a/crypto/sha/asm/sha256-armv4.pl
+++ b/crypto/sha/asm/sha256-armv4.pl
@@ -5,6 +5,8 @@
 # project. The module is, however, dual licensed under OpenSSL and
 # CRYPTOGAMS licenses depending on where you obtain it. For further
 # details see http://www.openssl.org/~appro/cryptogams/.
+#
+# Permission to use under GPL terms is granted.
 # ====================================================================
 
 # SHA256 block procedure for ARMv4. May 2007.
@@ -151,10 +153,24 @@ ___
 }
 
 $code=<<___;
-#include "arm_arch.h"
+#ifndef __KERNEL__
+# include "arm_arch.h"
+#else
+# define __ARM_ARCH__ __LINUX_ARM_ARCH__
+# define __ARM_MAX_ARCH__ 7
+#endif
 
 .text
+#if __ARM_ARCH__<7
 .code	32
+#else
+.syntax unified
+# ifdef __thumb2__
+.thumb
+# else
+.code   32
+# endif
+#endif
 
 .type	K256,%object
 .align	5
@@ -177,7 +193,7 @@ K256:
 .word	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
 .size	K256,.-K256
 .word	0				@ terminator
-#if __ARM_MAX_ARCH__>=7
+#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
 .LOPENSSL_armcap:
 .word	OPENSSL_armcap_P-sha256_block_data_order
 #endif
@@ -186,9 +202,12 @@ K256:
 .global	sha256_block_data_order
 .type	sha256_block_data_order,%function
 sha256_block_data_order:
+#if __ARM_ARCH__<7
 	sub	r3,pc,#8		@ sha256_block_data_order
-	add	$len,$inp,$len,lsl#6	@ len to point at the end of inp
-#if __ARM_MAX_ARCH__>=7
+#else
+	adr	r3,sha256_block_data_order
+#endif
+#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
 	ldr	r12,.LOPENSSL_armcap
 	ldr	r12,[r3,r12]		@ OPENSSL_armcap_P
 	tst	r12,#ARMV8_SHA256
@@ -196,6 +215,7 @@ sha256_block_data_order:
 	tst	r12,#ARMV7_NEON
 	bne	.LNEON
 #endif
+	add	$len,$inp,$len,lsl#6	@ len to point at the end of inp
 	stmdb	sp!,{$ctx,$inp,$len,r4-r11,lr}
 	ldmia	$ctx,{$A,$B,$C,$D,$E,$F,$G,$H}
 	sub	$Ktbl,r3,#256+32	@ K256
@@ -213,6 +233,9 @@ for($i=0;$i<16;$i++)	{ &BODY_00_15($i, at V); unshift(@V,pop(@V)); }
 $code.=".Lrounds_16_xx:\n";
 for (;$i<32;$i++)	{ &BODY_16_XX($i, at V); unshift(@V,pop(@V)); }
 $code.=<<___;
+#if __ARM_ARCH__>=7
+	ite	eq			@ Thumb2 thing, sanity check in ARM
+#endif
 	ldreq	$t3,[sp,#16*4]		@ pull ctx
 	bne	.Lrounds_16_xx
 
@@ -429,16 +452,19 @@ $code.=<<___;
 .arch	armv7-a
 .fpu	neon
 
+.global	sha256_block_data_order_neon
 .type	sha256_block_data_order_neon,%function
 .align	4
 sha256_block_data_order_neon:
 .LNEON:
 	stmdb	sp!,{r4-r12,lr}
 
+	sub	$H,sp,#16*4+16
+	adr	$Ktbl,K256
+	bic	$H,$H,#15		@ align for 128-bit stores
 	mov	$t2,sp
-	sub	sp,sp,#16*4+16		@ alloca
-	sub	$Ktbl,r3,#256+32	@ K256
-	bic	sp,sp,#15		@ align for 128-bit stores
+	mov	sp,$H			@ alloca
+	add	$len,$inp,$len,lsl#6	@ len to point at the end of inp
 
 	vld1.8		{@X[0]},[$inp]!
 	vld1.8		{@X[1]},[$inp]!
@@ -490,11 +516,13 @@ $code.=<<___;
 	ldr		$t0,[sp,#72]
 	sub		$Ktbl,$Ktbl,#256	@ rewind $Ktbl
 	teq		$inp,$t0
+	it		eq
 	subeq		$inp,$inp,#64		@ avoid SEGV
 	vld1.8		{@X[0]},[$inp]!		@ load next input block
 	vld1.8		{@X[1]},[$inp]!
 	vld1.8		{@X[2]},[$inp]!
 	vld1.8		{@X[3]},[$inp]!
+	it		ne
 	strne		$inp,[sp,#68]
 	mov		$Xfer,sp
 ___
@@ -526,10 +554,12 @@ $code.=<<___;
 	str	$D,[$t1],#4
 	stmia	$t1,{$E-$H}
 
+	ittte	ne
 	movne	$Xfer,sp
 	ldrne	$t1,[sp,#0]
 	eorne	$t2,$t2,$t2
 	ldreq	sp,[sp,#76]			@ restore original sp
+	itt	ne
 	eorne	$t3,$B,$C
 	bne	.L_00_48
 
@@ -548,13 +578,26 @@ my ($W0,$W1,$ABCD_SAVE,$EFGH_SAVE)=map("q$_",(12..15));
 my $Ktbl="r3";
 
 $code.=<<___;
-#if __ARM_MAX_ARCH__>=7
+#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
+
+# ifdef __thumb2__
+#  define INST(a,b,c,d)	.byte	c,d|0xc,a,b
+# else
+#  define INST(a,b,c,d)	.byte	a,b,c,d
+# endif
+
 .type	sha256_block_data_order_armv8,%function
 .align	5
 sha256_block_data_order_armv8:
 .LARMv8:
 	vld1.32	{$ABCD,$EFGH},[$ctx]
-	sub	$Ktbl,r3,#sha256_block_data_order-K256
+# ifdef __thumb2__
+	adr	$Ktbl,.LARMv8
+	sub	$Ktbl,$Ktbl,#.LARMv8-K256
+# else
+	adrl	$Ktbl,K256
+# endif
+	add	$len,$inp,$len,lsl#6	@ len to point at the end of inp
 
 .Loop_v8:
 	vld1.8		{@MSG[0]- at MSG[1]},[$inp]!
@@ -607,6 +650,7 @@ $code.=<<___;
 
 	vadd.i32	$ABCD,$ABCD,$ABCD_SAVE
 	vadd.i32	$EFGH,$EFGH,$EFGH_SAVE
+	it		ne
 	bne		.Loop_v8
 
 	vst1.32		{$ABCD,$EFGH},[$ctx]
@@ -619,11 +663,19 @@ ___
 $code.=<<___;
 .asciz  "SHA256 block transform for ARMv4/NEON/ARMv8, CRYPTOGAMS by <appro\@openssl.org>"
 .align	2
-#if __ARM_MAX_ARCH__>=7
+#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
 .comm   OPENSSL_armcap_P,4,4
 #endif
 ___
 
+open SELF,$0;
+while(<SELF>) {
+	next if (/^#!/);
+	last if (!s/^#/@/ and !/^$/);
+	print;
+}
+close SELF;
+
 {   my  %opcode = (
 	"sha256h"	=> 0xf3000c40,	"sha256h2"	=> 0xf3100c40,
 	"sha256su0"	=> 0xf3ba03c0,	"sha256su1"	=> 0xf3200c40	);
@@ -638,7 +690,7 @@ ___
 	    # since ARMv7 instructions are always encoded little-endian.
 	    # correct solution is to use .inst directive, but older
 	    # assemblers don't implement it:-(
-	    sprintf ".byte\t0x%02x,0x%02x,0x%02x,0x%02x\t@ %s %s",
+	    sprintf "INST(0x%02x,0x%02x,0x%02x,0x%02x)\t@ %s %s",
 			$word&0xff,($word>>8)&0xff,
 			($word>>16)&0xff,($word>>24)&0xff,
 			$mnemonic,$arg;

From steve at openssl.org  Mon Mar 23 13:16:04 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 23 Mar 2015 13:16:04 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427116564.024409.27013.nullmailer@dev.openssl.org>

The branch master has been updated
       via  564df0ddead0fbac0bf2eeec6164a81bc3fa8882 (commit)
       via  f422a51486a3ab415153eccdc3c3746c53da01f4 (commit)
      from  2ecd32a1f8f0643ae7b38f59bbaf9f0d6ef326fe (commit)


- Log -----------------------------------------------------------------
commit 564df0ddead0fbac0bf2eeec6164a81bc3fa8882
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Mar 14 18:06:59 2015 +0000

    Remove {i2d,d2i}_ASN1_BOOLEAN
    
    Remove {i2d,d2i}_ASN1_BOOLEAN.
    
    Rewrite single occurrence of d2i_ASN1_BOOLEAN in asn1_parse2
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit f422a51486a3ab415153eccdc3c3746c53da01f4
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Mar 14 04:16:42 2015 +0000

    Remove old ASN.1 code.
    
    Remove old M_ASN1_ macros and replace any occurences with the corresponding
    function.
    
    Remove d2i_ASN1_bytes, d2i_ASN1_SET, i2d_ASN1_SET: no longer used internally.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/asn1/Makefile     |  28 +----
 crypto/asn1/a_bitstr.c   |   6 +-
 crypto/asn1/a_bool.c     | 111 -----------------
 crypto/asn1/a_bytes.c    | 306 -----------------------------------------------
 crypto/asn1/a_enum.c     |   4 +-
 crypto/asn1/a_gentm.c    |   2 +-
 crypto/asn1/a_int.c      |  14 +--
 crypto/asn1/a_octet.c    |   6 +-
 crypto/asn1/a_set.c      | 239 ------------------------------------
 crypto/asn1/a_utctm.c    |   4 +-
 crypto/asn1/asn1.h       | 183 ----------------------------
 crypto/asn1/asn1_lib.c   |   9 +-
 crypto/asn1/asn1_par.c   |  16 +--
 crypto/asn1/asn_pack.c   | 100 ----------------
 crypto/asn1/evp_asn1.c   |  30 ++---
 crypto/asn1/p5_pbev2.c   |   4 +-
 crypto/asn1/t_req.c      |   2 +-
 crypto/asn1/x_pkey.c     |   4 +-
 crypto/ec/ec_asn1.c      |  18 +--
 crypto/ocsp/v3_ocsp.c    |   4 +-
 crypto/pkcs12/p12_add.c  |   4 +-
 crypto/pkcs12/p12_decr.c |   2 +-
 crypto/pkcs12/p12_init.c |   2 +-
 crypto/pkcs12/p12_mutl.c |   4 +-
 crypto/pkcs12/p12_p8e.c  |   2 +-
 crypto/pkcs7/pk7_doit.c  |  12 +-
 crypto/pkcs7/pk7_lib.c   |  14 +--
 crypto/rsa/rsa_saos.c    |   2 +-
 crypto/ts/ts_lib.c       |   8 +-
 crypto/ts/ts_rsp_sign.c  |   2 +-
 crypto/ts/ts_rsp_utils.c |   2 +-
 crypto/x509/x509_cmp.c   |   2 +-
 crypto/x509/x509_r2x.c   |   2 +-
 crypto/x509/x509_set.c   |  16 +--
 crypto/x509/x509_v3.c    |   2 +-
 crypto/x509/x509cset.c   |  18 +--
 crypto/x509v3/v3_akey.c  |   6 +-
 crypto/x509v3/v3_alt.c   |   6 +-
 crypto/x509v3/v3_bitst.c |   6 +-
 crypto/x509v3/v3_conf.c  |  10 +-
 crypto/x509v3/v3_cpols.c |   4 +-
 crypto/x509v3/v3_ia5.c   |   4 +-
 crypto/x509v3/v3_prn.c   |   2 +-
 crypto/x509v3/v3_skey.c  |  10 +-
 crypto/x509v3/v3_sxnet.c |  18 +--
 45 files changed, 145 insertions(+), 1105 deletions(-)
 delete mode 100644 crypto/asn1/a_bool.c
 delete mode 100644 crypto/asn1/a_bytes.c
 delete mode 100644 crypto/asn1/a_set.c

diff --git a/crypto/asn1/Makefile b/crypto/asn1/Makefile
index 3009bbf..cb143b3 100644
--- a/crypto/asn1/Makefile
+++ b/crypto/asn1/Makefile
@@ -18,7 +18,7 @@ APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=	a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \
-	a_print.c a_type.c a_set.c a_dup.c a_d2i_fp.c a_i2d_fp.c \
+	a_print.c a_type.c a_dup.c a_d2i_fp.c a_i2d_fp.c \
 	a_enum.c a_utf8.c a_sign.c a_digest.c a_verify.c a_mbstr.c a_strex.c \
 	x_algor.c x_val.c x_pubkey.c x_sig.c x_req.c x_bignum.c \
 	x_long.c x_name.c x_x509.c x_x509a.c x_crl.c x_info.c x_spki.c nsseq.c \
@@ -27,12 +27,12 @@ LIBSRC=	a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \
 	tasn_new.c tasn_fre.c tasn_enc.c tasn_dec.c tasn_utl.c tasn_typ.c \
 	tasn_prn.c tasn_scn.c ameth_lib.c \
 	f_int.c f_string.c n_pkey.c \
-	f_enum.c x_pkey.c a_bool.c x_exten.c bio_asn1.c bio_ndef.c asn_mime.c \
-	asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_bytes.c a_strnid.c \
+	f_enum.c x_pkey.c x_exten.c bio_asn1.c bio_ndef.c asn_mime.c \
+	asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_strnid.c \
 	evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.c \
 	asn_mstbl.c
 LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \
-	a_print.o a_type.o a_set.o a_dup.o a_d2i_fp.o a_i2d_fp.o \
+	a_print.o a_type.o a_dup.o a_d2i_fp.o a_i2d_fp.o \
 	a_enum.o a_utf8.o a_sign.o a_digest.o a_verify.o a_mbstr.o a_strex.o \
 	x_algor.o x_val.o x_pubkey.o x_sig.o x_req.o x_bignum.o \
 	x_long.o x_name.o x_x509.o x_x509a.o x_crl.o x_info.o x_spki.o nsseq.o \
@@ -41,8 +41,8 @@ LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \
 	tasn_new.o tasn_fre.o tasn_enc.o tasn_dec.o tasn_utl.o tasn_typ.o \
 	tasn_prn.o tasn_scn.o ameth_lib.o \
 	f_int.o f_string.o n_pkey.o \
-	f_enum.o x_pkey.o a_bool.o x_exten.o bio_asn1.o bio_ndef.o asn_mime.o \
-	asn1_gen.o asn1_par.o asn1_lib.o asn1_err.o a_bytes.o a_strnid.o \
+	f_enum.o x_pkey.o x_exten.o bio_asn1.o bio_ndef.o asn_mime.o \
+	asn1_gen.o asn1_par.o asn1_lib.o asn1_err.o a_strnid.o \
 	evp_asn1.o asn_pack.o p5_pbe.o p5_pbev2.o p8_pkey.o asn_moid.o \
 	asn_mstbl.o
 
@@ -125,14 +125,6 @@ a_bool.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 a_bool.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 a_bool.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 a_bool.o: ../../include/openssl/symhacks.h ../cryptlib.h a_bool.c
-a_bytes.o: ../../e_os.h ../../include/openssl/asn1.h
-a_bytes.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
-a_bytes.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-a_bytes.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
-a_bytes.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_bytes.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-a_bytes.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-a_bytes.o: ../cryptlib.h a_bytes.c
 a_d2i_fp.o: ../../e_os.h ../../include/openssl/asn1.h
 a_d2i_fp.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
 a_d2i_fp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -226,14 +218,6 @@ a_print.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 a_print.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 a_print.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 a_print.o: ../cryptlib.h a_print.c
-a_set.o: ../../e_os.h ../../include/openssl/asn1.h
-a_set.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
-a_set.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-a_set.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_set.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-a_set.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-a_set.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_set.o: ../../include/openssl/symhacks.h ../cryptlib.h a_set.c
 a_sign.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_sign.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 a_sign.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
diff --git a/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c
index 1b2f608..5a5cc23 100644
--- a/crypto/asn1/a_bitstr.c
+++ b/crypto/asn1/a_bitstr.c
@@ -62,7 +62,7 @@
 
 int ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len)
 {
-    return M_ASN1_BIT_STRING_set(x, d, len);
+    return ASN1_STRING_set(x, d, len);
 }
 
 int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
@@ -136,7 +136,7 @@ ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
     }
 
     if ((a == NULL) || ((*a) == NULL)) {
-        if ((ret = M_ASN1_BIT_STRING_new()) == NULL)
+        if ((ret = ASN1_BIT_STRING_new()) == NULL)
             return (NULL);
     } else
         ret = (*a);
@@ -178,7 +178,7 @@ ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
  err:
     ASN1err(ASN1_F_C2I_ASN1_BIT_STRING, i);
     if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-        M_ASN1_BIT_STRING_free(ret);
+        ASN1_BIT_STRING_free(ret);
     return (NULL);
 }
 
diff --git a/crypto/asn1/a_bool.c b/crypto/asn1/a_bool.c
deleted file mode 100644
index 1b85bc9..0000000
--- a/crypto/asn1/a_bool.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* crypto/asn1/a_bool.c */
-/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay at cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh at cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay at cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh at cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/asn1t.h>
-
-int i2d_ASN1_BOOLEAN(int a, unsigned char **pp)
-{
-    int r;
-    unsigned char *p;
-
-    r = ASN1_object_size(0, 1, V_ASN1_BOOLEAN);
-    if (pp == NULL)
-        return (r);
-    p = *pp;
-
-    ASN1_put_object(&p, 0, 1, V_ASN1_BOOLEAN, V_ASN1_UNIVERSAL);
-    *(p++) = (unsigned char)a;
-    *pp = p;
-    return (r);
-}
-
-int d2i_ASN1_BOOLEAN(int *a, const unsigned char **pp, long length)
-{
-    int ret = -1;
-    const unsigned char *p;
-    long len;
-    int inf, tag, xclass;
-    int i = 0;
-
-    p = *pp;
-    inf = ASN1_get_object(&p, &len, &tag, &xclass, length);
-    if (inf & 0x80) {
-        i = ASN1_R_BAD_OBJECT_HEADER;
-        goto err;
-    }
-
-    if (tag != V_ASN1_BOOLEAN) {
-        i = ASN1_R_EXPECTING_A_BOOLEAN;
-        goto err;
-    }
-
-    if (len != 1) {
-        i = ASN1_R_BOOLEAN_IS_WRONG_LENGTH;
-        goto err;
-    }
-    ret = (int)*(p++);
-    if (a != NULL)
-        (*a) = ret;
-    *pp = p;
-    return (ret);
- err:
-    ASN1err(ASN1_F_D2I_ASN1_BOOLEAN, i);
-    return (ret);
-}
diff --git a/crypto/asn1/a_bytes.c b/crypto/asn1/a_bytes.c
deleted file mode 100644
index 12715a7..0000000
--- a/crypto/asn1/a_bytes.c
+++ /dev/null
@@ -1,306 +0,0 @@
-/* crypto/asn1/a_bytes.c */
-/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay at cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh at cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay at cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh at cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/asn1.h>
-
-static int asn1_collate_primitive(ASN1_STRING *a, ASN1_const_CTX *c);
-/*
- * type is a 'bitmap' of acceptable string types.
- */
-ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, const unsigned char **pp,
-                                 long length, int type)
-{
-    ASN1_STRING *ret = NULL;
-    const unsigned char *p;
-    unsigned char *s;
-    long len;
-    int inf, tag, xclass;
-    int i = 0;
-
-    p = *pp;
-    inf = ASN1_get_object(&p, &len, &tag, &xclass, length);
-    if (inf & 0x80)
-        goto err;
-
-    if (tag >= 32) {
-        i = ASN1_R_TAG_VALUE_TOO_HIGH;
-        goto err;
-    }
-    if (!(ASN1_tag2bit(tag) & type)) {
-        i = ASN1_R_WRONG_TYPE;
-        goto err;
-    }
-
-    /* If a bit-string, exit early */
-    if (tag == V_ASN1_BIT_STRING)
-        return (d2i_ASN1_BIT_STRING(a, pp, length));
-
-    if ((a == NULL) || ((*a) == NULL)) {
-        if ((ret = ASN1_STRING_new()) == NULL)
-            return (NULL);
-    } else
-        ret = (*a);
-
-    if (len != 0) {
-        s = (unsigned char *)OPENSSL_malloc((int)len + 1);
-        if (s == NULL) {
-            i = ERR_R_MALLOC_FAILURE;
-            goto err;
-        }
-        memcpy(s, p, (int)len);
-        s[len] = '\0';
-        p += len;
-    } else
-        s = NULL;
-
-    if (ret->data != NULL)
-        OPENSSL_free(ret->data);
-    ret->length = (int)len;
-    ret->data = s;
-    ret->type = tag;
-    if (a != NULL)
-        (*a) = ret;
-    *pp = p;
-    return (ret);
- err:
-    ASN1err(ASN1_F_D2I_ASN1_TYPE_BYTES, i);
-    if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-        ASN1_STRING_free(ret);
-    return (NULL);
-}
-
-int i2d_ASN1_bytes(ASN1_STRING *a, unsigned char **pp, int tag, int xclass)
-{
-    int ret, r, constructed;
-    unsigned char *p;
-
-    if (a == NULL)
-        return (0);
-
-    if (tag == V_ASN1_BIT_STRING)
-        return (i2d_ASN1_BIT_STRING(a, pp));
-
-    ret = a->length;
-    r = ASN1_object_size(0, ret, tag);
-    if (pp == NULL)
-        return (r);
-    p = *pp;
-
-    if ((tag == V_ASN1_SEQUENCE) || (tag == V_ASN1_SET))
-        constructed = 1;
-    else
-        constructed = 0;
-    ASN1_put_object(&p, constructed, ret, tag, xclass);
-    memcpy(p, a->data, a->length);
-    p += a->length;
-    *pp = p;
-    return (r);
-}
-
-ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, const unsigned char **pp,
-                            long length, int Ptag, int Pclass)
-{
-    ASN1_STRING *ret = NULL;
-    const unsigned char *p;
-    unsigned char *s;
-    long len;
-    int inf, tag, xclass;
-    int i = 0;
-
-    if ((a == NULL) || ((*a) == NULL)) {
-        if ((ret = ASN1_STRING_new()) == NULL)
-            return (NULL);
-    } else
-        ret = (*a);
-
-    p = *pp;
-    inf = ASN1_get_object(&p, &len, &tag, &xclass, length);
-    if (inf & 0x80) {
-        i = ASN1_R_BAD_OBJECT_HEADER;
-        goto err;
-    }
-
-    if (tag != Ptag) {
-        i = ASN1_R_WRONG_TAG;
-        goto err;
-    }
-
-    if (inf & V_ASN1_CONSTRUCTED) {
-        ASN1_const_CTX c;
-
-        c.pp = pp;
-        c.p = p;
-        c.inf = inf;
-        c.slen = len;
-        c.tag = Ptag;
-        c.xclass = Pclass;
-        c.max = (length == 0) ? 0 : (p + length);
-        if (!asn1_collate_primitive(ret, &c))
-            goto err;
-        else {
-            p = c.p;
-        }
-    } else {
-        if (len != 0) {
-            if ((ret->length < len) || (ret->data == NULL)) {
-                if (ret->data != NULL)
-                    OPENSSL_free(ret->data);
-                s = (unsigned char *)OPENSSL_malloc((int)len + 1);
-                if (s == NULL) {
-                    i = ERR_R_MALLOC_FAILURE;
-                    goto err;
-                }
-            } else
-                s = ret->data;
-            memcpy(s, p, (int)len);
-            s[len] = '\0';
-            p += len;
-        } else {
-            s = NULL;
-            if (ret->data != NULL)
-                OPENSSL_free(ret->data);
-        }
-
-        ret->length = (int)len;
-        ret->data = s;
-        ret->type = Ptag;
-    }
-
-    if (a != NULL)
-        (*a) = ret;
-    *pp = p;
-    return (ret);
- err:
-    if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-        ASN1_STRING_free(ret);
-    ASN1err(ASN1_F_D2I_ASN1_BYTES, i);
-    return (NULL);
-}
-
-/*
- * We are about to parse 0..n d2i_ASN1_bytes objects, we are to collapse them
- * into the one structure that is then returned
- */
-/*
- * There have been a few bug fixes for this function from Paul Keogh
- * <paul.keogh at sse.ie>, many thanks to him
- */
-static int asn1_collate_primitive(ASN1_STRING *a, ASN1_const_CTX *c)
-{
-    ASN1_STRING *os = NULL;
-    BUF_MEM b;
-    int num;
-
-    b.length = 0;
-    b.max = 0;
-    b.data = NULL;
-
-    if (a == NULL) {
-        c->error = ERR_R_PASSED_NULL_PARAMETER;
-        goto err;
-    }
-
-    num = 0;
-    for (;;) {
-        if (c->inf & 1) {
-            c->eos = ASN1_const_check_infinite_end(&c->p,
-                                                   (long)(c->max - c->p));
-            if (c->eos)
-                break;
-        } else {
-            if (c->slen <= 0)
-                break;
-        }
-
-        c->q = c->p;
-        if (d2i_ASN1_bytes(&os, &c->p, c->max - c->p, c->tag, c->xclass)
-            == NULL) {
-            c->error = ERR_R_ASN1_LIB;
-            goto err;
-        }
-
-        if (!BUF_MEM_grow_clean(&b, num + os->length)) {
-            c->error = ERR_R_BUF_LIB;
-            goto err;
-        }
-        memcpy(&(b.data[num]), os->data, os->length);
-        if (!(c->inf & 1))
-            c->slen -= (c->p - c->q);
-        num += os->length;
-    }
-
-    if (!asn1_const_Finish(c))
-        goto err;
-
-    a->length = num;
-    if (a->data != NULL)
-        OPENSSL_free(a->data);
-    a->data = (unsigned char *)b.data;
-    if (os != NULL)
-        ASN1_STRING_free(os);
-    return (1);
- err:
-    ASN1err(ASN1_F_ASN1_COLLATE_PRIMITIVE, c->error);
-    if (os != NULL)
-        ASN1_STRING_free(os);
-    if (b.data != NULL)
-        OPENSSL_free(b.data);
-    return (0);
-}
diff --git a/crypto/asn1/a_enum.c b/crypto/asn1/a_enum.c
index c3498ac..00312b0 100644
--- a/crypto/asn1/a_enum.c
+++ b/crypto/asn1/a_enum.c
@@ -139,7 +139,7 @@ ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai)
     int len, j;
 
     if (ai == NULL)
-        ret = M_ASN1_ENUMERATED_new();
+        ret = ASN1_ENUMERATED_new();
     else
         ret = ai;
     if (ret == NULL) {
@@ -165,7 +165,7 @@ ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai)
     return (ret);
  err:
     if (ret != ai)
-        M_ASN1_ENUMERATED_free(ret);
+        ASN1_ENUMERATED_free(ret);
     return (NULL);
 }
 
diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c
index 97011f8..0e9149a 100644
--- a/crypto/asn1/a_gentm.c
+++ b/crypto/asn1/a_gentm.c
@@ -223,7 +223,7 @@ ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s,
     size_t len = 20;
 
     if (s == NULL)
-        s = M_ASN1_GENERALIZEDTIME_new();
+        s = ASN1_GENERALIZEDTIME_new();
     if (s == NULL)
         return (NULL);
 
diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c
index 7f11859..a33e3fd 100644
--- a/crypto/asn1/a_int.c
+++ b/crypto/asn1/a_int.c
@@ -63,7 +63,7 @@
 
 ASN1_INTEGER *ASN1_INTEGER_dup(const ASN1_INTEGER *x)
 {
-    return M_ASN1_INTEGER_dup(x);
+    return ASN1_STRING_dup(x);
 }
 
 int ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y)
@@ -190,7 +190,7 @@ ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,
     int i;
 
     if ((a == NULL) || ((*a) == NULL)) {
-        if ((ret = M_ASN1_INTEGER_new()) == NULL)
+        if ((ret = ASN1_INTEGER_new()) == NULL)
             return (NULL);
         ret->type = V_ASN1_INTEGER;
     } else
@@ -266,7 +266,7 @@ ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,
  err:
     ASN1err(ASN1_F_C2I_ASN1_INTEGER, i);
     if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-        M_ASN1_INTEGER_free(ret);
+        ASN1_INTEGER_free(ret);
     return (NULL);
 }
 
@@ -287,7 +287,7 @@ ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
     int i;
 
     if ((a == NULL) || ((*a) == NULL)) {
-        if ((ret = M_ASN1_INTEGER_new()) == NULL)
+        if ((ret = ASN1_INTEGER_new()) == NULL)
             return (NULL);
         ret->type = V_ASN1_INTEGER;
     } else
@@ -335,7 +335,7 @@ ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
  err:
     ASN1err(ASN1_F_D2I_ASN1_UINTEGER, i);
     if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-        M_ASN1_INTEGER_free(ret);
+        ASN1_INTEGER_free(ret);
     return (NULL);
 }
 
@@ -410,7 +410,7 @@ ASN1_INTEGER *BN_to_ASN1_INTEGER(const BIGNUM *bn, ASN1_INTEGER *ai)
     int len, j;
 
     if (ai == NULL)
-        ret = M_ASN1_INTEGER_new();
+        ret = ASN1_INTEGER_new();
     else
         ret = ai;
     if (ret == NULL) {
@@ -440,7 +440,7 @@ ASN1_INTEGER *BN_to_ASN1_INTEGER(const BIGNUM *bn, ASN1_INTEGER *ai)
     return (ret);
  err:
     if (ret != ai)
-        M_ASN1_INTEGER_free(ret);
+        ASN1_INTEGER_free(ret);
     return (NULL);
 }
 
diff --git a/crypto/asn1/a_octet.c b/crypto/asn1/a_octet.c
index 1a6e9ca..f6fd622 100644
--- a/crypto/asn1/a_octet.c
+++ b/crypto/asn1/a_octet.c
@@ -62,17 +62,17 @@
 
 ASN1_OCTET_STRING *ASN1_OCTET_STRING_dup(const ASN1_OCTET_STRING *x)
 {
-    return M_ASN1_OCTET_STRING_dup(x);
+    return ASN1_STRING_dup(x);
 }
 
 int ASN1_OCTET_STRING_cmp(const ASN1_OCTET_STRING *a,
                           const ASN1_OCTET_STRING *b)
 {
-    return M_ASN1_OCTET_STRING_cmp(a, b);
+    return ASN1_STRING_cmp(a, b);
 }
 
 int ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *x, const unsigned char *d,
                           int len)
 {
-    return M_ASN1_OCTET_STRING_set(x, d, len);
+    return ASN1_STRING_set(x, d, len);
 }
diff --git a/crypto/asn1/a_set.c b/crypto/asn1/a_set.c
deleted file mode 100644
index 453100b..0000000
--- a/crypto/asn1/a_set.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/* crypto/asn1/a_set.c */
-/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay at cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh at cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay at cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh at cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/asn1_mac.h>
-
-#ifndef NO_ASN1_OLD
-
-typedef struct {
-    unsigned char *pbData;
-    int cbData;
-} MYBLOB;
-
-/*
- * SetBlobCmp This function compares two elements of SET_OF block
- */
-static int SetBlobCmp(const void *elem1, const void *elem2)
-{
-    const MYBLOB *b1 = (const MYBLOB *)elem1;
-    const MYBLOB *b2 = (const MYBLOB *)elem2;
-    int r;
-
-    r = memcmp(b1->pbData, b2->pbData,
-               b1->cbData < b2->cbData ? b1->cbData : b2->cbData);
-    if (r != 0)
-        return r;
-    return b1->cbData - b2->cbData;
-}
-
-/*
- * int is_set: if TRUE, then sort the contents (i.e. it isn't a SEQUENCE)
- */
-int i2d_ASN1_SET(STACK_OF(OPENSSL_BLOCK) *a, unsigned char **pp,
-                 i2d_of_void *i2d, int ex_tag, int ex_class, int is_set)
-{
-    int ret = 0, r;
-    int i;
-    unsigned char *p;
-    unsigned char *pStart, *pTempMem;
-    MYBLOB *rgSetBlob;
-    int totSize;
-
-    if (a == NULL)
-        return (0);
-    for (i = sk_OPENSSL_BLOCK_num(a) - 1; i >= 0; i--)
-        ret += i2d(sk_OPENSSL_BLOCK_value(a, i), NULL);
-    r = ASN1_object_size(1, ret, ex_tag);
-    if (pp == NULL)
-        return (r);
-
-    p = *pp;
-    ASN1_put_object(&p, 1, ret, ex_tag, ex_class);
-
-/* Modified by gp at nsj.co.jp */
-    /* And then again by Ben */
-    /* And again by Steve */
-
-    if (!is_set || (sk_OPENSSL_BLOCK_num(a) < 2)) {
-        for (i = 0; i < sk_OPENSSL_BLOCK_num(a); i++)
-            i2d(sk_OPENSSL_BLOCK_value(a, i), &p);
-
-        *pp = p;
-        return (r);
-    }
-
-    pStart = p;                 /* Catch the beg of Setblobs */
-    /* In this array we will store the SET blobs */
-    rgSetBlob = OPENSSL_malloc(sk_OPENSSL_BLOCK_num(a) * sizeof(MYBLOB));
-    if (rgSetBlob == NULL) {
-        ASN1err(ASN1_F_I2D_ASN1_SET, ERR_R_MALLOC_FAILURE);
-        return (0);
-    }
-
-    for (i = 0; i < sk_OPENSSL_BLOCK_num(a); i++) {
-        rgSetBlob[i].pbData = p; /* catch each set encode blob */
-        i2d(sk_OPENSSL_BLOCK_value(a, i), &p);
-        rgSetBlob[i].cbData = p - rgSetBlob[i].pbData; /* Length of this
-                                                        * SetBlob */
-    }
-    *pp = p;
-    totSize = p - pStart;       /* This is the total size of all set blobs */
-
-    /*
-     * Now we have to sort the blobs. I am using a simple algo. *Sort ptrs
-     * *Copy to temp-mem *Copy from temp-mem to user-mem
-     */
-    qsort(rgSetBlob, sk_OPENSSL_BLOCK_num(a), sizeof(MYBLOB), SetBlobCmp);
-    if (!(pTempMem = OPENSSL_malloc(totSize))) {
-        OPENSSL_free(rgSetBlob);
-        ASN1err(ASN1_F_I2D_ASN1_SET, ERR_R_MALLOC_FAILURE);
-        return (0);
-    }
-
-/* Copy to temp mem */
-    p = pTempMem;
-    for (i = 0; i < sk_OPENSSL_BLOCK_num(a); ++i) {
-        memcpy(p, rgSetBlob[i].pbData, rgSetBlob[i].cbData);
-        p += rgSetBlob[i].cbData;
-    }
-
-/* Copy back to user mem*/
-    memcpy(pStart, pTempMem, totSize);
-    OPENSSL_free(pTempMem);
-    OPENSSL_free(rgSetBlob);
-
-    return (r);
-}
-
-STACK_OF(OPENSSL_BLOCK) *d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a,
-                                      const unsigned char **pp,
-                                      long length, d2i_of_void *d2i,
-                                      void (*free_func) (OPENSSL_BLOCK),
-                                      int ex_tag, int ex_class)
-{
-    ASN1_const_CTX c;
-    STACK_OF(OPENSSL_BLOCK) *ret = NULL;
-
-    if ((a == NULL) || ((*a) == NULL)) {
-        if ((ret = sk_OPENSSL_BLOCK_new_null()) == NULL) {
-            ASN1err(ASN1_F_D2I_ASN1_SET, ERR_R_MALLOC_FAILURE);
-            goto err;
-        }
-    } else
-        ret = (*a);
-
-    c.p = *pp;
-    c.max = (length == 0) ? 0 : (c.p + length);
-
-    c.inf = ASN1_get_object(&c.p, &c.slen, &c.tag, &c.xclass, c.max - c.p);
-    if (c.inf & 0x80)
-        goto err;
-    if (ex_class != c.xclass) {
-        ASN1err(ASN1_F_D2I_ASN1_SET, ASN1_R_BAD_CLASS);
-        goto err;
-    }
-    if (ex_tag != c.tag) {
-        ASN1err(ASN1_F_D2I_ASN1_SET, ASN1_R_BAD_TAG);
-        goto err;
-    }
-    if ((c.slen + c.p) > c.max) {
-        ASN1err(ASN1_F_D2I_ASN1_SET, ASN1_R_LENGTH_ERROR);
-        goto err;
-    }
-    /*
-     * check for infinite constructed - it can be as long as the amount of
-     * data passed to us
-     */
-    if (c.inf == (V_ASN1_CONSTRUCTED + 1))
-        c.slen = length + *pp - c.p;
-    c.max = c.p + c.slen;
-
-    while (c.p < c.max) {
-        char *s;
-
-        if (M_ASN1_D2I_end_sequence())
-            break;
-        /*
-         * XXX: This was called with 4 arguments, incorrectly, it seems if
-         * ((s=func(NULL,&c.p,c.slen,c.max-c.p)) == NULL)
-         */
-        if ((s = d2i(NULL, &c.p, c.slen)) == NULL) {
-            ASN1err(ASN1_F_D2I_ASN1_SET, ASN1_R_ERROR_PARSING_SET_ELEMENT);
-            asn1_add_error(*pp, (int)(c.p - *pp));
-            goto err;
-        }
-        if (!sk_OPENSSL_BLOCK_push(ret, s))
-            goto err;
-    }
-    if (a != NULL)
-        (*a) = ret;
-    *pp = c.p;
-    return (ret);
- err:
-    if ((ret != NULL) && ((a == NULL) || (*a != ret))) {
-        if (free_func != NULL)
-            sk_OPENSSL_BLOCK_pop_free(ret, free_func);
-        else
-            sk_OPENSSL_BLOCK_free(ret);
-    }
-    return (NULL);
-}
-
-#endif
diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c
index e56cbbc..2dac3b5 100644
--- a/crypto/asn1/a_utctm.c
+++ b/crypto/asn1/a_utctm.c
@@ -194,7 +194,7 @@ ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
 
     if (s == NULL) {
         free_s = 1;
-        s = M_ASN1_UTCTIME_new();
+        s = ASN1_UTCTIME_new();
     }
     if (s == NULL)
         goto err;
@@ -234,7 +234,7 @@ ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
     return (s);
  err:
     if (free_s && s)
-        M_ASN1_UTCTIME_free(s);
+        ASN1_UTCTIME_free(s);
     return NULL;
 }
 
diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 66e1fac..392143c 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -572,50 +572,6 @@ typedef struct BIT_STRING_BITNAME_st {
     const char *sname;
 } BIT_STRING_BITNAME;
 
-# define M_ASN1_STRING_length(x) ((x)->length)
-# define M_ASN1_STRING_length_set(x, n)  ((x)->length = (n))
-# define M_ASN1_STRING_type(x)   ((x)->type)
-# define M_ASN1_STRING_data(x)   ((x)->data)
-
-/* Macros for string operations */
-# define M_ASN1_BIT_STRING_new() (ASN1_BIT_STRING *)\
-                ASN1_STRING_type_new(V_ASN1_BIT_STRING)
-# define M_ASN1_BIT_STRING_free(a)       ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_BIT_STRING_dup(a) (ASN1_BIT_STRING *)\
-                ASN1_STRING_dup((const ASN1_STRING *)a)
-# define M_ASN1_BIT_STRING_cmp(a,b) ASN1_STRING_cmp(\
-                (const ASN1_STRING *)a,(const ASN1_STRING *)b)
-# define M_ASN1_BIT_STRING_set(a,b,c) ASN1_STRING_set((ASN1_STRING *)a,b,c)
-
-# define M_ASN1_INTEGER_new()    (ASN1_INTEGER *)\
-                ASN1_STRING_type_new(V_ASN1_INTEGER)
-# define M_ASN1_INTEGER_free(a)          ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_INTEGER_dup(a) (ASN1_INTEGER *)\
-                ASN1_STRING_dup((const ASN1_STRING *)a)
-# define M_ASN1_INTEGER_cmp(a,b) ASN1_STRING_cmp(\
-                (const ASN1_STRING *)a,(const ASN1_STRING *)b)
-
-# define M_ASN1_ENUMERATED_new() (ASN1_ENUMERATED *)\
-                ASN1_STRING_type_new(V_ASN1_ENUMERATED)
-# define M_ASN1_ENUMERATED_free(a)       ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_ENUMERATED_dup(a) (ASN1_ENUMERATED *)\
-                ASN1_STRING_dup((const ASN1_STRING *)a)
-# define M_ASN1_ENUMERATED_cmp(a,b)      ASN1_STRING_cmp(\
-                (const ASN1_STRING *)a,(const ASN1_STRING *)b)
-
-# define M_ASN1_OCTET_STRING_new()       (ASN1_OCTET_STRING *)\
-                ASN1_STRING_type_new(V_ASN1_OCTET_STRING)
-# define M_ASN1_OCTET_STRING_free(a)     ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_OCTET_STRING_dup(a) (ASN1_OCTET_STRING *)\
-                ASN1_STRING_dup((const ASN1_STRING *)a)
-# define M_ASN1_OCTET_STRING_cmp(a,b) ASN1_STRING_cmp(\
-                (const ASN1_STRING *)a,(const ASN1_STRING *)b)
-# define M_ASN1_OCTET_STRING_set(a,b,c)  ASN1_STRING_set((ASN1_STRING *)a,b,c)
-# define M_ASN1_OCTET_STRING_print(a,b)  ASN1_STRING_print(a,(ASN1_STRING *)b)
-# define M_i2d_ASN1_OCTET_STRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_OCTET_STRING,\
-                V_ASN1_UNIVERSAL)
-
 # define B_ASN1_TIME \
                         B_ASN1_UTCTIME | \
                         B_ASN1_GENERALIZEDTIME
@@ -645,134 +601,6 @@ typedef struct BIT_STRING_BITNAME_st {
                         B_ASN1_BMPSTRING|\
                         B_ASN1_UTF8STRING
 
-# define M_ASN1_PRINTABLE_new()  ASN1_STRING_type_new(V_ASN1_T61STRING)
-# define M_ASN1_PRINTABLE_free(a)        ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_PRINTABLE(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
-                pp,a->type,V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_PRINTABLE(a,pp,l) \
-                d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
-                        B_ASN1_PRINTABLE)
-
-# define M_DIRECTORYSTRING_new() ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)
-# define M_DIRECTORYSTRING_free(a)       ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_DIRECTORYSTRING(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
-                                                pp,a->type,V_ASN1_UNIVERSAL)
-# define M_d2i_DIRECTORYSTRING(a,pp,l) \
-                d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
-                        B_ASN1_DIRECTORYSTRING)
-
-# define M_DISPLAYTEXT_new() ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)
-# define M_DISPLAYTEXT_free(a) ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_DISPLAYTEXT(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
-                                                pp,a->type,V_ASN1_UNIVERSAL)
-# define M_d2i_DISPLAYTEXT(a,pp,l) \
-                d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
-                        B_ASN1_DISPLAYTEXT)
-
-# define M_ASN1_PRINTABLESTRING_new() (ASN1_PRINTABLESTRING *)\
-                ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)
-# define M_ASN1_PRINTABLESTRING_free(a)  ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_PRINTABLESTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_PRINTABLESTRING,\
-                V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_PRINTABLESTRING(a,pp,l) \
-                (ASN1_PRINTABLESTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_PRINTABLESTRING)
-
-# define M_ASN1_T61STRING_new()  (ASN1_T61STRING *)\
-                ASN1_STRING_type_new(V_ASN1_T61STRING)
-# define M_ASN1_T61STRING_free(a)        ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_T61STRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_T61STRING,\
-                V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_T61STRING(a,pp,l) \
-                (ASN1_T61STRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_T61STRING)
-
-# define M_ASN1_IA5STRING_new()  (ASN1_IA5STRING *)\
-                ASN1_STRING_type_new(V_ASN1_IA5STRING)
-# define M_ASN1_IA5STRING_free(a)        ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_IA5STRING_dup(a) \
-                (ASN1_IA5STRING *)ASN1_STRING_dup((const ASN1_STRING *)a)
-# define M_i2d_ASN1_IA5STRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_IA5STRING,\
-                        V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_IA5STRING(a,pp,l) \
-                (ASN1_IA5STRING *)d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l,\
-                        B_ASN1_IA5STRING)
-
-# define M_ASN1_UTCTIME_new()    (ASN1_UTCTIME *)\
-                ASN1_STRING_type_new(V_ASN1_UTCTIME)
-# define M_ASN1_UTCTIME_free(a)  ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_UTCTIME_dup(a) (ASN1_UTCTIME *)\
-                ASN1_STRING_dup((const ASN1_STRING *)a)
-
-# define M_ASN1_GENERALIZEDTIME_new()    (ASN1_GENERALIZEDTIME *)\
-                ASN1_STRING_type_new(V_ASN1_GENERALIZEDTIME)
-# define M_ASN1_GENERALIZEDTIME_free(a)  ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_GENERALIZEDTIME_dup(a) (ASN1_GENERALIZEDTIME *)ASN1_STRING_dup(\
-        (const ASN1_STRING *)a)
-
-# define M_ASN1_TIME_new()       (ASN1_TIME *)\
-                ASN1_STRING_type_new(V_ASN1_UTCTIME)
-# define M_ASN1_TIME_free(a)     ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_TIME_dup(a) (ASN1_TIME *)\
-        ASN1_STRING_dup((const ASN1_STRING *)a)
-
-# define M_ASN1_GENERALSTRING_new()      (ASN1_GENERALSTRING *)\
-                ASN1_STRING_type_new(V_ASN1_GENERALSTRING)
-# define M_ASN1_GENERALSTRING_free(a)    ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_GENERALSTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_GENERALSTRING,\
-                        V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_GENERALSTRING(a,pp,l) \
-                (ASN1_GENERALSTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_GENERALSTRING)
-
-# define M_ASN1_UNIVERSALSTRING_new()    (ASN1_UNIVERSALSTRING *)\
-                ASN1_STRING_type_new(V_ASN1_UNIVERSALSTRING)
-# define M_ASN1_UNIVERSALSTRING_free(a)  ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_UNIVERSALSTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UNIVERSALSTRING,\
-                        V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_UNIVERSALSTRING(a,pp,l) \
-                (ASN1_UNIVERSALSTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_UNIVERSALSTRING)
-
-# define M_ASN1_BMPSTRING_new()  (ASN1_BMPSTRING *)\
-                ASN1_STRING_type_new(V_ASN1_BMPSTRING)
-# define M_ASN1_BMPSTRING_free(a)        ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_BMPSTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_BMPSTRING,\
-                        V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_BMPSTRING(a,pp,l) \
-                (ASN1_BMPSTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_BMPSTRING)
-
-# define M_ASN1_VISIBLESTRING_new()      (ASN1_VISIBLESTRING *)\
-                ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)
-# define M_ASN1_VISIBLESTRING_free(a)    ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_VISIBLESTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_VISIBLESTRING,\
-                        V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_VISIBLESTRING(a,pp,l) \
-                (ASN1_VISIBLESTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_VISIBLESTRING)
-
-# define M_ASN1_UTF8STRING_new() (ASN1_UTF8STRING *)\
-                ASN1_STRING_type_new(V_ASN1_UTF8STRING)
-# define M_ASN1_UTF8STRING_free(a)       ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_UTF8STRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UTF8STRING,\
-                        V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_UTF8STRING(a,pp,l) \
-                (ASN1_UTF8STRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_UTF8STRING)
-
-  /* for the is_set parameter to i2d_ASN1_SET */
-# define IS_SEQUENCE     0
-# define IS_SET          1
-
 DECLARE_ASN1_FUNCTIONS_fname(ASN1_TYPE, ASN1_ANY, ASN1_TYPE)
 
 int ASN1_TYPE_get(ASN1_TYPE *a);
@@ -826,9 +654,6 @@ int ASN1_BIT_STRING_num_asc(char *name, BIT_STRING_BITNAME *tbl);
 int ASN1_BIT_STRING_set_asc(ASN1_BIT_STRING *bs, char *name, int value,
                             BIT_STRING_BITNAME *tbl);
 
-int i2d_ASN1_BOOLEAN(int a, unsigned char **pp);
-int d2i_ASN1_BOOLEAN(int *a, const unsigned char **pp, long length);
-
 DECLARE_ASN1_FUNCTIONS(ASN1_INTEGER)
 int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp);
 ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,
@@ -895,14 +720,6 @@ ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZE
                                                    **out);
 int ASN1_TIME_set_string(ASN1_TIME *s, const char *str);
 
-int i2d_ASN1_SET(STACK_OF(OPENSSL_BLOCK) *a, unsigned char **pp,
-                 i2d_of_void *i2d, int ex_tag, int ex_class, int is_set);
-STACK_OF(OPENSSL_BLOCK) *d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a,
-                                      const unsigned char **pp,
-                                      long length, d2i_of_void *d2i,
-                                      void (*free_func) (OPENSSL_BLOCK),
-                                      int ex_tag, int ex_class);
-
 int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a);
 int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size);
 int i2a_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *a);
diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index 1586aaf..fe63b62 100644
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c
@@ -460,21 +460,20 @@ void asn1_add_error(const unsigned char *address, int offset)
 
 int ASN1_STRING_length(const ASN1_STRING *x)
 {
-    return M_ASN1_STRING_length(x);
+    return x->length;
 }
 
 void ASN1_STRING_length_set(ASN1_STRING *x, int len)
 {
-    M_ASN1_STRING_length_set(x, len);
-    return;
+    x->length = len;
 }
 
 int ASN1_STRING_type(ASN1_STRING *x)
 {
-    return M_ASN1_STRING_type(x);
+    return x->type;
 }
 
 unsigned char *ASN1_STRING_data(ASN1_STRING *x)
 {
-    return M_ASN1_STRING_data(x);
+    return x->data;
 }
diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c
index b12edf9..20f3a88 100644
--- a/crypto/asn1/asn1_par.c
+++ b/crypto/asn1/asn1_par.c
@@ -215,15 +215,11 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
                         goto end;
                 }
             } else if (tag == V_ASN1_BOOLEAN) {
-                int ii;
-
-                opp = op;
-                ii = d2i_ASN1_BOOLEAN(NULL, &opp, len + hl);
-                if (ii < 0) {
+                if (len != 1) {
                     if (BIO_write(bp, "Bad boolean\n", 12) <= 0)
                         goto end;
                 }
-                BIO_printf(bp, ":%d", ii);
+                BIO_printf(bp, ":%u", p[0]);
             } else if (tag == V_ASN1_BMPSTRING) {
                 /* do the BMP thang */
             } else if (tag == V_ASN1_OCTET_STRING) {
@@ -281,7 +277,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
                     }
                 }
                 if (os != NULL) {
-                    M_ASN1_OCTET_STRING_free(os);
+                    ASN1_OCTET_STRING_free(os);
                     os = NULL;
                 }
             } else if (tag == V_ASN1_INTEGER) {
@@ -308,7 +304,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
                     if (BIO_write(bp, "BAD INTEGER", 11) <= 0)
                         goto end;
                 }
-                M_ASN1_INTEGER_free(bs);
+                ASN1_INTEGER_free(bs);
             } else if (tag == V_ASN1_ENUMERATED) {
                 ASN1_ENUMERATED *bs;
                 int i;
@@ -333,7 +329,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
                     if (BIO_write(bp, "BAD ENUMERATED", 14) <= 0)
                         goto end;
                 }
-                M_ASN1_ENUMERATED_free(bs);
+                ASN1_ENUMERATED_free(bs);
             } else if (len > 0 && dump) {
                 if (!nl) {
                     if (BIO_write(bp, "\n", 1) <= 0)
@@ -363,7 +359,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
     if (o != NULL)
         ASN1_OBJECT_free(o);
     if (os != NULL)
-        M_ASN1_OCTET_STRING_free(os);
+        ASN1_OCTET_STRING_free(os);
     *pp = p;
     return (ret);
 }
diff --git a/crypto/asn1/asn_pack.c b/crypto/asn1/asn_pack.c
index 366caf0..8d0f0b0 100644
--- a/crypto/asn1/asn_pack.c
+++ b/crypto/asn1/asn_pack.c
@@ -61,108 +61,8 @@
 #include "cryptlib.h"
 #include <openssl/asn1.h>
 
-#ifndef NO_ASN1_OLD
-
 /* ASN1 packing and unpacking functions */
 
-/* Turn an ASN1 encoded SEQUENCE OF into a STACK of structures */
-
-STACK_OF(OPENSSL_BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,
-                                         d2i_of_void *d2i,
-                                         void (*free_func) (OPENSSL_BLOCK))
-{
-    STACK_OF(OPENSSL_BLOCK) *sk;
-    const unsigned char *pbuf;
-    pbuf = buf;
-    if (!(sk = d2i_ASN1_SET(NULL, &pbuf, len, d2i, free_func,
-                            V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL)))
-        ASN1err(ASN1_F_ASN1_SEQ_UNPACK, ASN1_R_DECODE_ERROR);
-    return sk;
-}
-
-/*
- * Turn a STACK structures into an ASN1 encoded SEQUENCE OF structure in a
- * OPENSSL_malloc'ed buffer
- */
-
-unsigned char *ASN1_seq_pack(STACK_OF(OPENSSL_BLOCK) *safes, i2d_of_void *i2d,
-                             unsigned char **buf, int *len)
-{
-    int safelen;
-    unsigned char *safe, *p;
-    if (!(safelen = i2d_ASN1_SET(safes, NULL, i2d, V_ASN1_SEQUENCE,
-                                 V_ASN1_UNIVERSAL, IS_SEQUENCE))) {
-        ASN1err(ASN1_F_ASN1_SEQ_PACK, ASN1_R_ENCODE_ERROR);
-        return NULL;
-    }
-    if (!(safe = OPENSSL_malloc(safelen))) {
-        ASN1err(ASN1_F_ASN1_SEQ_PACK, ERR_R_MALLOC_FAILURE);
-        return NULL;
-    }
-    p = safe;
-    i2d_ASN1_SET(safes, &p, i2d, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL,
-                 IS_SEQUENCE);
-    if (len)
-        *len = safelen;
-    if (buf)
-        *buf = safe;
-    return safe;
-}
-
-/* Extract an ASN1 object from an ASN1_STRING */
-
-void *ASN1_unpack_string(ASN1_STRING *oct, d2i_of_void *d2i)
-{
-    const unsigned char *p;
-    char *ret;
-
-    p = oct->data;
-    if (!(ret = d2i(NULL, &p, oct->length)))
-        ASN1err(ASN1_F_ASN1_UNPACK_STRING, ASN1_R_DECODE_ERROR);
-    return ret;
-}
-
-/* Pack an ASN1 object into an ASN1_STRING */
-
-ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d, ASN1_STRING **oct)
-{
-    unsigned char *p;
-    ASN1_STRING *octmp;
-
-    if (!oct || !*oct) {
-        if (!(octmp = ASN1_STRING_new())) {
-            ASN1err(ASN1_F_ASN1_PACK_STRING, ERR_R_MALLOC_FAILURE);
-            return NULL;
-        }
-        if (oct)
-            *oct = octmp;
-    } else
-        octmp = *oct;
-
-    if (!(octmp->length = i2d(obj, NULL))) {
-        ASN1err(ASN1_F_ASN1_PACK_STRING, ASN1_R_ENCODE_ERROR);
-        goto err;
-    }
-    if (!(p = OPENSSL_malloc(octmp->length))) {
-        ASN1err(ASN1_F_ASN1_PACK_STRING, ERR_R_MALLOC_FAILURE);
-        goto err;
-    }
-    octmp->data = p;
-    i2d(obj, &p);
-    return octmp;
- err:
-    if (!oct || !*oct) {
-        ASN1_STRING_free(octmp);
-        if (oct)
-            *oct = NULL;
-    }
-    return NULL;
-}
-
-#endif
-
-/* ASN1_ITEM versions of the above */
-
 ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_STRING **oct)
 {
     ASN1_STRING *octmp;
diff --git a/crypto/asn1/evp_asn1.c b/crypto/asn1/evp_asn1.c
index 5876afa..3664576 100644
--- a/crypto/asn1/evp_asn1.c
+++ b/crypto/asn1/evp_asn1.c
@@ -65,10 +65,10 @@ int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len)
 {
     ASN1_STRING *os;
 
-    if ((os = M_ASN1_OCTET_STRING_new()) == NULL)
+    if ((os = ASN1_OCTET_STRING_new()) == NULL)
         return (0);
-    if (!M_ASN1_OCTET_STRING_set(os, data, len)) {
-        M_ASN1_OCTET_STRING_free(os);
+    if (!ASN1_OCTET_STRING_set(os, data, len)) {
+        ASN1_OCTET_STRING_free(os);
         return 0;
     }
     ASN1_TYPE_set(a, V_ASN1_OCTET_STRING, os);
@@ -85,8 +85,8 @@ int ASN1_TYPE_get_octetstring(ASN1_TYPE *a, unsigned char *data, int max_len)
         ASN1err(ASN1_F_ASN1_TYPE_GET_OCTETSTRING, ASN1_R_DATA_IS_WRONG);
         return (-1);
     }
-    p = M_ASN1_STRING_data(a->value.octet_string);
-    ret = M_ASN1_STRING_length(a->value.octet_string);
+    p = ASN1_STRING_data(a->value.octet_string);
+    ret = ASN1_STRING_length(a->value.octet_string);
     if (ret < max_len)
         num = ret;
     else
@@ -111,7 +111,7 @@ int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, unsigned char *data,
     os.length = len;
     ASN1_INTEGER_set(&in, num);
     n = i2d_ASN1_INTEGER(&in, NULL);
-    n += M_i2d_ASN1_OCTET_STRING(&os, NULL);
+    n += i2d_ASN1_OCTET_STRING(&os, NULL);
 
     size = ASN1_object_size(1, n, V_ASN1_SEQUENCE);
 
@@ -123,12 +123,12 @@ int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, unsigned char *data,
         return (0);
     }
 
-    M_ASN1_STRING_length_set(osp, size);
-    p = M_ASN1_STRING_data(osp);
+    ASN1_STRING_length_set(osp, size);
+    p = ASN1_STRING_data(osp);
 
     ASN1_put_object(&p, 1, n, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL);
     i2d_ASN1_INTEGER(&in, &p);
-    M_i2d_ASN1_OCTET_STRING(&os, &p);
+    i2d_ASN1_OCTET_STRING(&os, &p);
 
     ASN1_TYPE_set(a, V_ASN1_SEQUENCE, osp);
     return (1);
@@ -152,8 +152,8 @@ int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a, long *num,
     if ((a->type != V_ASN1_SEQUENCE) || (a->value.sequence == NULL)) {
         goto err;
     }
-    p = M_ASN1_STRING_data(a->value.sequence);
-    length = M_ASN1_STRING_length(a->value.sequence);
+    p = ASN1_STRING_data(a->value.sequence);
+    length = ASN1_STRING_length(a->value.sequence);
 
     c.pp = &p;
     c.p = p;
@@ -175,21 +175,21 @@ int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a, long *num,
     if (num != NULL)
         *num = ASN1_INTEGER_get(ai);
 
-    ret = M_ASN1_STRING_length(os);
+    ret = ASN1_STRING_length(os);
     if (max_len > ret)
         n = ret;
     else
         n = max_len;
 
     if (data != NULL)
-        memcpy(data, M_ASN1_STRING_data(os), n);
+        memcpy(data, ASN1_STRING_data(os), n);
     if (0) {
  err:
         ASN1err(ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING, ASN1_R_DATA_IS_WRONG);
     }
     if (os != NULL)
-        M_ASN1_OCTET_STRING_free(os);
+        ASN1_OCTET_STRING_free(os);
     if (ai != NULL)
-        M_ASN1_INTEGER_free(ai);
+        ASN1_INTEGER_free(ai);
     return (ret);
 }
diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c
index 73ba4a3..c56d850 100644
--- a/crypto/asn1/p5_pbev2.c
+++ b/crypto/asn1/p5_pbev2.c
@@ -210,7 +210,7 @@ X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen,
 
     if (!(kdf = PBKDF2PARAM_new()))
         goto merr;
-    if (!(osalt = M_ASN1_OCTET_STRING_new()))
+    if (!(osalt = ASN1_OCTET_STRING_new()))
         goto merr;
 
     kdf->salt->value.octet_string = osalt;
@@ -237,7 +237,7 @@ X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen,
     /* If have a key len set it up */
 
     if (keylen > 0) {
-        if (!(kdf->keylength = M_ASN1_INTEGER_new()))
+        if (!(kdf->keylength = ASN1_INTEGER_new()))
             goto merr;
         if (!ASN1_INTEGER_set(kdf->keylength, keylen))
             goto merr;
diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c
index 2a88958..bd76950 100644
--- a/crypto/asn1/t_req.c
+++ b/crypto/asn1/t_req.c
@@ -216,7 +216,7 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags,
                     goto err;
                 if (!X509V3_EXT_print(bp, ex, cflag, 16)) {
                     BIO_printf(bp, "%16s", "");
-                    M_ASN1_OCTET_STRING_print(bp, ex->value);
+                    ASN1_STRING_print(bp, ex->value);
                 }
                 if (BIO_write(bp, "\n", 1) <= 0)
                     goto err;
diff --git a/crypto/asn1/x_pkey.c b/crypto/asn1/x_pkey.c
index 2da23e4..cf5fd80 100644
--- a/crypto/asn1/x_pkey.c
+++ b/crypto/asn1/x_pkey.c
@@ -109,7 +109,7 @@ X509_PKEY *X509_PKEY_new(void)
     M_ASN1_New_Malloc(ret, X509_PKEY);
     ret->version = 0;
     M_ASN1_New(ret->enc_algor, X509_ALGOR_new);
-    M_ASN1_New(ret->enc_pkey, M_ASN1_OCTET_STRING_new);
+    M_ASN1_New(ret->enc_pkey, ASN1_OCTET_STRING_new);
     ret->dec_pkey = NULL;
     ret->key_length = 0;
     ret->key_data = NULL;
@@ -144,7 +144,7 @@ void X509_PKEY_free(X509_PKEY *x)
     if (x->enc_algor != NULL)
         X509_ALGOR_free(x->enc_algor);
     if (x->enc_pkey != NULL)
-        M_ASN1_OCTET_STRING_free(x->enc_pkey);
+        ASN1_OCTET_STRING_free(x->enc_pkey);
     if (x->dec_pkey != NULL)
         EVP_PKEY_free(x->dec_pkey);
     if ((x->key_data != NULL) && (x->key_free))
diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index b4b0e9f..87cc334 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -499,8 +499,8 @@ static int ec_asn1_group2curve(const EC_GROUP *group, X9_62_CURVE *curve)
     }
 
     /* set a and b */
-    if (!M_ASN1_OCTET_STRING_set(curve->a, a_buf, len_1) ||
-        !M_ASN1_OCTET_STRING_set(curve->b, b_buf, len_2)) {
+    if (!ASN1_OCTET_STRING_set(curve->a, a_buf, len_1) ||
+        !ASN1_OCTET_STRING_set(curve->b, b_buf, len_2)) {
         ECerr(EC_F_EC_ASN1_GROUP2CURVE, ERR_R_ASN1_LIB);
         goto err;
     }
@@ -1044,8 +1044,8 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
     ret->version = priv_key->version;
 
     if (priv_key->privateKey) {
-        ret->priv_key = BN_bin2bn(M_ASN1_STRING_data(priv_key->privateKey),
-                                  M_ASN1_STRING_length(priv_key->privateKey),
+        ret->priv_key = BN_bin2bn(ASN1_STRING_data(priv_key->privateKey),
+                                  ASN1_STRING_length(priv_key->privateKey),
                                   ret->priv_key);
         if (ret->priv_key == NULL) {
             ECerr(EC_F_D2I_ECPRIVATEKEY, ERR_R_BN_LIB);
@@ -1068,8 +1068,8 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
         const unsigned char *pub_oct;
         int pub_oct_len;
 
-        pub_oct = M_ASN1_STRING_data(priv_key->publicKey);
-        pub_oct_len = M_ASN1_STRING_length(priv_key->publicKey);
+        pub_oct = ASN1_STRING_data(priv_key->publicKey);
+        pub_oct_len = ASN1_STRING_length(priv_key->publicKey);
         /*
          * The first byte - point conversion form - must be present.
          */
@@ -1142,7 +1142,7 @@ int i2d_ECPrivateKey(EC_KEY *a, unsigned char **out)
         goto err;
     }
 
-    if (!M_ASN1_OCTET_STRING_set(priv_key->privateKey, buffer, buf_len)) {
+    if (!ASN1_OCTET_STRING_set(priv_key->privateKey, buffer, buf_len)) {
         ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_ASN1_LIB);
         goto err;
     }
@@ -1157,7 +1157,7 @@ int i2d_ECPrivateKey(EC_KEY *a, unsigned char **out)
     }
 
     if (!(a->enc_flag & EC_PKEY_NO_PUBKEY)) {
-        priv_key->publicKey = M_ASN1_BIT_STRING_new();
+        priv_key->publicKey = ASN1_BIT_STRING_new();
         if (priv_key->publicKey == NULL) {
             ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_MALLOC_FAILURE);
             goto err;
@@ -1184,7 +1184,7 @@ int i2d_ECPrivateKey(EC_KEY *a, unsigned char **out)
 
         priv_key->publicKey->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT | 0x07);
         priv_key->publicKey->flags |= ASN1_STRING_FLAG_BITS_LEFT;
-        if (!M_ASN1_BIT_STRING_set(priv_key->publicKey, buffer, buf_len)) {
+        if (!ASN1_BIT_STRING_set(priv_key->publicKey, buffer, buf_len)) {
             ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_ASN1_LIB);
             goto err;
         }
diff --git a/crypto/ocsp/v3_ocsp.c b/crypto/ocsp/v3_ocsp.c
index 006db17..6558116 100644
--- a/crypto/ocsp/v3_ocsp.c
+++ b/crypto/ocsp/v3_ocsp.c
@@ -248,14 +248,14 @@ static void *d2i_ocsp_nonce(void *a, const unsigned char **pp, long length)
 
  err:
     if (os && (!pos || (*pos != os)))
-        M_ASN1_OCTET_STRING_free(os);
+        ASN1_OCTET_STRING_free(os);
     OCSPerr(OCSP_F_D2I_OCSP_NONCE, ERR_R_MALLOC_FAILURE);
     return NULL;
 }
 
 static void ocsp_nonce_free(void *a)
 {
-    M_ASN1_OCTET_STRING_free(a);
+    ASN1_OCTET_STRING_free(a);
 }
 
 static int i2r_ocsp_nonce(const X509V3_EXT_METHOD *method, void *nonce,
diff --git a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c
index 982805d..51ea42a 100644
--- a/crypto/pkcs12/p12_add.c
+++ b/crypto/pkcs12/p12_add.c
@@ -142,7 +142,7 @@ PKCS7 *PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk)
         return NULL;
     }
     p7->type = OBJ_nid2obj(NID_pkcs7_data);
-    if (!(p7->d.data = M_ASN1_OCTET_STRING_new())) {
+    if (!(p7->d.data = ASN1_OCTET_STRING_new())) {
         PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA, ERR_R_MALLOC_FAILURE);
         return NULL;
     }
@@ -197,7 +197,7 @@ PKCS7 *PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
     }
     X509_ALGOR_free(p7->d.encrypted->enc_data->algorithm);
     p7->d.encrypted->enc_data->algorithm = pbe;
-    M_ASN1_OCTET_STRING_free(p7->d.encrypted->enc_data->enc_data);
+    ASN1_OCTET_STRING_free(p7->d.encrypted->enc_data->enc_data);
     if (!(p7->d.encrypted->enc_data->enc_data =
           PKCS12_item_i2d_encrypt(pbe, ASN1_ITEM_rptr(PKCS12_SAFEBAGS), pass,
                                   passlen, bags, 1))) {
diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c
index 6780b4f..7a9d3ca 100644
--- a/crypto/pkcs12/p12_decr.c
+++ b/crypto/pkcs12/p12_decr.c
@@ -174,7 +174,7 @@ ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor,
     ASN1_OCTET_STRING *oct = NULL;
     unsigned char *in = NULL;
     int inlen;
-    if (!(oct = M_ASN1_OCTET_STRING_new())) {
+    if (!(oct = ASN1_OCTET_STRING_new())) {
         PKCS12err(PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT, ERR_R_MALLOC_FAILURE);
         goto err;
     }
diff --git a/crypto/pkcs12/p12_init.c b/crypto/pkcs12/p12_init.c
index 0322df9..34710e9 100644
--- a/crypto/pkcs12/p12_init.c
+++ b/crypto/pkcs12/p12_init.c
@@ -74,7 +74,7 @@ PKCS12 *PKCS12_init(int mode)
     pkcs12->authsafes->type = OBJ_nid2obj(mode);
     switch (mode) {
     case NID_pkcs7_data:
-        if (!(pkcs12->authsafes->d.data = M_ASN1_OCTET_STRING_new())) {
+        if (!(pkcs12->authsafes->d.data = ASN1_OCTET_STRING_new())) {
             PKCS12err(PKCS12_F_PKCS12_INIT, ERR_R_MALLOC_FAILURE);
             goto err;
         }
diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c
index 4138a4d..d5eb8ff 100644
--- a/crypto/pkcs12/p12_mutl.c
+++ b/crypto/pkcs12/p12_mutl.c
@@ -146,7 +146,7 @@ int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
         PKCS12err(PKCS12_F_PKCS12_SET_MAC, PKCS12_R_MAC_GENERATION_ERROR);
         return 0;
     }
-    if (!(M_ASN1_OCTET_STRING_set(p12->mac->dinfo->digest, mac, maclen))) {
+    if (!(ASN1_OCTET_STRING_set(p12->mac->dinfo->digest, mac, maclen))) {
         PKCS12err(PKCS12_F_PKCS12_SET_MAC, PKCS12_R_MAC_STRING_SET_ERROR);
         return 0;
     }
@@ -160,7 +160,7 @@ int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
     if (!(p12->mac = PKCS12_MAC_DATA_new()))
         return PKCS12_ERROR;
     if (iter > 1) {
-        if (!(p12->mac->iter = M_ASN1_INTEGER_new())) {
+        if (!(p12->mac->iter = ASN1_INTEGER_new())) {
             PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE);
             return 0;
         }
diff --git a/crypto/pkcs12/p12_p8e.c b/crypto/pkcs12/p12_p8e.c
index 861a087..0275742 100644
--- a/crypto/pkcs12/p12_p8e.c
+++ b/crypto/pkcs12/p12_p8e.c
@@ -88,7 +88,7 @@ X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher,
     }
     X509_ALGOR_free(p8->algor);
     p8->algor = pbe;
-    M_ASN1_OCTET_STRING_free(p8->digest);
+    ASN1_OCTET_STRING_free(p8->digest);
     p8->digest =
         PKCS12_item_i2d_encrypt(pbe, ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO),
                                 pass, passlen, p8inf, 1);
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index 25ac2df..0200b3b 100644
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -409,7 +409,7 @@ static int pkcs7_cmp_ri(PKCS7_RECIP_INFO *ri, X509 *pcert)
                         pcert->cert_info->issuer);
     if (ret)
         return ret;
-    return M_ASN1_INTEGER_cmp(pcert->cert_info->serialNumber,
+    return ASN1_INTEGER_cmp(pcert->cert_info->serialNumber,
                               ri->issuer_and_serial->serial);
 }
 
@@ -735,7 +735,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         si_sk = p7->d.signed_and_enveloped->signer_info;
         os = p7->d.signed_and_enveloped->enc_data->enc_data;
         if (!os) {
-            os = M_ASN1_OCTET_STRING_new();
+            os = ASN1_OCTET_STRING_new();
             if (!os) {
                 PKCS7err(PKCS7_F_PKCS7_DATAFINAL, ERR_R_MALLOC_FAILURE);
                 goto err;
@@ -747,7 +747,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         /* XXXXXXXXXXXXXXXX */
         os = p7->d.enveloped->enc_data->enc_data;
         if (!os) {
-            os = M_ASN1_OCTET_STRING_new();
+            os = ASN1_OCTET_STRING_new();
             if (!os) {
                 PKCS7err(PKCS7_F_PKCS7_DATAFINAL, ERR_R_MALLOC_FAILURE);
                 goto err;
@@ -760,7 +760,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         os = PKCS7_get_octet_string(p7->d.sign->contents);
         /* If detached data then the content is excluded */
         if (PKCS7_type_is_data(p7->d.sign->contents) && p7->detached) {
-            M_ASN1_OCTET_STRING_free(os);
+            ASN1_OCTET_STRING_free(os);
             os = NULL;
             p7->d.sign->contents->d.data = NULL;
         }
@@ -770,7 +770,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         os = PKCS7_get_octet_string(p7->d.digest->contents);
         /* If detached data then the content is excluded */
         if (PKCS7_type_is_data(p7->d.digest->contents) && p7->detached) {
-            M_ASN1_OCTET_STRING_free(os);
+            ASN1_OCTET_STRING_free(os);
             os = NULL;
             p7->d.digest->contents->d.data = NULL;
         }
@@ -834,7 +834,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
             goto err;
         if (!EVP_DigestFinal_ex(mdc, md_data, &md_len))
             goto err;
-        M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
+        ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
     }
 
     if (!PKCS7_is_detached(p7)) {
diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index 0c5fcaa..511ae8c 100644
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -177,7 +177,7 @@ int PKCS7_set_type(PKCS7 *p7, int type)
         break;
     case NID_pkcs7_data:
         p7->type = obj;
-        if ((p7->d.data = M_ASN1_OCTET_STRING_new()) == NULL)
+        if ((p7->d.data = ASN1_OCTET_STRING_new()) == NULL)
             goto err;
         break;
     case NID_pkcs7_signedAndEnveloped:
@@ -368,9 +368,9 @@ int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
      * because ASN1_INTEGER_set is used to set a 'long' we will do things the
      * ugly way.
      */
-    M_ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
+    ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
     if (!(p7i->issuer_and_serial->serial =
-          M_ASN1_INTEGER_dup(X509_get_serialNumber(x509))))
+          ASN1_INTEGER_dup(X509_get_serialNumber(x509))))
         goto err;
 
     /* lets keep the pkey around for a while */
@@ -523,9 +523,9 @@ int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
                        X509_get_issuer_name(x509)))
         return 0;
 
-    M_ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
+    ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
     if (!(p7i->issuer_and_serial->serial =
-          M_ASN1_INTEGER_dup(X509_get_serialNumber(x509))))
+          ASN1_INTEGER_dup(X509_get_serialNumber(x509))))
         return 0;
 
     pkey = X509_get_pubkey(x509);
@@ -614,7 +614,7 @@ int PKCS7_stream(unsigned char ***boundary, PKCS7 *p7)
     case NID_pkcs7_signedAndEnveloped:
         os = p7->d.signed_and_enveloped->enc_data->enc_data;
         if (os == NULL) {
-            os = M_ASN1_OCTET_STRING_new();
+            os = ASN1_OCTET_STRING_new();
             p7->d.signed_and_enveloped->enc_data->enc_data = os;
         }
         break;
@@ -622,7 +622,7 @@ int PKCS7_stream(unsigned char ***boundary, PKCS7 *p7)
     case NID_pkcs7_enveloped:
         os = p7->d.enveloped->enc_data->enc_data;
         if (os == NULL) {
-            os = M_ASN1_OCTET_STRING_new();
+            os = ASN1_OCTET_STRING_new();
             p7->d.enveloped->enc_data->enc_data = os;
         }
         break;
diff --git a/crypto/rsa/rsa_saos.c b/crypto/rsa/rsa_saos.c
index e400236..6ebab3d 100644
--- a/crypto/rsa/rsa_saos.c
+++ b/crypto/rsa/rsa_saos.c
@@ -139,7 +139,7 @@ int RSA_verify_ASN1_OCTET_STRING(int dtype,
         ret = 1;
  err:
     if (sig != NULL)
-        M_ASN1_OCTET_STRING_free(sig);
+        ASN1_OCTET_STRING_free(sig);
     if (s != NULL) {
         OPENSSL_cleanse(s, (unsigned int)siglen);
         OPENSSL_free(s);
diff --git a/crypto/ts/ts_lib.c b/crypto/ts/ts_lib.c
index 089d5ea..6ec1f0c 100644
--- a/crypto/ts/ts_lib.c
+++ b/crypto/ts/ts_lib.c
@@ -115,7 +115,7 @@ int TS_ext_print_bio(BIO *bio, const STACK_OF(X509_EXTENSION) *extensions)
         BIO_printf(bio, ": %s\n", critical ? "critical" : "");
         if (!X509V3_EXT_print(bio, ex, 0, 4)) {
             BIO_printf(bio, "%4s", "");
-            M_ASN1_OCTET_STRING_print(bio, ex->value);
+            ASN1_STRING_print(bio, ex->value);
         }
         BIO_write(bio, "\n", 1);
     }
@@ -132,14 +132,14 @@ int TS_X509_ALGOR_print_bio(BIO *bio, const X509_ALGOR *alg)
 
 int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *a)
 {
-    const ASN1_OCTET_STRING *msg;
+    ASN1_OCTET_STRING *msg;
 
     TS_X509_ALGOR_print_bio(bio, TS_MSG_IMPRINT_get_algo(a));
 
     BIO_printf(bio, "Message data:\n");
     msg = TS_MSG_IMPRINT_get_msg(a);
-    BIO_dump_indent(bio, (const char *)M_ASN1_STRING_data(msg),
-                    M_ASN1_STRING_length(msg), 4);
+    BIO_dump_indent(bio, (const char *)ASN1_STRING_data(msg),
+                    ASN1_STRING_length(msg), 4);
 
     return 1;
 }
diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c
index db6ce32..b510ceb 100644
--- a/crypto/ts/ts_rsp_sign.c
+++ b/crypto/ts/ts_rsp_sign.c
@@ -1006,7 +1006,7 @@ static ASN1_GENERALIZEDTIME
     *p++ = '\0';
 
     /* Now call OpenSSL to check and set our genTime value */
-    if (!asn1_time && !(asn1_time = M_ASN1_GENERALIZEDTIME_new()))
+    if (!asn1_time && !(asn1_time = ASN1_GENERALIZEDTIME_new()))
         goto err;
     if (!ASN1_GENERALIZEDTIME_set_string(asn1_time, genTime_str)) {
         ASN1_GENERALIZEDTIME_free(asn1_time);
diff --git a/crypto/ts/ts_rsp_utils.c b/crypto/ts/ts_rsp_utils.c
index f6f6332..72d9f63 100644
--- a/crypto/ts/ts_rsp_utils.c
+++ b/crypto/ts/ts_rsp_utils.c
@@ -186,7 +186,7 @@ int TS_TST_INFO_set_time(TS_TST_INFO *a, const ASN1_GENERALIZEDTIME *gtime)
 
     if (a->time == gtime)
         return 1;
-    new_time = M_ASN1_GENERALIZEDTIME_dup(gtime);
+    new_time = ASN1_STRING_dup(gtime);
     if (new_time == NULL) {
         TSerr(TS_F_TS_TST_INFO_SET_TIME, ERR_R_MALLOC_FAILURE);
         return 0;
diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
index 04cecad..eb46a67 100644
--- a/crypto/x509/x509_cmp.c
+++ b/crypto/x509/x509_cmp.c
@@ -71,7 +71,7 @@ int X509_issuer_and_serial_cmp(const X509 *a, const X509 *b)
 
     ai = a->cert_info;
     bi = b->cert_info;
-    i = M_ASN1_INTEGER_cmp(ai->serialNumber, bi->serialNumber);
+    i = ASN1_INTEGER_cmp(ai->serialNumber, bi->serialNumber);
     if (i)
         return (i);
     return (X509_NAME_cmp(ai->issuer, bi->issuer));
diff --git a/crypto/x509/x509_r2x.c b/crypto/x509/x509_r2x.c
index 0ff439c..3cd7280 100644
--- a/crypto/x509/x509_r2x.c
+++ b/crypto/x509/x509_r2x.c
@@ -80,7 +80,7 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
     xi = ret->cert_info;
 
     if (sk_X509_ATTRIBUTE_num(r->req_info->attributes) != 0) {
-        if ((xi->version = M_ASN1_INTEGER_new()) == NULL)
+        if ((xi->version = ASN1_INTEGER_new()) == NULL)
             goto err;
         if (!ASN1_INTEGER_set(xi->version, 2))
             goto err;
diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c
index 5b802bd..6ddbabf 100644
--- a/crypto/x509/x509_set.c
+++ b/crypto/x509/x509_set.c
@@ -68,12 +68,12 @@ int X509_set_version(X509 *x, long version)
     if (x == NULL)
         return (0);
     if (version == 0) {
-        M_ASN1_INTEGER_free(x->cert_info->version);
+        ASN1_INTEGER_free(x->cert_info->version);
         x->cert_info->version = NULL;
         return (1);
     }
     if (x->cert_info->version == NULL) {
-        if ((x->cert_info->version = M_ASN1_INTEGER_new()) == NULL)
+        if ((x->cert_info->version = ASN1_INTEGER_new()) == NULL)
             return (0);
     }
     return (ASN1_INTEGER_set(x->cert_info->version, version));
@@ -87,9 +87,9 @@ int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial)
         return (0);
     in = x->cert_info->serialNumber;
     if (in != serial) {
-        in = M_ASN1_INTEGER_dup(serial);
+        in = ASN1_INTEGER_dup(serial);
         if (in != NULL) {
-            M_ASN1_INTEGER_free(x->cert_info->serialNumber);
+            ASN1_INTEGER_free(x->cert_info->serialNumber);
             x->cert_info->serialNumber = in;
         }
     }
@@ -118,9 +118,9 @@ int X509_set_notBefore(X509 *x, const ASN1_TIME *tm)
         return (0);
     in = x->cert_info->validity->notBefore;
     if (in != tm) {
-        in = M_ASN1_TIME_dup(tm);
+        in = ASN1_STRING_dup(tm);
         if (in != NULL) {
-            M_ASN1_TIME_free(x->cert_info->validity->notBefore);
+            ASN1_TIME_free(x->cert_info->validity->notBefore);
             x->cert_info->validity->notBefore = in;
         }
     }
@@ -135,9 +135,9 @@ int X509_set_notAfter(X509 *x, const ASN1_TIME *tm)
         return (0);
     in = x->cert_info->validity->notAfter;
     if (in != tm) {
-        in = M_ASN1_TIME_dup(tm);
+        in = ASN1_STRING_dup(tm);
         if (in != NULL) {
-            M_ASN1_TIME_free(x->cert_info->validity->notAfter);
+            ASN1_TIME_free(x->cert_info->validity->notAfter);
             x->cert_info->validity->notAfter = in;
         }
     }
diff --git a/crypto/x509/x509_v3.c b/crypto/x509/x509_v3.c
index 4a03445..0a6247d 100644
--- a/crypto/x509/x509_v3.c
+++ b/crypto/x509/x509_v3.c
@@ -254,7 +254,7 @@ int X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data)
 
     if (ex == NULL)
         return (0);
-    i = M_ASN1_OCTET_STRING_set(ex->value, data->data, data->length);
+    i = ASN1_OCTET_STRING_set(ex->value, data->data, data->length);
     if (!i)
         return (0);
     return (1);
diff --git a/crypto/x509/x509cset.c b/crypto/x509/x509cset.c
index 24ca35b..042c90d 100644
--- a/crypto/x509/x509cset.c
+++ b/crypto/x509/x509cset.c
@@ -69,7 +69,7 @@ int X509_CRL_set_version(X509_CRL *x, long version)
     if (x == NULL)
         return (0);
     if (x->crl->version == NULL) {
-        if ((x->crl->version = M_ASN1_INTEGER_new()) == NULL)
+        if ((x->crl->version = ASN1_INTEGER_new()) == NULL)
             return (0);
     }
     return (ASN1_INTEGER_set(x->crl->version, version));
@@ -90,9 +90,9 @@ int X509_CRL_set_lastUpdate(X509_CRL *x, const ASN1_TIME *tm)
         return (0);
     in = x->crl->lastUpdate;
     if (in != tm) {
-        in = M_ASN1_TIME_dup(tm);
+        in = ASN1_STRING_dup(tm);
         if (in != NULL) {
-            M_ASN1_TIME_free(x->crl->lastUpdate);
+            ASN1_TIME_free(x->crl->lastUpdate);
             x->crl->lastUpdate = in;
         }
     }
@@ -107,9 +107,9 @@ int X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm)
         return (0);
     in = x->crl->nextUpdate;
     if (in != tm) {
-        in = M_ASN1_TIME_dup(tm);
+        in = ASN1_STRING_dup(tm);
         if (in != NULL) {
-            M_ASN1_TIME_free(x->crl->nextUpdate);
+            ASN1_TIME_free(x->crl->nextUpdate);
             x->crl->nextUpdate = in;
         }
     }
@@ -140,9 +140,9 @@ int X509_REVOKED_set_revocationDate(X509_REVOKED *x, ASN1_TIME *tm)
         return (0);
     in = x->revocationDate;
     if (in != tm) {
-        in = M_ASN1_TIME_dup(tm);
+        in = ASN1_STRING_dup(tm);
         if (in != NULL) {
-            M_ASN1_TIME_free(x->revocationDate);
+            ASN1_TIME_free(x->revocationDate);
             x->revocationDate = in;
         }
     }
@@ -157,9 +157,9 @@ int X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial)
         return (0);
     in = x->serialNumber;
     if (in != serial) {
-        in = M_ASN1_INTEGER_dup(serial);
+        in = ASN1_INTEGER_dup(serial);
         if (in != NULL) {
-            M_ASN1_INTEGER_free(x->serialNumber);
+            ASN1_INTEGER_free(x->serialNumber);
             x->serialNumber = in;
         }
     }
diff --git a/crypto/x509v3/v3_akey.c b/crypto/x509v3/v3_akey.c
index e920270..7369af1 100644
--- a/crypto/x509v3/v3_akey.c
+++ b/crypto/x509v3/v3_akey.c
@@ -169,7 +169,7 @@ static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
 
     if ((issuer && !ikeyid) || (issuer == 2)) {
         isname = X509_NAME_dup(X509_get_issuer_name(cert));
-        serial = M_ASN1_INTEGER_dup(X509_get_serialNumber(cert));
+        serial = ASN1_INTEGER_dup(X509_get_serialNumber(cert));
         if (!isname || !serial) {
             X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,
                       X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS);
@@ -199,7 +199,7 @@ static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
 
  err:
     X509_NAME_free(isname);
-    M_ASN1_INTEGER_free(serial);
-    M_ASN1_OCTET_STRING_free(ikeyid);
+    ASN1_INTEGER_free(serial);
+    ASN1_OCTET_STRING_free(ikeyid);
     return NULL;
 }
diff --git a/crypto/x509v3/v3_alt.c b/crypto/x509v3/v3_alt.c
index e16d2b6..50cb6b2 100644
--- a/crypto/x509v3/v3_alt.c
+++ b/crypto/x509v3/v3_alt.c
@@ -367,7 +367,7 @@ static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
     while ((i = X509_NAME_get_index_by_NID(nm,
                                            NID_pkcs9_emailAddress, i)) >= 0) {
         ne = X509_NAME_get_entry(nm, i);
-        email = M_ASN1_IA5STRING_dup(X509_NAME_ENTRY_get_data(ne));
+        email = ASN1_STRING_dup(X509_NAME_ENTRY_get_data(ne));
         if (move_p) {
             X509_NAME_delete_entry(nm, i);
             X509_NAME_ENTRY_free(ne);
@@ -391,7 +391,7 @@ static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
 
  err:
     GENERAL_NAME_free(gen);
-    M_ASN1_IA5STRING_free(email);
+    ASN1_IA5STRING_free(email);
     return 0;
 
 }
@@ -498,7 +498,7 @@ GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
     }
 
     if (is_string) {
-        if (!(gen->d.ia5 = M_ASN1_IA5STRING_new()) ||
+        if (!(gen->d.ia5 = ASN1_IA5STRING_new()) ||
             !ASN1_STRING_set(gen->d.ia5, (unsigned char *)value,
                              strlen(value))) {
             X509V3err(X509V3_F_A2I_GENERAL_NAME, ERR_R_MALLOC_FAILURE);
diff --git a/crypto/x509v3/v3_bitst.c b/crypto/x509v3/v3_bitst.c
index b7bb3b5..bf0d7bc 100644
--- a/crypto/x509v3/v3_bitst.c
+++ b/crypto/x509v3/v3_bitst.c
@@ -112,7 +112,7 @@ ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
     ASN1_BIT_STRING *bs;
     int i;
     BIT_STRING_BITNAME *bnam;
-    if (!(bs = M_ASN1_BIT_STRING_new())) {
+    if (!(bs = ASN1_BIT_STRING_new())) {
         X509V3err(X509V3_F_V2I_ASN1_BIT_STRING, ERR_R_MALLOC_FAILURE);
         return NULL;
     }
@@ -124,7 +124,7 @@ ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
                 if (!ASN1_BIT_STRING_set_bit(bs, bnam->bitnum, 1)) {
                     X509V3err(X509V3_F_V2I_ASN1_BIT_STRING,
                               ERR_R_MALLOC_FAILURE);
-                    M_ASN1_BIT_STRING_free(bs);
+                    ASN1_BIT_STRING_free(bs);
                     return NULL;
                 }
                 break;
@@ -134,7 +134,7 @@ ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
             X509V3err(X509V3_F_V2I_ASN1_BIT_STRING,
                       X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT);
             X509V3_conf_err(val);
-            M_ASN1_BIT_STRING_free(bs);
+            ASN1_BIT_STRING_free(bs);
             return NULL;
         }
     }
diff --git a/crypto/x509v3/v3_conf.c b/crypto/x509v3/v3_conf.c
index 7af3aec..9631e57 100644
--- a/crypto/x509v3/v3_conf.c
+++ b/crypto/x509v3/v3_conf.c
@@ -195,7 +195,7 @@ static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method,
         p = ext_der;
         method->i2d(ext_struc, &p);
     }
-    if (!(ext_oct = M_ASN1_OCTET_STRING_new()))
+    if (!(ext_oct = ASN1_OCTET_STRING_new()))
         goto merr;
     ext_oct->data = ext_der;
     ext_der = NULL;
@@ -204,7 +204,7 @@ static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method,
     ext = X509_EXTENSION_create_by_NID(NULL, ext_nid, crit, ext_oct);
     if (!ext)
         goto merr;
-    M_ASN1_OCTET_STRING_free(ext_oct);
+    ASN1_OCTET_STRING_free(ext_oct);
 
     return ext;
 
@@ -213,7 +213,7 @@ static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method,
     if (ext_der != NULL)
         OPENSSL_free(ext_der);
     if (ext_oct != NULL)
-        M_ASN1_OCTET_STRING_free(ext_oct);
+        ASN1_OCTET_STRING_free(ext_oct);
     return NULL;
 
 }
@@ -292,7 +292,7 @@ static X509_EXTENSION *v3_generic_extension(const char *ext, char *value,
         goto err;
     }
 
-    if (!(oct = M_ASN1_OCTET_STRING_new())) {
+    if (!(oct = ASN1_OCTET_STRING_new())) {
         X509V3err(X509V3_F_V3_GENERIC_EXTENSION, ERR_R_MALLOC_FAILURE);
         goto err;
     }
@@ -305,7 +305,7 @@ static X509_EXTENSION *v3_generic_extension(const char *ext, char *value,
 
  err:
     ASN1_OBJECT_free(obj);
-    M_ASN1_OCTET_STRING_free(oct);
+    ASN1_OCTET_STRING_free(oct);
     if (ext_der)
         OPENSSL_free(ext_der);
     return extension;
diff --git a/crypto/x509v3/v3_cpols.c b/crypto/x509v3/v3_cpols.c
index 9826859..66d486f 100644
--- a/crypto/x509v3/v3_cpols.c
+++ b/crypto/x509v3/v3_cpols.c
@@ -234,7 +234,7 @@ static POLICYINFO *policy_section(X509V3_CTX *ctx,
                 X509V3err(X509V3_F_POLICY_SECTION, ERR_R_INTERNAL_ERROR);
                 goto err;
             }
-            if(!(qual->d.cpsuri = M_ASN1_IA5STRING_new()))
+            if(!(qual->d.cpsuri = ASN1_IA5STRING_new()))
                 goto merr;
             if (!ASN1_STRING_set(qual->d.cpsuri, cnf->value,
                                  strlen(cnf->value)))
@@ -304,7 +304,7 @@ static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
     for (i = 0; i < sk_CONF_VALUE_num(unot); i++) {
         cnf = sk_CONF_VALUE_value(unot, i);
         if (!strcmp(cnf->name, "explicitText")) {
-            if(!(not->exptext = M_ASN1_VISIBLESTRING_new()))
+            if(!(not->exptext = ASN1_VISIBLESTRING_new()))
                 goto merr;
             if (!ASN1_STRING_set(not->exptext, cnf->value,
                                  strlen(cnf->value)))
diff --git a/crypto/x509v3/v3_ia5.c b/crypto/x509v3/v3_ia5.c
index 642171f..42a0d86 100644
--- a/crypto/x509v3/v3_ia5.c
+++ b/crypto/x509v3/v3_ia5.c
@@ -97,11 +97,11 @@ ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
                   X509V3_R_INVALID_NULL_ARGUMENT);
         return NULL;
     }
-    if (!(ia5 = M_ASN1_IA5STRING_new()))
+    if (!(ia5 = ASN1_IA5STRING_new()))
         goto err;
     if (!ASN1_STRING_set((ASN1_STRING *)ia5, (unsigned char *)str,
                          strlen(str))) {
-        M_ASN1_IA5STRING_free(ia5);
+        ASN1_IA5STRING_free(ia5);
         goto err;
     }
 #ifdef CHARSET_EBCDIC
diff --git a/crypto/x509v3/v3_prn.c b/crypto/x509v3/v3_prn.c
index a760794..7fd3231 100644
--- a/crypto/x509v3/v3_prn.c
+++ b/crypto/x509v3/v3_prn.c
@@ -209,7 +209,7 @@ int X509V3_extensions_print(BIO *bp, char *title,
             return 0;
         if (!X509V3_EXT_print(bp, ex, flag, indent + 4)) {
             BIO_printf(bp, "%*s", indent + 4, "");
-            M_ASN1_OCTET_STRING_print(bp, ex->value);
+            ASN1_STRING_print(bp, ex->value);
         }
         if (BIO_write(bp, "\n", 1) <= 0)
             return 0;
diff --git a/crypto/x509v3/v3_skey.c b/crypto/x509v3/v3_skey.c
index 1cede04..705d86c 100644
--- a/crypto/x509v3/v3_skey.c
+++ b/crypto/x509v3/v3_skey.c
@@ -83,13 +83,13 @@ ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
     ASN1_OCTET_STRING *oct;
     long length;
 
-    if (!(oct = M_ASN1_OCTET_STRING_new())) {
+    if (!(oct = ASN1_OCTET_STRING_new())) {
         X509V3err(X509V3_F_S2I_ASN1_OCTET_STRING, ERR_R_MALLOC_FAILURE);
         return NULL;
     }
 
     if (!(oct->data = string_to_hex(str, &length))) {
-        M_ASN1_OCTET_STRING_free(oct);
+        ASN1_OCTET_STRING_free(oct);
         return NULL;
     }
 
@@ -110,7 +110,7 @@ static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
     if (strcmp(str, "hash"))
         return s2i_ASN1_OCTET_STRING(method, ctx, str);
 
-    if (!(oct = M_ASN1_OCTET_STRING_new())) {
+    if (!(oct = ASN1_OCTET_STRING_new())) {
         X509V3err(X509V3_F_S2I_SKEY_ID, ERR_R_MALLOC_FAILURE);
         return NULL;
     }
@@ -137,7 +137,7 @@ static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
         (pk->data, pk->length, pkey_dig, &diglen, EVP_sha1(), NULL))
         goto err;
 
-    if (!M_ASN1_OCTET_STRING_set(oct, pkey_dig, diglen)) {
+    if (!ASN1_OCTET_STRING_set(oct, pkey_dig, diglen)) {
         X509V3err(X509V3_F_S2I_SKEY_ID, ERR_R_MALLOC_FAILURE);
         goto err;
     }
@@ -145,6 +145,6 @@ static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
     return oct;
 
  err:
-    M_ASN1_OCTET_STRING_free(oct);
+    ASN1_OCTET_STRING_free(oct);
     return NULL;
 }
diff --git a/crypto/x509v3/v3_sxnet.c b/crypto/x509v3/v3_sxnet.c
index df1384a..ecd1ec6 100644
--- a/crypto/x509v3/v3_sxnet.c
+++ b/crypto/x509v3/v3_sxnet.c
@@ -117,7 +117,7 @@ static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out,
         tmp = i2s_ASN1_INTEGER(NULL, id->zone);
         BIO_printf(out, "\n%*sZone: %s, User: ", indent, "", tmp);
         OPENSSL_free(tmp);
-        M_ASN1_OCTET_STRING_print(out, id->user);
+        ASN1_STRING_print(out, id->user);
     }
     return 1;
 }
@@ -166,9 +166,9 @@ int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user,
                        int userlen)
 {
     ASN1_INTEGER *izone = NULL;
-    if (!(izone = M_ASN1_INTEGER_new()) || !ASN1_INTEGER_set(izone, lzone)) {
+    if (!(izone = ASN1_INTEGER_new()) || !ASN1_INTEGER_set(izone, lzone)) {
         X509V3err(X509V3_F_SXNET_ADD_ID_ULONG, ERR_R_MALLOC_FAILURE);
-        M_ASN1_INTEGER_free(izone);
+        ASN1_INTEGER_free(izone);
         return 0;
     }
     return SXNET_add_id_INTEGER(psx, izone, user, userlen);
@@ -214,7 +214,7 @@ int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *zone, char *user,
     if (userlen == -1)
         userlen = strlen(user);
 
-    if (!M_ASN1_OCTET_STRING_set(id->user, user, userlen))
+    if (!ASN1_OCTET_STRING_set(id->user, (unsigned char *)user, userlen))
         goto err;
     if (!sk_SXNETID_push(sx->ids, id))
         goto err;
@@ -238,7 +238,7 @@ ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, char *zone)
         return NULL;
     }
     oct = SXNET_get_id_INTEGER(sx, izone);
-    M_ASN1_INTEGER_free(izone);
+    ASN1_INTEGER_free(izone);
     return oct;
 }
 
@@ -246,13 +246,13 @@ ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone)
 {
     ASN1_INTEGER *izone = NULL;
     ASN1_OCTET_STRING *oct;
-    if (!(izone = M_ASN1_INTEGER_new()) || !ASN1_INTEGER_set(izone, lzone)) {
+    if (!(izone = ASN1_INTEGER_new()) || !ASN1_INTEGER_set(izone, lzone)) {
         X509V3err(X509V3_F_SXNET_GET_ID_ULONG, ERR_R_MALLOC_FAILURE);
-        M_ASN1_INTEGER_free(izone);
+        ASN1_INTEGER_free(izone);
         return NULL;
     }
     oct = SXNET_get_id_INTEGER(sx, izone);
-    M_ASN1_INTEGER_free(izone);
+    ASN1_INTEGER_free(izone);
     return oct;
 }
 
@@ -262,7 +262,7 @@ ASN1_OCTET_STRING *SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone)
     int i;
     for (i = 0; i < sk_SXNETID_num(sx->ids); i++) {
         id = sk_SXNETID_value(sx->ids, i);
-        if (!M_ASN1_INTEGER_cmp(id->zone, zone))
+        if (!ASN1_INTEGER_cmp(id->zone, zone))
             return id->user;
     }
     return NULL;

From steve at openssl.org  Mon Mar 23 13:59:11 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 23 Mar 2015 13:59:11 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427119151.258088.7336.nullmailer@dev.openssl.org>

The branch master has been updated
       via  4fe67498b0d1c0052fabcc46d6de07d7900aa850 (commit)
      from  564df0ddead0fbac0bf2eeec6164a81bc3fa8882 (commit)


- Log -----------------------------------------------------------------
commit 4fe67498b0d1c0052fabcc46d6de07d7900aa850
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 23 13:47:57 2015 +0000

    Remove deleted functions, update ordinals.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/asn1/asn1.h | 20 --------------------
 util/libeay.num    | 22 +++++++++++-----------
 2 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 392143c..ef5b9e8 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -747,14 +747,7 @@ BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai, BIGNUM *bn);
 /* given a string, return the correct type, max is the maximum length */
 int ASN1_PRINTABLE_type(const unsigned char *s, int max);
 
-int i2d_ASN1_bytes(ASN1_STRING *a, unsigned char **pp, int tag, int xclass);
-ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, const unsigned char **pp,
-                            long length, int Ptag, int Pclass);
 unsigned long ASN1_tag2bit(int tag);
-/* type is one or more of the B_ASN1_ values. */
-ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, const unsigned char **pp,
-                                 long length, int type);
-
 /* PARSING */
 int asn1_Finish(ASN1_CTX *c);
 int asn1_const_Finish(ASN1_const_CTX *c);
@@ -865,20 +858,7 @@ int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num,
 int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a, long *num,
                                   unsigned char *data, int max_len);
 
-STACK_OF(OPENSSL_BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,
-                                         d2i_of_void *d2i,
-                                         void (*free_func) (OPENSSL_BLOCK));
-unsigned char *ASN1_seq_pack(STACK_OF(OPENSSL_BLOCK) *safes, i2d_of_void *i2d,
-                             unsigned char **buf, int *len);
-void *ASN1_unpack_string(ASN1_STRING *oct, d2i_of_void *d2i);
 void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it);
-ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,
-                              ASN1_OCTET_STRING **oct);
-
-# define ASN1_pack_string_of(type,obj,i2d,oct) \
-    (ASN1_pack_string(CHECKED_PTR_OF(type, obj), \
-                      CHECKED_I2D_OF(type, i2d), \
-                      oct))
 
 ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it,
                             ASN1_OCTET_STRING **oct);
diff --git a/util/libeay.num b/util/libeay.num
index 3ad7e1d..623f639 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -703,7 +703,7 @@ BN_usub                                 709	EXIST::FUNCTION:
 bn_sqr_words                            710	NOEXIST::FUNCTION:
 _ossl_old_crypt                         711	NOEXIST::FUNCTION:
 d2i_ASN1_BIT_STRING                     712	EXIST::FUNCTION:
-d2i_ASN1_BOOLEAN                        713	EXIST::FUNCTION:
+d2i_ASN1_BOOLEAN                        713	NOEXIST::FUNCTION:
 d2i_ASN1_HEADER                         714	NOEXIST::FUNCTION:
 d2i_ASN1_IA5STRING                      715	EXIST::FUNCTION:
 d2i_ASN1_INTEGER                        716	EXIST::FUNCTION:
@@ -711,12 +711,12 @@ d2i_ASN1_OBJECT                         717	EXIST::FUNCTION:
 d2i_ASN1_OCTET_STRING                   718	EXIST::FUNCTION:
 d2i_ASN1_PRINTABLE                      719	EXIST::FUNCTION:
 d2i_ASN1_PRINTABLESTRING                720	EXIST::FUNCTION:
-d2i_ASN1_SET                            721	EXIST::FUNCTION:
+d2i_ASN1_SET                            721	NOEXIST::FUNCTION:
 d2i_ASN1_T61STRING                      722	EXIST::FUNCTION:
 d2i_ASN1_TYPE                           723	EXIST::FUNCTION:
 d2i_ASN1_UTCTIME                        724	EXIST::FUNCTION:
-d2i_ASN1_bytes                          725	EXIST::FUNCTION:
-d2i_ASN1_type_bytes                     726	EXIST::FUNCTION:
+d2i_ASN1_bytes                          725	NOEXIST::FUNCTION:
+d2i_ASN1_type_bytes                     726	NOEXIST::FUNCTION:
 d2i_DHparams                            727	EXIST::FUNCTION:DH
 d2i_DSAPrivateKey                       728	EXIST::FUNCTION:DSA
 d2i_DSAPrivateKey_bio                   729	EXIST::FUNCTION:DSA
@@ -808,17 +808,17 @@ i2a_ASN1_INTEGER                        815	EXIST::FUNCTION:
 i2a_ASN1_OBJECT                         816	EXIST::FUNCTION:
 i2a_ASN1_STRING                         817	EXIST::FUNCTION:
 i2d_ASN1_BIT_STRING                     818	EXIST::FUNCTION:
-i2d_ASN1_BOOLEAN                        819	EXIST::FUNCTION:
+i2d_ASN1_BOOLEAN                        819	NOEXIST::FUNCTION:
 i2d_ASN1_HEADER                         820	NOEXIST::FUNCTION:
 i2d_ASN1_IA5STRING                      821	EXIST::FUNCTION:
 i2d_ASN1_INTEGER                        822	EXIST::FUNCTION:
 i2d_ASN1_OBJECT                         823	EXIST::FUNCTION:
 i2d_ASN1_OCTET_STRING                   824	EXIST::FUNCTION:
 i2d_ASN1_PRINTABLE                      825	EXIST::FUNCTION:
-i2d_ASN1_SET                            826	EXIST::FUNCTION:
+i2d_ASN1_SET                            826	NOEXIST::FUNCTION:
 i2d_ASN1_TYPE                           827	EXIST::FUNCTION:
 i2d_ASN1_UTCTIME                        828	EXIST::FUNCTION:
-i2d_ASN1_bytes                          829	EXIST::FUNCTION:
+i2d_ASN1_bytes                          829	NOEXIST::FUNCTION:
 i2d_DHparams                            830	EXIST::FUNCTION:DH
 i2d_DSAPrivateKey                       831	EXIST::FUNCTION:DSA
 i2d_DSAPrivateKey_bio                   832	EXIST::FUNCTION:DSA
@@ -1231,10 +1231,10 @@ i2d_AUTHORITY_KEYID                     1254	EXIST::FUNCTION:
 d2i_AUTHORITY_KEYID                     1255	EXIST::FUNCTION:
 AUTHORITY_KEYID_new                     1256	EXIST::FUNCTION:
 AUTHORITY_KEYID_free                    1257	EXIST::FUNCTION:
-ASN1_seq_unpack                         1258	EXIST::FUNCTION:
-ASN1_seq_pack                           1259	EXIST::FUNCTION:
-ASN1_unpack_string                      1260	EXIST::FUNCTION:
-ASN1_pack_string                        1261	EXIST::FUNCTION:
+ASN1_seq_unpack                         1258	NOEXIST::FUNCTION:
+ASN1_seq_pack                           1259	NOEXIST::FUNCTION:
+ASN1_unpack_string                      1260	NOEXIST::FUNCTION:
+ASN1_pack_string                        1261	NOEXIST::FUNCTION:
 PKCS12_pack_safebag                     1262	NOEXIST::FUNCTION:
 PKCS12_MAKE_KEYBAG                      1263	EXIST::FUNCTION:
 PKCS8_encrypt                           1264	EXIST::FUNCTION:

From matt at openssl.org  Mon Mar 23 14:08:24 2015
From: matt at openssl.org (Matt Caswell)
Date: Mon, 23 Mar 2015 14:08:24 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1427119704.455162.10650.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  bd891f098bdfcaa285c073ce556d0f5e27ec3a10 (commit)
      from  c45dfdc68a4d84c5a7c2a346ea335052cb2755a1 (commit)


- Log -----------------------------------------------------------------
commit bd891f098bdfcaa285c073ce556d0f5e27ec3a10
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Mar 20 15:10:16 2015 +0000

    Don't check curves that haven't been sent
    
    Don't check that the curve appears in the list of acceptable curves for the
    peer, if they didn't send us such a list (RFC 4492 does not require that the
    extension be sent).
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>
    (cherry picked from commit b79d24101e3b5904b3770d60e32bdd6edc558337)

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

Summary of changes:
 ssl/t1_lib.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index a59fe82..3e01b6a 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -763,6 +763,16 @@ static int tls1_check_ec_key(SSL *s,
     for (j = 0; j <= 1; j++) {
         if (!tls1_get_curvelist(s, j, &pcurves, &num_curves))
             return 0;
+        if (j == 1 && num_curves == 0) {
+            /*
+             * If we've not received any curves then skip this check.
+             * RFC 4492 does not require the supported elliptic curves extension
+             * so if it is not sent we can just choose any curve.
+             * It is invalid to send an empty list in the elliptic curves
+             * extension, so num_curves == 0 always means no extension.
+             */
+            break;
+        }
         for (i = 0; i < num_curves; i++, pcurves += 2) {
             if (pcurves[0] == curve_id[0] && pcurves[1] == curve_id[1])
                 break;

From matt at openssl.org  Mon Mar 23 14:08:30 2015
From: matt at openssl.org (Matt Caswell)
Date: Mon, 23 Mar 2015 14:08:30 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427119710.477500.10910.nullmailer@dev.openssl.org>

The branch master has been updated
       via  b79d24101e3b5904b3770d60e32bdd6edc558337 (commit)
      from  4fe67498b0d1c0052fabcc46d6de07d7900aa850 (commit)


- Log -----------------------------------------------------------------
commit b79d24101e3b5904b3770d60e32bdd6edc558337
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Mar 20 15:10:16 2015 +0000

    Don't check curves that haven't been sent
    
    Don't check that the curve appears in the list of acceptable curves for the
    peer, if they didn't send us such a list (RFC 4492 does not require that the
    extension be sent).
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>

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

Summary of changes:
 ssl/t1_lib.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 8b75dba..511223e 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -706,6 +706,16 @@ static int tls1_check_ec_key(SSL *s,
     for (j = 0; j <= 1; j++) {
         if (!tls1_get_curvelist(s, j, &pcurves, &num_curves))
             return 0;
+        if (j == 1 && num_curves == 0) {
+            /*
+             * If we've not received any curves then skip this check.
+             * RFC 4492 does not require the supported elliptic curves extension
+             * so if it is not sent we can just choose any curve.
+             * It is invalid to send an empty list in the elliptic curves
+             * extension, so num_curves == 0 always means no extension.
+             */
+            break;
+        }
         for (i = 0; i < num_curves; i++, pcurves += 2) {
             if (pcurves[0] == curve_id[0] && pcurves[1] == curve_id[1])
                 break;

From levitte at openssl.org  Mon Mar 23 15:16:12 2015
From: levitte at openssl.org (Richard Levitte)
Date: Mon, 23 Mar 2015 15:16:12 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427123772.839935.31410.nullmailer@dev.openssl.org>

The branch master has been updated
       via  d2a5c40d0c5c4bfe2bec28070c3a0075f5bbdced (commit)
       via  4a695602d27bb09dead75b5ea76bf8c5fcac0be8 (commit)
      from  b79d24101e3b5904b3770d60e32bdd6edc558337 (commit)


- Log -----------------------------------------------------------------
commit d2a5c40d0c5c4bfe2bec28070c3a0075f5bbdced
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Mar 22 09:00:43 2015 +0100

    Remove PREFIX, as it's not used any more.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 4a695602d27bb09dead75b5ea76bf8c5fcac0be8
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Mar 22 08:56:02 2015 +0100

    Actually remove TABLE from version control
    
    Follow up on the earlier "Do not keep TABLE in version control".
    Actually removing TABLE from version control was forgotten.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 TABLE  | 6043 ----------------------------------------------------------------
 config |    3 +-
 2 files changed, 1 insertion(+), 6045 deletions(-)
 delete mode 100644 TABLE

diff --git a/TABLE b/TABLE
deleted file mode 100644
index f0e8b9b..0000000
--- a/TABLE
+++ /dev/null
@@ -1,6043 +0,0 @@
-Output of `Configure TABLE':
-
-*** BC-32
-$cc           = bcc32
-$cflags       = 
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = WIN32
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = win32
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** BS2000-OSD
-$cc           = c89
-$cflags       = -O -XLLML -XLLMK -XL -DB_ENDIAN -DCHARSET_EBCDIC
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = -lsocket -lnsl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** BSD-generic32
-$cc           = gcc
-$cflags       = -O3 -fomit-frame-pointer -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= bsd-gcc-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** BSD-generic64
-$cc           = gcc
-$cflags       = -O3 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= bsd-gcc-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** BSD-ia64
-$cc           = gcc
-$cflags       = -DL_ENDIAN -O3 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT
-$cpuid_obj    = ia64cpuid.o
-$bn_obj       = bn-ia64.o ia64-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
-$bf_obj       = 
-$md5_obj      = md5-ia64.o
-$sha1_obj     = sha1-ia64.o sha256-ia64.o sha512-ia64.o
-$cast_obj     = 
-$rc4_obj      = rc4-ia64.o rc4_skey.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-ia64.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= bsd-gcc-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** BSD-sparc64
-$cc           = gcc
-$cflags       = -DB_ENDIAN -O3 -DMD32_REG_T=int -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR
-$cpuid_obj    = sparcv9cap.o sparccpuid.o
-$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
-$ec_obj       = 
-$des_obj      = des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o
-$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o
-$bf_obj       = 
-$md5_obj      = md5-sparcv9.o
-$sha1_obj     = sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o
-$modes_obj    = ghash-sparcv9.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= bsd-gcc-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** BSD-sparcv8
-$cc           = gcc
-$cflags       = -DB_ENDIAN -O3 -mv8 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL
-$cpuid_obj    = 
-$bn_obj       = sparcv8.o
-$ec_obj       = 
-$des_obj      = des_enc-sparc.o fcrypt_b.o
-$aes_obj      = 
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = 
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= bsd-gcc-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** BSD-x86
-$cc           = gcc
-$cflags       = -DL_ENDIAN -O3 -fomit-frame-pointer -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = a.out
-$dso_scheme   = dlfcn
-$shared_target= bsd-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** BSD-x86-elf
-$cc           = gcc
-$cflags       = -DL_ENDIAN -Wall
-$debug_cflags   = -g
-$release_cflags = -O3 -fomit-frame-pointer
-$unistd       = 
-$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= bsd-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** BSD-x86_64
-$cc           = gcc
-$cflags       = -DL_ENDIAN -O3 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= bsd-gcc-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** Cygwin
-$cc           = gcc
-$cflags       = -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = CYGWIN
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = coff
-$dso_scheme   = dlfcn
-$shared_target= cygwin-shared
-$shared_cflag = -D_WINDLL
-$shared_ldflag = -shared
-$shared_extension = .dll.a
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** Cygwin-x86_64
-$cc           = gcc
-$cflags       = -DTERMIOS -DL_ENDIAN -O3 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = CYGWIN
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = mingw64
-$dso_scheme   = dlfcn
-$shared_target= cygwin-shared
-$shared_cflag = -D_WINDLL
-$shared_ldflag = -shared
-$shared_extension = .dll.a
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** DJGPP
-$cc           = gcc
-$cflags       = -I/dev/env/WATT_ROOT/inc -DTERMIO -DL_ENDIAN -fomit-frame-pointer -O2 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = MSDOS
-$lflags       = -L/dev/env/WATT_ROOT/lib -lwatt
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = a.out
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** MPE/iX-gcc
-$cc           = gcc
-$cflags       = -D_ENDIAN -DBN_DIV2W -O3 -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = MPE
-$lflags       = -L/SYSLOG/PUB -lsyslog -lsocket -lcurses
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** OS2-EMX
-$cc           = gcc
-$cflags       = 
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** OS390-Unix
-$cc           = c89.sh
-$cflags       = -O -DB_ENDIAN -DCHARSET_EBCDIC -DNO_SYS_PARAM_H  -D_ALL_SOURCE
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** QNX6
-$cc           = gcc
-$cflags       = 
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = -lsocket
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= bsd-gcc-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** QNX6-i386
-$cc           = gcc
-$cflags       = -DL_ENDIAN -O2 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = -lsocket
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= bsd-gcc-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** UWIN
-$cc           = cc
-$cflags       = -DTERMIOS -DL_ENDIAN -O -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = UWIN
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = win32
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** VC-CE
-$cc           = cl
-$cflags       = 
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = WINCE
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = win32
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** VC-WIN32
-$cc           = cl
-$cflags       = -W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE
-$debug_cflags   = -Zi
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = WIN32
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = win32n
-$dso_scheme   = win32
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** VC-WIN64A
-$cc           = cl
-$cflags       = -W3 -wd4090 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
-$debug_cflags   = -Zi
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = WIN64A
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = bn_asm.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = auto
-$dso_scheme   = win32
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** VC-WIN64I
-$cc           = cl
-$cflags       = -W3 -wd4090 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = WIN64I
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
-$cpuid_obj    = ia64cpuid.o
-$bn_obj       = ia64.o ia64-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
-$bf_obj       = 
-$md5_obj      = md5-ia64.o
-$sha1_obj     = sha1-ia64.o sha256-ia64.o sha512-ia64.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-ia64.o
-$engines_obj  = 
-$perlasm_scheme = ias
-$dso_scheme   = win32
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** aix-cc
-$cc           = cc
-$cflags       = -q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -qthreaded -D_THREAD_SAFE
-$sys_id       = AIX
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR
-$cpuid_obj    = ppccpuid.o ppccap.o
-$bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghashp8-ppc.o
-$engines_obj  = 
-$perlasm_scheme = aix32
-$dso_scheme   = dlfcn
-$shared_target= aix-shared
-$shared_cflag = 
-$shared_ldflag = -q32 -G
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = -X 32
-$multilib     = 
-
-*** aix-gcc
-$cc           = gcc
-$cflags       = -O -DB_ENDIAN
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -pthread
-$sys_id       = AIX
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR
-$cpuid_obj    = ppccpuid.o ppccap.o
-$bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghashp8-ppc.o
-$engines_obj  = 
-$perlasm_scheme = aix32
-$dso_scheme   = dlfcn
-$shared_target= aix-shared
-$shared_cflag = 
-$shared_ldflag = -shared -Wl,-G
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = -X32
-$multilib     = 
-
-*** aix64-cc
-$cc           = cc
-$cflags       = -q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -qthreaded -D_THREAD_SAFE
-$sys_id       = AIX
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR
-$cpuid_obj    = ppccpuid.o ppccap.o
-$bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghashp8-ppc.o
-$engines_obj  = 
-$perlasm_scheme = aix64
-$dso_scheme   = dlfcn
-$shared_target= aix-shared
-$shared_cflag = 
-$shared_ldflag = -q64 -G
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = -X 64
-$multilib     = 
-
-*** aix64-gcc
-$cc           = gcc
-$cflags       = -maix64 -O -DB_ENDIAN
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -pthread
-$sys_id       = AIX
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR
-$cpuid_obj    = ppccpuid.o ppccap.o
-$bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghashp8-ppc.o
-$engines_obj  = 
-$perlasm_scheme = aix64
-$dso_scheme   = dlfcn
-$shared_target= aix-shared
-$shared_cflag = 
-$shared_ldflag = -maix64 -shared -Wl,-G
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = -X64
-$multilib     = 
-
-*** android
-$cc           = gcc
-$cflags       = -mandroid -I$(ANDROID_DEV)/include -B$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** android-armv7
-$cc           = gcc
-$cflags       = -march=armv7-a -mandroid -I$(ANDROID_DEV)/include -B$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
-$cpuid_obj    = armcap.o armv4cpuid.o
-$bn_obj       = bn_asm.o armv4-mont.o armv4-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-armv4.o
-$des_obj      = 
-$aes_obj      = aes_cbc.o aes-armv4.o bsaes-armv7.o aesv8-armx.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-armv4-large.o sha256-armv4.o sha512-armv4.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-armv4.o ghashv8-armx.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** android-mips
-$cc           = gcc
-$cflags       = -mandroid -I$(ANDROID_DEV)/include -B$(ANDROID_DEV)/lib -O3 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = bn-mips.o mips-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_cbc.o aes-mips.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-mips.o sha256-mips.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = o32
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** android-x86
-$cc           = gcc
-$cflags       = -mandroid -I$(ANDROID_DEV)/include -B$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = android
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** bsdi-elf-gcc
-$cc           = gcc
-$cflags       = -DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= bsd-gcc-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** cc
-$cc           = cc
-$cflags       = -O
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** darwin-i386-cc
-$cc           = cc
-$cflags       = -arch i386 -DL_ENDIAN
-$debug_cflags   = -g3
-$release_cflags = -O3 -fomit-frame-pointer
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = MACOSX
-$lflags       = -Wl,-search_paths_first%
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = 
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = macosx
-$dso_scheme   = dlfcn
-$shared_target= darwin-shared
-$shared_cflag = -fPIC -fno-common
-$shared_ldflag = -arch i386 -dynamiclib
-$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** darwin-ppc-cc
-$cc           = cc
-$cflags       = -arch ppc -DB_ENDIAN -Wa,-force_cpusubtype_ALL
-$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g -Wall -O
-$release_cflags = -O3
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = MACOSX
-$lflags       = -Wl,-search_paths_first%
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = ppccpuid.o ppccap.o
-$bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghashp8-ppc.o
-$engines_obj  = 
-$perlasm_scheme = osx32
-$dso_scheme   = dlfcn
-$shared_target= darwin-shared
-$shared_cflag = -fPIC -fno-common
-$shared_ldflag = -arch ppc -dynamiclib
-$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** darwin64-debug-test-64-clang
-$cc           = clang
-$cflags       = -arch x86_64 -DL_ENDIAN -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
-$sys_id       = MACOSX
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = macosx
-$dso_scheme   = dlfcn
-$shared_target= darwin-shared
-$shared_cflag = -fPIC -fno-common
-$shared_ldflag = -arch x86_64 -dynamiclib
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** darwin64-ppc-cc
-$cc           = cc
-$cflags       = -arch ppc64 -O3 -DB_ENDIAN
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = MACOSX
-$lflags       = -Wl,-search_paths_first%
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = ppccpuid.o ppccap.o
-$bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghashp8-ppc.o
-$engines_obj  = 
-$perlasm_scheme = osx64
-$dso_scheme   = dlfcn
-$shared_target= darwin-shared
-$shared_cflag = -fPIC -fno-common
-$shared_ldflag = -arch ppc64 -dynamiclib
-$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** darwin64-x86_64-cc
-$cc           = cc
-$cflags       = -arch x86_64 -DL_ENDIAN -Wall
-$debug_cflags   = -ggdb -g2 -O0
-$release_cflags = -O3
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = MACOSX
-$lflags       = -Wl,-search_paths_first%
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = macosx
-$dso_scheme   = dlfcn
-$shared_target= darwin-shared
-$shared_cflag = -fPIC -fno-common
-$shared_ldflag = -arch x86_64 -dynamiclib
-$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug
-$cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = -lefence
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-VC-WIN64I
-$cc           = cl
-$cflags       = -W3 -wd4090 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = WIN64I
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
-$cpuid_obj    = ia64cpuid.o
-$bn_obj       = ia64.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
-$bf_obj       = 
-$md5_obj      = md5-ia64.o
-$sha1_obj     = sha1-ia64.o sha256-ia64.o sha512-ia64.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-ia64.o
-$engines_obj  = 
-$perlasm_scheme = ias
-$dso_scheme   = win32
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-ben
-$cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DDEBUG_SAFESTACK -O2 -pipe
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-ben-darwin64
-$cc           = cc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-language-extension-token -Wno-extended-offsetof -arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = MACOSX
-$lflags       = -Wl,-search_paths_first%
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = macosx
-$dso_scheme   = dlfcn
-$shared_target= darwin-shared
-$shared_cflag = -fPIC -fno-common
-$shared_ldflag = -arch x86_64 -dynamiclib
-$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-ben-debug
-$cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DOPENSSL_NO_HW_PADLOCK -g3 -O2 -pipe
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-ben-debug-64
-$cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= bsd-gcc-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-ben-debug-64-clang
-$cc           = clang
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= bsd-gcc-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-ben-debug-64-noopt
-$cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -pipe
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= bsd-gcc-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-ben-macos
-$cc           = cc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_ASM -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -DL_ENDIAN -g3 -pipe
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-ben-no-opt
-$cc           = gcc
-$cflags       =  -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -Wall -g3
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-ben-openbsd
-$cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-ben-openbsd-debug
-$cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-ben-strict
-$cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-bodo
-$cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -m64
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 64
-
-*** debug-erbridge
-$cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DBN_DEBUG -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -m64
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 64
-
-*** debug-geoff32
-$cc           = gcc
-$cflags       = -DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-geoff64
-$cc           = gcc
-$cflags       = -DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-levitte-linux-elf-extreme
-$cc           = gcc
-$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-levitte-linux-noasm
-$cc           = gcc
-$cflags       = -DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-levitte-linux-noasm-extreme
-$cc           = gcc
-$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-linux-elf-noefence
-$cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -march=i486 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-linux-ia32-aes
-$cc           = gcc
-$cflags       = -DAES_EXPERIMENTAL -DL_ENDIAN -O3 -fomit-frame-pointer -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o
-$ec_obj       = 
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes_x86core.o aes_cbc.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = 
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-linux-pentium
-$cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentium -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-linux-ppro
-$cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-rse
-$cc           = cc
-$cflags       = -DL_ENDIAN -pipe -O -g -ggdb3 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-steve-opt
-$cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -m64
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-steve32
-$cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g -pipe
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -rdynamic -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -m32
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-steve64
-$cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -m64
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-test-64-clang
-$cc           = clang
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= bsd-gcc-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** dist
-$cc           = cc
-$cflags       = -O
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** gcc
-$cc           = gcc
-$cflags       = -O3
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** hpux-ia64-cc
-$cc           = cc
-$cflags       = -Ae +DD32 +O2 +Olit=all -z -DB_ENDIAN -D_REENTRANT
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT
-$cpuid_obj    = ia64cpuid.o
-$bn_obj       = bn-ia64.o ia64-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
-$bf_obj       = 
-$md5_obj      = md5-ia64.o
-$sha1_obj     = sha1-ia64.o sha256-ia64.o sha512-ia64.o
-$cast_obj     = 
-$rc4_obj      = rc4-ia64.o rc4_skey.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-ia64.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= hpux-shared
-$shared_cflag = +Z
-$shared_ldflag = +DD32 -b
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = /hpux32
-
-*** hpux-ia64-gcc
-$cc           = gcc
-$cflags       = -O3 -DB_ENDIAN -D_REENTRANT
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT
-$cpuid_obj    = ia64cpuid.o
-$bn_obj       = bn-ia64.o ia64-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
-$bf_obj       = 
-$md5_obj      = md5-ia64.o
-$sha1_obj     = sha1-ia64.o sha256-ia64.o sha512-ia64.o
-$cast_obj     = 
-$rc4_obj      = rc4-ia64.o rc4_skey.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-ia64.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= hpux-shared
-$shared_cflag = -fpic
-$shared_ldflag = -shared
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = /hpux32
-
-*** hpux-parisc1_1-cc
-$cc           = cc
-$cflags       = +DA1.1 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -Wl,+s -ldld
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
-$cpuid_obj    = pariscid.o
-$bn_obj       = bn_asm.o parisc-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-parisc.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-parisc.o sha256-parisc.o sha512-parisc.o
-$cast_obj     = 
-$rc4_obj      = rc4-parisc.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-parisc.o
-$engines_obj  = 
-$perlasm_scheme = 32
-$dso_scheme   = dl
-$shared_target= hpux-shared
-$shared_cflag = +Z
-$shared_ldflag = -b
-$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = /pa1.1
-
-*** hpux-parisc1_1-gcc
-$cc           = gcc
-$cflags       = -O3 -DB_ENDIAN -DBN_DIV2W
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -Wl,+s -ldld
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
-$cpuid_obj    = pariscid.o
-$bn_obj       = bn_asm.o parisc-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-parisc.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-parisc.o sha256-parisc.o sha512-parisc.o
-$cast_obj     = 
-$rc4_obj      = rc4-parisc.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-parisc.o
-$engines_obj  = 
-$perlasm_scheme = 32
-$dso_scheme   = dl
-$shared_target= hpux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -shared
-$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = /pa1.1
-
-*** hpux64-ia64-cc
-$cc           = cc
-$cflags       = -Ae +DD64 +O3 +Olit=all -z -DB_ENDIAN -D_REENTRANT
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT
-$cpuid_obj    = ia64cpuid.o
-$bn_obj       = bn-ia64.o ia64-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
-$bf_obj       = 
-$md5_obj      = md5-ia64.o
-$sha1_obj     = sha1-ia64.o sha256-ia64.o sha512-ia64.o
-$cast_obj     = 
-$rc4_obj      = rc4-ia64.o rc4_skey.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-ia64.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= hpux-shared
-$shared_cflag = +Z
-$shared_ldflag = +DD64 -b
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = /hpux64
-
-*** hpux64-ia64-gcc
-$cc           = gcc
-$cflags       = -mlp64 -O3 -DB_ENDIAN -D_REENTRANT
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT
-$cpuid_obj    = ia64cpuid.o
-$bn_obj       = bn-ia64.o ia64-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
-$bf_obj       = 
-$md5_obj      = md5-ia64.o
-$sha1_obj     = sha1-ia64.o sha256-ia64.o sha512-ia64.o
-$cast_obj     = 
-$rc4_obj      = rc4-ia64.o rc4_skey.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-ia64.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= hpux-shared
-$shared_cflag = -fpic
-$shared_ldflag = -mlp64 -shared
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = /hpux64
-
-*** hpux64-parisc2-cc
-$cc           = cc
-$cflags       = +DD64 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
-$cpuid_obj    = pariscid.o
-$bn_obj       = pa-risc2W.o parisc-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-parisc.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-parisc.o sha256-parisc.o sha512-parisc.o
-$cast_obj     = 
-$rc4_obj      = rc4-parisc.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-parisc.o
-$engines_obj  = 
-$perlasm_scheme = 64
-$dso_scheme   = dlfcn
-$shared_target= hpux-shared
-$shared_cflag = +Z
-$shared_ldflag = +DD64 -b
-$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = /pa20_64
-
-*** hpux64-parisc2-gcc
-$cc           = gcc
-$cflags       = -O3 -DB_ENDIAN -D_REENTRANT
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
-$cpuid_obj    = 
-$bn_obj       = pa-risc2W.o
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= hpux-shared
-$shared_cflag = -fpic
-$shared_ldflag = -shared
-$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = /pa20_64
-
-*** hurd-x86
-$cc           = gcc
-$cflags       = -DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** ios64-cross
-$cc           = cc
-$cflags       = -O3 -arch arm64 -mios-version-min=7.0.0 -isysroot $(CROSS_TOP)/SDKs/$(CROSS_SDK) -fno-common
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = iOS
-$lflags       = -Wl,-search_paths_first%
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
-$cpuid_obj    = armcap.o arm64cpuid.o mem_clr.o
-$bn_obj       = 
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aesv8-armx.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-armv8.o sha256-armv8.o sha512-armv8.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghashv8-armx.o
-$engines_obj  = 
-$perlasm_scheme = ios64
-$dso_scheme   = dlfcn
-$shared_target= darwin-shared
-$shared_cflag = -fPIC -fno-common
-$shared_ldflag = -dynamiclib
-$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** iphoneos-cross
-$cc           = cc
-$cflags       = -O3 -isysroot $(CROSS_TOP)/SDKs/$(CROSS_SDK) -fomit-frame-pointer -fno-common
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = iOS
-$lflags       = -Wl,-search_paths_first%
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= darwin-shared
-$shared_cflag = -fPIC -fno-common
-$shared_ldflag = -dynamiclib
-$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** irix-cc
-$cc           = cc
-$cflags       = -O2 -use_readonly_const -DB_ENDIAN
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC2 DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = bn-mips.o mips-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_cbc.o aes-mips.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-mips.o sha256-mips.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = o32
-$dso_scheme   = dlfcn
-$shared_target= irix-shared
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** irix-gcc
-$cc           = gcc
-$cflags       = -O3 -DB_ENDIAN
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR
-$cpuid_obj    = 
-$bn_obj       = bn-mips.o mips-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_cbc.o aes-mips.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-mips.o sha256-mips.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = o32
-$dso_scheme   = dlfcn
-$shared_target= irix-shared
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** irix-mips3-cc
-$cc           = cc
-$cflags       = -n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_SGI_MP_SOURCE
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT
-$cpuid_obj    = 
-$bn_obj       = bn-mips.o mips-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_cbc.o aes-mips.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-mips.o sha256-mips.o sha512-mips.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = n32
-$dso_scheme   = dlfcn
-$shared_target= irix-shared
-$shared_cflag = 
-$shared_ldflag = -n32
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 32
-
-*** irix-mips3-gcc
-$cc           = gcc
-$cflags       = -mabi=n32 -O3 -DB_ENDIAN -DBN_DIV3W
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_SGI_MP_SOURCE
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT
-$cpuid_obj    = 
-$bn_obj       = bn-mips.o mips-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_cbc.o aes-mips.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-mips.o sha256-mips.o sha512-mips.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = n32
-$dso_scheme   = dlfcn
-$shared_target= irix-shared
-$shared_cflag = 
-$shared_ldflag = -mabi=n32
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 32
-
-*** irix64-mips4-cc
-$cc           = cc
-$cflags       = -64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_SGI_MP_SOURCE
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG
-$cpuid_obj    = 
-$bn_obj       = bn-mips.o mips-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_cbc.o aes-mips.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-mips.o sha256-mips.o sha512-mips.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = 64
-$dso_scheme   = dlfcn
-$shared_target= irix-shared
-$shared_cflag = 
-$shared_ldflag = -64
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 64
-
-*** irix64-mips4-gcc
-$cc           = gcc
-$cflags       = -mabi=64 -mips4 -O3 -DB_ENDIAN -DBN_DIV3W
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_SGI_MP_SOURCE
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG
-$cpuid_obj    = 
-$bn_obj       = bn-mips.o mips-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_cbc.o aes-mips.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-mips.o sha256-mips.o sha512-mips.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = 64
-$dso_scheme   = dlfcn
-$shared_target= irix-shared
-$shared_cflag = 
-$shared_ldflag = -mabi=64
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 64
-
-*** levitte-linux-elf
-$cc           = gcc
-$cflags       = -DL_ENDIAN -Wall
-$debug_cflags   = -DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG-ggdb -g3
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-aarch64
-$cc           = gcc
-$cflags       = -O3 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
-$cpuid_obj    = armcap.o arm64cpuid.o mem_clr.o
-$bn_obj       = 
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aesv8-armx.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-armv8.o sha256-armv8.o sha512-armv8.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghashv8-armx.o
-$engines_obj  = 
-$perlasm_scheme = linux64
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-alpha-gcc
-$cc           = gcc
-$cflags       = -O3 -DL_ENDIAN
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL
-$cpuid_obj    = alphacpuid.o
-$bn_obj       = bn_asm.o alpha-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = 
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-alpha.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-alpha.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-aout
-$cc           = gcc
-$cflags       = -DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = a.out
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-armv4
-$cc           = gcc
-$cflags       = -O3 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
-$cpuid_obj    = armcap.o armv4cpuid.o
-$bn_obj       = bn_asm.o armv4-mont.o armv4-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-armv4.o
-$des_obj      = 
-$aes_obj      = aes_cbc.o aes-armv4.o bsaes-armv7.o aesv8-armx.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-armv4-large.o sha256-armv4.o sha512-armv4.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-armv4.o ghashv8-armx.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-c64xplus
-$cc           = cl6x
-$cflags       = --linux -ea=.s -eo=.o -mv6400+ -o2 -ox -ms -pden -DOPENSSL_SMALL_FOOTPRINT
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG
-$cpuid_obj    = c64xpluscpuid.o
-$bn_obj       = bn-c64xplus.o c64xplus-gf2m.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes-c64xplus.o aes_cbc.o aes_ctr.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-c64xplus.o sha256-c64xplus.o sha512-c64xplus.o
-$cast_obj     = 
-$rc4_obj      = rc4-c64xplus.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-c64xplus.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = --pic
-$shared_ldflag = -z --sysv --shared
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = true
-$arflags      = 
-$multilib     = 
-
-*** linux-elf
-$cc           = gcc
-$cflags       = -DL_ENDIAN -Wall
-$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -g -march=i486
-$release_cflags = -O3 -fomit-frame-pointer
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = -lefence
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-generic32
-$cc           = gcc
-$cflags       = -Wall
-$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g
-$release_cflags = -O3 -fomit-frame-pointer
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-generic64
-$cc           = gcc
-$cflags       = -Wall
-$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g
-$release_cflags = -O3
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-ia32-icc
-$cc           = icc
-$cflags       = -DL_ENDIAN -O2
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl -no_cpprt
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -KPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-ia64
-$cc           = gcc
-$cflags       = -DL_ENDIAN -O3 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT
-$cpuid_obj    = ia64cpuid.o
-$bn_obj       = bn-ia64.o ia64-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
-$bf_obj       = 
-$md5_obj      = md5-ia64.o
-$sha1_obj     = sha1-ia64.o sha256-ia64.o sha512-ia64.o
-$cast_obj     = 
-$rc4_obj      = rc4-ia64.o rc4_skey.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-ia64.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-ia64-icc
-$cc           = icc
-$cflags       = -DL_ENDIAN -O2 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl -no_cpprt
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT
-$cpuid_obj    = ia64cpuid.o
-$bn_obj       = bn-ia64.o ia64-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
-$bf_obj       = 
-$md5_obj      = md5-ia64.o
-$sha1_obj     = sha1-ia64.o sha256-ia64.o sha512-ia64.o
-$cast_obj     = 
-$rc4_obj      = rc4-ia64.o rc4_skey.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-ia64.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-mips32
-$cc           = gcc
-$cflags       = -mabi=32 -O3 -Wall -DBN_DIV3W
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = bn-mips.o mips-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_cbc.o aes-mips.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-mips.o sha256-mips.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = o32
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-mips64
-$cc           = gcc
-$cflags       = -mabi=n32 -O3 -Wall -DBN_DIV3W
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = bn-mips.o mips-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_cbc.o aes-mips.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-mips.o sha256-mips.o sha512-mips.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = n32
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -mabi=n32
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 32
-
-*** linux-ppc
-$cc           = gcc
-$cflags       = -DB_ENDIAN -O3 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL
-$cpuid_obj    = ppccpuid.o ppccap.o
-$bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghashp8-ppc.o
-$engines_obj  = 
-$perlasm_scheme = linux32
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-ppc64
-$cc           = gcc
-$cflags       = -m64 -DB_ENDIAN -O3 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL
-$cpuid_obj    = ppccpuid.o ppccap.o
-$bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghashp8-ppc.o
-$engines_obj  = 
-$perlasm_scheme = linux64
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -m64
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 64
-
-*** linux-ppc64le
-$cc           = gcc
-$cflags       = -m64 -DL_ENDIAN -O3 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL
-$cpuid_obj    = ppccpuid.o ppccap.o
-$bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghashp8-ppc.o
-$engines_obj  = 
-$perlasm_scheme = linux64le
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -m64
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-sparcv8
-$cc           = gcc
-$cflags       = -mv8 -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -DBN_DIV2W
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = sparcv8.o
-$ec_obj       = 
-$des_obj      = des_enc-sparc.o fcrypt_b.o
-$aes_obj      = 
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = 
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-sparcv9
-$cc           = gcc
-$cflags       = -m32 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = ULTRASPARC
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = sparcv9cap.o sparccpuid.o
-$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
-$ec_obj       = 
-$des_obj      = des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o
-$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o
-$bf_obj       = 
-$md5_obj      = md5-sparcv9.o
-$sha1_obj     = sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o
-$modes_obj    = ghash-sparcv9.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -m32
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-x32
-$cc           = gcc
-$cflags       = -mx32 -DL_ENDIAN -O3 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -mx32
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = x32
-
-*** linux-x86_64
-$cc           = gcc
-$cflags       = -m64 -DL_ENDIAN -Wall
-$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g
-$release_cflags = -O3
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -m64
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 64
-
-*** linux-x86_64-clang
-$cc           = clang
-$cflags       = -m64 -DL_ENDIAN -O3 -Weverything -Wno-language-extension-token -Wno-extended-offsetof -Wno-padded -Wno-shorten-64-to-32 -Wno-format-nonliteral -Wno-missing-noreturn -Wno-unused-parameter -Wno-sign-conversion -Wno-unreachable-code -Wno-conversion -Wno-documentation -Wno-missing-variable-declarations -Wno-cast-align -Wno-incompatible-pointer-types-discards-qualifiers -Wno-missing-variable-declarations -Wno-missing-field-initializers -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-conditional-uninitialized -Wno-switch-enum -Qunused-arguments
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -m64
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 64
-
-*** linux-x86_64-icc
-$cc           = icc
-$cflags       = -DL_ENDIAN -O2
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl -no_cpprt
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 64
-
-*** linux32-s390x
-$cc           = gcc
-$cflags       = -m31 -Wa,-mzarch -DB_ENDIAN -O3 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = s390xcap.o s390xcpuid.o
-$bn_obj       = bn_asm.o s390x-mont.o s390x-gf2m.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes-s390x.o aes-ctr.o aes-xts.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-s390x.o sha256-s390x.o sha512-s390x.o
-$cast_obj     = 
-$rc4_obj      = rc4-s390x.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-s390x.o
-$engines_obj  = 
-$perlasm_scheme = 31
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -m31
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = /highgprs
-
-*** linux64-mips64
-$cc           = gcc
-$cflags       = -mabi=64 -O3 -Wall -DBN_DIV3W
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = bn-mips.o mips-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_cbc.o aes-mips.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-mips.o sha256-mips.o sha512-mips.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = 64
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -mabi=64
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 64
-
-*** linux64-s390x
-$cc           = gcc
-$cflags       = -m64 -DB_ENDIAN -O3 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = s390xcap.o s390xcpuid.o
-$bn_obj       = bn-s390x.o s390x-mont.o s390x-gf2m.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes-s390x.o aes-ctr.o aes-xts.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-s390x.o sha256-s390x.o sha512-s390x.o
-$cast_obj     = 
-$rc4_obj      = rc4-s390x.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-s390x.o
-$engines_obj  = 
-$perlasm_scheme = 64
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -m64
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 64
-
-*** linux64-sparcv9
-$cc           = gcc
-$cflags       = -m64 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = ULTRASPARC
-$lflags       = -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR
-$cpuid_obj    = sparcv9cap.o sparccpuid.o
-$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
-$ec_obj       = 
-$des_obj      = des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o
-$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o
-$bf_obj       = 
-$md5_obj      = md5-sparcv9.o
-$sha1_obj     = sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o
-$modes_obj    = ghash-sparcv9.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -m64
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 64
-
-*** mingw
-$cc           = gcc
-$cflags       = -mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 -march=i486 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_MT
-$sys_id       = MINGW32
-$lflags       = -lws2_32 -lgdi32 -lcrypt32
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT EXPORT_VAR_AS_FN
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = coff
-$dso_scheme   = win32
-$shared_target= cygwin-shared
-$shared_cflag = -D_WINDLL -DOPENSSL_USE_APPLINK
-$shared_ldflag = -mno-cygwin
-$shared_extension = .dll.a
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** mingw64
-$cc           = gcc
-$cflags       = -mno-cygwin -DL_ENDIAN -O3 -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_MT
-$sys_id       = MINGW64
-$lflags       = -lws2_32 -lgdi32 -lcrypt32
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = mingw64
-$dso_scheme   = win32
-$shared_target= cygwin-shared
-$shared_cflag = -D_WINDLL
-$shared_ldflag = -mno-cygwin
-$shared_extension = .dll.a
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** netware-clib
-$cc           = mwccnlm
-$cflags       = 
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** netware-clib-bsdsock
-$cc           = mwccnlm
-$cflags       = 
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** netware-clib-bsdsock-gcc
-$cc           = i586-netware-gcc
-$cflags       = -nostdinc -I/ndk/nwsdk/include/nlm -DNETWARE_BSDSOCK -DNETDB_USE_INTERNET -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** netware-clib-gcc
-$cc           = i586-netware-gcc
-$cflags       = -nostdinc -I/ndk/nwsdk/include/nlm -I/ndk/ws295sdk/include -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** netware-libc
-$cc           = mwccnlm
-$cflags       = 
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** netware-libc-bsdsock
-$cc           = mwccnlm
-$cflags       = 
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** netware-libc-bsdsock-gcc
-$cc           = i586-netware-gcc
-$cflags       = -nostdinc -I/ndk/libc/include -DNETWARE_BSDSOCK -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYS_NETWARE -DTERMIO -O2 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** netware-libc-gcc
-$cc           = i586-netware-gcc
-$cflags       = -nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYS_NETWARE -DTERMIO -O2 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** nextstep
-$cc           = cc
-$cflags       = -O -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = <libc.h>
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** nextstep3.3
-$cc           = cc
-$cflags       = -O3 -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = <libc.h>
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** osf1-alpha-cc
-$cc           = cc
-$cflags       = -std1 -tune host -O4 -readonly_strings
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK
-$cpuid_obj    = alphacpuid.o
-$bn_obj       = bn_asm.o alpha-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = 
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-alpha.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-alpha.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= alpha-osf1-shared
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = .so
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** osf1-alpha-gcc
-$cc           = gcc
-$cflags       = -O3
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1
-$cpuid_obj    = alphacpuid.o
-$bn_obj       = bn_asm.o alpha-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = 
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-alpha.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-alpha.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= alpha-osf1-shared
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = .so
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** purify
-$cc           = purify gcc
-$cflags       = -g -DPURIFY -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = -lsocket -lnsl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** qnx4
-$cc           = cc
-$cflags       = -DL_ENDIAN -DTERMIO
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** sco5-cc
-$cc           = cc
-$cflags       = -belf
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = -lsocket -lnsl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf-1
-$dso_scheme   = dlfcn
-$shared_target= svr3-shared
-$shared_cflag = -Kpic
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** sco5-gcc
-$cc           = gcc
-$cflags       = -O3 -fomit-frame-pointer
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = -lsocket -lnsl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf-1
-$dso_scheme   = dlfcn
-$shared_target= svr3-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** solaris-sparcv8-cc
-$cc           = cc
-$cflags       = -xarch=v8 -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W
-$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O
-$release_cflags = -xO5 -xdepend
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -lsocket -lnsl -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = sparcv8.o
-$ec_obj       = 
-$des_obj      = des_enc-sparc.o fcrypt_b.o
-$aes_obj      = 
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = 
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -KPIC
-$shared_ldflag = -G -dy -z text
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** solaris-sparcv8-gcc
-$cc           = gcc
-$cflags       = -mv8 -Wall -DB_ENDIAN
-$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g
-$release_cflags = -O3 -fomit-frame-pointer -DBN_DIV2W
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -lsocket -lnsl -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = sparcv8.o
-$ec_obj       = 
-$des_obj      = des_enc-sparc.o fcrypt_b.o
-$aes_obj      = 
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = 
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -shared
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** solaris-sparcv9-cc
-$cc           = cc
-$cflags       = -xtarget=ultra -xarch=v8plus -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W
-$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O
-$release_cflags = -xO5 -xdepend
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = ULTRASPARC
-$lflags       = -lsocket -lnsl -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR
-$cpuid_obj    = sparcv9cap.o sparccpuid.o
-$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
-$ec_obj       = 
-$des_obj      = des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o
-$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o
-$bf_obj       = 
-$md5_obj      = md5-sparcv9.o
-$sha1_obj     = sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o
-$modes_obj    = ghash-sparcv9.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -KPIC
-$shared_ldflag = -G -dy -z text
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** solaris-sparcv9-gcc
-$cc           = gcc
-$cflags       = -m32 -mcpu=ultrasparc -Wall -DB_ENDIAN -DBN_DIV2W
-$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -pedantic -ansi -Wshadow -Wno-long-long -D__EXTENSIONS__
-$release_cflags = -O3 -fomit-frame-pointer
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = ULTRASPARC
-$lflags       = -lsocket -lnsl -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = sparcv9cap.o sparccpuid.o
-$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
-$ec_obj       = 
-$des_obj      = des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o
-$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o
-$bf_obj       = 
-$md5_obj      = md5-sparcv9.o
-$sha1_obj     = sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o
-$modes_obj    = ghash-sparcv9.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -shared
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** solaris-x86-cc
-$cc           = cc
-$cflags       = -fast -xarch=generic -O -Xa
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -lsocket -lnsl -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -KPIC
-$shared_ldflag = -G -dy -z text
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** solaris-x86-gcc
-$cc           = gcc
-$cflags       = -O3 -fomit-frame-pointer -march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -lsocket -lnsl -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -shared
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** solaris64-sparcv9-cc
-$cc           = cc
-$cflags       = -xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = ULTRASPARC
-$lflags       = -lsocket -lnsl -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR
-$cpuid_obj    = sparcv9cap.o sparccpuid.o
-$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
-$ec_obj       = 
-$des_obj      = des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o
-$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o
-$bf_obj       = 
-$md5_obj      = md5-sparcv9.o
-$sha1_obj     = sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o
-$modes_obj    = ghash-sparcv9.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -KPIC
-$shared_ldflag = -xarch=v9 -G -dy -z text
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = /64
-
-*** solaris64-sparcv9-gcc
-$cc           = gcc
-$cflags       = -m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = ULTRASPARC
-$lflags       = -lsocket -lnsl -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR
-$cpuid_obj    = sparcv9cap.o sparccpuid.o
-$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
-$ec_obj       = 
-$des_obj      = des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o
-$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o
-$bf_obj       = 
-$md5_obj      = md5-sparcv9.o
-$sha1_obj     = sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o
-$modes_obj    = ghash-sparcv9.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -m64 -shared
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = /64
-
-*** solaris64-x86_64-cc
-$cc           = cc
-$cflags       = -fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -lsocket -lnsl -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -KPIC
-$shared_ldflag = -xarch=amd64 -G -dy -z text
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = /64
-
-*** solaris64-x86_64-gcc
-$cc           = gcc
-$cflags       = -m64 -O3 -Wall -DL_ENDIAN
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -lsocket -lnsl -ldl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
-$cast_obj     = 
-$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -m64 -shared -static-libgcc
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = /64
-
-*** tru64-alpha-cc
-$cc           = cc
-$cflags       = -std1 -tune host -fast -readonly_strings
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -pthread
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK
-$cpuid_obj    = alphacpuid.o
-$bn_obj       = bn_asm.o alpha-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = 
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-alpha.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-alpha.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= alpha-osf1-shared
-$shared_cflag = 
-$shared_ldflag = -msym
-$shared_extension = .so
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** uClinux-dist
-$cc           = 
-$cflags       = $(CFLAGS)
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = $(LDFLAGS) $(LDLIBS)
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = 
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -shared
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** uClinux-dist64
-$cc           = 
-$cflags       = $(CFLAGS)
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = $(LDFLAGS) $(LDLIBS)
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = 
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -shared
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** ultrix-cc
-$cc           = cc
-$cflags       = -std1 -O -Olimit 2500 -DL_ENDIAN
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** ultrix-gcc
-$cc           = gcc
-$cflags       = -O3 -DL_ENDIAN
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** unixware-2.0
-$cc           = cc
-$cflags       = -DFILIO_H -DNO_STRINGS_H
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -Kthread
-$sys_id       = 
-$lflags       = -lsocket -lnsl -lresolv -lx
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** unixware-2.1
-$cc           = cc
-$cflags       = -O -DFILIO_H
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -Kthread
-$sys_id       = 
-$lflags       = -lsocket -lnsl -lresolv -lx
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** unixware-7
-$cc           = cc
-$cflags       = -O -DFILIO_H -Kalloca
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -Kthread
-$sys_id       = 
-$lflags       = -lsocket -lnsl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG MD2_CHAR RC4_INDEX DES_PTR DES_RISC1 DES_UNROLL
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf-1
-$dso_scheme   = dlfcn
-$shared_target= svr5-shared
-$shared_cflag = -Kpic
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** unixware-7-gcc
-$cc           = gcc
-$cflags       = -DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -lsocket -lnsl
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
-$bf_obj       = bf-586.o
-$md5_obj      = md5-586.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
-$cast_obj     = cast-586.o
-$rc4_obj      = rc4-586.o
-$rmd160_obj   = rmd-586.o
-$rc5_obj      = rc5-586.o
-$wp_obj       = wp_block.o wp-mmx.o
-$cmll_obj     = cmll-x86.o
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf-1
-$dso_scheme   = dlfcn
-$shared_target= gnu-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** vos-gcc
-$cc           = gcc
-$cflags       = -Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN
-$debug_cflags   = -O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG
-$release_cflags = -O3
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = VOS
-$lflags       = -Wl,-map
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = BN_LLONG
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = .so
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** vxworks-mips
-$cc           = ccmips
-$cflags       = -mrtp -mips2 -O -G 0 -B$(WIND_BASE)/host/$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE="$(WIND_BASE)/target/lib/h/config/vsbConfig.h" -DCPU=MIPS32 -msoft-float -mno-branch-likely -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I$(WIND_BASE)/target/usr/h -I$(WIND_BASE)/target/h/wrn/coreip
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = VXWORKS
-$lflags       = -Wl,--defsym,__wrs_rtp_base=0xe0000000 -L $(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = bn-mips.o mips-mont.o
-$ec_obj       = 
-$des_obj      = 
-$aes_obj      = aes_cbc.o aes-mips.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-mips.o sha256-mips.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = o32
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = ranlibmips
-$arflags      = 
-$multilib     = 
-
-*** vxworks-ppc405
-$cc           = ccppc
-$cflags       = -g -msoft-float -mlongcall -DCPU=PPC405 -I$(WIND_BASE)/target/h
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = VXWORKS
-$lflags       = -r
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** vxworks-ppc60x
-$cc           = ccppc
-$cflags       = -D_REENTRANT -mrtp -mhard-float -mstrict-align -fno-implicit-fp -DPPC32_fp60x -O2 -fstrength-reduce -fno-builtin -fno-strict-aliasing -Wall -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -I$(WIND_BASE)/target/usr/h -I$(WIND_BASE)/target/usr/h/wrn/coreip
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = VXWORKS
-$lflags       = -Wl,--defsym,__wrs_rtp_base=0xe0000000 -L $(WIND_BASE)/target/usr/lib/ppc/PPC32/common
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** vxworks-ppc750
-$cc           = ccppc
-$cflags       = -ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I$(WIND_BASE)/target/h $(DEBUG_FLAG)
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = VXWORKS
-$lflags       = -r
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** vxworks-ppc750-debug
-$cc           = ccppc
-$cflags       = -ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = VXWORKS
-$lflags       = -r
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** vxworks-ppc860
-$cc           = ccppc
-$cflags       = -nostdinc -msoft-float -DCPU=PPC860 -DNO_STRINGS_H -I$(WIND_BASE)/target/h
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = VXWORKS
-$lflags       = -r
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** vxworks-ppcgen
-$cc           = ccppc
-$cflags       = -D_REENTRANT -mrtp -msoft-float -mstrict-align -O1 -fno-builtin -fno-strict-aliasing -Wall -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -I$(WIND_BASE)/target/usr/h -I$(WIND_BASE)/target/usr/h/wrn/coreip
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = VXWORKS
-$lflags       = -Wl,--defsym,__wrs_rtp_base=0xe0000000 -L $(WIND_BASE)/target/usr/lib/ppc/PPC32/sfcommon
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** vxworks-simlinux
-$cc           = ccpentium
-$cflags       = -B$(WIND_BASE)/host/$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE="$(WIND_BASE)/target/lib/h/config/vsbConfig.h" -DL_ENDIAN -DCPU=SIMLINUX -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DOPENSSL_NO_HW_PADLOCK
-$debug_cflags   = 
-$release_cflags = 
-$unistd       = 
-$thread_cflag = 
-$sys_id       = VXWORKS
-$lflags       = -r
-$debug_lflags   = 
-$release_lflags = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
-$ec_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  = 
-$perlasm_scheme = void
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = ranlibpentium
-$arflags      = 
-$multilib     = 
diff --git a/config b/config
index 44c48c1..944ead2 100755
--- a/config
+++ b/config
@@ -20,7 +20,6 @@
 # Be as similar to the output of config.guess/config.sub
 # as possible.
 
-PREFIX=""
 SUFFIX=""
 TEST="false"
 EXE=""
@@ -931,7 +930,7 @@ if [ $? = "0" ]; then
   OUT="$OUT-$CC"
 fi
 
-OUT="$PREFIX$OUT"
+OUT="$OUT"
 
 $PERL ./Configure LIST | grep "$OUT" > /dev/null
 if [ $? = "0" ]; then

From matt at openssl.org  Mon Mar 23 16:04:57 2015
From: matt at openssl.org (Matt Caswell)
Date: Mon, 23 Mar 2015 16:04:57 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427126697.280903.17296.nullmailer@dev.openssl.org>

The branch master has been updated
       via  c7f5b5d7bc462ca9dd5fc391e25c00a691960017 (commit)
       via  77d514c5a00511017967f98b03a946d86c923e94 (commit)
       via  ac59d70553723cd8c7c1558071a2e1672d80daef (commit)
       via  69f682374868ba2b19a8aeada496bf03dbb037cf (commit)
       via  4bcdb4a6019e57b3de077b17940e18befe745531 (commit)
       via  913f1042b3801bfa0e366922060507949e4af280 (commit)
      from  d2a5c40d0c5c4bfe2bec28070c3a0075f5bbdced (commit)


- Log -----------------------------------------------------------------
commit c7f5b5d7bc462ca9dd5fc391e25c00a691960017
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 23 15:27:40 2015 +0000

    Fix SSL_clear unused return
    
    Fix missing return value check in dtls1_listen when calling SSL_clear().
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 77d514c5a00511017967f98b03a946d86c923e94
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 9 15:33:46 2015 +0000

    ssl3_set_handshake_header returns
    
    Change ssl_set_handshake_header from return void to returning int, and
    handle error return code appropriately.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit ac59d70553723cd8c7c1558071a2e1672d80daef
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Mar 6 14:39:46 2015 +0000

    apps return value checks
    
    Ensure that all libssl functions called from within the apps have their
    return values checked where appropriate.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 69f682374868ba2b19a8aeada496bf03dbb037cf
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Mar 6 14:37:17 2015 +0000

    Fix missing return value checks
    
    Ensure that all functions have their return values checked where
    appropriate. This covers all functions defined and called from within
    libssl.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 4bcdb4a6019e57b3de077b17940e18befe745531
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 5 10:14:40 2015 +0000

    Check libssl function returns
    
    Mark most functions returning a result defined in any libssl header file
    with __owur to warn if they are used without checking the return value.
    Use -DUNUSED_RETURN compiler flag with gcc to activate these warnings.
    Some functions returning a result are skipped if it is common and valid to
    use these functions without checking the return value.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 913f1042b3801bfa0e366922060507949e4af280
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Mar 6 14:22:22 2015 +0000

    Add -DDEBUG_UNUSED to --strict-warnings
    
    In order to receive warnings on unused function return values the flag
    -DDEBUG_UNUSED must be passed to the compiler. This change adds that for the
    --strict-warnings Configure option.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 Configure       |   2 +-
 apps/s_cb.c     |   6 +-
 apps/s_client.c |  36 ++++-
 apps/s_server.c |  73 ++++++---
 apps/s_time.c   |  12 +-
 apps/sess_id.c  |   5 +-
 ssl/bio_ssl.c   |   5 +-
 ssl/d1_both.c   |   9 +-
 ssl/d1_clnt.c   |   6 +-
 ssl/d1_lib.c    |  13 +-
 ssl/d1_pkt.c    |   8 +-
 ssl/d1_srvr.c   |   6 +-
 ssl/s23_clnt.c  |   6 +-
 ssl/s23_srvr.c  |   6 +-
 ssl/s3_both.c   |  11 +-
 ssl/s3_clnt.c   |  29 +++-
 ssl/s3_enc.c    |  10 +-
 ssl/s3_lib.c    |   7 +-
 ssl/s3_pkt.c    |   5 +-
 ssl/s3_srvr.c   |  65 +++++++-
 ssl/srtp.h      |   8 +-
 ssl/ssl.h       | 428 +++++++++++++++++++++++++--------------------------
 ssl/ssl_algs.c  |   2 +-
 ssl/ssl_ciph.c  |   5 +-
 ssl/ssl_err.c   |  84 ++++------
 ssl/ssl_lib.c   |  25 ++-
 ssl/ssl_locl.h  | 464 ++++++++++++++++++++++++++++----------------------------
 ssl/ssl_rsa.c   |   5 +-
 ssl/ssl_sess.c  |   6 +-
 ssl/ssl_txt.c   |   3 +-
 ssl/ssltest.c   |  95 +++++++-----
 ssl/t1_enc.c    |   3 +-
 ssl/t1_lib.c    |  26 ++--
 ssl/tls1.h      |   8 +-
 34 files changed, 847 insertions(+), 635 deletions(-)

diff --git a/Configure b/Configure
index a574f5a..5993f9b 100755
--- a/Configure
+++ b/Configure
@@ -110,7 +110,7 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimenta
 # Minimum warning options... any contributions to OpenSSL should at least get
 # past these.
 
-my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK";
+my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DDEBUG_UNUSED";
 
 my $clang_disabled_warnings = "-Wno-language-extension-token -Wno-extended-offsetof -Wno-padded -Wno-shorten-64-to-32 -Wno-format-nonliteral -Wno-missing-noreturn -Wno-unused-parameter -Wno-sign-conversion -Wno-unreachable-code -Wno-conversion -Wno-documentation -Wno-missing-variable-declarations -Wno-cast-align -Wno-incompatible-pointer-types-discards-qualifiers -Wno-missing-variable-declarations -Wno-missing-field-initializers -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-conditional-uninitialized -Wno-switch-enum";
 
diff --git a/apps/s_cb.c b/apps/s_cb.c
index 8a66c9a..8bc4b81 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -1181,8 +1181,10 @@ static int set_cert_cb(SSL *ssl, void *arg)
 
         print_chain_flags(bio_err, ssl, rv);
         if (rv & CERT_PKEY_VALID) {
-            SSL_use_certificate(ssl, exc->cert);
-            SSL_use_PrivateKey(ssl, exc->key);
+            if(!SSL_use_certificate(ssl, exc->cert)
+               || !SSL_use_PrivateKey(ssl, exc->key)) {
+                return 0;
+            }
             /*
              * NB: we wouldn't normally do this as it is not efficient
              * building chains on each connection better to cache the chain
diff --git a/apps/s_client.c b/apps/s_client.c
index 3ec754f..c02ed3c 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1259,8 +1259,11 @@ int MAIN(int argc, char **argv)
     if (sdebug)
         ssl_ctx_security_debug(ctx, bio_err, sdebug);
 
-    if (vpm)
-        SSL_CTX_set1_param(ctx, vpm);
+    if (vpm && !SSL_CTX_set1_param(ctx, vpm)) {
+        BIO_printf(bio_err, "Error setting verify params\n");
+        ERR_print_errors(bio_err);
+        goto end;
+    }
 
     if (!args_ssl_call(ctx, bio_err, cctx, ssl_args, 1, no_jpake)) {
         ERR_print_errors(bio_err);
@@ -1299,8 +1302,14 @@ int MAIN(int argc, char **argv)
     }
 #endif
 #ifndef OPENSSL_NO_SRTP
-    if (srtp_profiles != NULL)
-        SSL_CTX_set_tlsext_use_srtp(ctx, srtp_profiles);
+    if (srtp_profiles != NULL) {
+        /* Returns 0 on success!! */
+        if(SSL_CTX_set_tlsext_use_srtp(ctx, srtp_profiles)) {
+            BIO_printf(bio_err, "Error setting SRTP profile\n");
+            ERR_print_errors(bio_err);
+            goto end;
+        }
+    }
 #endif
     if (exc)
         ssl_ctx_set_excert(ctx, exc);
@@ -1318,16 +1327,23 @@ int MAIN(int argc, char **argv)
             BIO_printf(bio_err, "Error parsing -alpn argument\n");
             goto end;
         }
-        SSL_CTX_set_alpn_protos(ctx, alpn, alpn_len);
+        /* Returns 0 on success!! */
+        if(SSL_CTX_set_alpn_protos(ctx, alpn, alpn_len)) {
+            BIO_printf(bio_err, "Error setting ALPN\n");
+            goto end;
+        }
         OPENSSL_free(alpn);
     }
 #endif
 #ifndef OPENSSL_NO_TLSEXT
     for (i = 0; i < serverinfo_types_count; i++) {
-        SSL_CTX_add_client_custom_ext(ctx,
+        if(!SSL_CTX_add_client_custom_ext(ctx,
                                       serverinfo_types[i],
                                       NULL, NULL, NULL,
-                                      serverinfo_cli_parse_cb, NULL);
+                                      serverinfo_cli_parse_cb, NULL)) {
+            BIO_printf(bio_err, "Warning: Unable to add custom extension %u. "
+                       "Skipping\n", serverinfo_types[i]);
+        }
     }
 #endif
 
@@ -1390,7 +1406,11 @@ int MAIN(int argc, char **argv)
             ERR_print_errors(bio_err);
             goto end;
         }
-        SSL_set_session(con, sess);
+        if(!SSL_set_session(con, sess)) {
+            BIO_printf(bio_err, "Can't set session\n");
+            ERR_print_errors(bio_err);
+            goto end;
+        }
         SSL_SESSION_free(sess);
     }
 
diff --git a/apps/s_server.c b/apps/s_server.c
index ec2fe6f..298e665 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1723,8 +1723,14 @@ int MAIN(int argc, char *argv[])
         SSL_CTX_sess_set_cache_size(ctx, 128);
 
 #ifndef OPENSSL_NO_SRTP
-    if (srtp_profiles != NULL)
-        SSL_CTX_set_tlsext_use_srtp(ctx, srtp_profiles);
+    if (srtp_profiles != NULL) {
+        /* Returns 0 on success!! */
+        if(SSL_CTX_set_tlsext_use_srtp(ctx, srtp_profiles)) {
+            BIO_printf(bio_err, "Error setting SRTP profile\n");
+            ERR_print_errors(bio_err);
+            goto end;
+        }
+    }
 #endif
 
     if ((!SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) ||
@@ -1733,8 +1739,11 @@ int MAIN(int argc, char *argv[])
         ERR_print_errors(bio_err);
         /* goto end; */
     }
-    if (vpm)
-        SSL_CTX_set1_param(ctx, vpm);
+    if (vpm && !SSL_CTX_set1_param(ctx, vpm)) {
+        BIO_printf(bio_err, "Error setting X509 params\n");
+        ERR_print_errors(bio_err);
+        goto end;
+    }
 
     ssl_ctx_add_crls(ctx, crls, 0);
     if (!args_ssl_call(ctx, bio_err, cctx, ssl_args, no_ecdhe, no_jpake))
@@ -1790,8 +1799,11 @@ int MAIN(int argc, char *argv[])
             (!SSL_CTX_set_default_verify_paths(ctx2))) {
             ERR_print_errors(bio_err);
         }
-        if (vpm)
-            SSL_CTX_set1_param(ctx2, vpm);
+        if (vpm && !SSL_CTX_set1_param(ctx2, vpm))  {
+            BIO_printf(bio_err, "Error setting X509 params\n");
+            ERR_print_errors(bio_err);
+            goto end;
+        }
 
         ssl_ctx_add_crls(ctx2, crls, 0);
         if (!args_ssl_call(ctx2, bio_err, cctx, ssl_args, no_ecdhe, no_jpake))
@@ -1913,8 +1925,13 @@ int MAIN(int argc, char *argv[])
 #endif
 
     SSL_CTX_set_verify(ctx, s_server_verify, verify_callback);
-    SSL_CTX_set_session_id_context(ctx, (void *)&s_server_session_id_context,
-                                   sizeof s_server_session_id_context);
+    if(!SSL_CTX_set_session_id_context(ctx,
+        (void *)&s_server_session_id_context,
+        sizeof s_server_session_id_context)) {
+        BIO_printf(bio_err, "error setting session id context\n");
+        ERR_print_errors(bio_err);
+        goto end;
+    }
 
     /* Set DTLS cookie generation and verification callbacks */
     SSL_CTX_set_cookie_generate_cb(ctx, generate_cookie_callback);
@@ -1923,9 +1940,13 @@ int MAIN(int argc, char *argv[])
 #ifndef OPENSSL_NO_TLSEXT
     if (ctx2) {
         SSL_CTX_set_verify(ctx2, s_server_verify, verify_callback);
-        SSL_CTX_set_session_id_context(ctx2,
+        if(!SSL_CTX_set_session_id_context(ctx2,
                                        (void *)&s_server_session_id_context,
-                                       sizeof s_server_session_id_context);
+                                       sizeof s_server_session_id_context)) {
+            BIO_printf(bio_err, "error setting session id context\n");
+            ERR_print_errors(bio_err);
+            goto end;
+        }
 
         tlsextcbp.biodebug = bio_s_out;
         SSL_CTX_set_tlsext_servername_callback(ctx2, ssl_servername_cb);
@@ -2130,10 +2151,18 @@ static int sv_body(char *hostname, int s, int stype, unsigned char *context)
             kssl_ctx_setstring(kctx, KSSL_KEYTAB, KRB5KEYTAB);
         }
 #endif                          /* OPENSSL_NO_KRB5 */
-        if (context)
-            SSL_set_session_id_context(con, context, strlen((char *)context));
+        if (context && !SSL_set_session_id_context(con, context,
+                                                   strlen((char *)context))) {
+            BIO_printf(bio_err, "Error setting session id context\n");
+            ret = -1;
+            goto err;
+        }
+    }
+    if(!SSL_clear(con)) {
+        BIO_printf(bio_err, "Error clearing SSL connection\n");
+        ret = -1;
+        goto err;
     }
-    SSL_clear(con);
 
     if (stype == SOCK_DGRAM) {
 
@@ -2687,8 +2716,10 @@ static int www_body(char *hostname, int s, int stype, unsigned char *context)
         kssl_ctx_setstring(kctx, KSSL_KEYTAB, KRB5KEYTAB);
     }
 #endif                          /* OPENSSL_NO_KRB5 */
-    if (context)
-        SSL_set_session_id_context(con, context, strlen((char *)context));
+    if (context && !SSL_set_session_id_context(con, context,
+                                               strlen((char *)context))) {
+        goto err;
+    }
 
     sbio = BIO_new_socket(s, BIO_NOCLOSE);
     if (s_nbio_test) {
@@ -3033,8 +3064,11 @@ static int rev_body(char *hostname, int s, int stype, unsigned char *context)
         kssl_ctx_setstring(kctx, KSSL_KEYTAB, KRB5KEYTAB);
     }
 #endif                          /* OPENSSL_NO_KRB5 */
-    if (context)
-        SSL_set_session_id_context(con, context, strlen((char *)context));
+    if (context && !SSL_set_session_id_context(con, context,
+                                               strlen((char *)context))) {
+        ERR_print_errors(bio_err);
+        goto err;
+    }
 
     sbio = BIO_new_socket(s, BIO_NOCLOSE);
     SSL_set_bio(con, sbio, sbio);
@@ -3230,7 +3264,10 @@ static int add_session(SSL *ssl, SSL_SESSION *session)
         return 0;
     }
     p = sess->der;
-    i2d_SSL_SESSION(session, &p);
+    if(i2d_SSL_SESSION(session, &p) < 0) {
+        BIO_printf(bio_err, "Error encoding session\n");
+        return 0;
+    }
 
     sess->next = first;
     first = sess;
diff --git a/apps/s_time.c b/apps/s_time.c
index 96e39aa..5b94634 100644
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -356,7 +356,8 @@ int MAIN(int argc, char **argv)
 
     if (st_bugs)
         SSL_CTX_set_options(tm_ctx, SSL_OP_ALL);
-    SSL_CTX_set_cipher_list(tm_ctx, tm_cipher);
+    if(!SSL_CTX_set_cipher_list(tm_ctx, tm_cipher))
+        goto end;
     if (!set_cert_stuff(tm_ctx, t_cert_file, t_key_file))
         goto end;
 
@@ -405,7 +406,8 @@ int MAIN(int argc, char **argv)
         if (s_www_path != NULL) {
             BIO_snprintf(buf, sizeof buf, "GET %s HTTP/1.0\r\n\r\n",
                          s_www_path);
-            SSL_write(scon, buf, strlen(buf));
+            if(SSL_write(scon, buf, strlen(buf)) <= 0)
+                goto end;
             while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)
                 bytes_read += i;
         }
@@ -461,7 +463,8 @@ int MAIN(int argc, char **argv)
 
     if (s_www_path != NULL) {
         BIO_snprintf(buf, sizeof buf, "GET %s HTTP/1.0\r\n\r\n", s_www_path);
-        SSL_write(scon, buf, strlen(buf));
+        if(SSL_write(scon, buf, strlen(buf)) <= 0)
+            goto end;
         while (SSL_read(scon, buf, sizeof(buf)) > 0) ;
     }
 #ifdef NO_SHUTDOWN
@@ -498,7 +501,8 @@ int MAIN(int argc, char **argv)
         if (s_www_path) {
             BIO_snprintf(buf, sizeof buf, "GET %s HTTP/1.0\r\n\r\n",
                          s_www_path);
-            SSL_write(scon, buf, strlen(buf));
+            if(SSL_write(scon, buf, strlen(buf)) <= 0)
+                goto end;
             while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)
                 bytes_read += i;
         }
diff --git a/apps/sess_id.c b/apps/sess_id.c
index fcb0911..9400af9 100644
--- a/apps/sess_id.c
+++ b/apps/sess_id.c
@@ -166,7 +166,10 @@ int MAIN(int argc, char **argv)
             BIO_printf(bio_err, "Context too long\n");
             goto end;
         }
-        SSL_SESSION_set1_id_context(x, (unsigned char *)context, ctx_len);
+        if(!SSL_SESSION_set1_id_context(x, (unsigned char *)context, ctx_len)) {
+            BIO_printf(bio_err, "Error setting id context\n");
+            goto end;
+        }
     }
 
     if (!noout || text) {
diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index e2831af..99f8b5e 100644
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c
@@ -292,7 +292,10 @@ static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
         else if (ssl->handshake_func == ssl->method->ssl_accept)
             SSL_set_accept_state(ssl);
 
-        SSL_clear(ssl);
+        if(!SSL_clear(ssl)) {
+            ret = 0;
+            break;
+        }
 
         if (b->next_bio != NULL)
             ret = BIO_ctrl(b->next_bio, cmd, num, ptr);
diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index a7d0a82..22626f1 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -989,7 +989,10 @@ int dtls1_send_change_cipher_spec(SSL *s, int a, int b)
                                      s->d1->handshake_write_seq, 0, 0);
 
         /* buffer the message to handle re-xmits */
-        dtls1_buffer_message(s, 1);
+        if(!dtls1_buffer_message(s, 1)) {
+            SSLerr(SSL_F_DTLS1_SEND_CHANGE_CIPHER_SPEC, ERR_R_INTERNAL_ERROR);
+            return -1;
+        }
 
         s->state = b;
     }
@@ -1237,7 +1240,7 @@ void dtls1_clear_record_buffer(SSL *s)
     }
 }
 
-unsigned char *dtls1_set_message_header(SSL *s, unsigned char *p,
+void dtls1_set_message_header(SSL *s, unsigned char *p,
                                         unsigned char mt, unsigned long len,
                                         unsigned long frag_off,
                                         unsigned long frag_len)
@@ -1250,8 +1253,6 @@ unsigned char *dtls1_set_message_header(SSL *s, unsigned char *p,
 
     dtls1_set_message_header_int(s, mt, len, s->d1->handshake_write_seq,
                                  frag_off, frag_len);
-
-    return p += DTLS1_HM_HEADER_LENGTH;
 }
 
 /* don't actually do the writing, wait till the MTU has been retrieved */
diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c
index 151dd47..c5831cd 100644
--- a/ssl/d1_clnt.c
+++ b/ssl/d1_clnt.c
@@ -181,8 +181,10 @@ int dtls1_connect(SSL *s)
         cb = s->ctx->info_callback;
 
     s->in_handshake++;
-    if (!SSL_in_init(s) || SSL_in_before(s))
-        SSL_clear(s);
+    if (!SSL_in_init(s) || SSL_in_before(s)) {
+        if(!SSL_clear(s))
+            return -1;
+    }
 
 #ifndef OPENSSL_NO_SCTP
     /*
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index e9a2fc5..ad6561c 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -67,7 +67,7 @@
 #endif
 
 static void get_current_time(struct timeval *t);
-static void dtls1_set_handshake_header(SSL *s, int type, unsigned long len);
+static int dtls1_set_handshake_header(SSL *s, int type, unsigned long len);
 static int dtls1_handshake_write(SSL *s);
 const char dtls1_version_str[] = "DTLSv1" OPENSSL_VERSION_PTEXT;
 int dtls1_listen(SSL *s, struct sockaddr *client);
@@ -547,7 +547,8 @@ int dtls1_listen(SSL *s, struct sockaddr *client)
     int ret;
 
     /* Ensure there is no state left over from a previous invocation */
-    SSL_clear(s);
+    if(!SSL_clear(s))
+        return -1;
 
     SSL_set_options(s, SSL_OP_COOKIE_EXCHANGE);
     s->d1->listen = 1;
@@ -560,14 +561,18 @@ int dtls1_listen(SSL *s, struct sockaddr *client)
     return 1;
 }
 
-static void dtls1_set_handshake_header(SSL *s, int htype, unsigned long len)
+static int dtls1_set_handshake_header(SSL *s, int htype, unsigned long len)
 {
     unsigned char *p = (unsigned char *)s->init_buf->data;
     dtls1_set_message_header(s, p, htype, len, 0, len);
     s->init_num = (int)len + DTLS1_HM_HEADER_LENGTH;
     s->init_off = 0;
     /* Buffer the message to handle re-xmits */
-    dtls1_buffer_message(s, 0);
+
+    if(!dtls1_buffer_message(s, 0))
+        return 0;
+
+    return 1;
 }
 
 static int dtls1_handshake_write(SSL *s)
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index 4dbd694..5463acf 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -937,7 +937,10 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         }
 #ifndef OPENSSL_NO_HEARTBEATS
         else if (rr->type == TLS1_RT_HEARTBEAT) {
-            dtls1_process_heartbeat(s);
+            /* We allow a 0 return */
+            if(dtls1_process_heartbeat(s) < 0) {
+                return -1;
+            }
 
             /* Exit and notify application to read again */
             rr->length = 0;
@@ -1246,7 +1249,8 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             if (dtls1_check_timeout_num(s) < 0)
                 return -1;
 
-            dtls1_retransmit_buffered_messages(s);
+            /* Ignore retransmit failures - swallow return code */
+            if(dtls1_retransmit_buffered_messages(s));
             rr->length = 0;
             goto start;
         }
diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c
index bcf63e0..24361ae 100644
--- a/ssl/d1_srvr.c
+++ b/ssl/d1_srvr.c
@@ -184,8 +184,10 @@ int dtls1_accept(SSL *s)
 
     /* init things to blank */
     s->in_handshake++;
-    if (!SSL_in_init(s) || SSL_in_before(s))
-        SSL_clear(s);
+    if (!SSL_in_init(s) || SSL_in_before(s)) {
+        if(!SSL_clear(s))
+            return -1;
+    }
 
     s->d1->listen = listen;
 #ifndef OPENSSL_NO_SCTP
diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c
index e04d3af..21a32bc 100644
--- a/ssl/s23_clnt.c
+++ b/ssl/s23_clnt.c
@@ -157,8 +157,10 @@ int ssl23_connect(SSL *s)
         cb = s->ctx->info_callback;
 
     s->in_handshake++;
-    if (!SSL_in_init(s) || SSL_in_before(s))
-        SSL_clear(s);
+    if (!SSL_in_init(s) || SSL_in_before(s)) {
+        if(!SSL_clear(s))
+            return -1;
+    }
 
     for (;;) {
         state = s->state;
diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c
index 6ac6e4e..255d278 100644
--- a/ssl/s23_srvr.c
+++ b/ssl/s23_srvr.c
@@ -156,8 +156,10 @@ int ssl23_accept(SSL *s)
         cb = s->ctx->info_callback;
 
     s->in_handshake++;
-    if (!SSL_in_init(s) || SSL_in_before(s))
-        SSL_clear(s);
+    if (!SSL_in_init(s) || SSL_in_before(s)) {
+        if(!SSL_clear(s))
+            return -1;
+    }
 
     for (;;) {
         state = s->state;
diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index de49e64..2bc4e6a 100644
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -187,7 +187,10 @@ int ssl3_send_finished(SSL *s, int a, int b, const char *sender, int slen)
             s->s3->previous_server_finished_len = i;
         }
 
-        ssl_set_handshake_header(s, SSL3_MT_FINISHED, l);
+        if(!ssl_set_handshake_header(s, SSL3_MT_FINISHED, l)) {
+            SSLerr(SSL_F_SSL3_SEND_FINISHED, ERR_R_INTERNAL_ERROR);
+            return -1;
+        }
         s->state = b;
     }
 
@@ -324,7 +327,11 @@ unsigned long ssl3_output_cert_chain(SSL *s, CERT_PKEY *cpk)
     p = ssl_handshake_start(s);
     l2n3(l, p);
     l += 3;
-    ssl_set_handshake_header(s, SSL3_MT_CERTIFICATE, l);
+
+    if(!ssl_set_handshake_header(s, SSL3_MT_CERTIFICATE, l)) {
+        SSLerr(SSL_F_SSL3_OUTPUT_CERT_CHAIN, ERR_R_INTERNAL_ERROR);
+        return 0;
+    }
     return l + SSL_HM_HEADER_LENGTH(s);
 }
 
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index b37a733..81381ef 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -197,8 +197,10 @@ int ssl3_connect(SSL *s)
         cb = s->ctx->info_callback;
 
     s->in_handshake++;
-    if (!SSL_in_init(s) || SSL_in_before(s))
-        SSL_clear(s);
+    if (!SSL_in_init(s) || SSL_in_before(s)) {
+        if(!SSL_clear(s))
+            return -1;
+    }
 
 #ifndef OPENSSL_NO_HEARTBEATS
     /*
@@ -841,7 +843,11 @@ int ssl3_client_hello(SSL *s)
 #endif
 
         l = p - d;
-        ssl_set_handshake_header(s, SSL3_MT_CLIENT_HELLO, l);
+        if(!ssl_set_handshake_header(s, SSL3_MT_CLIENT_HELLO, l)) {
+            ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
+            SSLerr(SSL_F_SSL3_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
+            goto err;
+        }
         s->state = SSL3_ST_CW_CLNT_HELLO_B;
     }
 
@@ -2996,7 +3002,12 @@ int ssl3_send_client_key_exchange(SSL *s)
             goto err;
         }
 
-        ssl_set_handshake_header(s, SSL3_MT_CLIENT_KEY_EXCHANGE, n);
+        if(!ssl_set_handshake_header(s, SSL3_MT_CLIENT_KEY_EXCHANGE, n)) {
+            ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
+            SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
+            goto err;
+        }
+
         s->state = SSL3_ST_CW_KEY_EXCH_B;
     }
 
@@ -3044,6 +3055,11 @@ int ssl3_send_client_key_exchange(SSL *s)
         OPENSSL_cleanse(pms, pmslen);
         OPENSSL_free(pms);
         s->cert->pms = NULL;
+        if(s->session->master_key_length < 0) {
+            ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
+            SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
+            goto err;
+        }
     }
     return n;
  memerr:
@@ -3190,7 +3206,10 @@ int ssl3_send_client_verify(SSL *s)
             SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY, ERR_R_INTERNAL_ERROR);
             goto err;
         }
-        ssl_set_handshake_header(s, SSL3_MT_CERTIFICATE_VERIFY, n);
+        if(!ssl_set_handshake_header(s, SSL3_MT_CERTIFICATE_VERIFY, n)) {
+            SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY, ERR_R_INTERNAL_ERROR);
+            goto err;
+        }
         s->state = SSL3_ST_CW_CERT_VRFY_B;
     }
     EVP_MD_CTX_cleanup(&mctx);
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index 83a576a..bcefe12 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -253,7 +253,10 @@ int ssl3_change_cipher_state(SSL *s, int which)
             EVP_CIPHER_CTX_init(s->enc_read_ctx);
         dd = s->enc_read_ctx;
 
-        ssl_replace_hash(&s->read_hash, m);
+        if(!ssl_replace_hash(&s->read_hash, m)) {
+                SSLerr(SSL_F_SSL3_CHANGE_CIPHER_STATE, ERR_R_INTERNAL_ERROR);
+                goto err2;
+        }
 #ifndef OPENSSL_NO_COMP
         /* COMPRESS */
         if (s->expand != NULL) {
@@ -288,7 +291,10 @@ int ssl3_change_cipher_state(SSL *s, int which)
              */
             EVP_CIPHER_CTX_init(s->enc_write_ctx);
         dd = s->enc_write_ctx;
-        ssl_replace_hash(&s->write_hash, m);
+        if(!ssl_replace_hash(&s->write_hash, m)) {
+                SSLerr(SSL_F_SSL3_CHANGE_CIPHER_STATE, ERR_R_INTERNAL_ERROR);
+                goto err2;
+        }
 #ifndef OPENSSL_NO_COMP
         /* COMPRESS */
         if (s->compress != NULL) {
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 3e6530e..6c59824 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3087,13 +3087,15 @@ int ssl3_pending(const SSL *s)
             SSL3_RT_APPLICATION_DATA) ? s->s3->rrec.length : 0;
 }
 
-void ssl3_set_handshake_header(SSL *s, int htype, unsigned long len)
+int ssl3_set_handshake_header(SSL *s, int htype, unsigned long len)
 {
     unsigned char *p = (unsigned char *)s->init_buf->data;
     *(p++) = htype;
     l2n3(len, p);
     s->init_num = (int)len + SSL3_HM_HEADER_LENGTH;
     s->init_off = 0;
+
+     return 1;
 }
 
 int ssl3_handshake_write(SSL *s)
@@ -3114,7 +3116,8 @@ int ssl3_new(SSL *s)
     s->s3 = s3;
 
 #ifndef OPENSSL_NO_SRP
-    SSL_SRP_CTX_init(s);
+    if(!SSL_SRP_CTX_init(s))
+          goto err;
 #endif
     s->method->ssl_clear(s);
     return (1);
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index cf02e49..4f81f1a 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -1320,7 +1320,10 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         }
 #ifndef OPENSSL_NO_HEARTBEATS
         else if (rr->type == TLS1_RT_HEARTBEAT) {
-            tls1_process_heartbeat(s);
+            /* We can ignore 0 return values */
+            if(tls1_process_heartbeat(s) < 0) {
+                return -1;
+            }
 
             /* Exit and notify application to read again */
             rr->length = 0;
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index f8c7e37..ccccd54 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -226,8 +226,10 @@ int ssl3_accept(SSL *s)
 
     /* init things to blank */
     s->in_handshake++;
-    if (!SSL_in_init(s) || SSL_in_before(s))
-        SSL_clear(s);
+    if (!SSL_in_init(s) || SSL_in_before(s)) {
+        if(!SSL_clear(s))
+            return -1;
+    }
 
     if (s->cert == NULL) {
         SSLerr(SSL_F_SSL3_ACCEPT, SSL_R_NO_CERTIFICATE_SET);
@@ -884,7 +886,10 @@ int ssl3_send_hello_request(SSL *s)
 {
 
     if (s->state == SSL3_ST_SW_HELLO_REQ_A) {
-        ssl_set_handshake_header(s, SSL3_MT_HELLO_REQUEST, 0);
+        if(!ssl_set_handshake_header(s, SSL3_MT_HELLO_REQUEST, 0)) {
+            SSLerr(SSL_F_SSL3_SEND_HELLO_REQUEST, ERR_R_INTERNAL_ERROR);
+            return -1;
+        }
         s->state = SSL3_ST_SW_HELLO_REQ_B;
     }
 
@@ -1500,7 +1505,10 @@ int ssl3_send_server_hello(SSL *s)
 #endif
         /* do the header */
         l = (p - d);
-        ssl_set_handshake_header(s, SSL3_MT_SERVER_HELLO, l);
+        if(!ssl_set_handshake_header(s, SSL3_MT_SERVER_HELLO, l)) {
+            SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO, ERR_R_INTERNAL_ERROR);
+            return -1;
+        }
         s->state = SSL3_ST_SW_SRVR_HELLO_B;
     }
 
@@ -1512,7 +1520,10 @@ int ssl3_send_server_done(SSL *s)
 {
 
     if (s->state == SSL3_ST_SW_SRVR_DONE_A) {
-        ssl_set_handshake_header(s, SSL3_MT_SERVER_DONE, 0);
+        if(!ssl_set_handshake_header(s, SSL3_MT_SERVER_DONE, 0)) {
+            SSLerr(SSL_F_SSL3_SEND_SERVER_DONE, ERR_R_INTERNAL_ERROR);
+            return -1;
+        }
         s->state = SSL3_ST_SW_SRVR_DONE_B;
     }
 
@@ -1959,7 +1970,11 @@ int ssl3_send_server_key_exchange(SSL *s)
             }
         }
 
-        ssl_set_handshake_header(s, SSL3_MT_SERVER_KEY_EXCHANGE, n);
+        if(!ssl_set_handshake_header(s, SSL3_MT_SERVER_KEY_EXCHANGE, n)) {
+            al = SSL_AD_HANDSHAKE_FAILURE;
+            SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
+            goto f_err;
+        }
     }
 
     s->state = SSL3_ST_SW_KEY_EXCH_B;
@@ -2037,7 +2052,10 @@ int ssl3_send_certificate_request(SSL *s)
         p = ssl_handshake_start(s) + off;
         s2n(nl, p);
 
-        ssl_set_handshake_header(s, SSL3_MT_CERTIFICATE_REQUEST, n);
+        if(!ssl_set_handshake_header(s, SSL3_MT_CERTIFICATE_REQUEST, n)) {
+            SSLerr(SSL_F_SSL3_SEND_CERTIFICATE_REQUEST, ERR_R_INTERNAL_ERROR);
+            return -1;
+        }
 
         s->state = SSL3_ST_SW_CERT_REQ_B;
     }
@@ -2227,6 +2245,11 @@ int ssl3_get_client_key_exchange(SSL *s)
                                                         sizeof
                                                         (rand_premaster_secret));
         OPENSSL_cleanse(p, sizeof(rand_premaster_secret));
+        if(s->session->master_key_length < 0) {
+            al = SSL_AD_INTERNAL_ERROR;
+            SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
+            goto f_err;
+        }
     } else
 #endif
 #ifndef OPENSSL_NO_DH
@@ -2319,6 +2342,11 @@ int ssl3_get_client_key_exchange(SSL *s)
                                                         session->master_key,
                                                         p, i);
         OPENSSL_cleanse(p, i);
+        if(s->session->master_key_length < 0) {
+            al = SSL_AD_INTERNAL_ERROR;
+            SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
+            goto f_err;
+        }
         if (dh_clnt)
             return 2;
     } else
@@ -2484,6 +2512,11 @@ int ssl3_get_client_key_exchange(SSL *s)
                                                         s->
                                                         session->master_key,
                                                         pms, outl);
+        if(s->session->master_key_length < 0) {
+            al = SSL_INTERNAL_ERROR;
+            SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
+            goto f_err;
+        }
 
         if (kssl_ctx->client_princ) {
             size_t len = strlen(kssl_ctx->client_princ);
@@ -2632,6 +2665,11 @@ int ssl3_get_client_key_exchange(SSL *s)
                                                         p, i);
 
         OPENSSL_cleanse(p, i);
+        if(s->session->master_key_length < 0) {
+            al = SSL_AD_INTERNAL_ERROR;
+            SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
+            goto f_err;
+        }
         return (ret);
     } else
 #endif
@@ -2716,6 +2754,11 @@ int ssl3_get_client_key_exchange(SSL *s)
                                                         session->master_key,
                                                         psk_or_pre_ms,
                                                         pre_ms_len);
+        if(s->session->master_key_length < 0) {
+            al = SSL_AD_INTERNAL_ERROR;
+            SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
+            goto psk_err;
+        }
         psk_err = 0;
  psk_err:
         OPENSSL_cleanse(psk_or_pre_ms, sizeof(psk_or_pre_ms));
@@ -2817,6 +2860,11 @@ int ssl3_get_client_key_exchange(SSL *s)
                                                         s->
                                                         session->master_key,
                                                         premaster_secret, 32);
+        if(s->session->master_key_length < 0) {
+            al = SSL_AD_INTERNAL_ERROR;
+            SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
+            goto f_err;
+        }
         /* Check if pubkey from client certificate was used */
         if (EVP_PKEY_CTX_ctrl
             (pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2, NULL) > 0)
@@ -3387,7 +3435,8 @@ int ssl3_send_newsession_ticket(SSL *s)
         /* Now write out lengths: p points to end of data written */
         /* Total length */
         len = p - ssl_handshake_start(s);
-        ssl_set_handshake_header(s, SSL3_MT_NEWSESSION_TICKET, len);
+        if(!ssl_set_handshake_header(s, SSL3_MT_NEWSESSION_TICKET, len))
+            goto err;
         /* Skip ticket lifetime hint */
         p = ssl_handshake_start(s) + 4;
         s2n(len - 6, p);
diff --git a/ssl/srtp.h b/ssl/srtp.h
index 2279c32..611f5ef 100644
--- a/ssl/srtp.h
+++ b/ssl/srtp.h
@@ -132,11 +132,11 @@ extern "C" {
 
 # ifndef OPENSSL_NO_SRTP
 
-int SSL_CTX_set_tlsext_use_srtp(SSL_CTX *ctx, const char *profiles);
-int SSL_set_tlsext_use_srtp(SSL *ctx, const char *profiles);
+__owur int SSL_CTX_set_tlsext_use_srtp(SSL_CTX *ctx, const char *profiles);
+__owur int SSL_set_tlsext_use_srtp(SSL *ctx, const char *profiles);
 
-STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl);
-SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
+__owur STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl);
+__owur SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
 
 # endif
 
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 56eb7ba..3a6f9fb 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -664,14 +664,14 @@ void SSL_set_msg_callback(SSL *ssl,
 # ifndef OPENSSL_NO_SRP
 
 /* see tls_srp.c */
-int SSL_SRP_CTX_init(SSL *s);
-int SSL_CTX_SRP_CTX_init(SSL_CTX *ctx);
+__owur int SSL_SRP_CTX_init(SSL *s);
+__owur int SSL_CTX_SRP_CTX_init(SSL_CTX *ctx);
 int SSL_SRP_CTX_free(SSL *ctx);
 int SSL_CTX_SRP_CTX_free(SSL_CTX *ctx);
-int SSL_srp_server_param_with_username(SSL *s, int *ad);
-int SRP_generate_server_master_secret(SSL *s, unsigned char *master_key);
-int SRP_Calc_A_param(SSL *s);
-int SRP_generate_client_master_secret(SSL *s, unsigned char *master_key);
+__owur int SSL_srp_server_param_with_username(SSL *s, int *ad);
+__owur int SRP_generate_server_master_secret(SSL *s, unsigned char *master_key);
+__owur int SRP_Calc_A_param(SSL *s);
+__owur int SRP_generate_client_master_secret(SSL *s, unsigned char *master_key);
 
 # endif
 
@@ -772,7 +772,7 @@ void SSL_CTX_set_client_cert_cb(SSL_CTX *ctx,
 int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx)) (SSL *ssl, X509 **x509,
                                                  EVP_PKEY **pkey);
 # ifndef OPENSSL_NO_ENGINE
-int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e);
+__owur int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e);
 # endif
 void SSL_CTX_set_cookie_generate_cb(SSL_CTX *ctx,
                                     int (*app_gen_cookie_cb) (SSL *ssl,
@@ -805,7 +805,7 @@ void SSL_get0_next_proto_negotiated(const SSL *s, const unsigned char **data,
 # endif
 
 # ifndef OPENSSL_NO_TLSEXT
-int SSL_select_next_proto(unsigned char **out, unsigned char *outlen,
+__owur int SSL_select_next_proto(unsigned char **out, unsigned char *outlen,
                           const unsigned char *in, unsigned int inlen,
                           const unsigned char *client,
                           unsigned int client_len);
@@ -815,9 +815,9 @@ int SSL_select_next_proto(unsigned char **out, unsigned char *outlen,
 # define OPENSSL_NPN_NEGOTIATED  1
 # define OPENSSL_NPN_NO_OVERLAP  2
 
-int SSL_CTX_set_alpn_protos(SSL_CTX *ctx, const unsigned char *protos,
+__owur int SSL_CTX_set_alpn_protos(SSL_CTX *ctx, const unsigned char *protos,
                             unsigned protos_len);
-int SSL_set_alpn_protos(SSL *ssl, const unsigned char *protos,
+__owur int SSL_set_alpn_protos(SSL *ssl, const unsigned char *protos,
                         unsigned protos_len);
 void SSL_CTX_set_alpn_select_cb(SSL_CTX *ctx,
                                 int (*cb) (SSL *ssl,
@@ -894,8 +894,8 @@ void SSL_set_psk_server_callback(SSL *ssl,
                                                                       unsigned
                                                                       int
                                                                       max_psk_len));
-int SSL_CTX_use_psk_identity_hint(SSL_CTX *ctx, const char *identity_hint);
-int SSL_use_psk_identity_hint(SSL *s, const char *identity_hint);
+__owur int SSL_CTX_use_psk_identity_hint(SSL_CTX *ctx, const char *identity_hint);
+__owur int SSL_use_psk_identity_hint(SSL *s, const char *identity_hint);
 const char *SSL_get_psk_identity_hint(const SSL *s);
 const char *SSL_get_psk_identity(const SSL *s);
 # endif
@@ -903,21 +903,21 @@ const char *SSL_get_psk_identity(const SSL *s);
 # ifndef OPENSSL_NO_TLSEXT
 /* Register callbacks to handle custom TLS Extensions for client or server. */
 
-int SSL_CTX_add_client_custom_ext(SSL_CTX *ctx, unsigned int ext_type,
+__owur int SSL_CTX_add_client_custom_ext(SSL_CTX *ctx, unsigned int ext_type,
                                   custom_ext_add_cb add_cb,
                                   custom_ext_free_cb free_cb,
                                   void *add_arg,
                                   custom_ext_parse_cb parse_cb,
                                   void *parse_arg);
 
-int SSL_CTX_add_server_custom_ext(SSL_CTX *ctx, unsigned int ext_type,
+__owur int SSL_CTX_add_server_custom_ext(SSL_CTX *ctx, unsigned int ext_type,
                                   custom_ext_add_cb add_cb,
                                   custom_ext_free_cb free_cb,
                                   void *add_arg,
                                   custom_ext_parse_cb parse_cb,
                                   void *parse_arg);
 
-int SSL_extension_supported(unsigned int ext_type);
+__owur int SSL_extension_supported(unsigned int ext_type);
 
 # endif
 
@@ -1362,88 +1362,88 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
 # define SSL_get0_ec_point_formats(s, plst) \
         SSL_ctrl(s,SSL_CTRL_GET_EC_POINT_FORMATS,0,plst)
 
-BIO_METHOD *BIO_f_ssl(void);
-BIO *BIO_new_ssl(SSL_CTX *ctx, int client);
-BIO *BIO_new_ssl_connect(SSL_CTX *ctx);
-BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx);
-int BIO_ssl_copy_session_id(BIO *to, BIO *from);
+__owur BIO_METHOD *BIO_f_ssl(void);
+__owur BIO *BIO_new_ssl(SSL_CTX *ctx, int client);
+__owur BIO *BIO_new_ssl_connect(SSL_CTX *ctx);
+__owur BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx);
+__owur int BIO_ssl_copy_session_id(BIO *to, BIO *from);
 void BIO_ssl_shutdown(BIO *ssl_bio);
 
-int SSL_CTX_set_cipher_list(SSL_CTX *, const char *str);
-SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth);
+__owur int SSL_CTX_set_cipher_list(SSL_CTX *, const char *str);
+__owur SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth);
 void SSL_CTX_free(SSL_CTX *);
-long SSL_CTX_set_timeout(SSL_CTX *ctx, long t);
-long SSL_CTX_get_timeout(const SSL_CTX *ctx);
-X509_STORE *SSL_CTX_get_cert_store(const SSL_CTX *);
+__owur long SSL_CTX_set_timeout(SSL_CTX *ctx, long t);
+__owur long SSL_CTX_get_timeout(const SSL_CTX *ctx);
+__owur X509_STORE *SSL_CTX_get_cert_store(const SSL_CTX *);
 void SSL_CTX_set_cert_store(SSL_CTX *, X509_STORE *);
-int SSL_want(const SSL *s);
-int SSL_clear(SSL *s);
+__owur int SSL_want(const SSL *s);
+__owur int SSL_clear(SSL *s);
 
 void SSL_CTX_flush_sessions(SSL_CTX *ctx, long tm);
 
-const SSL_CIPHER *SSL_get_current_cipher(const SSL *s);
-int SSL_CIPHER_get_bits(const SSL_CIPHER *c, int *alg_bits);
-char *SSL_CIPHER_get_version(const SSL_CIPHER *c);
-const char *SSL_CIPHER_get_name(const SSL_CIPHER *c);
-unsigned long SSL_CIPHER_get_id(const SSL_CIPHER *c);
-
-int SSL_get_fd(const SSL *s);
-int SSL_get_rfd(const SSL *s);
-int SSL_get_wfd(const SSL *s);
-const char *SSL_get_cipher_list(const SSL *s, int n);
-char *SSL_get_shared_ciphers(const SSL *s, char *buf, int len);
-int SSL_get_read_ahead(const SSL *s);
-int SSL_pending(const SSL *s);
+__owur const SSL_CIPHER *SSL_get_current_cipher(const SSL *s);
+__owur int SSL_CIPHER_get_bits(const SSL_CIPHER *c, int *alg_bits);
+__owur char *SSL_CIPHER_get_version(const SSL_CIPHER *c);
+__owur const char *SSL_CIPHER_get_name(const SSL_CIPHER *c);
+__owur unsigned long SSL_CIPHER_get_id(const SSL_CIPHER *c);
+
+__owur int SSL_get_fd(const SSL *s);
+__owur int SSL_get_rfd(const SSL *s);
+__owur int SSL_get_wfd(const SSL *s);
+__owur const char *SSL_get_cipher_list(const SSL *s, int n);
+__owur char *SSL_get_shared_ciphers(const SSL *s, char *buf, int len);
+__owur int SSL_get_read_ahead(const SSL *s);
+__owur int SSL_pending(const SSL *s);
 # ifndef OPENSSL_NO_SOCK
-int SSL_set_fd(SSL *s, int fd);
-int SSL_set_rfd(SSL *s, int fd);
-int SSL_set_wfd(SSL *s, int fd);
+__owur int SSL_set_fd(SSL *s, int fd);
+__owur int SSL_set_rfd(SSL *s, int fd);
+__owur int SSL_set_wfd(SSL *s, int fd);
 # endif
 void SSL_set_rbio(SSL *s, BIO *rbio);
 void SSL_set_wbio(SSL *s, BIO *wbio);
 void SSL_set_bio(SSL *s, BIO *rbio, BIO *wbio);
-BIO *SSL_get_rbio(const SSL *s);
-BIO *SSL_get_wbio(const SSL *s);
-int SSL_set_cipher_list(SSL *s, const char *str);
+__owur BIO *SSL_get_rbio(const SSL *s);
+__owur BIO *SSL_get_wbio(const SSL *s);
+__owur int SSL_set_cipher_list(SSL *s, const char *str);
 void SSL_set_read_ahead(SSL *s, int yes);
-int SSL_get_verify_mode(const SSL *s);
-int SSL_get_verify_depth(const SSL *s);
-int (*SSL_get_verify_callback(const SSL *s)) (int, X509_STORE_CTX *);
+__owur int SSL_get_verify_mode(const SSL *s);
+__owur int SSL_get_verify_depth(const SSL *s);
+__owur int (*SSL_get_verify_callback(const SSL *s)) (int, X509_STORE_CTX *);
 void SSL_set_verify(SSL *s, int mode,
                     int (*callback) (int ok, X509_STORE_CTX *ctx));
 void SSL_set_verify_depth(SSL *s, int depth);
 void SSL_set_cert_cb(SSL *s, int (*cb) (SSL *ssl, void *arg), void *arg);
 # ifndef OPENSSL_NO_RSA
-int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa);
+__owur int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa);
 # endif
-int SSL_use_RSAPrivateKey_ASN1(SSL *ssl, const unsigned char *d, long len);
-int SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey);
-int SSL_use_PrivateKey_ASN1(int pk, SSL *ssl, const unsigned char *d,
+__owur int SSL_use_RSAPrivateKey_ASN1(SSL *ssl, const unsigned char *d, long len);
+__owur int SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey);
+__owur int SSL_use_PrivateKey_ASN1(int pk, SSL *ssl, const unsigned char *d,
                             long len);
-int SSL_use_certificate(SSL *ssl, X509 *x);
-int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len);
+__owur int SSL_use_certificate(SSL *ssl, X509 *x);
+__owur int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len);
 
 # ifndef OPENSSL_NO_TLSEXT
 /* Set serverinfo data for the current active cert. */
-int SSL_CTX_use_serverinfo(SSL_CTX *ctx, const unsigned char *serverinfo,
+__owur int SSL_CTX_use_serverinfo(SSL_CTX *ctx, const unsigned char *serverinfo,
                            size_t serverinfo_length);
 #  ifndef OPENSSL_NO_STDIO
-int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file);
+__owur int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file);
 #  endif                        /* NO_STDIO */
 
 # endif
 
 # ifndef OPENSSL_NO_STDIO
-int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type);
-int SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type);
-int SSL_use_certificate_file(SSL *ssl, const char *file, int type);
-int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type);
-int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type);
-int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type);
+__owur int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type);
+__owur int SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type);
+__owur int SSL_use_certificate_file(SSL *ssl, const char *file, int type);
+__owur int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type);
+__owur int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type);
+__owur int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type);
 /* PEM type */
-int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file);
-STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
-int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
+__owur int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file);
+__owur STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
+__owur int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
                                         const char *file);
 #  ifndef OPENSSL_SYS_VMS
 int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
@@ -1453,53 +1453,53 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
 # endif
 
 void SSL_load_error_strings(void);
-const char *SSL_state_string(const SSL *s);
-const char *SSL_rstate_string(const SSL *s);
-const char *SSL_state_string_long(const SSL *s);
-const char *SSL_rstate_string_long(const SSL *s);
-long SSL_SESSION_get_time(const SSL_SESSION *s);
-long SSL_SESSION_set_time(SSL_SESSION *s, long t);
-long SSL_SESSION_get_timeout(const SSL_SESSION *s);
-long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
-int SSL_SESSION_has_ticket(const SSL_SESSION *s);
-unsigned long SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s);
+__owur const char *SSL_state_string(const SSL *s);
+__owur const char *SSL_rstate_string(const SSL *s);
+__owur const char *SSL_state_string_long(const SSL *s);
+__owur const char *SSL_rstate_string_long(const SSL *s);
+__owur long SSL_SESSION_get_time(const SSL_SESSION *s);
+__owur long SSL_SESSION_set_time(SSL_SESSION *s, long t);
+__owur long SSL_SESSION_get_timeout(const SSL_SESSION *s);
+__owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
+__owur int SSL_SESSION_has_ticket(const SSL_SESSION *s);
+__owur unsigned long SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s);
 void SSL_SESSION_get0_ticket(const SSL_SESSION *s, unsigned char **tick,
                             size_t *len);
 void SSL_copy_session_id(SSL *to, const SSL *from);
-X509 *SSL_SESSION_get0_peer(SSL_SESSION *s);
-int SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned char *sid_ctx,
+__owur X509 *SSL_SESSION_get0_peer(SSL_SESSION *s);
+__owur int SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned char *sid_ctx,
                                 unsigned int sid_ctx_len);
 
-SSL_SESSION *SSL_SESSION_new(void);
+__owur SSL_SESSION *SSL_SESSION_new(void);
 const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s,
                                         unsigned int *len);
-unsigned int SSL_SESSION_get_compress_id(const SSL_SESSION *s);
+__owur unsigned int SSL_SESSION_get_compress_id(const SSL_SESSION *s);
 # ifndef OPENSSL_NO_STDIO
 int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *ses);
 # endif
 int SSL_SESSION_print(BIO *fp, const SSL_SESSION *ses);
 int SSL_SESSION_print_keylog(BIO *bp, const SSL_SESSION *x);
 void SSL_SESSION_free(SSL_SESSION *ses);
-int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp);
-int SSL_set_session(SSL *to, SSL_SESSION *session);
-int SSL_CTX_add_session(SSL_CTX *s, SSL_SESSION *c);
+__owur int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp);
+__owur int SSL_set_session(SSL *to, SSL_SESSION *session);
+__owur int SSL_CTX_add_session(SSL_CTX *s, SSL_SESSION *c);
 int SSL_CTX_remove_session(SSL_CTX *, SSL_SESSION *c);
-int SSL_CTX_set_generate_session_id(SSL_CTX *, GEN_SESSION_CB);
-int SSL_set_generate_session_id(SSL *, GEN_SESSION_CB);
-int SSL_has_matching_session_id(const SSL *ssl, const unsigned char *id,
+__owur int SSL_CTX_set_generate_session_id(SSL_CTX *, GEN_SESSION_CB);
+__owur int SSL_set_generate_session_id(SSL *, GEN_SESSION_CB);
+__owur int SSL_has_matching_session_id(const SSL *ssl, const unsigned char *id,
                                 unsigned int id_len);
 SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
                              long length);
 
 # ifdef HEADER_X509_H
-X509 *SSL_get_peer_certificate(const SSL *s);
+__owur X509 *SSL_get_peer_certificate(const SSL *s);
 # endif
 
-STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *s);
+__owur STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *s);
 
-int SSL_CTX_get_verify_mode(const SSL_CTX *ctx);
-int SSL_CTX_get_verify_depth(const SSL_CTX *ctx);
-int (*SSL_CTX_get_verify_callback(const SSL_CTX *ctx)) (int,
+__owur int SSL_CTX_get_verify_mode(const SSL_CTX *ctx);
+__owur int SSL_CTX_get_verify_depth(const SSL_CTX *ctx);
+__owur int (*SSL_CTX_get_verify_callback(const SSL_CTX *ctx)) (int,
                                                         X509_STORE_CTX *);
 void SSL_CTX_set_verify(SSL_CTX *ctx, int mode,
                         int (*callback) (int, X509_STORE_CTX *));
@@ -1510,40 +1510,40 @@ void SSL_CTX_set_cert_verify_callback(SSL_CTX *ctx,
 void SSL_CTX_set_cert_cb(SSL_CTX *c, int (*cb) (SSL *ssl, void *arg),
                          void *arg);
 # ifndef OPENSSL_NO_RSA
-int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa);
+__owur int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa);
 # endif
-int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, const unsigned char *d,
+__owur int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, const unsigned char *d,
                                    long len);
-int SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey);
-int SSL_CTX_use_PrivateKey_ASN1(int pk, SSL_CTX *ctx,
+__owur int SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey);
+__owur int SSL_CTX_use_PrivateKey_ASN1(int pk, SSL_CTX *ctx,
                                 const unsigned char *d, long len);
-int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x);
-int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len,
+__owur int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x);
+__owur int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len,
                                  const unsigned char *d);
 
 void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb);
 void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx, void *u);
 
-int SSL_CTX_check_private_key(const SSL_CTX *ctx);
-int SSL_check_private_key(const SSL *ctx);
+__owur int SSL_CTX_check_private_key(const SSL_CTX *ctx);
+__owur int SSL_check_private_key(const SSL *ctx);
 
-int SSL_CTX_set_session_id_context(SSL_CTX *ctx, const unsigned char *sid_ctx,
+__owur int SSL_CTX_set_session_id_context(SSL_CTX *ctx, const unsigned char *sid_ctx,
                                    unsigned int sid_ctx_len);
 
 SSL *SSL_new(SSL_CTX *ctx);
-int SSL_set_session_id_context(SSL *ssl, const unsigned char *sid_ctx,
+__owur int SSL_set_session_id_context(SSL *ssl, const unsigned char *sid_ctx,
                                unsigned int sid_ctx_len);
 
-int SSL_CTX_set_purpose(SSL_CTX *s, int purpose);
-int SSL_set_purpose(SSL *s, int purpose);
-int SSL_CTX_set_trust(SSL_CTX *s, int trust);
-int SSL_set_trust(SSL *s, int trust);
+__owur int SSL_CTX_set_purpose(SSL_CTX *s, int purpose);
+__owur int SSL_set_purpose(SSL *s, int purpose);
+__owur int SSL_CTX_set_trust(SSL_CTX *s, int trust);
+__owur int SSL_set_trust(SSL *s, int trust);
 
-int SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm);
-int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm);
+__owur int SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm);
+__owur int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm);
 
-X509_VERIFY_PARAM *SSL_CTX_get0_param(SSL_CTX *ctx);
-X509_VERIFY_PARAM *SSL_get0_param(SSL *ssl);
+__owur X509_VERIFY_PARAM *SSL_CTX_get0_param(SSL_CTX *ctx);
+__owur X509_VERIFY_PARAM *SSL_get0_param(SSL *ssl);
 
 # ifndef OPENSSL_NO_SRP
 int SSL_CTX_set_srp_username(SSL_CTX *ctx, char *name);
@@ -1562,156 +1562,156 @@ int SSL_set_srp_server_param(SSL *s, const BIGNUM *N, const BIGNUM *g,
 int SSL_set_srp_server_param_pw(SSL *s, const char *user, const char *pass,
                                 const char *grp);
 
-BIGNUM *SSL_get_srp_g(SSL *s);
-BIGNUM *SSL_get_srp_N(SSL *s);
+__owur BIGNUM *SSL_get_srp_g(SSL *s);
+__owur BIGNUM *SSL_get_srp_N(SSL *s);
 
-char *SSL_get_srp_username(SSL *s);
-char *SSL_get_srp_userinfo(SSL *s);
+__owur char *SSL_get_srp_username(SSL *s);
+__owur char *SSL_get_srp_userinfo(SSL *s);
 # endif
 
 void SSL_certs_clear(SSL *s);
 void SSL_free(SSL *ssl);
-int SSL_accept(SSL *ssl);
-int SSL_connect(SSL *ssl);
-int SSL_read(SSL *ssl, void *buf, int num);
-int SSL_peek(SSL *ssl, void *buf, int num);
-int SSL_write(SSL *ssl, const void *buf, int num);
+__owur int SSL_accept(SSL *ssl);
+__owur int SSL_connect(SSL *ssl);
+__owur int SSL_read(SSL *ssl, void *buf, int num);
+__owur int SSL_peek(SSL *ssl, void *buf, int num);
+__owur int SSL_write(SSL *ssl, const void *buf, int num);
 long SSL_ctrl(SSL *ssl, int cmd, long larg, void *parg);
 long SSL_callback_ctrl(SSL *, int, void (*)(void));
 long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
 long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
 
-int SSL_get_error(const SSL *s, int ret_code);
-const char *SSL_get_version(const SSL *s);
+__owur int SSL_get_error(const SSL *s, int ret_code);
+__owur const char *SSL_get_version(const SSL *s);
 
 /* This sets the 'default' SSL version that SSL_new() will create */
-int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth);
+__owur int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth);
 
 # ifndef OPENSSL_NO_SSL3_METHOD
-const SSL_METHOD *SSLv3_method(void); /* SSLv3 */
-const SSL_METHOD *SSLv3_server_method(void); /* SSLv3 */
-const SSL_METHOD *SSLv3_client_method(void); /* SSLv3 */
+__owur const SSL_METHOD *SSLv3_method(void); /* SSLv3 */
+__owur const SSL_METHOD *SSLv3_server_method(void); /* SSLv3 */
+__owur const SSL_METHOD *SSLv3_client_method(void); /* SSLv3 */
 # endif
 
-const SSL_METHOD *SSLv23_method(void); /* Negotiate highest available SSL/TLS
+__owur const SSL_METHOD *SSLv23_method(void); /* Negotiate highest available SSL/TLS
                                         * version */
-const SSL_METHOD *SSLv23_server_method(void); /* Negotiate highest available
+__owur const SSL_METHOD *SSLv23_server_method(void); /* Negotiate highest available
                                                * SSL/TLS version */
-const SSL_METHOD *SSLv23_client_method(void); /* Negotiate highest available
+__owur const SSL_METHOD *SSLv23_client_method(void); /* Negotiate highest available
                                                * SSL/TLS version */
 
-const SSL_METHOD *TLSv1_method(void); /* TLSv1.0 */
-const SSL_METHOD *TLSv1_server_method(void); /* TLSv1.0 */
-const SSL_METHOD *TLSv1_client_method(void); /* TLSv1.0 */
+__owur const SSL_METHOD *TLSv1_method(void); /* TLSv1.0 */
+__owur const SSL_METHOD *TLSv1_server_method(void); /* TLSv1.0 */
+__owur const SSL_METHOD *TLSv1_client_method(void); /* TLSv1.0 */
 
-const SSL_METHOD *TLSv1_1_method(void); /* TLSv1.1 */
-const SSL_METHOD *TLSv1_1_server_method(void); /* TLSv1.1 */
-const SSL_METHOD *TLSv1_1_client_method(void); /* TLSv1.1 */
+__owur const SSL_METHOD *TLSv1_1_method(void); /* TLSv1.1 */
+__owur const SSL_METHOD *TLSv1_1_server_method(void); /* TLSv1.1 */
+__owur const SSL_METHOD *TLSv1_1_client_method(void); /* TLSv1.1 */
 
-const SSL_METHOD *TLSv1_2_method(void); /* TLSv1.2 */
-const SSL_METHOD *TLSv1_2_server_method(void); /* TLSv1.2 */
-const SSL_METHOD *TLSv1_2_client_method(void); /* TLSv1.2 */
+__owur const SSL_METHOD *TLSv1_2_method(void); /* TLSv1.2 */
+__owur const SSL_METHOD *TLSv1_2_server_method(void); /* TLSv1.2 */
+__owur const SSL_METHOD *TLSv1_2_client_method(void); /* TLSv1.2 */
 
-const SSL_METHOD *DTLSv1_method(void); /* DTLSv1.0 */
-const SSL_METHOD *DTLSv1_server_method(void); /* DTLSv1.0 */
-const SSL_METHOD *DTLSv1_client_method(void); /* DTLSv1.0 */
+__owur const SSL_METHOD *DTLSv1_method(void); /* DTLSv1.0 */
+__owur const SSL_METHOD *DTLSv1_server_method(void); /* DTLSv1.0 */
+__owur const SSL_METHOD *DTLSv1_client_method(void); /* DTLSv1.0 */
 
-const SSL_METHOD *DTLSv1_2_method(void); /* DTLSv1.2 */
-const SSL_METHOD *DTLSv1_2_server_method(void); /* DTLSv1.2 */
-const SSL_METHOD *DTLSv1_2_client_method(void); /* DTLSv1.2 */
+__owur const SSL_METHOD *DTLSv1_2_method(void); /* DTLSv1.2 */
+__owur const SSL_METHOD *DTLSv1_2_server_method(void); /* DTLSv1.2 */
+__owur const SSL_METHOD *DTLSv1_2_client_method(void); /* DTLSv1.2 */
 
-const SSL_METHOD *DTLS_method(void); /* DTLS 1.0 and 1.2 */
-const SSL_METHOD *DTLS_server_method(void); /* DTLS 1.0 and 1.2 */
-const SSL_METHOD *DTLS_client_method(void); /* DTLS 1.0 and 1.2 */
+__owur const SSL_METHOD *DTLS_method(void); /* DTLS 1.0 and 1.2 */
+__owur const SSL_METHOD *DTLS_server_method(void); /* DTLS 1.0 and 1.2 */
+__owur const SSL_METHOD *DTLS_client_method(void); /* DTLS 1.0 and 1.2 */
 
-STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *s);
-STACK_OF(SSL_CIPHER) *SSL_get1_supported_ciphers(SSL *s);
+__owur STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *s);
+__owur STACK_OF(SSL_CIPHER) *SSL_get1_supported_ciphers(SSL *s);
 
-int SSL_do_handshake(SSL *s);
+__owur int SSL_do_handshake(SSL *s);
 int SSL_renegotiate(SSL *s);
-int SSL_renegotiate_abbreviated(SSL *s);
-int SSL_renegotiate_pending(SSL *s);
+__owur int SSL_renegotiate_abbreviated(SSL *s);
+__owur int SSL_renegotiate_pending(SSL *s);
 int SSL_shutdown(SSL *s);
 
-const SSL_METHOD *SSL_CTX_get_ssl_method(SSL_CTX *ctx);
-const SSL_METHOD *SSL_get_ssl_method(SSL *s);
-int SSL_set_ssl_method(SSL *s, const SSL_METHOD *method);
-const char *SSL_alert_type_string_long(int value);
-const char *SSL_alert_type_string(int value);
-const char *SSL_alert_desc_string_long(int value);
-const char *SSL_alert_desc_string(int value);
+__owur const SSL_METHOD *SSL_CTX_get_ssl_method(SSL_CTX *ctx);
+__owur const SSL_METHOD *SSL_get_ssl_method(SSL *s);
+__owur int SSL_set_ssl_method(SSL *s, const SSL_METHOD *method);
+__owur const char *SSL_alert_type_string_long(int value);
+__owur const char *SSL_alert_type_string(int value);
+__owur const char *SSL_alert_desc_string_long(int value);
+__owur const char *SSL_alert_desc_string(int value);
 
 void SSL_set_client_CA_list(SSL *s, STACK_OF(X509_NAME) *name_list);
 void SSL_CTX_set_client_CA_list(SSL_CTX *ctx, STACK_OF(X509_NAME) *name_list);
-STACK_OF(X509_NAME) *SSL_get_client_CA_list(const SSL *s);
-STACK_OF(X509_NAME) *SSL_CTX_get_client_CA_list(const SSL_CTX *s);
-int SSL_add_client_CA(SSL *ssl, X509 *x);
-int SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x);
+__owur STACK_OF(X509_NAME) *SSL_get_client_CA_list(const SSL *s);
+__owur STACK_OF(X509_NAME) *SSL_CTX_get_client_CA_list(const SSL_CTX *s);
+__owur int SSL_add_client_CA(SSL *ssl, X509 *x);
+__owur int SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x);
 
 void SSL_set_connect_state(SSL *s);
 void SSL_set_accept_state(SSL *s);
 
-long SSL_get_default_timeout(const SSL *s);
+__owur long SSL_get_default_timeout(const SSL *s);
 
 int SSL_library_init(void);
 
-char *SSL_CIPHER_description(const SSL_CIPHER *, char *buf, int size);
-STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk);
+__owur char *SSL_CIPHER_description(const SSL_CIPHER *, char *buf, int size);
+__owur STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk);
 
-SSL *SSL_dup(SSL *ssl);
+__owur SSL *SSL_dup(SSL *ssl);
 
-X509 *SSL_get_certificate(const SSL *ssl);
+__owur X509 *SSL_get_certificate(const SSL *ssl);
 /*
  * EVP_PKEY
  */ struct evp_pkey_st *SSL_get_privatekey(const SSL *ssl);
 
-X509 *SSL_CTX_get0_certificate(const SSL_CTX *ctx);
-EVP_PKEY *SSL_CTX_get0_privatekey(const SSL_CTX *ctx);
+__owur X509 *SSL_CTX_get0_certificate(const SSL_CTX *ctx);
+__owur EVP_PKEY *SSL_CTX_get0_privatekey(const SSL_CTX *ctx);
 
 void SSL_CTX_set_quiet_shutdown(SSL_CTX *ctx, int mode);
-int SSL_CTX_get_quiet_shutdown(const SSL_CTX *ctx);
+__owur int SSL_CTX_get_quiet_shutdown(const SSL_CTX *ctx);
 void SSL_set_quiet_shutdown(SSL *ssl, int mode);
-int SSL_get_quiet_shutdown(const SSL *ssl);
+__owur int SSL_get_quiet_shutdown(const SSL *ssl);
 void SSL_set_shutdown(SSL *ssl, int mode);
-int SSL_get_shutdown(const SSL *ssl);
-int SSL_version(const SSL *ssl);
-int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx);
-int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
+__owur int SSL_get_shutdown(const SSL *ssl);
+__owur int SSL_version(const SSL *ssl);
+__owur int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx);
+__owur int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
                                   const char *CApath);
 # define SSL_get0_session SSL_get_session/* just peek at pointer */
-SSL_SESSION *SSL_get_session(const SSL *ssl);
-SSL_SESSION *SSL_get1_session(SSL *ssl); /* obtain a reference count */
-SSL_CTX *SSL_get_SSL_CTX(const SSL *ssl);
+__owur SSL_SESSION *SSL_get_session(const SSL *ssl);
+__owur SSL_SESSION *SSL_get1_session(SSL *ssl); /* obtain a reference count */
+__owur SSL_CTX *SSL_get_SSL_CTX(const SSL *ssl);
 SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX *ctx);
 void SSL_set_info_callback(SSL *ssl,
                            void (*cb) (const SSL *ssl, int type, int val));
 void (*SSL_get_info_callback(const SSL *ssl)) (const SSL *ssl, int type,
                                                int val);
-int SSL_state(const SSL *ssl);
+__owur int SSL_state(const SSL *ssl);
 void SSL_set_state(SSL *ssl, int state);
 
 void SSL_set_verify_result(SSL *ssl, long v);
-long SSL_get_verify_result(const SSL *ssl);
+__owur long SSL_get_verify_result(const SSL *ssl);
 
-int SSL_set_ex_data(SSL *ssl, int idx, void *data);
+__owur int SSL_set_ex_data(SSL *ssl, int idx, void *data);
 void *SSL_get_ex_data(const SSL *ssl, int idx);
-int SSL_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
+__owur int SSL_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
                          CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
 
-int SSL_SESSION_set_ex_data(SSL_SESSION *ss, int idx, void *data);
+__owur int SSL_SESSION_set_ex_data(SSL_SESSION *ss, int idx, void *data);
 void *SSL_SESSION_get_ex_data(const SSL_SESSION *ss, int idx);
-int SSL_SESSION_get_ex_new_index(long argl, void *argp,
+__owur int SSL_SESSION_get_ex_new_index(long argl, void *argp,
                                  CRYPTO_EX_new *new_func,
                                  CRYPTO_EX_dup *dup_func,
                                  CRYPTO_EX_free *free_func);
 
-int SSL_CTX_set_ex_data(SSL_CTX *ssl, int idx, void *data);
+__owur int SSL_CTX_set_ex_data(SSL_CTX *ssl, int idx, void *data);
 void *SSL_CTX_get_ex_data(const SSL_CTX *ssl, int idx);
-int SSL_CTX_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
+__owur int SSL_CTX_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
                              CRYPTO_EX_dup *dup_func,
                              CRYPTO_EX_free *free_func);
 
-int SSL_get_ex_data_X509_STORE_CTX_idx(void);
+__owur int SSL_get_ex_data_X509_STORE_CTX_idx(void);
 
 # define SSL_CTX_sess_set_cache_size(ctx,t) \
         SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SESS_CACHE_SIZE,t,NULL)
@@ -1770,32 +1770,32 @@ void SSL_set_tmp_ecdh_callback(SSL *ssl,
 # endif
 
 # ifndef OPENSSL_NO_COMP
-const COMP_METHOD *SSL_get_current_compression(SSL *s);
-const COMP_METHOD *SSL_get_current_expansion(SSL *s);
-const char *SSL_COMP_get_name(const COMP_METHOD *comp);
+__owur const COMP_METHOD *SSL_get_current_compression(SSL *s);
+__owur const COMP_METHOD *SSL_get_current_expansion(SSL *s);
+__owur const char *SSL_COMP_get_name(const COMP_METHOD *comp);
 STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void);
-STACK_OF(SSL_COMP) *SSL_COMP_set0_compression_methods(STACK_OF(SSL_COMP)
+__owur STACK_OF(SSL_COMP) *SSL_COMP_set0_compression_methods(STACK_OF(SSL_COMP)
                                                       *meths);
 void SSL_COMP_free_compression_methods(void);
-int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm);
+__owur int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm);
 # else
-const void *SSL_get_current_compression(SSL *s);
-const void *SSL_get_current_expansion(SSL *s);
-const char *SSL_COMP_get_name(const void *comp);
+__owur const void *SSL_get_current_compression(SSL *s);
+__owur const void *SSL_get_current_expansion(SSL *s);
+__owur const char *SSL_COMP_get_name(const void *comp);
 void *SSL_COMP_get_compression_methods(void);
-int SSL_COMP_add_compression_method(int id, void *cm);
+__owur int SSL_COMP_add_compression_method(int id, void *cm);
 # endif
 
 const SSL_CIPHER *SSL_CIPHER_find(SSL *ssl, const unsigned char *ptr);
 
 /* TLS extensions functions */
-int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len);
+__owur int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len);
 
-int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb,
+__owur int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb,
                                   void *arg);
 
 /* Pre-shared secret session resumption functions */
-int SSL_set_session_secret_cb(SSL *s,
+__owur int SSL_set_session_secret_cb(SSL *s,
                               tls_session_secret_cb_fn tls_session_secret_cb,
                               void *arg);
 
@@ -1810,27 +1810,27 @@ void SSL_set_not_resumable_session_callback(SSL *ssl,
                                                        is_forward_secure));
 
 void SSL_set_debug(SSL *s, int debug);
-int SSL_cache_hit(SSL *s);
-int SSL_is_server(SSL *s);
+__owur int SSL_cache_hit(SSL *s);
+__owur int SSL_is_server(SSL *s);
 
-SSL_CONF_CTX *SSL_CONF_CTX_new(void);
+__owur __owur SSL_CONF_CTX *SSL_CONF_CTX_new(void);
 int SSL_CONF_CTX_finish(SSL_CONF_CTX *cctx);
 void SSL_CONF_CTX_free(SSL_CONF_CTX *cctx);
 unsigned int SSL_CONF_CTX_set_flags(SSL_CONF_CTX *cctx, unsigned int flags);
-unsigned int SSL_CONF_CTX_clear_flags(SSL_CONF_CTX *cctx, unsigned int flags);
-int SSL_CONF_CTX_set1_prefix(SSL_CONF_CTX *cctx, const char *pre);
+__owur unsigned int SSL_CONF_CTX_clear_flags(SSL_CONF_CTX *cctx, unsigned int flags);
+__owur int SSL_CONF_CTX_set1_prefix(SSL_CONF_CTX *cctx, const char *pre);
 
 void SSL_CONF_CTX_set_ssl(SSL_CONF_CTX *cctx, SSL *ssl);
 void SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *cctx, SSL_CTX *ctx);
 
-int SSL_CONF_cmd(SSL_CONF_CTX *cctx, const char *cmd, const char *value);
-int SSL_CONF_cmd_argv(SSL_CONF_CTX *cctx, int *pargc, char ***pargv);
-int SSL_CONF_cmd_value_type(SSL_CONF_CTX *cctx, const char *cmd);
+__owur int SSL_CONF_cmd(SSL_CONF_CTX *cctx, const char *cmd, const char *value);
+__owur int SSL_CONF_cmd_argv(SSL_CONF_CTX *cctx, int *pargc, char ***pargv);
+__owur int SSL_CONF_cmd_value_type(SSL_CONF_CTX *cctx, const char *cmd);
 
 # ifndef OPENSSL_NO_SSL_TRACE
 void SSL_trace(int write_p, int version, int content_type,
                const void *buf, size_t len, SSL *ssl, void *arg);
-const char *SSL_CIPHER_standard_name(const SSL_CIPHER *c);
+__owur const char *SSL_CIPHER_standard_name(const SSL_CIPHER *c);
 # endif
 
 /* What the "other" parameter contains in security callback */
@@ -1892,7 +1892,7 @@ const char *SSL_CIPHER_standard_name(const SSL_CIPHER *c);
 # define SSL_SECOP_PEER_CA_MD            (SSL_SECOP_CA_MD | SSL_SECOP_PEER)
 
 void SSL_set_security_level(SSL *s, int level);
-int SSL_get_security_level(const SSL *s);
+__owur int SSL_get_security_level(const SSL *s);
 void SSL_set_security_callback(SSL *s,
                                int (*cb) (SSL *s, SSL_CTX *ctx, int op,
                                           int bits, int nid, void *other,
@@ -1901,10 +1901,10 @@ int (*SSL_get_security_callback(const SSL *s)) (SSL *s, SSL_CTX *ctx, int op,
                                                 int bits, int nid,
                                                 void *other, void *ex);
 void SSL_set0_security_ex_data(SSL *s, void *ex);
-void *SSL_get0_security_ex_data(const SSL *s);
+__owur void *SSL_get0_security_ex_data(const SSL *s);
 
 void SSL_CTX_set_security_level(SSL_CTX *ctx, int level);
-int SSL_CTX_get_security_level(const SSL_CTX *ctx);
+__owur int SSL_CTX_get_security_level(const SSL_CTX *ctx);
 void SSL_CTX_set_security_callback(SSL_CTX *ctx,
                                    int (*cb) (SSL *s, SSL_CTX *ctx, int op,
                                               int bits, int nid, void *other,
@@ -1916,10 +1916,10 @@ int (*SSL_CTX_get_security_callback(const SSL_CTX *ctx)) (SSL *s,
                                                           void *other,
                                                           void *ex);
 void SSL_CTX_set0_security_ex_data(SSL_CTX *ctx, void *ex);
-void *SSL_CTX_get0_security_ex_data(const SSL_CTX *ctx);
+__owur void *SSL_CTX_get0_security_ex_data(const SSL_CTX *ctx);
 
 # ifndef OPENSSL_NO_UNIT_TEST
-const struct openssl_ssl_test_functions *SSL_test_functions(void);
+__owur const struct openssl_ssl_test_functions *SSL_test_functions(void);
 # endif
 
 /* BEGIN ERROR CODES */
@@ -1956,6 +1956,7 @@ void ERR_load_SSL_strings(void);
 # define SSL_F_DTLS1_READ_BYTES                           258
 # define SSL_F_DTLS1_READ_FAILED                          259
 # define SSL_F_DTLS1_SEND_CERTIFICATE_REQUEST             260
+# define SSL_F_DTLS1_SEND_CHANGE_CIPHER_SPEC              342
 # define SSL_F_DTLS1_SEND_CLIENT_CERTIFICATE              261
 # define SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE             262
 # define SSL_F_DTLS1_SEND_CLIENT_VERIFY                   263
@@ -2011,7 +2012,10 @@ void ERR_load_SSL_strings(void);
 # define SSL_F_SSL3_SEND_CLIENT_CERTIFICATE               151
 # define SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE              152
 # define SSL_F_SSL3_SEND_CLIENT_VERIFY                    153
+# define SSL_F_SSL3_SEND_FINISHED                         343
+# define SSL_F_SSL3_SEND_HELLO_REQUEST                    344
 # define SSL_F_SSL3_SEND_SERVER_CERTIFICATE               154
+# define SSL_F_SSL3_SEND_SERVER_DONE                      345
 # define SSL_F_SSL3_SEND_SERVER_HELLO                     242
 # define SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE              155
 # define SSL_F_SSL3_SETUP_KEY_BLOCK                       157
diff --git a/ssl/ssl_algs.c b/ssl/ssl_algs.c
index 504e4d7..ba9fc48 100644
--- a/ssl/ssl_algs.c
+++ b/ssl/ssl_algs.c
@@ -130,7 +130,7 @@ int SSL_library_init(void)
      * This will initialise the built-in compression algorithms. The value
      * returned is a STACK_OF(SSL_COMP), but that can be discarded safely
      */
-    (void)SSL_COMP_get_compression_methods();
+    SSL_COMP_get_compression_methods();
 #endif
     /* initialize cipher/digest methods table */
     ssl_load_ciphers();
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index f220e8e..0f6758b 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -532,10 +532,13 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
             else
                 *comp = NULL;
         }
+        /* If were only interested in comp then return success */
+        if((enc == NULL) && (md == NULL))
+            return 1;
     }
 
     if ((enc == NULL) || (md == NULL))
-        return (0);
+        return 0;
 
     switch (c->algorithm_enc) {
     case SSL_DES:
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index f370e9e..75ca684 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -1,6 +1,6 @@
 /* ssl/ssl_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2014 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2015 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -83,8 +83,7 @@ static ERR_STRING_DATA SSL_str_functs[] = {
     {ERR_FUNC(SSL_F_DTLS1_ENC), "DTLS1_ENC"},
     {ERR_FUNC(SSL_F_DTLS1_GET_HELLO_VERIFY), "DTLS1_GET_HELLO_VERIFY"},
     {ERR_FUNC(SSL_F_DTLS1_GET_MESSAGE), "dtls1_get_message"},
-    {ERR_FUNC(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT),
-     "DTLS1_GET_MESSAGE_FRAGMENT"},
+    {ERR_FUNC(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT), "DTLS1_GET_MESSAGE_FRAGMENT"},
     {ERR_FUNC(SSL_F_DTLS1_GET_RECORD), "dtls1_get_record"},
     {ERR_FUNC(SSL_F_DTLS1_HANDLE_TIMEOUT), "dtls1_handle_timeout"},
     {ERR_FUNC(SSL_F_DTLS1_HEARTBEAT), "dtls1_heartbeat"},
@@ -96,7 +95,9 @@ static ERR_STRING_DATA SSL_str_functs[] = {
     {ERR_FUNC(SSL_F_DTLS1_READ_BYTES), "dtls1_read_bytes"},
     {ERR_FUNC(SSL_F_DTLS1_READ_FAILED), "dtls1_read_failed"},
     {ERR_FUNC(SSL_F_DTLS1_SEND_CERTIFICATE_REQUEST),
-     "dtls1_send_certificate_request"},
+     "DTLS1_SEND_CERTIFICATE_REQUEST"},
+    {ERR_FUNC(SSL_F_DTLS1_SEND_CHANGE_CIPHER_SPEC),
+     "dtls1_send_change_cipher_spec"},
     {ERR_FUNC(SSL_F_DTLS1_SEND_CLIENT_CERTIFICATE),
      "dtls1_send_client_certificate"},
     {ERR_FUNC(SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE),
@@ -109,8 +110,7 @@ static ERR_STRING_DATA SSL_str_functs[] = {
     {ERR_FUNC(SSL_F_DTLS1_SEND_SERVER_HELLO), "dtls1_send_server_hello"},
     {ERR_FUNC(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE),
      "dtls1_send_server_key_exchange"},
-    {ERR_FUNC(SSL_F_DTLS1_WRITE_APP_DATA_BYTES),
-     "dtls1_write_app_data_bytes"},
+    {ERR_FUNC(SSL_F_DTLS1_WRITE_APP_DATA_BYTES), "dtls1_write_app_data_bytes"},
     {ERR_FUNC(SSL_F_SSL23_ACCEPT), "ssl23_accept"},
     {ERR_FUNC(SSL_F_SSL23_CLIENT_HELLO), "SSL23_CLIENT_HELLO"},
     {ERR_FUNC(SSL_F_SSL23_CONNECT), "ssl23_connect"},
@@ -130,10 +130,8 @@ static ERR_STRING_DATA SSL_str_functs[] = {
     {ERR_FUNC(SSL_F_SSL3_CONNECT), "ssl3_connect"},
     {ERR_FUNC(SSL_F_SSL3_CTRL), "ssl3_ctrl"},
     {ERR_FUNC(SSL_F_SSL3_CTX_CTRL), "ssl3_ctx_ctrl"},
-    {ERR_FUNC(SSL_F_SSL3_DIGEST_CACHED_RECORDS),
-     "ssl3_digest_cached_records"},
-    {ERR_FUNC(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC),
-     "ssl3_do_change_cipher_spec"},
+    {ERR_FUNC(SSL_F_SSL3_DIGEST_CACHED_RECORDS), "ssl3_digest_cached_records"},
+    {ERR_FUNC(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC), "ssl3_do_change_cipher_spec"},
     {ERR_FUNC(SSL_F_SSL3_ENC), "ssl3_enc"},
     {ERR_FUNC(SSL_F_SSL3_GENERATE_KEY_BLOCK), "SSL3_GENERATE_KEY_BLOCK"},
     {ERR_FUNC(SSL_F_SSL3_GET_CERTIFICATE_REQUEST),
@@ -169,8 +167,11 @@ static ERR_STRING_DATA SSL_str_functs[] = {
     {ERR_FUNC(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE),
      "ssl3_send_client_key_exchange"},
     {ERR_FUNC(SSL_F_SSL3_SEND_CLIENT_VERIFY), "ssl3_send_client_verify"},
+    {ERR_FUNC(SSL_F_SSL3_SEND_FINISHED), "ssl3_send_finished"},
+    {ERR_FUNC(SSL_F_SSL3_SEND_HELLO_REQUEST), "ssl3_send_hello_request"},
     {ERR_FUNC(SSL_F_SSL3_SEND_SERVER_CERTIFICATE),
      "ssl3_send_server_certificate"},
+    {ERR_FUNC(SSL_F_SSL3_SEND_SERVER_DONE), "ssl3_send_server_done"},
     {ERR_FUNC(SSL_F_SSL3_SEND_SERVER_HELLO), "ssl3_send_server_hello"},
     {ERR_FUNC(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE),
      "ssl3_send_server_key_exchange"},
@@ -183,8 +184,7 @@ static ERR_STRING_DATA SSL_str_functs[] = {
     {ERR_FUNC(SSL_F_SSL_ADD_CERT_TO_BUF), "SSL_ADD_CERT_TO_BUF"},
     {ERR_FUNC(SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT),
      "ssl_add_clienthello_renegotiate_ext"},
-    {ERR_FUNC(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT),
-     "ssl_add_clienthello_tlsext"},
+    {ERR_FUNC(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT), "ssl_add_clienthello_tlsext"},
     {ERR_FUNC(SSL_F_SSL_ADD_CLIENTHELLO_USE_SRTP_EXT),
      "ssl_add_clienthello_use_srtp_ext"},
     {ERR_FUNC(SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK),
@@ -193,8 +193,7 @@ static ERR_STRING_DATA SSL_str_functs[] = {
      "SSL_add_file_cert_subjects_to_stack"},
     {ERR_FUNC(SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT),
      "ssl_add_serverhello_renegotiate_ext"},
-    {ERR_FUNC(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT),
-     "ssl_add_serverhello_tlsext"},
+    {ERR_FUNC(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT), "ssl_add_serverhello_tlsext"},
     {ERR_FUNC(SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT),
      "ssl_add_serverhello_use_srtp_ext"},
     {ERR_FUNC(SSL_F_SSL_BAD_METHOD), "ssl_bad_method"},
@@ -210,8 +209,7 @@ static ERR_STRING_DATA SSL_str_functs[] = {
      "SSL_CHECK_SERVERHELLO_TLSEXT"},
     {ERR_FUNC(SSL_F_SSL_CHECK_SRVR_ECC_CERT_AND_ALG),
      "ssl_check_srvr_ecc_cert_and_alg"},
-    {ERR_FUNC(SSL_F_SSL_CIPHER_PROCESS_RULESTR),
-     "SSL_CIPHER_PROCESS_RULESTR"},
+    {ERR_FUNC(SSL_F_SSL_CIPHER_PROCESS_RULESTR), "SSL_CIPHER_PROCESS_RULESTR"},
     {ERR_FUNC(SSL_F_SSL_CIPHER_STRENGTH_SORT), "SSL_CIPHER_STRENGTH_SORT"},
     {ERR_FUNC(SSL_F_SSL_CLEAR), "SSL_clear"},
     {ERR_FUNC(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD),
@@ -296,10 +294,8 @@ static ERR_STRING_DATA SSL_str_functs[] = {
     {ERR_FUNC(SSL_F_SSL_SET_PURPOSE), "SSL_set_purpose"},
     {ERR_FUNC(SSL_F_SSL_SET_RFD), "SSL_set_rfd"},
     {ERR_FUNC(SSL_F_SSL_SET_SESSION), "SSL_set_session"},
-    {ERR_FUNC(SSL_F_SSL_SET_SESSION_ID_CONTEXT),
-     "SSL_set_session_id_context"},
-    {ERR_FUNC(SSL_F_SSL_SET_SESSION_TICKET_EXT),
-     "SSL_set_session_ticket_ext"},
+    {ERR_FUNC(SSL_F_SSL_SET_SESSION_ID_CONTEXT), "SSL_set_session_id_context"},
+    {ERR_FUNC(SSL_F_SSL_SET_SESSION_TICKET_EXT), "SSL_set_session_ticket_ext"},
     {ERR_FUNC(SSL_F_SSL_SET_TRUST), "SSL_set_trust"},
     {ERR_FUNC(SSL_F_SSL_SET_WFD), "SSL_set_wfd"},
     {ERR_FUNC(SSL_F_SSL_SHUTDOWN), "SSL_shutdown"},
@@ -317,10 +313,8 @@ static ERR_STRING_DATA SSL_str_functs[] = {
     {ERR_FUNC(SSL_F_SSL_USE_PRIVATEKEY_FILE), "SSL_use_PrivateKey_file"},
     {ERR_FUNC(SSL_F_SSL_USE_PSK_IDENTITY_HINT), "SSL_use_psk_identity_hint"},
     {ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY), "SSL_use_RSAPrivateKey"},
-    {ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY_ASN1),
-     "SSL_use_RSAPrivateKey_ASN1"},
-    {ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY_FILE),
-     "SSL_use_RSAPrivateKey_file"},
+    {ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY_ASN1), "SSL_use_RSAPrivateKey_ASN1"},
+    {ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY_FILE), "SSL_use_RSAPrivateKey_file"},
     {ERR_FUNC(SSL_F_SSL_VERIFY_CERT_CHAIN), "ssl_verify_cert_chain"},
     {ERR_FUNC(SSL_F_SSL_WRITE), "SSL_write"},
     {ERR_FUNC(SSL_F_TLS12_CHECK_PEER_SIGALG), "tls12_check_peer_sigalg"},
@@ -391,16 +385,14 @@ static ERR_STRING_DATA SSL_str_reasons[] = {
     {ERR_REASON(SSL_R_BAD_VALUE), "bad value"},
     {ERR_REASON(SSL_R_BAD_WRITE_RETRY), "bad write retry"},
     {ERR_REASON(SSL_R_BIO_NOT_SET), "bio not set"},
-    {ERR_REASON(SSL_R_BLOCK_CIPHER_PAD_IS_WRONG),
-     "block cipher pad is wrong"},
+    {ERR_REASON(SSL_R_BLOCK_CIPHER_PAD_IS_WRONG), "block cipher pad is wrong"},
     {ERR_REASON(SSL_R_BN_LIB), "bn lib"},
     {ERR_REASON(SSL_R_CA_DN_LENGTH_MISMATCH), "ca dn length mismatch"},
     {ERR_REASON(SSL_R_CA_DN_TOO_LONG), "ca dn too long"},
     {ERR_REASON(SSL_R_CA_KEY_TOO_SMALL), "ca key too small"},
     {ERR_REASON(SSL_R_CA_MD_TOO_WEAK), "ca md too weak"},
     {ERR_REASON(SSL_R_CCS_RECEIVED_EARLY), "ccs received early"},
-    {ERR_REASON(SSL_R_CERTIFICATE_VERIFY_FAILED),
-     "certificate verify failed"},
+    {ERR_REASON(SSL_R_CERTIFICATE_VERIFY_FAILED), "certificate verify failed"},
     {ERR_REASON(SSL_R_CERT_CB_ERROR), "cert cb error"},
     {ERR_REASON(SSL_R_CERT_LENGTH_MISMATCH), "cert length mismatch"},
     {ERR_REASON(SSL_R_CIPHER_CODE_WRONG_LENGTH), "cipher code wrong length"},
@@ -413,8 +405,7 @@ static ERR_STRING_DATA SSL_str_reasons[] = {
     {ERR_REASON(SSL_R_COMPRESSION_FAILURE), "compression failure"},
     {ERR_REASON(SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE),
      "compression id not within private range"},
-    {ERR_REASON(SSL_R_COMPRESSION_LIBRARY_ERROR),
-     "compression library error"},
+    {ERR_REASON(SSL_R_COMPRESSION_LIBRARY_ERROR), "compression library error"},
     {ERR_REASON(SSL_R_CONNECTION_TYPE_NOT_SET), "connection type not set"},
     {ERR_REASON(SSL_R_COOKIE_MISMATCH), "cookie mismatch"},
     {ERR_REASON(SSL_R_DATA_BETWEEN_CCS_AND_FINISHED),
@@ -443,8 +434,7 @@ static ERR_STRING_DATA SSL_str_reasons[] = {
     {ERR_REASON(SSL_R_EE_KEY_TOO_SMALL), "ee key too small"},
     {ERR_REASON(SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST),
      "empty srtp protection profile list"},
-    {ERR_REASON(SSL_R_ENCRYPTED_LENGTH_TOO_LONG),
-     "encrypted length too long"},
+    {ERR_REASON(SSL_R_ENCRYPTED_LENGTH_TOO_LONG), "encrypted length too long"},
     {ERR_REASON(SSL_R_ERROR_GENERATING_TMP_RSA_KEY),
      "error generating tmp rsa key"},
     {ERR_REASON(SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST),
@@ -494,8 +484,7 @@ static ERR_STRING_DATA SSL_str_reasons[] = {
     {ERR_REASON(SSL_R_MISSING_ECDH_CERT), "missing ecdh cert"},
     {ERR_REASON(SSL_R_MISSING_ECDSA_SIGNING_CERT),
      "missing ecdsa signing cert"},
-    {ERR_REASON(SSL_R_MISSING_EXPORT_TMP_DH_KEY),
-     "missing export tmp dh key"},
+    {ERR_REASON(SSL_R_MISSING_EXPORT_TMP_DH_KEY), "missing export tmp dh key"},
     {ERR_REASON(SSL_R_MISSING_EXPORT_TMP_RSA_KEY),
      "missing export tmp rsa key"},
     {ERR_REASON(SSL_R_MISSING_RSA_CERTIFICATE), "missing rsa certificate"},
@@ -527,8 +516,7 @@ static ERR_STRING_DATA SSL_str_reasons[] = {
     {ERR_REASON(SSL_R_NO_PRIVATE_KEY_ASSIGNED), "no private key assigned"},
     {ERR_REASON(SSL_R_NO_PROTOCOLS_AVAILABLE), "no protocols available"},
     {ERR_REASON(SSL_R_NO_RENEGOTIATION), "no renegotiation"},
-    {ERR_REASON(SSL_R_NO_REQUIRED_DIGEST),
-     "digest requred for handshake isn't computed"},
+    {ERR_REASON(SSL_R_NO_REQUIRED_DIGEST), "no required digest"},
     {ERR_REASON(SSL_R_NO_SHARED_CIPHER), "no shared cipher"},
     {ERR_REASON(SSL_R_NO_SHARED_SIGATURE_ALGORITHMS),
      "no shared sigature algorithms"},
@@ -546,8 +534,7 @@ static ERR_STRING_DATA SSL_str_reasons[] = {
      "only TLS 1.2 allowed in Suite B mode"},
     {ERR_REASON(SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE),
      "only tls allowed in fips mode"},
-    {ERR_REASON(SSL_R_OPAQUE_PRF_INPUT_TOO_LONG),
-     "opaque PRF input too long"},
+    {ERR_REASON(SSL_R_OPAQUE_PRF_INPUT_TOO_LONG), "opaque PRF input too long"},
     {ERR_REASON(SSL_R_PACKET_LENGTH_TOO_LONG), "packet length too long"},
     {ERR_REASON(SSL_R_PARSE_TLSEXT), "parse tlsext"},
     {ERR_REASON(SSL_R_PATH_TOO_LONG), "path too long"},
@@ -597,8 +584,7 @@ static ERR_STRING_DATA SSL_str_reasons[] = {
     {ERR_REASON(SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE),
      "ssl3 ext invalid servername type"},
     {ERR_REASON(SSL_R_SSL3_SESSION_ID_TOO_LONG), "ssl3 session id too long"},
-    {ERR_REASON(SSL_R_SSL3_SESSION_ID_TOO_SHORT),
-     "ssl3 session id too short"},
+    {ERR_REASON(SSL_R_SSL3_SESSION_ID_TOO_SHORT), "ssl3 session id too short"},
     {ERR_REASON(SSL_R_SSLV3_ALERT_BAD_CERTIFICATE),
      "sslv3 alert bad certificate"},
     {ERR_REASON(SSL_R_SSLV3_ALERT_BAD_RECORD_MAC),
@@ -634,13 +620,11 @@ static ERR_STRING_DATA SSL_str_reasons[] = {
      "ssl session id context too long"},
     {ERR_REASON(SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH),
      "ssl session id has bad length"},
-    {ERR_REASON(SSL_R_TLSV1_ALERT_ACCESS_DENIED),
-     "tlsv1 alert access denied"},
+    {ERR_REASON(SSL_R_TLSV1_ALERT_ACCESS_DENIED), "tlsv1 alert access denied"},
     {ERR_REASON(SSL_R_TLSV1_ALERT_DECODE_ERROR), "tlsv1 alert decode error"},
     {ERR_REASON(SSL_R_TLSV1_ALERT_DECRYPTION_FAILED),
      "tlsv1 alert decryption failed"},
-    {ERR_REASON(SSL_R_TLSV1_ALERT_DECRYPT_ERROR),
-     "tlsv1 alert decrypt error"},
+    {ERR_REASON(SSL_R_TLSV1_ALERT_DECRYPT_ERROR), "tlsv1 alert decrypt error"},
     {ERR_REASON(SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION),
      "tlsv1 alert export restriction"},
     {ERR_REASON(SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK),
@@ -683,8 +667,7 @@ static ERR_STRING_DATA SSL_str_reasons[] = {
      "tls rsa encrypted value length is wrong"},
     {ERR_REASON(SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER),
      "tried to use unsupported cipher"},
-    {ERR_REASON(SSL_R_UNABLE_TO_DECODE_DH_CERTS),
-     "unable to decode dh certs"},
+    {ERR_REASON(SSL_R_UNABLE_TO_DECODE_DH_CERTS), "unable to decode dh certs"},
     {ERR_REASON(SSL_R_UNABLE_TO_DECODE_ECDH_CERTS),
      "unable to decode ecdh certs"},
     {ERR_REASON(SSL_R_UNABLE_TO_FIND_DH_PARAMETERS),
@@ -693,8 +676,7 @@ static ERR_STRING_DATA SSL_str_reasons[] = {
      "unable to find ecdh parameters"},
     {ERR_REASON(SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS),
      "unable to find public key parameters"},
-    {ERR_REASON(SSL_R_UNABLE_TO_FIND_SSL_METHOD),
-     "unable to find ssl method"},
+    {ERR_REASON(SSL_R_UNABLE_TO_FIND_SSL_METHOD), "unable to find ssl method"},
     {ERR_REASON(SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES),
      "unable to load ssl3 md5 routines"},
     {ERR_REASON(SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES),
@@ -708,12 +690,10 @@ static ERR_STRING_DATA SSL_str_reasons[] = {
     {ERR_REASON(SSL_R_UNKNOWN_CIPHER_TYPE), "unknown cipher type"},
     {ERR_REASON(SSL_R_UNKNOWN_CMD_NAME), "unknown cmd name"},
     {ERR_REASON(SSL_R_UNKNOWN_DIGEST), "unknown digest"},
-    {ERR_REASON(SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE),
-     "unknown key exchange type"},
+    {ERR_REASON(SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE), "unknown key exchange type"},
     {ERR_REASON(SSL_R_UNKNOWN_PKEY_TYPE), "unknown pkey type"},
     {ERR_REASON(SSL_R_UNKNOWN_PROTOCOL), "unknown protocol"},
-    {ERR_REASON(SSL_R_UNKNOWN_REMOTE_ERROR_TYPE),
-     "unknown remote error type"},
+    {ERR_REASON(SSL_R_UNKNOWN_REMOTE_ERROR_TYPE), "unknown remote error type"},
     {ERR_REASON(SSL_R_UNKNOWN_SSL_VERSION), "unknown ssl version"},
     {ERR_REASON(SSL_R_UNKNOWN_STATE), "unknown state"},
     {ERR_REASON(SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED),
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 1e9b34f..0c9f4f7 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -378,7 +378,8 @@ SSL *SSL_new(SSL_CTX *ctx)
     s->references = 1;
     s->server = (ctx->method->ssl_accept == ssl_undefined_function) ? 0 : 1;
 
-    SSL_clear(s);
+    if(!SSL_clear(s))
+        goto err;
 
     CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL, s, &s->ex_data);
 
@@ -885,7 +886,10 @@ void SSL_copy_session_id(SSL *t, const SSL *f)
     CERT *tmp;
 
     /* Do we need to to SSL locking? */
-    SSL_set_session(t, SSL_get_session(f));
+    if(!SSL_set_session(t, SSL_get_session(f))) {
+        /* How do we handle this!! void function */
+        return;
+    }
 
     /*
      * what if we are setup as SSLv2 but want to talk SSLv3 or vice-versa
@@ -904,7 +908,10 @@ void SSL_copy_session_id(SSL *t, const SSL *f)
         t->cert = NULL;
     if (tmp != NULL)
         ssl_cert_free(tmp);
-    SSL_set_session_id_context(t, f->sid_ctx, f->sid_ctx_length);
+    if(!SSL_set_session_id_context(t, f->sid_ctx, f->sid_ctx_length)) {
+        /* Really should do something about this..but void function - ignore */
+        ;
+    }
 }
 
 /* Fix this so it checks all the valid key/cert options */
@@ -1924,10 +1931,10 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth)
     if (ret->cert_store == NULL)
         goto err;
 
-    ssl_create_cipher_list(ret->method,
+    if(!ssl_create_cipher_list(ret->method,
                            &ret->cipher_list, &ret->cipher_list_by_id,
-                           SSL_DEFAULT_CIPHER_LIST, ret->cert);
-    if (ret->cipher_list == NULL || sk_SSL_CIPHER_num(ret->cipher_list) <= 0) {
+                           SSL_DEFAULT_CIPHER_LIST, ret->cert)
+       || sk_SSL_CIPHER_num(ret->cipher_list) <= 0) {
         SSLerr(SSL_F_SSL_CTX_NEW, SSL_R_LIBRARY_HAS_NO_CIPHERS);
         goto err2;
     }
@@ -1980,7 +1987,8 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth)
     ret->psk_server_callback = NULL;
 #endif
 #ifndef OPENSSL_NO_SRP
-    SSL_CTX_SRP_CTX_init(ret);
+    if(!SSL_CTX_SRP_CTX_init(ret))
+        goto err;
 #endif
 #ifndef OPENSSL_NO_ENGINE
     ret->client_cert_engine = NULL;
@@ -2783,7 +2791,8 @@ SSL *SSL_dup(SSL *s)
                 goto err;
         }
 
-        SSL_set_session_id_context(ret, s->sid_ctx, s->sid_ctx_length);
+        if(!SSL_set_session_id_context(ret, s->sid_ctx, s->sid_ctx_length))
+            goto err;
     }
 
     ret->options = s->options;
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 3396572..3b3f298 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -1839,7 +1839,7 @@ typedef struct ssl3_enc_method {
     /* Handshake header length */
     unsigned int hhlen;
     /* Set the handshake header */
-    void (*set_handshake_header) (SSL *s, int type, unsigned long len);
+    int (*set_handshake_header) (SSL *s, int type, unsigned long len);
     /* Write out handshake message */
     int (*do_write) (SSL *s);
 } SSL3_ENC_METHOD;
@@ -2050,379 +2050,379 @@ struct openssl_ssl_test_functions {
 
 void ssl_clear_cipher_ctx(SSL *s);
 int ssl_clear_bad_session(SSL *s);
-CERT *ssl_cert_new(void);
-CERT *ssl_cert_dup(CERT *cert);
+__owur CERT *ssl_cert_new(void);
+__owur CERT *ssl_cert_dup(CERT *cert);
 void ssl_cert_set_default_md(CERT *cert);
 void ssl_cert_clear_certs(CERT *c);
 void ssl_cert_free(CERT *c);
-SESS_CERT *ssl_sess_cert_new(void);
+__owur SESS_CERT *ssl_sess_cert_new(void);
 void ssl_sess_cert_free(SESS_CERT *sc);
-int ssl_set_peer_cert_type(SESS_CERT *c, int type);
-int ssl_get_new_session(SSL *s, int session);
-int ssl_get_prev_session(SSL *s, unsigned char *session, int len,
+__owur int ssl_set_peer_cert_type(SESS_CERT *c, int type);
+__owur int ssl_get_new_session(SSL *s, int session);
+__owur int ssl_get_prev_session(SSL *s, unsigned char *session, int len,
                          const unsigned char *limit);
-int ssl_cipher_id_cmp(const SSL_CIPHER *a, const SSL_CIPHER *b);
+__owur int ssl_cipher_id_cmp(const SSL_CIPHER *a, const SSL_CIPHER *b);
 DECLARE_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, ssl_cipher_id);
-int ssl_cipher_ptr_id_cmp(const SSL_CIPHER *const *ap,
+__owur int ssl_cipher_ptr_id_cmp(const SSL_CIPHER *const *ap,
                           const SSL_CIPHER *const *bp);
-STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s, unsigned char *p,
+__owur STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s, unsigned char *p,
                                                int num,
                                                STACK_OF(SSL_CIPHER) **skp);
-int ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *sk,
+__owur int ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *sk,
                              unsigned char *p,
                              int (*put_cb) (const SSL_CIPHER *,
                                             unsigned char *));
-STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *meth,
+__owur STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *meth,
                                              STACK_OF(SSL_CIPHER) **pref,
                                              STACK_OF(SSL_CIPHER) **sorted,
                                              const char *rule_str, CERT *c);
 void ssl_update_cache(SSL *s, int mode);
-int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
+__owur int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
                        const EVP_MD **md, int *mac_pkey_type,
                        int *mac_secret_size, SSL_COMP **comp, int use_etm);
-int ssl_get_handshake_digest(int i, long *mask, const EVP_MD **md);
-int ssl_cipher_get_cert_index(const SSL_CIPHER *c);
-const SSL_CIPHER *ssl_get_cipher_by_char(SSL *ssl, const unsigned char *ptr);
-int ssl_cert_set0_chain(SSL *s, SSL_CTX *ctx, STACK_OF(X509) *chain);
-int ssl_cert_set1_chain(SSL *s, SSL_CTX *ctx, STACK_OF(X509) *chain);
-int ssl_cert_add0_chain_cert(SSL *s, SSL_CTX *ctx, X509 *x);
-int ssl_cert_add1_chain_cert(SSL *s, SSL_CTX *ctx, X509 *x);
-int ssl_cert_select_current(CERT *c, X509 *x);
-int ssl_cert_set_current(CERT *c, long arg);
-X509 *ssl_cert_get0_next_certificate(CERT *c, int first);
+__owur int ssl_get_handshake_digest(int i, long *mask, const EVP_MD **md);
+__owur int ssl_cipher_get_cert_index(const SSL_CIPHER *c);
+__owur const SSL_CIPHER *ssl_get_cipher_by_char(SSL *ssl, const unsigned char *ptr);
+__owur int ssl_cert_set0_chain(SSL *s, SSL_CTX *ctx, STACK_OF(X509) *chain);
+__owur int ssl_cert_set1_chain(SSL *s, SSL_CTX *ctx, STACK_OF(X509) *chain);
+__owur int ssl_cert_add0_chain_cert(SSL *s, SSL_CTX *ctx, X509 *x);
+__owur int ssl_cert_add1_chain_cert(SSL *s, SSL_CTX *ctx, X509 *x);
+__owur int ssl_cert_select_current(CERT *c, X509 *x);
+__owur int ssl_cert_set_current(CERT *c, long arg);
+__owur X509 *ssl_cert_get0_next_certificate(CERT *c, int first);
 void ssl_cert_set_cert_cb(CERT *c, int (*cb) (SSL *ssl, void *arg),
                           void *arg);
 
-int ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk);
-int ssl_add_cert_chain(SSL *s, CERT_PKEY *cpk, unsigned long *l);
-int ssl_build_cert_chain(SSL *s, SSL_CTX *ctx, int flags);
-int ssl_cert_set_cert_store(CERT *c, X509_STORE *store, int chain, int ref);
+__owur int ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk);
+__owur int ssl_add_cert_chain(SSL *s, CERT_PKEY *cpk, unsigned long *l);
+__owur int ssl_build_cert_chain(SSL *s, SSL_CTX *ctx, int flags);
+__owur int ssl_cert_set_cert_store(CERT *c, X509_STORE *store, int chain, int ref);
 
-int ssl_security(SSL *s, int op, int bits, int nid, void *other);
-int ssl_ctx_security(SSL_CTX *ctx, int op, int bits, int nid, void *other);
+__owur int ssl_security(SSL *s, int op, int bits, int nid, void *other);
+__owur int ssl_ctx_security(SSL_CTX *ctx, int op, int bits, int nid, void *other);
 
 int ssl_undefined_function(SSL *s);
-int ssl_undefined_void_function(void);
-int ssl_undefined_const_function(const SSL *s);
-CERT_PKEY *ssl_get_server_send_pkey(const SSL *s);
+__owur int ssl_undefined_void_function(void);
+__owur int ssl_undefined_const_function(const SSL *s);
+__owur CERT_PKEY *ssl_get_server_send_pkey(const SSL *s);
 #  ifndef OPENSSL_NO_TLSEXT
-int ssl_get_server_cert_serverinfo(SSL *s, const unsigned char **serverinfo,
+__owur int ssl_get_server_cert_serverinfo(SSL *s, const unsigned char **serverinfo,
                                    size_t *serverinfo_length);
 #  endif
-EVP_PKEY *ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *c, const EVP_MD **pmd);
-int ssl_cert_type(X509 *x, EVP_PKEY *pkey);
+__owur EVP_PKEY *ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *c, const EVP_MD **pmd);
+__owur int ssl_cert_type(X509 *x, EVP_PKEY *pkey);
 void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher);
-STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s);
-int ssl_verify_alarm_type(long type);
+__owur STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s);
+__owur int ssl_verify_alarm_type(long type);
 void ssl_load_ciphers(void);
-int ssl_fill_hello_random(SSL *s, int server, unsigned char *field, int len);
+__owur int ssl_fill_hello_random(SSL *s, int server, unsigned char *field, int len);
 
-const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p);
-int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p);
+__owur const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p);
+__owur int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p);
 void ssl3_init_finished_mac(SSL *s);
-int ssl3_send_server_certificate(SSL *s);
-int ssl3_send_newsession_ticket(SSL *s);
-int ssl3_send_cert_status(SSL *s);
-int ssl3_get_finished(SSL *s, int state_a, int state_b);
-int ssl3_setup_key_block(SSL *s);
-int ssl3_send_change_cipher_spec(SSL *s, int state_a, int state_b);
-int ssl3_change_cipher_state(SSL *s, int which);
+__owur int ssl3_send_server_certificate(SSL *s);
+__owur int ssl3_send_newsession_ticket(SSL *s);
+__owur int ssl3_send_cert_status(SSL *s);
+__owur int ssl3_get_finished(SSL *s, int state_a, int state_b);
+__owur int ssl3_setup_key_block(SSL *s);
+__owur int ssl3_send_change_cipher_spec(SSL *s, int state_a, int state_b);
+__owur int ssl3_change_cipher_state(SSL *s, int which);
 void ssl3_cleanup_key_block(SSL *s);
-int ssl3_do_write(SSL *s, int type);
+__owur int ssl3_do_write(SSL *s, int type);
 int ssl3_send_alert(SSL *s, int level, int desc);
-int ssl3_generate_master_secret(SSL *s, unsigned char *out,
+__owur int ssl3_generate_master_secret(SSL *s, unsigned char *out,
                                 unsigned char *p, int len);
-int ssl3_get_req_cert_type(SSL *s, unsigned char *p);
-long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok);
-int ssl3_send_finished(SSL *s, int a, int b, const char *sender, int slen);
-int ssl3_num_ciphers(void);
-const SSL_CIPHER *ssl3_get_cipher(unsigned int u);
+__owur int ssl3_get_req_cert_type(SSL *s, unsigned char *p);
+__owur long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok);
+__owur int ssl3_send_finished(SSL *s, int a, int b, const char *sender, int slen);
+__owur int ssl3_num_ciphers(void);
+__owur const SSL_CIPHER *ssl3_get_cipher(unsigned int u);
 int ssl3_renegotiate(SSL *ssl);
 int ssl3_renegotiate_check(SSL *ssl);
-int ssl3_dispatch_alert(SSL *s);
-int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek);
-int ssl3_write_bytes(SSL *s, int type, const void *buf, int len);
-int ssl3_final_finish_mac(SSL *s, const char *sender, int slen,
+__owur int ssl3_dispatch_alert(SSL *s);
+__owur int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek);
+__owur int ssl3_write_bytes(SSL *s, int type, const void *buf, int len);
+__owur int ssl3_final_finish_mac(SSL *s, const char *sender, int slen,
                           unsigned char *p);
-int ssl3_cert_verify_mac(SSL *s, int md_nid, unsigned char *p);
+__owur int ssl3_cert_verify_mac(SSL *s, int md_nid, unsigned char *p);
 void ssl3_finish_mac(SSL *s, const unsigned char *buf, int len);
-int ssl3_enc(SSL *s, int send_data);
-int n_ssl3_mac(SSL *ssl, unsigned char *md, int send_data);
+__owur int ssl3_enc(SSL *s, int send_data);
+__owur int n_ssl3_mac(SSL *ssl, unsigned char *md, int send_data);
 void ssl3_free_digest_list(SSL *s);
-unsigned long ssl3_output_cert_chain(SSL *s, CERT_PKEY *cpk);
-SSL_CIPHER *ssl3_choose_cipher(SSL *ssl, STACK_OF(SSL_CIPHER) *clnt,
+__owur unsigned long ssl3_output_cert_chain(SSL *s, CERT_PKEY *cpk);
+__owur SSL_CIPHER *ssl3_choose_cipher(SSL *ssl, STACK_OF(SSL_CIPHER) *clnt,
                                STACK_OF(SSL_CIPHER) *srvr);
-int ssl3_setup_buffers(SSL *s);
-int ssl3_setup_read_buffer(SSL *s);
-int ssl3_setup_write_buffer(SSL *s);
+__owur int ssl3_setup_buffers(SSL *s);
+__owur int ssl3_setup_read_buffer(SSL *s);
+__owur int ssl3_setup_write_buffer(SSL *s);
 int ssl3_release_read_buffer(SSL *s);
 int ssl3_release_write_buffer(SSL *s);
-int ssl3_digest_cached_records(SSL *s);
-int ssl3_new(SSL *s);
+__owur int ssl3_digest_cached_records(SSL *s);
+__owur int ssl3_new(SSL *s);
 void ssl3_free(SSL *s);
-int ssl3_accept(SSL *s);
-int ssl3_connect(SSL *s);
-int ssl3_read(SSL *s, void *buf, int len);
-int ssl3_peek(SSL *s, void *buf, int len);
-int ssl3_write(SSL *s, const void *buf, int len);
-int ssl3_shutdown(SSL *s);
+__owur int ssl3_accept(SSL *s);
+__owur int ssl3_connect(SSL *s);
+__owur int ssl3_read(SSL *s, void *buf, int len);
+__owur int ssl3_peek(SSL *s, void *buf, int len);
+__owur int ssl3_write(SSL *s, const void *buf, int len);
+__owur int ssl3_shutdown(SSL *s);
 void ssl3_clear(SSL *s);
-long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg);
-long ssl3_ctx_ctrl(SSL_CTX *s, int cmd, long larg, void *parg);
-long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp) (void));
-long ssl3_ctx_callback_ctrl(SSL_CTX *s, int cmd, void (*fp) (void));
-int ssl3_pending(const SSL *s);
+__owur long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg);
+__owur long ssl3_ctx_ctrl(SSL_CTX *s, int cmd, long larg, void *parg);
+__owur long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp) (void));
+__owur long ssl3_ctx_callback_ctrl(SSL_CTX *s, int cmd, void (*fp) (void));
+__owur int ssl3_pending(const SSL *s);
 
 void ssl3_record_sequence_update(unsigned char *seq);
-int ssl3_do_change_cipher_spec(SSL *ssl);
-long ssl3_default_timeout(void);
-
-void ssl3_set_handshake_header(SSL *s, int htype, unsigned long len);
-int ssl3_handshake_write(SSL *s);
-
-int ssl23_num_ciphers(void);
-const SSL_CIPHER *ssl23_get_cipher(unsigned int u);
-int ssl23_read(SSL *s, void *buf, int len);
-int ssl23_peek(SSL *s, void *buf, int len);
-int ssl23_write(SSL *s, const void *buf, int len);
-int ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p);
-const SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p);
-long ssl23_default_timeout(void);
-
-int ssl_allow_compression(SSL *s);
-
-long tls1_default_timeout(void);
-int dtls1_do_write(SSL *s, int type);
-int ssl3_read_n(SSL *s, int n, int max, int extend);
-int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek);
-int ssl3_do_compress(SSL *ssl);
-int ssl3_do_uncompress(SSL *ssl);
-int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
+__owur int ssl3_do_change_cipher_spec(SSL *ssl);
+__owur long ssl3_default_timeout(void);
+
+__owur int ssl3_set_handshake_header(SSL *s, int htype, unsigned long len);
+__owur int ssl3_handshake_write(SSL *s);
+
+__owur int ssl23_num_ciphers(void);
+__owur const SSL_CIPHER *ssl23_get_cipher(unsigned int u);
+__owur int ssl23_read(SSL *s, void *buf, int len);
+__owur int ssl23_peek(SSL *s, void *buf, int len);
+__owur int ssl23_write(SSL *s, const void *buf, int len);
+__owur int ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p);
+__owur const SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p);
+__owur long ssl23_default_timeout(void);
+
+__owur int ssl_allow_compression(SSL *s);
+
+__owur long tls1_default_timeout(void);
+__owur int dtls1_do_write(SSL *s, int type);
+__owur int ssl3_read_n(SSL *s, int n, int max, int extend);
+__owur int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek);
+__owur int ssl3_do_compress(SSL *ssl);
+__owur int ssl3_do_uncompress(SSL *ssl);
+__owur int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
                        unsigned int len);
-unsigned char *dtls1_set_message_header(SSL *s,
-                                        unsigned char *p, unsigned char mt,
-                                        unsigned long len,
-                                        unsigned long frag_off,
-                                        unsigned long frag_len);
-
-int dtls1_write_app_data_bytes(SSL *s, int type, const void *buf, int len);
-int dtls1_write_bytes(SSL *s, int type, const void *buf, int len);
-
-int dtls1_send_change_cipher_spec(SSL *s, int a, int b);
-int dtls1_send_finished(SSL *s, int a, int b, const char *sender, int slen);
-int dtls1_read_failed(SSL *s, int code);
-int dtls1_buffer_message(SSL *s, int ccs);
-int dtls1_retransmit_message(SSL *s, unsigned short seq,
+void dtls1_set_message_header(SSL *s,
+                              unsigned char *p, unsigned char mt,
+                              unsigned long len,
+                              unsigned long frag_off,
+                              unsigned long frag_len);
+
+__owur int dtls1_write_app_data_bytes(SSL *s, int type, const void *buf, int len);
+__owur int dtls1_write_bytes(SSL *s, int type, const void *buf, int len);
+
+__owur int dtls1_send_change_cipher_spec(SSL *s, int a, int b);
+__owur int dtls1_send_finished(SSL *s, int a, int b, const char *sender, int slen);
+__owur int dtls1_read_failed(SSL *s, int code);
+__owur int dtls1_buffer_message(SSL *s, int ccs);
+__owur int dtls1_retransmit_message(SSL *s, unsigned short seq,
                              unsigned long frag_off, int *found);
-int dtls1_get_queue_priority(unsigned short seq, int is_ccs);
-int dtls1_retransmit_buffered_messages(SSL *s);
+__owur int dtls1_get_queue_priority(unsigned short seq, int is_ccs);
+__owur int dtls1_retransmit_buffered_messages(SSL *s);
 void dtls1_clear_record_buffer(SSL *s);
 void dtls1_get_message_header(unsigned char *data,
                               struct hm_header_st *msg_hdr);
 void dtls1_get_ccs_header(unsigned char *data, struct ccs_header_st *ccs_hdr);
 void dtls1_reset_seq_numbers(SSL *s, int rw);
-long dtls1_default_timeout(void);
-struct timeval *dtls1_get_timeout(SSL *s, struct timeval *timeleft);
-int dtls1_check_timeout_num(SSL *s);
-int dtls1_handle_timeout(SSL *s);
-const SSL_CIPHER *dtls1_get_cipher(unsigned int u);
+__owur long dtls1_default_timeout(void);
+__owur struct timeval *dtls1_get_timeout(SSL *s, struct timeval *timeleft);
+__owur int dtls1_check_timeout_num(SSL *s);
+__owur int dtls1_handle_timeout(SSL *s);
+__owur const SSL_CIPHER *dtls1_get_cipher(unsigned int u);
 void dtls1_start_timer(SSL *s);
 void dtls1_stop_timer(SSL *s);
-int dtls1_is_timer_expired(SSL *s);
+__owur int dtls1_is_timer_expired(SSL *s);
 void dtls1_double_timeout(SSL *s);
-int dtls1_send_newsession_ticket(SSL *s);
-unsigned int dtls1_min_mtu(SSL *s);
-unsigned int dtls1_link_min_mtu(void);
+__owur int dtls1_send_newsession_ticket(SSL *s);
+__owur unsigned int dtls1_min_mtu(SSL *s);
+__owur unsigned int dtls1_link_min_mtu(void);
 void dtls1_hm_fragment_free(hm_fragment *frag);
 
 /* some client-only functions */
-int ssl3_client_hello(SSL *s);
-int ssl3_get_server_hello(SSL *s);
-int ssl3_get_certificate_request(SSL *s);
-int ssl3_get_new_session_ticket(SSL *s);
-int ssl3_get_cert_status(SSL *s);
-int ssl3_get_server_done(SSL *s);
-int ssl3_send_client_verify(SSL *s);
-int ssl3_send_client_certificate(SSL *s);
-int ssl_do_client_cert_cb(SSL *s, X509 **px509, EVP_PKEY **ppkey);
-int ssl3_send_client_key_exchange(SSL *s);
-int ssl3_get_key_exchange(SSL *s);
-int ssl3_get_server_certificate(SSL *s);
-int ssl3_check_cert_and_algorithm(SSL *s);
+__owur int ssl3_client_hello(SSL *s);
+__owur int ssl3_get_server_hello(SSL *s);
+__owur int ssl3_get_certificate_request(SSL *s);
+__owur int ssl3_get_new_session_ticket(SSL *s);
+__owur int ssl3_get_cert_status(SSL *s);
+__owur int ssl3_get_server_done(SSL *s);
+__owur int ssl3_send_client_verify(SSL *s);
+__owur int ssl3_send_client_certificate(SSL *s);
+__owur int ssl_do_client_cert_cb(SSL *s, X509 **px509, EVP_PKEY **ppkey);
+__owur int ssl3_send_client_key_exchange(SSL *s);
+__owur int ssl3_get_key_exchange(SSL *s);
+__owur int ssl3_get_server_certificate(SSL *s);
+__owur int ssl3_check_cert_and_algorithm(SSL *s);
 #  ifndef OPENSSL_NO_TLSEXT
 #   ifndef OPENSSL_NO_NEXTPROTONEG
-int ssl3_send_next_proto(SSL *s);
+__owur int ssl3_send_next_proto(SSL *s);
 #   endif
 #  endif
 
 int dtls1_client_hello(SSL *s);
 
 /* some server-only functions */
-int ssl3_get_client_hello(SSL *s);
-int ssl3_send_server_hello(SSL *s);
-int ssl3_send_hello_request(SSL *s);
-int ssl3_send_server_key_exchange(SSL *s);
-int ssl3_send_certificate_request(SSL *s);
-int ssl3_send_server_done(SSL *s);
-int ssl3_get_client_certificate(SSL *s);
-int ssl3_get_client_key_exchange(SSL *s);
-int ssl3_get_cert_verify(SSL *s);
+__owur int ssl3_get_client_hello(SSL *s);
+__owur int ssl3_send_server_hello(SSL *s);
+__owur int ssl3_send_hello_request(SSL *s);
+__owur int ssl3_send_server_key_exchange(SSL *s);
+__owur int ssl3_send_certificate_request(SSL *s);
+__owur int ssl3_send_server_done(SSL *s);
+__owur int ssl3_get_client_certificate(SSL *s);
+__owur int ssl3_get_client_key_exchange(SSL *s);
+__owur int ssl3_get_cert_verify(SSL *s);
 #  ifndef OPENSSL_NO_NEXTPROTONEG
-int ssl3_get_next_proto(SSL *s);
+__owur int ssl3_get_next_proto(SSL *s);
 #  endif
 
-int ssl23_accept(SSL *s);
-int ssl23_connect(SSL *s);
-int ssl23_read_bytes(SSL *s, int n);
-int ssl23_write_bytes(SSL *s);
+__owur int ssl23_accept(SSL *s);
+__owur int ssl23_connect(SSL *s);
+__owur int ssl23_read_bytes(SSL *s, int n);
+__owur int ssl23_write_bytes(SSL *s);
 
-int tls1_new(SSL *s);
+__owur int tls1_new(SSL *s);
 void tls1_free(SSL *s);
 void tls1_clear(SSL *s);
 long tls1_ctrl(SSL *s, int cmd, long larg, void *parg);
 long tls1_callback_ctrl(SSL *s, int cmd, void (*fp) (void));
 
-int dtls1_new(SSL *s);
-int dtls1_accept(SSL *s);
-int dtls1_connect(SSL *s);
+__owur int dtls1_new(SSL *s);
+__owur int dtls1_accept(SSL *s);
+__owur int dtls1_connect(SSL *s);
 void dtls1_free(SSL *s);
 void dtls1_clear(SSL *s);
 long dtls1_ctrl(SSL *s, int cmd, long larg, void *parg);
-int dtls1_shutdown(SSL *s);
+__owur int dtls1_shutdown(SSL *s);
 
-long dtls1_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok);
-int dtls1_get_record(SSL *s);
-int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
+__owur long dtls1_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok);
+__owur int dtls1_get_record(SSL *s);
+__owur int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
                    unsigned int len, int create_empty_fragement);
-int dtls1_dispatch_alert(SSL *s);
+__owur int dtls1_dispatch_alert(SSL *s);
 
-int ssl_init_wbio_buffer(SSL *s, int push);
+__owur int ssl_init_wbio_buffer(SSL *s, int push);
 void ssl_free_wbio_buffer(SSL *s);
 
-int tls1_change_cipher_state(SSL *s, int which);
-int tls1_setup_key_block(SSL *s);
-int tls1_enc(SSL *s, int snd);
-int tls1_final_finish_mac(SSL *s,
+__owur int tls1_change_cipher_state(SSL *s, int which);
+__owur int tls1_setup_key_block(SSL *s);
+__owur int tls1_enc(SSL *s, int snd);
+__owur int tls1_final_finish_mac(SSL *s,
                           const char *str, int slen, unsigned char *p);
-int tls1_cert_verify_mac(SSL *s, int md_nid, unsigned char *p);
-int tls1_mac(SSL *ssl, unsigned char *md, int snd);
-int tls1_generate_master_secret(SSL *s, unsigned char *out,
+__owur int tls1_cert_verify_mac(SSL *s, int md_nid, unsigned char *p);
+__owur int tls1_mac(SSL *ssl, unsigned char *md, int snd);
+__owur int tls1_generate_master_secret(SSL *s, unsigned char *out,
                                 unsigned char *p, int len);
-int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
+__owur int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
                                 const char *label, size_t llen,
                                 const unsigned char *p, size_t plen,
                                 int use_context);
-int tls1_alert_code(int code);
-int ssl3_alert_code(int code);
-int ssl_ok(SSL *s);
+__owur int tls1_alert_code(int code);
+__owur int ssl3_alert_code(int code);
+__owur int ssl_ok(SSL *s);
 
 #  ifndef OPENSSL_NO_EC
-int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s);
+__owur int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s);
 #  endif
 
 SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n);
 
 #  ifndef OPENSSL_NO_EC
-int tls1_ec_curve_id2nid(int curve_id);
-int tls1_ec_nid2curve_id(int nid);
-int tls1_check_curve(SSL *s, const unsigned char *p, size_t len);
-int tls1_shared_curve(SSL *s, int nmatch);
-int tls1_set_curves(unsigned char **pext, size_t *pextlen,
+__owur int tls1_ec_curve_id2nid(int curve_id);
+__owur int tls1_ec_nid2curve_id(int nid);
+__owur int tls1_check_curve(SSL *s, const unsigned char *p, size_t len);
+__owur int tls1_shared_curve(SSL *s, int nmatch);
+__owur int tls1_set_curves(unsigned char **pext, size_t *pextlen,
                     int *curves, size_t ncurves);
-int tls1_set_curves_list(unsigned char **pext, size_t *pextlen,
+__owur int tls1_set_curves_list(unsigned char **pext, size_t *pextlen,
                          const char *str);
-int tls1_check_ec_tmp_key(SSL *s, unsigned long id);
+__owur int tls1_check_ec_tmp_key(SSL *s, unsigned long id);
 #  endif                        /* OPENSSL_NO_EC */
 
 #  ifndef OPENSSL_NO_TLSEXT
-int tls1_shared_list(SSL *s,
+__owur int tls1_shared_list(SSL *s,
                      const unsigned char *l1, size_t l1len,
                      const unsigned char *l2, size_t l2len, int nmatch);
-unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf,
+__owur unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf,
                                           unsigned char *limit, int *al);
-unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
+__owur unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
                                           unsigned char *limit, int *al);
-int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **data,
+__owur int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **data,
                                  unsigned char *d, int n);
-int tls1_set_server_sigalgs(SSL *s);
-int ssl_check_clienthello_tlsext_late(SSL *s);
-int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **data,
+__owur int tls1_set_server_sigalgs(SSL *s);
+__owur int ssl_check_clienthello_tlsext_late(SSL *s);
+__owur int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **data,
                                  unsigned char *d, int n);
-int ssl_prepare_clienthello_tlsext(SSL *s);
-int ssl_prepare_serverhello_tlsext(SSL *s);
+__owur int ssl_prepare_clienthello_tlsext(SSL *s);
+__owur int ssl_prepare_serverhello_tlsext(SSL *s);
 
 #   ifndef OPENSSL_NO_HEARTBEATS
-int tls1_heartbeat(SSL *s);
-int dtls1_heartbeat(SSL *s);
-int tls1_process_heartbeat(SSL *s);
-int dtls1_process_heartbeat(SSL *s);
+__owur int tls1_heartbeat(SSL *s);
+__owur int dtls1_heartbeat(SSL *s);
+__owur int tls1_process_heartbeat(SSL *s);
+__owur int dtls1_process_heartbeat(SSL *s);
 #   endif
 
-int tls1_process_ticket(SSL *s, unsigned char *session_id, int len,
+__owur int tls1_process_ticket(SSL *s, unsigned char *session_id, int len,
                         const unsigned char *limit, SSL_SESSION **ret);
 
-int tls12_get_sigandhash(unsigned char *p, const EVP_PKEY *pk,
+__owur int tls12_get_sigandhash(unsigned char *p, const EVP_PKEY *pk,
                          const EVP_MD *md);
-int tls12_get_sigid(const EVP_PKEY *pk);
-const EVP_MD *tls12_get_hash(unsigned char hash_alg);
+__owur int tls12_get_sigid(const EVP_PKEY *pk);
+__owur const EVP_MD *tls12_get_hash(unsigned char hash_alg);
 void ssl_set_sig_mask(unsigned long *pmask_a, SSL *s, int op);
 
-int tls1_set_sigalgs_list(CERT *c, const char *str, int client);
-int tls1_set_sigalgs(CERT *c, const int *salg, size_t salglen, int client);
-int tls1_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain,
+__owur int tls1_set_sigalgs_list(CERT *c, const char *str, int client);
+__owur int tls1_set_sigalgs(CERT *c, const int *salg, size_t salglen, int client);
+__owur int tls1_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain,
                      int idx);
 void tls1_set_cert_validity(SSL *s);
 
 #  endif
 #  ifndef OPENSSL_NO_DH
-DH *ssl_get_auto_dh(SSL *s);
+__owur DH *ssl_get_auto_dh(SSL *s);
 #  endif
 
-int ssl_security_cert(SSL *s, SSL_CTX *ctx, X509 *x, int vfy, int is_ee);
-int ssl_security_cert_chain(SSL *s, STACK_OF(X509) *sk, X509 *ex, int vfy);
+__owur int ssl_security_cert(SSL *s, SSL_CTX *ctx, X509 *x, int vfy, int is_ee);
+__owur int ssl_security_cert_chain(SSL *s, STACK_OF(X509) *sk, X509 *ex, int vfy);
 
-EVP_MD_CTX *ssl_replace_hash(EVP_MD_CTX **hash, const EVP_MD *md);
+__owur EVP_MD_CTX *ssl_replace_hash(EVP_MD_CTX **hash, const EVP_MD *md);
 void ssl_clear_hash_ctx(EVP_MD_CTX **hash);
-int ssl_add_serverhello_renegotiate_ext(SSL *s, unsigned char *p, int *len,
+__owur int ssl_add_serverhello_renegotiate_ext(SSL *s, unsigned char *p, int *len,
                                         int maxlen);
-int ssl_parse_serverhello_renegotiate_ext(SSL *s, unsigned char *d, int len,
+__owur int ssl_parse_serverhello_renegotiate_ext(SSL *s, unsigned char *d, int len,
                                           int *al);
-int ssl_add_clienthello_renegotiate_ext(SSL *s, unsigned char *p, int *len,
+__owur int ssl_add_clienthello_renegotiate_ext(SSL *s, unsigned char *p, int *len,
                                         int maxlen);
-int ssl_parse_clienthello_renegotiate_ext(SSL *s, unsigned char *d, int len,
+__owur int ssl_parse_clienthello_renegotiate_ext(SSL *s, unsigned char *d, int len,
                                           int *al);
-long ssl_get_algorithm2(SSL *s);
-size_t tls12_copy_sigalgs(SSL *s, unsigned char *out,
+__owur long ssl_get_algorithm2(SSL *s);
+__owur size_t tls12_copy_sigalgs(SSL *s, unsigned char *out,
                           const unsigned char *psig, size_t psiglen);
-int tls1_save_sigalgs(SSL *s, const unsigned char *data, int dsize);
-int tls1_process_sigalgs(SSL *s);
-size_t tls12_get_psigalgs(SSL *s, const unsigned char **psigs);
-int tls12_check_peer_sigalg(const EVP_MD **pmd, SSL *s,
+__owur int tls1_save_sigalgs(SSL *s, const unsigned char *data, int dsize);
+__owur int tls1_process_sigalgs(SSL *s);
+__owur size_t tls12_get_psigalgs(SSL *s, const unsigned char **psigs);
+__owur int tls12_check_peer_sigalg(const EVP_MD **pmd, SSL *s,
                             const unsigned char *sig, EVP_PKEY *pkey);
 void ssl_set_client_disabled(SSL *s);
-int ssl_cipher_disabled(SSL *s, const SSL_CIPHER *c, int op);
+__owur int ssl_cipher_disabled(SSL *s, const SSL_CIPHER *c, int op);
 
-int ssl_add_clienthello_use_srtp_ext(SSL *s, unsigned char *p, int *len,
+__owur int ssl_add_clienthello_use_srtp_ext(SSL *s, unsigned char *p, int *len,
                                      int maxlen);
-int ssl_parse_clienthello_use_srtp_ext(SSL *s, unsigned char *d, int len,
+__owur int ssl_parse_clienthello_use_srtp_ext(SSL *s, unsigned char *d, int len,
                                        int *al);
-int ssl_add_serverhello_use_srtp_ext(SSL *s, unsigned char *p, int *len,
+__owur int ssl_add_serverhello_use_srtp_ext(SSL *s, unsigned char *p, int *len,
                                      int maxlen);
-int ssl_parse_serverhello_use_srtp_ext(SSL *s, unsigned char *d, int len,
+__owur int ssl_parse_serverhello_use_srtp_ext(SSL *s, unsigned char *d, int len,
                                        int *al);
 
-int ssl_handshake_hash(SSL *s, unsigned char *out, int outlen);
+__owur int ssl_handshake_hash(SSL *s, unsigned char *out, int outlen);
 
 /* s3_cbc.c */
 void ssl3_cbc_copy_mac(unsigned char *out,
                        const SSL3_RECORD *rec, unsigned md_size);
-int ssl3_cbc_remove_padding(const SSL *s,
+__owur int ssl3_cbc_remove_padding(const SSL *s,
                             SSL3_RECORD *rec,
                             unsigned block_size, unsigned mac_size);
-int tls1_cbc_remove_padding(const SSL *s,
+__owur int tls1_cbc_remove_padding(const SSL *s,
                             SSL3_RECORD *rec,
                             unsigned block_size, unsigned mac_size);
-char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx);
+__owur char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx);
 void ssl3_cbc_digest_record(const EVP_MD_CTX *ctx,
                             unsigned char *md_out,
                             size_t *md_out_size,
@@ -2437,19 +2437,19 @@ void tls_fips_digest_extra(const EVP_CIPHER_CTX *cipher_ctx,
                            EVP_MD_CTX *mac_ctx, const unsigned char *data,
                            size_t data_len, size_t orig_len);
 
-int srp_verify_server_param(SSL *s, int *al);
+__owur int srp_verify_server_param(SSL *s, int *al);
 
 /* t1_ext.c */
 
 void custom_ext_init(custom_ext_methods *meths);
 
-int custom_ext_parse(SSL *s, int server,
+__owur int custom_ext_parse(SSL *s, int server,
                      unsigned int ext_type,
                      const unsigned char *ext_data, size_t ext_size, int *al);
-int custom_ext_add(SSL *s, int server,
+__owur int custom_ext_add(SSL *s, int server,
                    unsigned char **pret, unsigned char *limit, int *al);
 
-int custom_exts_copy(custom_ext_methods *dst, const custom_ext_methods *src);
+__owur int custom_exts_copy(custom_ext_methods *dst, const custom_ext_methods *src);
 void custom_exts_free(custom_ext_methods *exts);
 
 # else
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index 8799d3d..60a6834 100644
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -693,7 +693,10 @@ int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file)
         int r;
         unsigned long err;
 
-        SSL_CTX_clear_chain_certs(ctx);
+        if(!SSL_CTX_clear_chain_certs(ctx)) {
+            ret = 0;
+            goto end;
+        }
 
         while ((ca = PEM_read_bio_X509(in, NULL,
                                        ctx->default_passwd_callback,
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index cf019c8..22d2e66 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -510,12 +510,14 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
              */
             if (!
                 (s->session_ctx->session_cache_mode &
-                 SSL_SESS_CACHE_NO_INTERNAL_STORE))
+                 SSL_SESS_CACHE_NO_INTERNAL_STORE)) {
                 /*
                  * The following should not return 1, otherwise, things are
                  * very strange
                  */
-                SSL_CTX_add_session(s->session_ctx, ret);
+                if(SSL_CTX_add_session(s->session_ctx, ret))
+                    goto err;
+            }
         }
     }
 
diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c
index e5774d2..ccdf8ec 100644
--- a/ssl/ssl_txt.c
+++ b/ssl/ssl_txt.c
@@ -214,7 +214,8 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
     if (x->compress_meth != 0) {
         SSL_COMP *comp = NULL;
 
-        ssl_cipher_get_evp(x, NULL, NULL, NULL, NULL, &comp, 0);
+        if(!ssl_cipher_get_evp(x, NULL, NULL, NULL, NULL, &comp, 0))
+            goto err;
         if (comp == NULL) {
             if (BIO_printf(bp, "\n    Compression: %d", x->compress_meth) <=
                 0)
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index a57d505..457ba86 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -1443,8 +1443,11 @@ int main(int argc, char *argv[])
     SSL_CTX_set_security_level(s_ctx, 0);
 
     if (cipher != NULL) {
-        SSL_CTX_set_cipher_list(c_ctx, cipher);
-        SSL_CTX_set_cipher_list(s_ctx, cipher);
+        if(!SSL_CTX_set_cipher_list(c_ctx, cipher)
+           || !SSL_CTX_set_cipher_list(s_ctx, cipher)) {
+            ERR_print_errors(bio_err);
+            goto end;
+        }
     }
 
     /* Process SSL_CONF arguments */
@@ -1537,10 +1540,13 @@ int main(int argc, char *argv[])
     }
 
     if (client_auth) {
-        SSL_CTX_use_certificate_file(c_ctx, client_cert, SSL_FILETYPE_PEM);
-        SSL_CTX_use_PrivateKey_file(c_ctx,
+        if(!SSL_CTX_use_certificate_file(c_ctx, client_cert, SSL_FILETYPE_PEM)
+           || !SSL_CTX_use_PrivateKey_file(c_ctx,
                                     (client_key ? client_key : client_cert),
-                                    SSL_FILETYPE_PEM);
+                                    SSL_FILETYPE_PEM)) {
+            ERR_print_errors(bio_err);
+            goto end;
+        }
     }
 
     if ((!SSL_CTX_load_verify_locations(s_ctx, CAfile, CApath)) ||
@@ -1569,8 +1575,11 @@ int main(int argc, char *argv[])
 
     {
         int session_id_context = 0;
-        SSL_CTX_set_session_id_context(s_ctx, (void *)&session_id_context,
-                                       sizeof session_id_context);
+        if(!SSL_CTX_set_session_id_context(s_ctx, (void *)&session_id_context,
+                                       sizeof session_id_context)) {
+            ERR_print_errors(bio_err);
+            goto end;
+        }
     }
 
     /* Use PSK only if PSK key is given */
@@ -1637,15 +1646,22 @@ int main(int argc, char *argv[])
     }
 #endif
 
-    if (serverinfo_sct)
-        SSL_CTX_add_client_custom_ext(c_ctx, SCT_EXT_TYPE,
+    if (serverinfo_sct) {
+        if(!SSL_CTX_add_client_custom_ext(c_ctx, SCT_EXT_TYPE,
                                       NULL, NULL, NULL,
-                                      serverinfo_cli_parse_cb, NULL);
-    if (serverinfo_tack)
-        SSL_CTX_add_client_custom_ext(c_ctx, TACK_EXT_TYPE,
+                                      serverinfo_cli_parse_cb, NULL)) {
+            BIO_printf(bio_err, "Error adding SCT extension\n");
+            goto end;
+        }
+    }
+    if (serverinfo_tack) {
+        if(!SSL_CTX_add_client_custom_ext(c_ctx, TACK_EXT_TYPE,
                                       NULL, NULL, NULL,
-                                      serverinfo_cli_parse_cb, NULL);
-
+                                      serverinfo_cli_parse_cb, NULL)) {
+            BIO_printf(bio_err, "Error adding TACK extension\n");
+            goto end;
+        }
+    }
     if (serverinfo_file)
         if (!SSL_CTX_use_serverinfo_file(s_ctx, serverinfo_file)) {
             BIO_printf(bio_err, "missing serverinfo file\n");
@@ -1653,39 +1669,41 @@ int main(int argc, char *argv[])
         }
 
     if (custom_ext) {
-        SSL_CTX_add_client_custom_ext(c_ctx, CUSTOM_EXT_TYPE_0,
+        if(!SSL_CTX_add_client_custom_ext(c_ctx, CUSTOM_EXT_TYPE_0,
                                       custom_ext_0_cli_add_cb,
                                       NULL, NULL,
-                                      custom_ext_0_cli_parse_cb, NULL);
-        SSL_CTX_add_client_custom_ext(c_ctx, CUSTOM_EXT_TYPE_1,
+                                      custom_ext_0_cli_parse_cb, NULL)
+           || !SSL_CTX_add_client_custom_ext(c_ctx, CUSTOM_EXT_TYPE_1,
                                       custom_ext_1_cli_add_cb,
                                       NULL, NULL,
-                                      custom_ext_1_cli_parse_cb, NULL);
-        SSL_CTX_add_client_custom_ext(c_ctx, CUSTOM_EXT_TYPE_2,
+                                      custom_ext_1_cli_parse_cb, NULL)
+           || !SSL_CTX_add_client_custom_ext(c_ctx, CUSTOM_EXT_TYPE_2,
                                       custom_ext_2_cli_add_cb,
                                       NULL, NULL,
-                                      custom_ext_2_cli_parse_cb, NULL);
-        SSL_CTX_add_client_custom_ext(c_ctx, CUSTOM_EXT_TYPE_3,
+                                      custom_ext_2_cli_parse_cb, NULL)
+           || !SSL_CTX_add_client_custom_ext(c_ctx, CUSTOM_EXT_TYPE_3,
                                       custom_ext_3_cli_add_cb,
                                       NULL, NULL,
-                                      custom_ext_3_cli_parse_cb, NULL);
-
-        SSL_CTX_add_server_custom_ext(s_ctx, CUSTOM_EXT_TYPE_0,
+                                      custom_ext_3_cli_parse_cb, NULL)
+           || !SSL_CTX_add_server_custom_ext(s_ctx, CUSTOM_EXT_TYPE_0,
                                       custom_ext_0_srv_add_cb,
                                       NULL, NULL,
-                                      custom_ext_0_srv_parse_cb, NULL);
-        SSL_CTX_add_server_custom_ext(s_ctx, CUSTOM_EXT_TYPE_1,
+                                      custom_ext_0_srv_parse_cb, NULL)
+           || !SSL_CTX_add_server_custom_ext(s_ctx, CUSTOM_EXT_TYPE_1,
                                       custom_ext_1_srv_add_cb,
                                       NULL, NULL,
-                                      custom_ext_1_srv_parse_cb, NULL);
-        SSL_CTX_add_server_custom_ext(s_ctx, CUSTOM_EXT_TYPE_2,
+                                      custom_ext_1_srv_parse_cb, NULL)
+           || !SSL_CTX_add_server_custom_ext(s_ctx, CUSTOM_EXT_TYPE_2,
                                       custom_ext_2_srv_add_cb,
                                       NULL, NULL,
-                                      custom_ext_2_srv_parse_cb, NULL);
-        SSL_CTX_add_server_custom_ext(s_ctx, CUSTOM_EXT_TYPE_3,
+                                      custom_ext_2_srv_parse_cb, NULL)
+           || !SSL_CTX_add_server_custom_ext(s_ctx, CUSTOM_EXT_TYPE_3,
                                       custom_ext_3_srv_add_cb,
                                       NULL, NULL,
-                                      custom_ext_3_srv_parse_cb, NULL);
+                                      custom_ext_3_srv_parse_cb, NULL)) {
+            BIO_printf(bio_err, "Error setting custom extensions\n");
+            goto end;
+        }
     }
 
     if (alpn_server)
@@ -1699,7 +1717,12 @@ int main(int argc, char *argv[])
             BIO_printf(bio_err, "Error parsing -alpn_client argument\n");
             goto end;
         }
-        SSL_CTX_set_alpn_protos(c_ctx, alpn, alpn_len);
+        /* Returns 0 on success!! */
+        if(SSL_CTX_set_alpn_protos(c_ctx, alpn, alpn_len)) {
+            BIO_printf(bio_err, "Error setting ALPN\n");
+            OPENSSL_free(alpn);
+            goto end;
+        }
         OPENSSL_free(alpn);
     }
 
@@ -1722,8 +1745,12 @@ int main(int argc, char *argv[])
 #endif                          /* OPENSSL_NO_KRB5 */
 
     for (i = 0; i < number; i++) {
-        if (!reuse)
-            SSL_set_session(c_ssl, NULL);
+        if (!reuse) {
+            if(!SSL_set_session(c_ssl, NULL)) {
+                BIO_printf(bio_err, "Failed to set session\n");
+                goto end;
+            }
+        }
         if (bio_pair)
             ret = doit_biopair(s_ssl, c_ssl, bytes, &s_time, &c_time);
         else
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 26f8415..df97f19 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -1095,7 +1095,8 @@ int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
              * exchange and before certificate verify)
              */
             s->s3->flags |= TLS1_FLAGS_KEEP_HANDSHAKE;
-            ssl3_digest_cached_records(s);
+            if(!ssl3_digest_cached_records(s))
+                return -1;
         }
         hashlen = ssl_handshake_hash(s, hash, sizeof(hash));
 #ifdef SSL_DEBUG
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 511223e..dd28cd6 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1431,7 +1431,11 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf,
     if (SSL_IS_DTLS(s) && SSL_get_srtp_profiles(s)) {
         int el;
 
-        ssl_add_clienthello_use_srtp_ext(s, 0, &el, 0);
+        /* Returns 0 on success!! */
+        if (ssl_add_clienthello_use_srtp_ext(s, 0, &el, 0)) {
+            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return NULL;
+        }
 
         if ((limit - ret - 4 - el) < 0)
             return NULL;
@@ -1601,8 +1605,11 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
     if (SSL_IS_DTLS(s) && s->srtp_profile) {
         int el;
 
-        ssl_add_serverhello_use_srtp_ext(s, 0, &el, 0);
-
+        /* Returns 0 on success!! */
+        if(ssl_add_serverhello_use_srtp_ext(s, 0, &el, 0)) {
+            SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return NULL;
+        }
         if ((limit - ret - 4 - el) < 0)
             return NULL;
 
@@ -4141,12 +4148,13 @@ int tls1_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain,
 /* Set validity of certificates in an SSL structure */
 void tls1_set_cert_validity(SSL *s)
 {
-    tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_RSA_ENC);
-    tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_RSA_SIGN);
-    tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_DSA_SIGN);
-    tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_DH_RSA);
-    tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_DH_DSA);
-    tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_ECC);
+    /* Deliberately ignore all return values */
+    if(tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_RSA_ENC)
+       || tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_RSA_SIGN)
+       || tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_DSA_SIGN)
+       || tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_DH_RSA)
+       || tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_DH_DSA)
+       || tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_ECC));
 }
 
 /* User level utiity function to check a chain is suitable */
diff --git a/ssl/tls1.h b/ssl/tls1.h
index cb14d8e..e1beaf3 100644
--- a/ssl/tls1.h
+++ b/ssl/tls1.h
@@ -312,8 +312,8 @@ extern "C" {
 
 #  define TLSEXT_MAXLEN_host_name 255
 
-const char *SSL_get_servername(const SSL *s, const int type);
-int SSL_get_servername_type(const SSL *s);
+__owur const char *SSL_get_servername(const SSL *s, const int type);
+__owur int SSL_get_servername_type(const SSL *s);
 /*
  * SSL_export_keying_material exports a value derived from the master secret,
  * as specified in RFC 5705. It writes |olen| bytes to |out| given a label and
@@ -321,7 +321,7 @@ int SSL_get_servername_type(const SSL *s);
  * flag controls whether a context is included.) It returns 1 on success and
  * zero otherwise.
  */
-int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
+__owur int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
                                const char *label, size_t llen,
                                const unsigned char *p, size_t plen,
                                int use_context);
@@ -334,7 +334,7 @@ int SSL_get_shared_sigalgs(SSL *s, int idx,
                            int *psign, int *phash, int *psignandhash,
                            unsigned char *rsig, unsigned char *rhash);
 
-int SSL_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain);
+__owur int SSL_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain);
 
 #  define SSL_set_tlsext_host_name(s,name) \
 SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_HOSTNAME,TLSEXT_NAMETYPE_host_name,(char *)name)

From steve at openssl.org  Mon Mar 23 18:27:47 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 23 Mar 2015 18:27:47 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427135267.283952.26773.nullmailer@dev.openssl.org>

The branch master has been updated
       via  4903abd50a8e86ac6bf9f0c6a54cec54d9fc3120 (commit)
      from  c7f5b5d7bc462ca9dd5fc391e25c00a691960017 (commit)


- Log -----------------------------------------------------------------
commit 4903abd50a8e86ac6bf9f0c6a54cec54d9fc3120
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Mar 15 13:43:56 2015 +0000

    make X509_EXTENSION opaque
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/asn1/t_req.c             |  2 +-
 crypto/asn1/x_crl.c             |  8 ++++----
 crypto/ocsp/ocsp_ext.c          |  3 ++-
 crypto/ts/ts_lib.c              |  3 ++-
 crypto/x509/Makefile            |  4 ++--
 crypto/x509/x509.h              |  6 +-----
 crypto/x509/x509_lcl.h          |  6 ++++++
 crypto/x509/x509_v3.c           |  1 +
 crypto/{asn1 => x509}/x_exten.c |  1 +
 crypto/x509v3/v3_lib.c          | 15 +++++++++------
 crypto/x509v3/v3_prn.c          | 30 +++++++++++++++---------------
 11 files changed, 44 insertions(+), 35 deletions(-)
 rename crypto/{asn1 => x509}/x_exten.c (99%)

diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c
index bd76950..01eabfa 100644
--- a/crypto/asn1/t_req.c
+++ b/crypto/asn1/t_req.c
@@ -216,7 +216,7 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags,
                     goto err;
                 if (!X509V3_EXT_print(bp, ex, cflag, 16)) {
                     BIO_printf(bp, "%16s", "");
-                    ASN1_STRING_print(bp, ex->value);
+                    ASN1_STRING_print(bp, X509_EXTENSION_get_data(ex));
                 }
                 if (BIO_write(bp, "\n", 1) <= 0)
                     goto err;
diff --git a/crypto/asn1/x_crl.c b/crypto/asn1/x_crl.c
index 8884223..e32556e 100644
--- a/crypto/asn1/x_crl.c
+++ b/crypto/asn1/x_crl.c
@@ -179,8 +179,8 @@ static int crl_set_issuers(X509_CRL *crl)
 
         for (j = 0; j < sk_X509_EXTENSION_num(exts); j++) {
             ext = sk_X509_EXTENSION_value(exts, j);
-            if (ext->critical > 0) {
-                if (OBJ_obj2nid(ext->object) == NID_certificate_issuer)
+            if (X509_EXTENSION_get_critical(ext)) {
+                if (OBJ_obj2nid(X509_EXTENSION_get_object(ext)) == NID_certificate_issuer)
                     continue;
                 crl->flags |= EXFLAG_CRITICAL;
                 break;
@@ -253,10 +253,10 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
         for (idx = 0; idx < sk_X509_EXTENSION_num(exts); idx++) {
             int nid;
             ext = sk_X509_EXTENSION_value(exts, idx);
-            nid = OBJ_obj2nid(ext->object);
+            nid = OBJ_obj2nid(X509_EXTENSION_get_object(ext));
             if (nid == NID_freshest_crl)
                 crl->flags |= EXFLAG_FRESHEST;
-            if (ext->critical > 0) {
+            if (X509_EXTENSION_get_critical(ext)) {
                 /* We handle IDP and deltas */
                 if ((nid == NID_issuing_distribution_point)
                     || (nid == NID_authority_key_identifier)
diff --git a/crypto/ocsp/ocsp_ext.c b/crypto/ocsp/ocsp_ext.c
index 04ae17f..4c6edb1 100644
--- a/crypto/ocsp/ocsp_ext.c
+++ b/crypto/ocsp/ocsp_ext.c
@@ -388,7 +388,8 @@ int OCSP_check_nonce(OCSP_REQUEST *req, OCSP_BASICRESP *bs)
      */
     req_ext = OCSP_REQUEST_get_ext(req, req_idx);
     resp_ext = OCSP_BASICRESP_get_ext(bs, resp_idx);
-    if (ASN1_OCTET_STRING_cmp(req_ext->value, resp_ext->value))
+    if (ASN1_OCTET_STRING_cmp(X509_EXTENSION_get_data(req_ext),
+                              X509_EXTENSION_get_data(resp_ext)))
         return 0;
     return 1;
 }
diff --git a/crypto/ts/ts_lib.c b/crypto/ts/ts_lib.c
index 6ec1f0c..cac9aa4 100644
--- a/crypto/ts/ts_lib.c
+++ b/crypto/ts/ts_lib.c
@@ -61,6 +61,7 @@
 #include "cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/bn.h>
+#include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include <openssl/ts.h>
 
@@ -115,7 +116,7 @@ int TS_ext_print_bio(BIO *bio, const STACK_OF(X509_EXTENSION) *extensions)
         BIO_printf(bio, ": %s\n", critical ? "critical" : "");
         if (!X509V3_EXT_print(bio, ex, 0, 4)) {
             BIO_printf(bio, "%4s", "");
-            ASN1_STRING_print(bio, ex->value);
+            ASN1_STRING_print(bio, X509_EXTENSION_get_data(ex));
         }
         BIO_write(bio, "\n", 1);
     }
diff --git a/crypto/x509/Makefile b/crypto/x509/Makefile
index de96405..f6cfbec 100644
--- a/crypto/x509/Makefile
+++ b/crypto/x509/Makefile
@@ -22,13 +22,13 @@ LIBSRC=	x509_def.c x509_d2.c x509_r2x.c x509_cmp.c \
 	x509_set.c x509cset.c x509rset.c x509_err.c \
 	x509name.c x509_v3.c x509_ext.c x509_att.c \
 	x509type.c x509_lu.c x_all.c x509_txt.c \
-	x509_trs.c by_file.c by_dir.c x509_vpm.c x_attrib.c
+	x509_trs.c by_file.c by_dir.c x509_vpm.c x_attrib.c x_exten.c
 LIBOBJ= x509_def.o x509_d2.o x509_r2x.o x509_cmp.o \
 	x509_obj.o x509_req.o x509spki.o x509_vfy.o \
 	x509_set.o x509cset.o x509rset.o x509_err.o \
 	x509name.o x509_v3.o x509_ext.o x509_att.o \
 	x509type.o x509_lu.o x_all.o x509_txt.o \
-	x509_trs.o by_file.o by_dir.o x509_vpm.o x_attrib.o
+	x509_trs.o by_file.o by_dir.o x509_vpm.o x_attrib.o x_exten.o
 
 SRC= $(LIBSRC)
 
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index 64f1283..5fcea0c 100644
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -171,11 +171,7 @@ DECLARE_STACK_OF(X509_NAME)
 
 # define X509_EX_V_NETSCAPE_HACK         0x8000
 # define X509_EX_V_INIT                  0x0001
-typedef struct X509_extension_st {
-    ASN1_OBJECT *object;
-    ASN1_BOOLEAN critical;
-    ASN1_OCTET_STRING *value;
-} X509_EXTENSION;
+typedef struct X509_extension_st X509_EXTENSION;
 
 typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS;
 
diff --git a/crypto/x509/x509_lcl.h b/crypto/x509/x509_lcl.h
index 15b8618..5e38f5f 100644
--- a/crypto/x509/x509_lcl.h
+++ b/crypto/x509/x509_lcl.h
@@ -86,3 +86,9 @@ struct x509_attributes_st {
          */ ASN1_TYPE *single;
     } value;
 };
+
+struct X509_extension_st {
+    ASN1_OBJECT *object;
+    ASN1_BOOLEAN critical;
+    ASN1_OCTET_STRING *value;
+};
diff --git a/crypto/x509/x509_v3.c b/crypto/x509/x509_v3.c
index 0a6247d..d70bfae 100644
--- a/crypto/x509/x509_v3.c
+++ b/crypto/x509/x509_v3.c
@@ -64,6 +64,7 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
+#include "x509_lcl.h"
 
 int X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x)
 {
diff --git a/crypto/asn1/x_exten.c b/crypto/x509/x_exten.c
similarity index 99%
rename from crypto/asn1/x_exten.c
rename to crypto/x509/x_exten.c
index 00a9580..c0d4c96 100644
--- a/crypto/asn1/x_exten.c
+++ b/crypto/x509/x_exten.c
@@ -61,6 +61,7 @@
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
+#include "x509_lcl.h"
 
 ASN1_SEQUENCE(X509_EXTENSION) = {
         ASN1_SIMPLE(X509_EXTENSION, object, ASN1_OBJECT),
diff --git a/crypto/x509v3/v3_lib.c b/crypto/x509v3/v3_lib.c
index 90ddd86..7e3e984 100644
--- a/crypto/x509v3/v3_lib.c
+++ b/crypto/x509v3/v3_lib.c
@@ -117,7 +117,7 @@ const X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid)
 const X509V3_EXT_METHOD *X509V3_EXT_get(X509_EXTENSION *ext)
 {
     int nid;
-    if ((nid = OBJ_obj2nid(ext->object)) == NID_undef)
+    if ((nid = OBJ_obj2nid(X509_EXTENSION_get_object(ext))) == NID_undef)
         return NULL;
     return X509V3_EXT_get_nid(nid);
 }
@@ -180,14 +180,17 @@ void *X509V3_EXT_d2i(X509_EXTENSION *ext)
 {
     const X509V3_EXT_METHOD *method;
     const unsigned char *p;
+    ASN1_STRING *extvalue;
+    int extlen;
 
     if (!(method = X509V3_EXT_get(ext)))
         return NULL;
-    p = ext->value->data;
+    extvalue = X509_EXTENSION_get_data(ext);
+    p = ASN1_STRING_data(extvalue);
+    extlen = ASN1_STRING_length(extvalue);
     if (method->it)
-        return ASN1_item_d2i(NULL, &p, ext->value->length,
-                             ASN1_ITEM_ptr(method->it));
-    return method->d2i(NULL, &p, ext->value->length);
+        return ASN1_item_d2i(NULL, &p, extlen, ASN1_ITEM_ptr(method->it));
+    return method->d2i(NULL, &p, extlen);
 }
 
 /*-
@@ -226,7 +229,7 @@ void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit,
         lastpos = 0;
     for (i = lastpos; i < sk_X509_EXTENSION_num(x); i++) {
         ex = sk_X509_EXTENSION_value(x, i);
-        if (OBJ_obj2nid(ex->object) == nid) {
+        if (OBJ_obj2nid(X509_EXTENSION_get_object(ex)) == nid) {
             if (idx) {
                 *idx = i;
                 found_ex = ex;
diff --git a/crypto/x509v3/v3_prn.c b/crypto/x509v3/v3_prn.c
index 7fd3231..9d093a3 100644
--- a/crypto/x509v3/v3_prn.c
+++ b/crypto/x509v3/v3_prn.c
@@ -65,7 +65,7 @@
 
 /* Extension printing routines */
 
-static int unknown_ext_print(BIO *out, X509_EXTENSION *ext,
+static int unknown_ext_print(BIO *out, const unsigned char *ext, int extlen,
                              unsigned long flag, int indent, int supported);
 
 /* Print out a name+value stack */
@@ -120,23 +120,26 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,
 {
     void *ext_str = NULL;
     char *value = NULL;
+    ASN1_OCTET_STRING *extoct;
     const unsigned char *p;
+    int extlen;
     const X509V3_EXT_METHOD *method;
     STACK_OF(CONF_VALUE) *nval = NULL;
     int ok = 1;
 
+    extoct = X509_EXTENSION_get_data(ext);
+    p = ASN1_STRING_data(extoct);
+    extlen = ASN1_STRING_length(extoct);
+
     if (!(method = X509V3_EXT_get(ext)))
-        return unknown_ext_print(out, ext, flag, indent, 0);
-    p = ext->value->data;
+        return unknown_ext_print(out, p, extlen, flag, indent, 0);
     if (method->it)
-        ext_str =
-            ASN1_item_d2i(NULL, &p, ext->value->length,
-                          ASN1_ITEM_ptr(method->it));
+        ext_str = ASN1_item_d2i(NULL, &p, extlen, ASN1_ITEM_ptr(method->it));
     else
-        ext_str = method->d2i(NULL, &p, ext->value->length);
+        ext_str = method->d2i(NULL, &p, extlen);
 
     if (!ext_str)
-        return unknown_ext_print(out, ext, flag, indent, 1);
+        return unknown_ext_print(out, p, extlen, flag, indent, 1);
 
     if (method->i2s) {
         if (!(value = method->i2s(method, ext_str))) {
@@ -209,7 +212,7 @@ int X509V3_extensions_print(BIO *bp, char *title,
             return 0;
         if (!X509V3_EXT_print(bp, ex, flag, indent + 4)) {
             BIO_printf(bp, "%*s", indent + 4, "");
-            ASN1_STRING_print(bp, ex->value);
+            ASN1_STRING_print(bp, X509_EXTENSION_get_data(ex));
         }
         if (BIO_write(bp, "\n", 1) <= 0)
             return 0;
@@ -217,7 +220,7 @@ int X509V3_extensions_print(BIO *bp, char *title,
     return 1;
 }
 
-static int unknown_ext_print(BIO *out, X509_EXTENSION *ext,
+static int unknown_ext_print(BIO *out, const unsigned char *ext, int extlen,
                              unsigned long flag, int indent, int supported)
 {
     switch (flag & X509V3_EXT_UNKNOWN_MASK) {
@@ -233,12 +236,9 @@ static int unknown_ext_print(BIO *out, X509_EXTENSION *ext,
         return 1;
 
     case X509V3_EXT_PARSE_UNKNOWN:
-        return ASN1_parse_dump(out,
-                               ext->value->data, ext->value->length, indent,
-                               -1);
+        return ASN1_parse_dump(out, ext, extlen, indent, -1);
     case X509V3_EXT_DUMP_UNKNOWN:
-        return BIO_dump_indent(out, (char *)ext->value->data,
-                               ext->value->length, indent);
+        return BIO_dump_indent(out, (char *)ext, extlen, indent);
 
     default:
         return 1;

From steve at openssl.org  Mon Mar 23 19:28:56 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 23 Mar 2015 19:28:56 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427138936.554813.14123.nullmailer@dev.openssl.org>

The branch master has been updated
       via  06e6aa47de1b4da912069eef2e3458952ac79335 (commit)
      from  4903abd50a8e86ac6bf9f0c6a54cec54d9fc3120 (commit)


- Log -----------------------------------------------------------------
commit 06e6aa47de1b4da912069eef2e3458952ac79335
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 23 18:47:05 2015 +0000

    Fix build.
    
    Remove x_exten.c and x_exten.o from crypto/asn1/Makefile: they've moved now.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/asn1/Makefile | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/crypto/asn1/Makefile b/crypto/asn1/Makefile
index cb143b3..a2051f7 100644
--- a/crypto/asn1/Makefile
+++ b/crypto/asn1/Makefile
@@ -27,7 +27,7 @@ LIBSRC=	a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \
 	tasn_new.c tasn_fre.c tasn_enc.c tasn_dec.c tasn_utl.c tasn_typ.c \
 	tasn_prn.c tasn_scn.c ameth_lib.c \
 	f_int.c f_string.c n_pkey.c \
-	f_enum.c x_pkey.c x_exten.c bio_asn1.c bio_ndef.c asn_mime.c \
+	f_enum.c x_pkey.c bio_asn1.c bio_ndef.c asn_mime.c \
 	asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_strnid.c \
 	evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.c \
 	asn_mstbl.c
@@ -41,7 +41,7 @@ LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \
 	tasn_new.o tasn_fre.o tasn_enc.o tasn_dec.o tasn_utl.o tasn_typ.o \
 	tasn_prn.o tasn_scn.o ameth_lib.o \
 	f_int.o f_string.o n_pkey.o \
-	f_enum.o x_pkey.o x_exten.o bio_asn1.o bio_ndef.o asn_mime.o \
+	f_enum.o x_pkey.o bio_asn1.o bio_ndef.o asn_mime.o \
 	asn1_gen.o asn1_par.o asn1_lib.o asn1_err.o a_strnid.o \
 	evp_asn1.o asn_pack.o p5_pbe.o p5_pbev2.o p8_pkey.o asn_moid.o \
 	asn_mstbl.o
@@ -766,18 +766,6 @@ x_crl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 x_crl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 x_crl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 x_crl.o: ../../include/openssl/x509v3.h ../cryptlib.h asn1_locl.h x_crl.c
-x_exten.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-x_exten.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
-x_exten.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-x_exten.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-x_exten.o: ../../include/openssl/ecdsa.h ../../include/openssl/evp.h
-x_exten.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
-x_exten.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_exten.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-x_exten.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
-x_exten.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_exten.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-x_exten.o: ../../include/openssl/x509_vfy.h x_exten.c
 x_info.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 x_info.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 x_info.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h

From kurt at openssl.org  Mon Mar 23 20:17:15 2015
From: kurt at openssl.org (Kurt Roeckx)
Date: Mon, 23 Mar 2015 20:17:15 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427141835.393773.29683.nullmailer@dev.openssl.org>

The branch master has been updated
       via  4dcb4b91db26de8716c2f43ffb710175fc3279fc (commit)
       via  93f1c13619c5b41f2dcfdbf6ae666f867922a87a (commit)
       via  24a0d3933d24059942a3cf99695d486c8fadd576 (commit)
      from  06e6aa47de1b4da912069eef2e3458952ac79335 (commit)


- Log -----------------------------------------------------------------
commit 4dcb4b91db26de8716c2f43ffb710175fc3279fc
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sun Mar 15 00:26:26 2015 +0100

    return unexpected message when receiving kx with kDHr or kDHd
    
    It was saying that it was an illegal parameter / unsupported cipher
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 93f1c13619c5b41f2dcfdbf6ae666f867922a87a
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sat Mar 14 23:23:26 2015 +0100

    Don't send a for ServerKeyExchange for kDHr and kDHd
    
    The certificate already contains the DH parameters in that case.
    ssl3_send_server_key_exchange() would fail in that case anyway.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 24a0d3933d24059942a3cf99695d486c8fadd576
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Wed Mar 18 19:02:50 2015 +0100

    Make sure that cert is never NULL
    
    Also removes for it being NULL
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 ssl/d1_srvr.c |  6 +-----
 ssl/s3_clnt.c |  5 -----
 ssl/s3_srvr.c |  4 ----
 ssl/ssl.h     |  1 -
 ssl/ssl_err.c |  2 --
 ssl/ssl_lib.c | 47 +++++++++++++++++++----------------------------
 6 files changed, 20 insertions(+), 45 deletions(-)

diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c
index 24361ae..b55af35 100644
--- a/ssl/d1_srvr.c
+++ b/ssl/d1_srvr.c
@@ -199,10 +199,6 @@ int dtls1_accept(SSL *s)
              s->in_handshake, NULL);
 #endif
 
-    if (s->cert == NULL) {
-        SSLerr(SSL_F_DTLS1_ACCEPT, SSL_R_NO_CERTIFICATE_SET);
-        return (-1);
-    }
 #ifndef OPENSSL_NO_HEARTBEATS
     /*
      * If we're awaiting a HeartbeatResponse, pretend we already got and
@@ -488,7 +484,7 @@ int dtls1_accept(SSL *s)
 #ifndef OPENSSL_NO_PSK
                 || ((alg_k & SSL_kPSK) && s->ctx->psk_identity_hint)
 #endif
-                || (alg_k & (SSL_kDHE | SSL_kDHr | SSL_kDHd))
+                || (alg_k & SSL_kDHE)
                 || (alg_k & SSL_kECDHE)
                 || ((alg_k & SSL_kRSA)
                     && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 81381ef..f4b60be 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1722,11 +1722,6 @@ int ssl3_get_key_exchange(SSL *s)
 
         s->session->sess_cert->peer_dh_tmp = dh;
         dh = NULL;
-    } else if ((alg_k & SSL_kDHr) || (alg_k & SSL_kDHd)) {
-        al = SSL_AD_ILLEGAL_PARAMETER;
-        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,
-               SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER);
-        goto f_err;
     }
 #endif                          /* !OPENSSL_NO_DH */
 
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index ccccd54..0efe3dd 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -231,10 +231,6 @@ int ssl3_accept(SSL *s)
             return -1;
     }
 
-    if (s->cert == NULL) {
-        SSLerr(SSL_F_SSL3_ACCEPT, SSL_R_NO_CERTIFICATE_SET);
-        return (-1);
-    }
 #ifndef OPENSSL_NO_HEARTBEATS
     /*
      * If we're awaiting a HeartbeatResponse, pretend we already got and
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 3a6f9fb..dec3abc 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -2387,7 +2387,6 @@ void ERR_load_SSL_strings(void);
 # define SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST             157
 # define SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST 233
 # define SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG    234
-# define SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER            235
 # define SSL_R_UNABLE_TO_DECODE_DH_CERTS                  236
 # define SSL_R_UNABLE_TO_DECODE_ECDH_CERTS                313
 # define SSL_R_UNABLE_TO_FIND_DH_PARAMETERS               238
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index 75ca684..5792906 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -665,8 +665,6 @@ static ERR_STRING_DATA SSL_str_reasons[] = {
      "tls peer did not respond with certificate list"},
     {ERR_REASON(SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG),
      "tls rsa encrypted value length is wrong"},
-    {ERR_REASON(SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER),
-     "tried to use unsupported cipher"},
     {ERR_REASON(SSL_R_UNABLE_TO_DECODE_DH_CERTS), "unable to decode dh certs"},
     {ERR_REASON(SSL_R_UNABLE_TO_DECODE_ECDH_CERTS),
      "unable to decode ecdh certs"},
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 0c9f4f7..54974df 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -883,8 +883,6 @@ STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *s)
  */
 void SSL_copy_session_id(SSL *t, const SSL *f)
 {
-    CERT *tmp;
-
     /* Do we need to to SSL locking? */
     if(!SSL_set_session(t, SSL_get_session(f))) {
         /* How do we handle this!! void function */
@@ -900,14 +898,9 @@ void SSL_copy_session_id(SSL *t, const SSL *f)
         t->method->ssl_new(t);  /* setup new */
     }
 
-    tmp = t->cert;
-    if (f->cert != NULL) {
-        CRYPTO_add(&f->cert->references, 1, CRYPTO_LOCK_SSL_CERT);
-        t->cert = f->cert;
-    } else
-        t->cert = NULL;
-    if (tmp != NULL)
-        ssl_cert_free(tmp);
+    CRYPTO_add(&f->cert->references, 1, CRYPTO_LOCK_SSL_CERT);
+    ssl_cert_free(t->cert);
+    t->cert = f->cert;
     if(!SSL_set_session_id_context(t, f->sid_ctx, f->sid_ctx_length)) {
         /* Really should do something about this..but void function - ignore */
         ;
@@ -918,7 +911,7 @@ void SSL_copy_session_id(SSL *t, const SSL *f)
 int SSL_CTX_check_private_key(const SSL_CTX *ctx)
 {
     if ((ctx == NULL) ||
-        (ctx->cert == NULL) || (ctx->cert->key->x509 == NULL)) {
+        (ctx->cert->key->x509 == NULL)) {
         SSLerr(SSL_F_SSL_CTX_CHECK_PRIVATE_KEY,
                SSL_R_NO_CERTIFICATE_ASSIGNED);
         return (0);
@@ -939,10 +932,6 @@ int SSL_check_private_key(const SSL *ssl)
         SSLerr(SSL_F_SSL_CHECK_PRIVATE_KEY, ERR_R_PASSED_NULL_PARAMETER);
         return (0);
     }
-    if (ssl->cert == NULL) {
-        SSLerr(SSL_F_SSL_CHECK_PRIVATE_KEY, SSL_R_NO_CERTIFICATE_ASSIGNED);
-        return 0;
-    }
     if (ssl->cert->key->x509 == NULL) {
         SSLerr(SSL_F_SSL_CHECK_PRIVATE_KEY, SSL_R_NO_CERTIFICATE_ASSIGNED);
         return (0);
@@ -3055,26 +3044,28 @@ SSL_CTX *SSL_get_SSL_CTX(const SSL *ssl)
 
 SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX *ctx)
 {
-    CERT *ocert = ssl->cert;
+    CERT *new_cert;
     if (ssl->ctx == ctx)
         return ssl->ctx;
 #ifndef OPENSSL_NO_TLSEXT
     if (ctx == NULL)
         ctx = ssl->initial_ctx;
 #endif
-    ssl->cert = ssl_cert_dup(ctx->cert);
-    if (ocert) {
-        /* Preserve any already negotiated parameters */
-        if (ssl->server) {
-            ssl->cert->peer_sigalgs = ocert->peer_sigalgs;
-            ssl->cert->peer_sigalgslen = ocert->peer_sigalgslen;
-            ocert->peer_sigalgs = NULL;
-            ssl->cert->ciphers_raw = ocert->ciphers_raw;
-            ssl->cert->ciphers_rawlen = ocert->ciphers_rawlen;
-            ocert->ciphers_raw = NULL;
-        }
-        ssl_cert_free(ocert);
+    new_cert = ssl_cert_dup(ctx->cert);
+    if (new_cert == NULL) {
+        return NULL;
     }
+    /* Preserve any already negotiated parameters */
+    if (ssl->server) {
+        new_cert->peer_sigalgs = ssl->cert->peer_sigalgs;
+        new_cert->peer_sigalgslen = ssl->cert->peer_sigalgslen;
+        ssl->cert->peer_sigalgs = NULL;
+        new_cert->ciphers_raw = ssl->cert->ciphers_raw;
+        new_cert->ciphers_rawlen = ssl->cert->ciphers_rawlen;
+        ssl->cert->ciphers_raw = NULL;
+    }
+    ssl_cert_free(ssl->cert);
+    ssl->cert = new_cert;
 
     /*
      * Program invariant: |sid_ctx| has fixed size (SSL_MAX_SID_CTX_LENGTH),

From levitte at openssl.org  Mon Mar 23 20:31:24 2015
From: levitte at openssl.org (Richard Levitte)
Date: Mon, 23 Mar 2015 20:31:24 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1427142684.425032.2321.nullmailer@dev.openssl.org>

The branch master has been updated
       via  e390df779af965c340d0b7940a6c361a27177e18 (commit)
      from  d7576bdb40be362dc3f67b36abfff794a7251538 (commit)


- Log -----------------------------------------------------------------
commit e390df779af965c340d0b7940a6c361a27177e18
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Mar 23 21:25:08 2015 +0100

    Make a virtual link to the latest source called latest.tar.gz
    
    The idea came from Rich Salz and Stefan Eissing <stefan.eissing at greenbytes.de>
    and is that it would be nice if a script could ask for /source/latest.tar.gz
    and get a 302 that points at the actual latest tarball.
    
    For this to become as smooth as possible, it required three things:
    - add some markup around the latest tarball (a <span class="latest"> wrapper),
      done in openssl.wml.
    - Move source/.htaccess to source/.htaccess.in and add an appropriate rewrite
      to implement the 302, with a visible marker indicating where the file name
      of the currently latest tarball should be inserted.
    - do a bit of hackery in Makefile to extract the latest file name from
      source/index.html after that one has been rebuilt, and use that to create
      source/.htaccess from source/.htaccess.in.

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

Summary of changes:
 Makefile                           | 8 +++++++-
 openssl.wml                        | 2 +-
 source/{.htaccess => .htaccess.in} | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)
 rename source/{.htaccess => .htaccess.in} (92%)

diff --git a/Makefile b/Makefile
index e2670e3..3f2f4d5 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,14 @@ generated:
 	perl run-fundingfaq.pl < support/funding/support-faq.txt >support/funding/support-faq.inc
 	( cd news && xsltproc vulnerabilities.xsl vulnerabilities.xml > vulnerabilities.wml )
 
-simple:
+simple: rebuild hack-source_htaccess
+rebuild:
 	wmk $(FORCE) -I $(SNAP) -a $(DIRS) index.wml
+hack-source_htaccess:
+	latest=`grep '<span class="latest">' < source/index.html | \
+		sed -e 's|^.*<span class="latest">||' -e 's|</span>.*$$||'`; \
+	    sed -e "s|%%LATEST%%|$$latest|" \
+		< source/.htaccess.in > source/.htaccess
 
 manpages:
 	sh ./run-pod2html.sh $(PODSHOME)
diff --git a/openssl.wml b/openssl.wml
index cf202af..6369cb0 100644
--- a/openssl.wml
+++ b/openssl.wml
@@ -372,7 +372,7 @@ foreach $l (@L) {
     $l =~ s|(\s+)(\S+/)(\s*\n)$|$1."<a href=\"$2\"><b>$2</b></a>".$3|e;
     foreach $hi (@HI) {
         $l =~ s|^(.*$hi.*)$|<font color="#cc3333">$1&nbsp;&nbsp;<b>[LATEST]</b></font>|;
-        $l =~ s|>($hi)<|><font color="#cc3333">$1</font><|;
+        $l =~ s|>($hi)<|><font color="#cc3333"><span class="latest">$1</span></font><|;
     }
     print $l;
 }
diff --git a/source/.htaccess b/source/.htaccess.in
similarity index 92%
rename from source/.htaccess
rename to source/.htaccess.in
index 9fe909e..7ee68ac 100644
--- a/source/.htaccess
+++ b/source/.htaccess.in
@@ -29,3 +29,5 @@ RewriteRule openssl-(fips.*)  old/fips/openssl-$1 [L]
 <Files *.gz.sha1>
     RemoveEncoding .gz
 </Files>
+
+RewriteRule ^/latest.tar.gz$ /%%LATEST%% [R=302,NC]

From levitte at openssl.org  Mon Mar 23 20:38:38 2015
From: levitte at openssl.org (Richard Levitte)
Date: Mon, 23 Mar 2015 20:38:38 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1427143118.809157.11339.nullmailer@dev.openssl.org>

The branch master has been updated
       via  b8162319b4520a144c65bfcd2eeafd35547b9849 (commit)
      from  e390df779af965c340d0b7940a6c361a27177e18 (commit)


- Log -----------------------------------------------------------------
commit b8162319b4520a144c65bfcd2eeafd35547b9849
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Mar 23 21:38:13 2015 +0100

    Do not have a starting slash, since we've not top of tree

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

Summary of changes:
 source/.htaccess.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/.htaccess.in b/source/.htaccess.in
index 7ee68ac..ecdfd3a 100644
--- a/source/.htaccess.in
+++ b/source/.htaccess.in
@@ -30,4 +30,4 @@ RewriteRule openssl-(fips.*)  old/fips/openssl-$1 [L]
     RemoveEncoding .gz
 </Files>
 
-RewriteRule ^/latest.tar.gz$ /%%LATEST%% [R=302,NC]
+RewriteRule ^latest\.tar\.gz$ %%LATEST%% [R=302,NC]

From steve at openssl.org  Mon Mar 23 23:22:15 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 23 Mar 2015 23:22:15 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427152935.032442.3311.nullmailer@dev.openssl.org>

The branch master has been updated
       via  dd12df794a6fde993cb1970d1f484793a0973988 (commit)
      from  4dcb4b91db26de8716c2f43ffb710175fc3279fc (commit)


- Log -----------------------------------------------------------------
commit dd12df794a6fde993cb1970d1f484793a0973988
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Feb 9 14:54:48 2015 +0000

    Remove old style ASN.1 support.
    
    Remove old ASN.1 COMPAT type. This was meant as a temporary measure
    so older ASN.1 code (from OpenSSL 0.9.6) still worked. It's a hack
    which breaks constification and hopefully nothing uses it now, if
    it ever did.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/asn1/asn1t.h    | 34 --------------------------
 crypto/asn1/tasn_dec.c | 66 ++------------------------------------------------
 crypto/asn1/tasn_enc.c | 16 ------------
 crypto/asn1/tasn_fre.c |  7 ------
 crypto/asn1/tasn_new.c | 11 ---------
 5 files changed, 2 insertions(+), 132 deletions(-)

diff --git a/crypto/asn1/asn1t.h b/crypto/asn1/asn1t.h
index 99bc0ee..3dcca32 100644
--- a/crypto/asn1/asn1t.h
+++ b/crypto/asn1/asn1t.h
@@ -597,10 +597,6 @@ struct ASN1_ITEM_st {
  * The 'funcs' field is used for application
  * specific functions.
  *
- * For COMPAT types the funcs field gives a
- * set of functions that handle this type, this
- * supports the old d2i, i2d convention.
- *
  * The EXTERN type uses a new style d2i/i2d.
  * The new style should be used where possible
  * because it avoids things like the d2i IMPLICIT
@@ -625,8 +621,6 @@ struct ASN1_ITEM_st {
 
 # define ASN1_ITYPE_CHOICE               0x2
 
-# define ASN1_ITYPE_COMPAT               0x3
-
 # define ASN1_ITYPE_EXTERN               0x4
 
 # define ASN1_ITYPE_MSTRING              0x5
@@ -677,13 +671,6 @@ typedef int ASN1_primitive_print(BIO *out, ASN1_VALUE **pval,
                                  const ASN1_ITEM *it, int indent,
                                  const ASN1_PCTX *pctx);
 
-typedef struct ASN1_COMPAT_FUNCS_st {
-    ASN1_new_func *asn1_new;
-    ASN1_free_func *asn1_free;
-    ASN1_d2i_func *asn1_d2i;
-    ASN1_i2d_func *asn1_i2d;
-} ASN1_COMPAT_FUNCS;
-
 typedef struct ASN1_EXTERN_FUNCS_st {
     void *app_data;
     ASN1_ex_new_func *asn1_ex_new;
@@ -786,27 +773,6 @@ typedef struct ASN1_STREAM_ARG_st {
                                         ASN1_ITYPE_MSTRING, mask, NULL, 0, NULL, sizeof(ASN1_STRING), #itname \
                                 ASN1_ITEM_end(itname)
 
-/* Macro to implement an ASN1_ITEM in terms of old style funcs */
-
-# define IMPLEMENT_COMPAT_ASN1(sname) IMPLEMENT_COMPAT_ASN1_type(sname, V_ASN1_SEQUENCE)
-
-# define IMPLEMENT_COMPAT_ASN1_type(sname, tag) \
-        static const ASN1_COMPAT_FUNCS sname##_ff = { \
-                (ASN1_new_func *)sname##_new, \
-                (ASN1_free_func *)sname##_free, \
-                (ASN1_d2i_func *)d2i_##sname, \
-                (ASN1_i2d_func *)i2d_##sname, \
-        }; \
-        ASN1_ITEM_start(sname) \
-                ASN1_ITYPE_COMPAT, \
-                tag, \
-                NULL, \
-                0, \
-                &sname##_ff, \
-                0, \
-                #sname \
-        ASN1_ITEM_end(sname)
-
 # define IMPLEMENT_EXTERN_ASN1(sname, tag, fptrs) \
         ASN1_ITEM_start(sname) \
                 ASN1_ITYPE_EXTERN, \
diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index 3d62284..b96c1b5 100644
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -167,19 +167,17 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
                      int tag, int aclass, char opt, ASN1_TLC *ctx)
 {
     const ASN1_TEMPLATE *tt, *errtt = NULL;
-    const ASN1_COMPAT_FUNCS *cf;
     const ASN1_EXTERN_FUNCS *ef;
     const ASN1_AUX *aux = it->funcs;
     ASN1_aux_cb *asn1_cb;
     const unsigned char *p = NULL, *q;
-    unsigned char *wp = NULL;   /* BIG FAT WARNING! BREAKS CONST WHERE USED */
-    unsigned char imphack = 0, oclass;
+    unsigned char oclass;
     char seq_eoc, seq_nolen, cst, isopt;
     long tmplen;
     int i;
     int otag;
     int ret = 0;
-    ASN1_VALUE **pchptr, *ptmpval;
+    ASN1_VALUE **pchptr;
     if (!pval)
         return 0;
     if (aux && aux->asn1_cb)
@@ -240,66 +238,6 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
         ef = it->funcs;
         return ef->asn1_ex_d2i(pval, in, len, it, tag, aclass, opt, ctx);
 
-    case ASN1_ITYPE_COMPAT:
-        /* we must resort to old style evil hackery */
-        cf = it->funcs;
-
-        /* If OPTIONAL see if it is there */
-        if (opt) {
-            int exptag;
-            p = *in;
-            if (tag == -1)
-                exptag = it->utype;
-            else
-                exptag = tag;
-            /*
-             * Don't care about anything other than presence of expected tag
-             */
-
-            ret = asn1_check_tlen(NULL, NULL, NULL, NULL, NULL,
-                                  &p, len, exptag, aclass, 1, ctx);
-            if (!ret) {
-                ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ERR_R_NESTED_ASN1_ERROR);
-                goto err;
-            }
-            if (ret == -1)
-                return -1;
-        }
-
-        /*
-         * This is the old style evil hack IMPLICIT handling: since the
-         * underlying code is expecting a tag and class other than the one
-         * present we change the buffer temporarily then change it back
-         * afterwards. This doesn't and never did work for tags > 30. Yes
-         * this is *horrible* but it is only needed for old style d2i which
-         * will hopefully not be around for much longer. FIXME: should copy
-         * the buffer then modify it so the input buffer can be const: we
-         * should *always* copy because the old style d2i might modify the
-         * buffer.
-         */
-
-        if (tag != -1) {
-            wp = *(unsigned char **)in;
-            imphack = *wp;
-            if (p == NULL) {
-                ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ERR_R_NESTED_ASN1_ERROR);
-                goto err;
-            }
-            *wp = (unsigned char)((*p & V_ASN1_CONSTRUCTED)
-                                  | it->utype);
-        }
-
-        ptmpval = cf->asn1_d2i(pval, in, len);
-
-        if (tag != -1)
-            *wp = imphack;
-
-        if (ptmpval)
-            return 1;
-
-        ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ERR_R_NESTED_ASN1_ERROR);
-        goto err;
-
     case ASN1_ITYPE_CHOICE:
         if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL))
             goto auxerr;
diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c
index bc9429c..1c200b0 100644
--- a/crypto/asn1/tasn_enc.c
+++ b/crypto/asn1/tasn_enc.c
@@ -127,9 +127,7 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                      const ASN1_ITEM *it, int tag, int aclass)
 {
     const ASN1_TEMPLATE *tt = NULL;
-    unsigned char *p = NULL;
     int i, seqcontlen, seqlen, ndef = 1;
-    const ASN1_COMPAT_FUNCS *cf;
     const ASN1_EXTERN_FUNCS *ef;
     const ASN1_AUX *aux = it->funcs;
     ASN1_aux_cb *asn1_cb = 0;
@@ -172,20 +170,6 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
         ef = it->funcs;
         return ef->asn1_ex_i2d(pval, out, it, tag, aclass);
 
-    case ASN1_ITYPE_COMPAT:
-        /* old style hackery... */
-        cf = it->funcs;
-        if (out)
-            p = *out;
-        i = cf->asn1_i2d(*pval, out);
-        /*
-         * Fixup for IMPLICIT tag: note this messes up for tags > 30, but so
-         * did the old code. Tags > 30 are very rare anyway.
-         */
-        if (out && (tag != -1))
-            *p = aclass | tag | (*p & V_ASN1_CONSTRUCTED);
-        return i;
-
     case ASN1_ITYPE_NDEF_SEQUENCE:
         /* Use indefinite length constructed if requested */
         if (aclass & ASN1_TFLG_NDEF)
diff --git a/crypto/asn1/tasn_fre.c b/crypto/asn1/tasn_fre.c
index aeea4ef..49c5793 100644
--- a/crypto/asn1/tasn_fre.c
+++ b/crypto/asn1/tasn_fre.c
@@ -82,7 +82,6 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,
 {
     const ASN1_TEMPLATE *tt = NULL, *seqtt;
     const ASN1_EXTERN_FUNCS *ef;
-    const ASN1_COMPAT_FUNCS *cf;
     const ASN1_AUX *aux = it->funcs;
     ASN1_aux_cb *asn1_cb;
     int i;
@@ -129,12 +128,6 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,
         }
         break;
 
-    case ASN1_ITYPE_COMPAT:
-        cf = it->funcs;
-        if (cf && cf->asn1_free)
-            cf->asn1_free(*pval);
-        break;
-
     case ASN1_ITYPE_EXTERN:
         ef = it->funcs;
         if (ef && ef->asn1_ex_free)
diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c
index 7d2964f..3884897 100644
--- a/crypto/asn1/tasn_new.c
+++ b/crypto/asn1/tasn_new.c
@@ -89,7 +89,6 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
                                     int combine)
 {
     const ASN1_TEMPLATE *tt = NULL;
-    const ASN1_COMPAT_FUNCS *cf;
     const ASN1_EXTERN_FUNCS *ef;
     const ASN1_AUX *aux = it->funcs;
     ASN1_aux_cb *asn1_cb;
@@ -118,15 +117,6 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
         }
         break;
 
-    case ASN1_ITYPE_COMPAT:
-        cf = it->funcs;
-        if (cf && cf->asn1_new) {
-            *pval = cf->asn1_new();
-            if (!*pval)
-                goto memerr;
-        }
-        break;
-
     case ASN1_ITYPE_PRIMITIVE:
         if (it->templates) {
             if (!ASN1_template_new(pval, it->templates))
@@ -245,7 +235,6 @@ static void asn1_item_clear(ASN1_VALUE **pval, const ASN1_ITEM *it)
         asn1_primitive_clear(pval, it);
         break;
 
-    case ASN1_ITYPE_COMPAT:
     case ASN1_ITYPE_CHOICE:
     case ASN1_ITYPE_SEQUENCE:
     case ASN1_ITYPE_NDEF_SEQUENCE:

From levitte at openssl.org  Tue Mar 24 10:45:21 2015
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 24 Mar 2015 10:45:21 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1427193921.766061.8749.nullmailer@dev.openssl.org>

The branch master has been updated
       via  ca73e95bc4ae7bbc28119ef1998425fd1b6ae0a0 (commit)
      from  b8162319b4520a144c65bfcd2eeafd35547b9849 (commit)


- Log -----------------------------------------------------------------
commit ca73e95bc4ae7bbc28119ef1998425fd1b6ae0a0
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 24 11:45:14 2015 +0100

    Add a RewriteBase, or the physical directory will be prefixed

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

Summary of changes:
 source/.htaccess.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/.htaccess.in b/source/.htaccess.in
index ecdfd3a..ee5c94e 100644
--- a/source/.htaccess.in
+++ b/source/.htaccess.in
@@ -30,4 +30,5 @@ RewriteRule openssl-(fips.*)  old/fips/openssl-$1 [L]
     RemoveEncoding .gz
 </Files>
 
+RewriteBase /source
 RewriteRule ^latest\.tar\.gz$ %%LATEST%% [R=302,NC]

From levitte at openssl.org  Tue Mar 24 11:19:50 2015
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 24 Mar 2015 11:19:50 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427195990.056365.24149.nullmailer@dev.openssl.org>

The branch master has been updated
       via  77b1f87214224689a84db21d2eb54e9497186d93 (commit)
       via  47b31827887608f910dc80228106a03556c40c4e (commit)
      from  dd12df794a6fde993cb1970d1f484793a0973988 (commit)


- Log -----------------------------------------------------------------
commit 77b1f87214224689a84db21d2eb54e9497186d93
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 24 11:59:01 2015 +0100

    Adjust include path
    
    Thanks to a -I.., the path does work, at least on unix.  However, this
    doesn't work so well on VMS.  Correcting the path to not rely on given
    -I does work on both.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 47b31827887608f910dc80228106a03556c40c4e
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 24 11:57:14 2015 +0100

    JPAKE Makefile missing 'files' target
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/jpake/Makefile   | 3 +++
 crypto/x509v3/v3_scts.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/crypto/jpake/Makefile b/crypto/jpake/Makefile
index a56d558..112dfb1 100644
--- a/crypto/jpake/Makefile
+++ b/crypto/jpake/Makefile
@@ -21,6 +21,9 @@ lib:	$(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib
 
+files:
+	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
 links:
 	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
 	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
diff --git a/crypto/x509v3/v3_scts.c b/crypto/x509v3/v3_scts.c
index 9a4c3eb..e70d5e9 100644
--- a/crypto/x509v3/v3_scts.c
+++ b/crypto/x509v3/v3_scts.c
@@ -60,7 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/asn1.h>
 #include <openssl/x509v3.h>
-#include "../ssl/ssl_locl.h"
+#include "../../ssl/ssl_locl.h"
 
 #if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
 # define SCT_TIMESTAMP unsigned __int64

From levitte at openssl.org  Tue Mar 24 11:22:14 2015
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 24 Mar 2015 11:22:14 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427196134.852388.25545.nullmailer@dev.openssl.org>

The branch master has been updated
       via  2383a74be14d26d57bf7e56a2f2688705577d5e7 (commit)
       via  912d7c75d41a36bac2371f4e3a440eca86b6489b (commit)
      from  77b1f87214224689a84db21d2eb54e9497186d93 (commit)


- Log -----------------------------------------------------------------
commit 2383a74be14d26d57bf7e56a2f2688705577d5e7
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 24 12:16:31 2015 +0100

    Use OPENSSL_malloc rather than malloc/calloc
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 912d7c75d41a36bac2371f4e3a440eca86b6489b
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 24 08:38:22 2015 +0100

    Fix eng_cryptodev to not depend on BN internals.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/engine/eng_cryptodev.c | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
index 65efc81..d005e01 100644
--- a/crypto/engine/eng_cryptodev.c
+++ b/crypto/engine/eng_cryptodev.c
@@ -30,7 +30,6 @@
 #include <openssl/engine.h>
 #include <openssl/evp.h>
 #include <openssl/bn.h>
-#include "../bn/bn_lcl.h"
 
 #if (defined(__unix__) || defined(unix)) && !defined(USG) && \
         (defined(OpenBSD) || defined(__FreeBSD__))
@@ -1014,7 +1013,6 @@ cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest,
  */
 static int bn2crparam(const BIGNUM *a, struct crparam *crp)
 {
-    int i, j, k;
     ssize_t bytes, bits;
     u_char *b;
 
@@ -1022,9 +1020,9 @@ static int bn2crparam(const BIGNUM *a, struct crparam *crp)
     crp->crp_nbits = 0;
 
     bits = BN_num_bits(a);
-    bytes = (bits + 7) / 8;
+    bytes = BN_num_bytes(a);
 
-    b = malloc(bytes);
+    b = OPENSSL_malloc(bytes);
     if (b == NULL)
         return (1);
     memset(b, 0, bytes);
@@ -1032,14 +1030,7 @@ static int bn2crparam(const BIGNUM *a, struct crparam *crp)
     crp->crp_p = (caddr_t) b;
     crp->crp_nbits = bits;
 
-    for (i = 0, j = 0; i < a->top; i++) {
-        for (k = 0; k < BN_BITS2 / 8; k++) {
-            if ((j + k) >= bytes)
-                return (0);
-            b[j + k] = a->d[i] >> (k * 8);
-        }
-        j += BN_BITS2 / 8;
-    }
+    BN_bn2bin(a, b);
     return (0);
 }
 
@@ -1054,7 +1045,7 @@ static int crparam2bn(struct crparam *crp, BIGNUM *a)
     if (bytes == 0)
         return (-1);
 
-    if ((pd = (u_int8_t *) malloc(bytes)) == NULL)
+    if ((pd = (u_int8_t *) OPENSSL_malloc(bytes)) == NULL)
         return (-1);
 
     for (i = 0; i < bytes; i++)
@@ -1239,10 +1230,10 @@ cryptodev_dsa_dsa_mod_exp(DSA *dsa, BIGNUM *t1, BIGNUM *g,
                           BIGNUM *u1, BIGNUM *pub_key, BIGNUM *u2, BIGNUM *p,
                           BN_CTX *ctx, BN_MONT_CTX *mont)
 {
-    BIGNUM t2;
+    BIGNUM *t2;
     int ret = 0;
 
-    BN_init(&t2);
+    t2 = BN_new();
 
     /* v = ( g^u1 * y^u2 mod p ) mod q */
     /* let t1 = g ^ u1 mod p */
@@ -1252,17 +1243,17 @@ cryptodev_dsa_dsa_mod_exp(DSA *dsa, BIGNUM *t1, BIGNUM *g,
         goto err;
 
     /* let t2 = y ^ u2 mod p */
-    if (!dsa->meth->bn_mod_exp(dsa, &t2, dsa->pub_key, u2, dsa->p, ctx, mont))
+    if (!dsa->meth->bn_mod_exp(dsa, t2, dsa->pub_key, u2, dsa->p, ctx, mont))
         goto err;
     /* let u1 = t1 * t2 mod p */
-    if (!BN_mod_mul(u1, t1, &t2, dsa->p, ctx))
+    if (!BN_mod_mul(u1, t1, t2, dsa->p, ctx))
         goto err;
 
     BN_copy(t1, u1);
 
     ret = 1;
  err:
-    BN_free(&t2);
+    BN_free(t2);
     return (ret);
 }
 

From matt at openssl.org  Tue Mar 24 11:38:09 2015
From: matt at openssl.org (Matt Caswell)
Date: Tue, 24 Mar 2015 11:38:09 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1427197089.587795.30072.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  117476ba30f6afa3a634c2e2c4860d59fbe06572 (commit)
      from  a6a704f448364b0840adefdcd922527b36232804 (commit)


- Log -----------------------------------------------------------------
commit 117476ba30f6afa3a634c2e2c4860d59fbe06572
Author: Mike Frysinger <vapier at gentoo.org>
Date:   Sat Mar 21 05:08:41 2015 -0400

    Fix malloc define typo
    
    Fix compilation failure when SCTP is compiled due to incorrect define.
    
    Reported-by: Conrad Kostecki <ck+gentoobugzilla at bl4ckb0x.de>
    URL: https://bugs.gentoo.org/543828
    
    RT#3758
    Signed-off-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    
    (cherry picked from commit 7c82e339a677f8546e1456c7a8f6788598a9de43)

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

Summary of changes:
 crypto/bio/bss_dgram.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index b495db2..2e78fd1 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -1293,7 +1293,7 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
                 (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
             authchunks = OPENSSL_malloc(optlen);
             if (!authchunks) {
-                BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_ERROR);
+                BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_FAILURE);
                 return -1;
             }
             memset(authchunks, 0, sizeof(optlen));
@@ -1365,7 +1365,7 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
         char *tmp;
         data->saved_message.bio = b;
         if(!(tmp = OPENSSL_malloc(inl))) {
-            BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_ERROR);
+            BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_FAILURE);
             return -1;
         }
         if (data->saved_message.data)

From matt at openssl.org  Tue Mar 24 11:38:27 2015
From: matt at openssl.org (Matt Caswell)
Date: Tue, 24 Mar 2015 11:38:27 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1427197107.533229.30416.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  bc0eb82b852cb10a3f34cbd17fdda7d8b4bdeb0e (commit)
      from  bd891f098bdfcaa285c073ce556d0f5e27ec3a10 (commit)


- Log -----------------------------------------------------------------
commit bc0eb82b852cb10a3f34cbd17fdda7d8b4bdeb0e
Author: Mike Frysinger <vapier at gentoo.org>
Date:   Sat Mar 21 05:08:41 2015 -0400

    Fix malloc define typo
    
    Fix compilation failure when SCTP is compiled due to incorrect define.
    
    Reported-by: Conrad Kostecki <ck+gentoobugzilla at bl4ckb0x.de>
    URL: https://bugs.gentoo.org/543828
    
    RT#3758
    Signed-off-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    
    (cherry picked from commit 7c82e339a677f8546e1456c7a8f6788598a9de43)

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

Summary of changes:
 crypto/bio/bss_dgram.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 388d90d..de80b99 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -1352,7 +1352,7 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
                 (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
             authchunks = OPENSSL_malloc(optlen);
             if (!authchunks) {
-                BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_ERROR);
+                BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_FAILURE);
                 return -1;
             }
             memset(authchunks, 0, sizeof(optlen));
@@ -1424,7 +1424,7 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
         char *tmp;
         data->saved_message.bio = b;
         if(!(tmp = OPENSSL_malloc(inl))) {
-            BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_ERROR);
+            BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_FAILURE);
             return -1;
         }
         if (data->saved_message.data)

From matt at openssl.org  Tue Mar 24 11:38:36 2015
From: matt at openssl.org (Matt Caswell)
Date: Tue, 24 Mar 2015 11:38:36 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427197116.006794.30722.nullmailer@dev.openssl.org>

The branch master has been updated
       via  7c82e339a677f8546e1456c7a8f6788598a9de43 (commit)
      from  2383a74be14d26d57bf7e56a2f2688705577d5e7 (commit)


- Log -----------------------------------------------------------------
commit 7c82e339a677f8546e1456c7a8f6788598a9de43
Author: Mike Frysinger <vapier at gentoo.org>
Date:   Sat Mar 21 05:08:41 2015 -0400

    Fix malloc define typo
    
    Fix compilation failure when SCTP is compiled due to incorrect define.
    
    Reported-by: Conrad Kostecki <ck+gentoobugzilla at bl4ckb0x.de>
    URL: https://bugs.gentoo.org/543828
    
    RT#3758
    Signed-off-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 crypto/bio/bss_dgram.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index aef8149..ed275d1 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -1338,7 +1338,7 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
                 (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
             authchunks = OPENSSL_malloc(optlen);
             if (!authchunks) {
-                BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_ERROR);
+                BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_FAILURE);
                 return -1;
             }
             memset(authchunks, 0, optlen);
@@ -1410,7 +1410,7 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
         char *tmp;
         data->saved_message.bio = b;
         if(!(tmp = OPENSSL_malloc(inl))) {
-            BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_ERROR);
+            BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_FAILURE);
             return -1;
         }
         if (data->saved_message.data)

From rsalz at openssl.org  Tue Mar 24 11:52:58 2015
From: rsalz at openssl.org (Rich Salz)
Date: Tue, 24 Mar 2015 11:52:58 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427197978.809713.2388.nullmailer@dev.openssl.org>

The branch master has been updated
       via  0dfb9398bb6493d5a56216e0c7039cb3f9fc88c6 (commit)
      from  7c82e339a677f8546e1456c7a8f6788598a9de43 (commit)


- Log -----------------------------------------------------------------
commit 0dfb9398bb6493d5a56216e0c7039cb3f9fc88c6
Author: Rich Salz <rsalz at openssl.org>
Date:   Tue Mar 24 07:52:24 2015 -0400

    free NULL cleanup
    
    Start ensuring all OpenSSL "free" routines allow NULL, and remove
    any if check before calling them.
    This gets ASN1_OBJECT_free and ASN1_STRING_free.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 CHANGES                        |  5 +++++
 apps/cms.c                     |  3 +--
 crypto/asn1/a_bitstr.c         |  2 +-
 crypto/asn1/a_int.c            |  4 ++--
 crypto/asn1/a_utctm.c          |  8 ++++----
 crypto/asn1/asn1_lib.c         |  4 +++-
 crypto/asn1/asn1_par.c         | 12 ++++--------
 crypto/asn1/evp_asn1.c         |  3 +--
 crypto/asn1/p5_pbe.c           |  3 +--
 crypto/asn1/tasn_fre.c         | 26 +++++++++++++++++---------
 crypto/asn1/x_algor.c          |  3 +--
 crypto/asn1/x_pkey.c           |  3 +--
 crypto/asn1/x_x509a.c          |  3 +--
 crypto/dh/dh_ameth.c           |  6 ++----
 crypto/dh/dh_pmeth.c           |  6 ++----
 crypto/dsa/dsa_ameth.c         |  6 ++----
 crypto/ec/ec_asn1.c            |  5 ++---
 crypto/ocsp/ocsp_lib.c         |  3 +--
 crypto/ocsp/v3_ocsp.c          |  2 +-
 crypto/rsa/rsa_ameth.c         |  9 +++------
 crypto/rsa/rsa_saos.c          |  3 +--
 crypto/x509v3/pcy_data.c       |  3 +--
 crypto/x509v3/v3_conf.c        |  3 +--
 crypto/x509v3/v3_pci.c         |  5 +----
 doc/crypto/ASN1_OBJECT_new.pod |  1 +
 doc/crypto/ASN1_STRING_new.pod |  1 +
 26 files changed, 61 insertions(+), 71 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5dd7d8d..ab5b482 100644
--- a/CHANGES
+++ b/CHANGES
@@ -71,6 +71,11 @@
         Remove all but one '#ifdef undef' which is to be looked at.
      [Rich Salz]
 
+  *) Clean up calling of xxx_free routines.
+        Just like free(), fix most of the xxx_free routines to accept
+        NULL.  Remove the non-null checks from callers.  Save much code.
+     [Rich Salz]
+
   *) Experimental support for a new, fast, unbiased prime candidate generator,
      bn_probable_prime_dh_coprime(). Not currently used by any prime generator.
      [Felix Laurie von Massenbach <felix at erbridge.co.uk>]
diff --git a/apps/cms.c b/apps/cms.c
index d983e28..0877426 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -1152,8 +1152,7 @@ int MAIN(int argc, char **argv)
         OPENSSL_free(secret_keyid);
     if (pwri_tmp)
         OPENSSL_free(pwri_tmp);
-    if (econtent_type)
-        ASN1_OBJECT_free(econtent_type);
+    ASN1_OBJECT_free(econtent_type);
     if (rr)
         CMS_ReceiptRequest_free(rr);
     if (rr_to)
diff --git a/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c
index 5a5cc23..4078be4 100644
--- a/crypto/asn1/a_bitstr.c
+++ b/crypto/asn1/a_bitstr.c
@@ -177,7 +177,7 @@ ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
     return (ret);
  err:
     ASN1err(ASN1_F_C2I_ASN1_BIT_STRING, i);
-    if ((ret != NULL) && ((a == NULL) || (*a != ret)))
+    if ((a == NULL) || (*a != ret))
         ASN1_BIT_STRING_free(ret);
     return (NULL);
 }
diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c
index a33e3fd..65fac75 100644
--- a/crypto/asn1/a_int.c
+++ b/crypto/asn1/a_int.c
@@ -265,7 +265,7 @@ ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,
     return (ret);
  err:
     ASN1err(ASN1_F_C2I_ASN1_INTEGER, i);
-    if ((ret != NULL) && ((a == NULL) || (*a != ret)))
+    if ((a == NULL) || (*a != ret))
         ASN1_INTEGER_free(ret);
     return (NULL);
 }
@@ -334,7 +334,7 @@ ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
     return (ret);
  err:
     ASN1err(ASN1_F_D2I_ASN1_UINTEGER, i);
-    if ((ret != NULL) && ((a == NULL) || (*a != ret)))
+    if ((a == NULL) || (*a != ret))
         ASN1_INTEGER_free(ret);
     return (NULL);
 }
diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c
index 2dac3b5..0e2f1b0 100644
--- a/crypto/asn1/a_utctm.c
+++ b/crypto/asn1/a_utctm.c
@@ -193,11 +193,11 @@ ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
     int free_s = 0;
 
     if (s == NULL) {
-        free_s = 1;
         s = ASN1_UTCTIME_new();
+        if (s == NULL)
+            goto err;
+        free_s = 1;
     }
-    if (s == NULL)
-        goto err;
 
     ts = OPENSSL_gmtime(&t, &data);
     if (ts == NULL)
@@ -233,7 +233,7 @@ ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
 #endif
     return (s);
  err:
-    if (free_s && s)
+    if (free_s)
         ASN1_UTCTIME_free(s);
     return NULL;
 }
diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index fe63b62..2e36cff 100644
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c
@@ -429,7 +429,9 @@ void ASN1_STRING_free(ASN1_STRING *a)
 
 void ASN1_STRING_clear_free(ASN1_STRING *a)
 {
-    if (a && a->data && !(a->flags & ASN1_STRING_FLAG_NDEF))
+    if (a == NULL)
+        return;
+    if (a->data && !(a->flags & ASN1_STRING_FLAG_NDEF))
         OPENSSL_cleanse(a->data, a->length);
     ASN1_STRING_free(a);
 }
diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c
index 20f3a88..574e8de 100644
--- a/crypto/asn1/asn1_par.c
+++ b/crypto/asn1/asn1_par.c
@@ -276,10 +276,8 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
                         nl = 1;
                     }
                 }
-                if (os != NULL) {
-                    ASN1_OCTET_STRING_free(os);
-                    os = NULL;
-                }
+                ASN1_OCTET_STRING_free(os);
+                os = NULL;
             } else if (tag == V_ASN1_INTEGER) {
                 ASN1_INTEGER *bs;
                 int i;
@@ -356,10 +354,8 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
     }
     ret = 1;
  end:
-    if (o != NULL)
-        ASN1_OBJECT_free(o);
-    if (os != NULL)
-        ASN1_OCTET_STRING_free(os);
+    ASN1_OBJECT_free(o);
+    ASN1_OCTET_STRING_free(os);
     *pp = p;
     return (ret);
 }
diff --git a/crypto/asn1/evp_asn1.c b/crypto/asn1/evp_asn1.c
index 3664576..e6a5b5f 100644
--- a/crypto/asn1/evp_asn1.c
+++ b/crypto/asn1/evp_asn1.c
@@ -187,8 +187,7 @@ int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a, long *num,
  err:
         ASN1err(ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING, ASN1_R_DATA_IS_WRONG);
     }
-    if (os != NULL)
-        ASN1_OCTET_STRING_free(os);
+    ASN1_OCTET_STRING_free(os);
     if (ai != NULL)
         ASN1_INTEGER_free(ai);
     return (ret);
diff --git a/crypto/asn1/p5_pbe.c b/crypto/asn1/p5_pbe.c
index bdbfdcd..d54b094 100644
--- a/crypto/asn1/p5_pbe.c
+++ b/crypto/asn1/p5_pbe.c
@@ -118,8 +118,7 @@ int PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter,
  err:
     if (pbe != NULL)
         PBEPARAM_free(pbe);
-    if (pbe_str != NULL)
-        ASN1_STRING_free(pbe_str);
+    ASN1_STRING_free(pbe_str);
     return 0;
 }
 
diff --git a/crypto/asn1/tasn_fre.c b/crypto/asn1/tasn_fre.c
index 49c5793..bdc26f9 100644
--- a/crypto/asn1/tasn_fre.c
+++ b/crypto/asn1/tasn_fre.c
@@ -85,6 +85,7 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,
     const ASN1_AUX *aux = it->funcs;
     ASN1_aux_cb *asn1_cb;
     int i;
+
     if (!pval)
         return;
     if ((it->itype != ASN1_ITYPE_PRIMITIVE) && !*pval)
@@ -116,6 +117,7 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,
         i = asn1_get_choice_selector(pval, it);
         if ((i >= 0) && (i < it->tcount)) {
             ASN1_VALUE **pchval;
+
             tt = it->templates + i;
             pchval = asn1_get_field_ptr(pval, tt);
             ASN1_template_free(pchval, tt);
@@ -170,35 +172,41 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,
 
 void ASN1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
 {
-    int i;
     if (tt->flags & ASN1_TFLG_SK_MASK) {
         STACK_OF(ASN1_VALUE) *sk = (STACK_OF(ASN1_VALUE) *)*pval;
+        int i;
+
         for (i = 0; i < sk_ASN1_VALUE_num(sk); i++) {
-            ASN1_VALUE *vtmp;
-            vtmp = sk_ASN1_VALUE_value(sk, i);
+            ASN1_VALUE *vtmp = sk_ASN1_VALUE_value(sk, i);
+
             asn1_item_combine_free(&vtmp, ASN1_ITEM_ptr(tt->item), 0);
         }
         sk_ASN1_VALUE_free(sk);
         *pval = NULL;
-    } else
+    } else {
         asn1_item_combine_free(pval, ASN1_ITEM_ptr(tt->item),
                                tt->flags & ASN1_TFLG_COMBINE);
+    }
 }
 
 void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
     int utype;
+
+    /* Special case: if 'it' is a primitive with a free_func, use that. */
     if (it) {
-        const ASN1_PRIMITIVE_FUNCS *pf;
-        pf = it->funcs;
+        const ASN1_PRIMITIVE_FUNCS *pf = it->funcs;
+
         if (pf && pf->prim_free) {
             pf->prim_free(pval, it);
             return;
         }
     }
-    /* Special case: if 'it' is NULL free contents of ASN1_TYPE */
+
+    /* Special case: if 'it' is NULL, free contents of ASN1_TYPE */
     if (!it) {
         ASN1_TYPE *typ = (ASN1_TYPE *)*pval;
+
         utype = typ->type;
         pval = &typ->value.asn1_value;
         if (!*pval)
@@ -235,8 +243,8 @@ void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 
     default:
         ASN1_STRING_free((ASN1_STRING *)*pval);
-        *pval = NULL;
         break;
     }
-    *pval = NULL;
+    if (*pval)
+        *pval = NULL;
 }
diff --git a/crypto/asn1/x_algor.c b/crypto/asn1/x_algor.c
index 0aa3ded..30d6481 100644
--- a/crypto/asn1/x_algor.c
+++ b/crypto/asn1/x_algor.c
@@ -86,8 +86,7 @@ int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval)
             return 0;
     }
     if (alg) {
-        if (alg->algorithm)
-            ASN1_OBJECT_free(alg->algorithm);
+        ASN1_OBJECT_free(alg->algorithm);
         alg->algorithm = aobj;
     }
     if (ptype == 0)
diff --git a/crypto/asn1/x_pkey.c b/crypto/asn1/x_pkey.c
index cf5fd80..f4396e7 100644
--- a/crypto/asn1/x_pkey.c
+++ b/crypto/asn1/x_pkey.c
@@ -143,8 +143,7 @@ void X509_PKEY_free(X509_PKEY *x)
 
     if (x->enc_algor != NULL)
         X509_ALGOR_free(x->enc_algor);
-    if (x->enc_pkey != NULL)
-        ASN1_OCTET_STRING_free(x->enc_pkey);
+    ASN1_OCTET_STRING_free(x->enc_pkey);
     if (x->dec_pkey != NULL)
         EVP_PKEY_free(x->dec_pkey);
     if ((x->key_data != NULL) && (x->key_free))
diff --git a/crypto/asn1/x_x509a.c b/crypto/asn1/x_x509a.c
index 2a2ca87..8be50b5 100644
--- a/crypto/asn1/x_x509a.c
+++ b/crypto/asn1/x_x509a.c
@@ -159,8 +159,7 @@ int X509_add1_trust_object(X509 *x, ASN1_OBJECT *obj)
     if (!objtmp || sk_ASN1_OBJECT_push(aux->trust, objtmp))
         return 1;
  err:
-    if (objtmp)
-        ASN1_OBJECT_free(objtmp);
+    ASN1_OBJECT_free(objtmp);
     return 0;
 }
 
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index 2c77381..e7d56f1 100644
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -191,8 +191,7 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
  err:
     if (penc)
         OPENSSL_free(penc);
-    if (str)
-        ASN1_STRING_free(str);
+    ASN1_STRING_free(str);
 
     return 0;
 }
@@ -297,8 +296,7 @@ static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
  err:
     if (dp != NULL)
         OPENSSL_free(dp);
-    if (params != NULL)
-        ASN1_STRING_free(params);
+    ASN1_STRING_free(params);
     if (prkey != NULL)
         ASN1_STRING_clear_free(prkey);
     return 0;
diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c
index 8975f44..668f5f3 100644
--- a/crypto/dh/dh_pmeth.c
+++ b/crypto/dh/dh_pmeth.c
@@ -155,8 +155,7 @@ static void pkey_dh_cleanup(EVP_PKEY_CTX *ctx)
     if (dctx) {
         if (dctx->kdf_ukm)
             OPENSSL_free(dctx->kdf_ukm);
-        if (dctx->kdf_oid)
-            ASN1_OBJECT_free(dctx->kdf_oid);
+        ASN1_OBJECT_free(dctx->kdf_oid);
         OPENSSL_free(dctx);
     }
 }
@@ -245,8 +244,7 @@ static int pkey_dh_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
         return dctx->kdf_ukmlen;
 
     case EVP_PKEY_CTRL_DH_KDF_OID:
-        if (dctx->kdf_oid)
-            ASN1_OBJECT_free(dctx->kdf_oid);
+        ASN1_OBJECT_free(dctx->kdf_oid);
         dctx->kdf_oid = p2;
         return 1;
 
diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index d63c417..425144a 100644
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -166,8 +166,7 @@ static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
  err:
     if (penc)
         OPENSSL_free(penc);
-    if (str)
-        ASN1_STRING_free(str);
+    ASN1_STRING_free(str);
 
     return 0;
 }
@@ -328,8 +327,7 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
  err:
     if (dp != NULL)
         OPENSSL_free(dp);
-    if (params != NULL)
-        ASN1_STRING_free(params);
+    ASN1_STRING_free(params);
     if (prkey != NULL)
         ASN1_STRING_clear_free(prkey);
     return 0;
diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index 87cc334..90de23b 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -317,8 +317,7 @@ static int ec_asn1_group2fieldid(const EC_GROUP *group, X9_62_FIELDID *field)
         return 0;
 
     /* clear the old values (if necessary) */
-    if (field->fieldType != NULL)
-        ASN1_OBJECT_free(field->fieldType);
+    ASN1_OBJECT_free(field->fieldType);
     if (field->p.other != NULL)
         ASN1_TYPE_free(field->p.other);
 
@@ -654,7 +653,7 @@ ECPKPARAMETERS *ec_asn1_group2pkparameters(const EC_GROUP *group,
             return NULL;
         }
     } else {
-        if (ret->type == 0 && ret->value.named_curve)
+        if (ret->type == 0)
             ASN1_OBJECT_free(ret->value.named_curve);
         else if (ret->type == 1 && ret->value.parameters)
             ECPARAMETERS_free(ret->value.parameters);
diff --git a/crypto/ocsp/ocsp_lib.c b/crypto/ocsp/ocsp_lib.c
index 8e87f49..34df9ac 100644
--- a/crypto/ocsp/ocsp_lib.c
+++ b/crypto/ocsp/ocsp_lib.c
@@ -110,8 +110,7 @@ OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst,
         goto err;
 
     alg = cid->hashAlgorithm;
-    if (alg->algorithm != NULL)
-        ASN1_OBJECT_free(alg->algorithm);
+    ASN1_OBJECT_free(alg->algorithm);
     if ((nid = EVP_MD_type(dgst)) == NID_undef) {
         OCSPerr(OCSP_F_OCSP_CERT_ID_NEW, OCSP_R_UNKNOWN_NID);
         goto err;
diff --git a/crypto/ocsp/v3_ocsp.c b/crypto/ocsp/v3_ocsp.c
index 6558116..7e502d7 100644
--- a/crypto/ocsp/v3_ocsp.c
+++ b/crypto/ocsp/v3_ocsp.c
@@ -247,7 +247,7 @@ static void *d2i_ocsp_nonce(void *a, const unsigned char **pp, long length)
     return os;
 
  err:
-    if (os && (!pos || (*pos != os)))
+    if ((pos == NULL) || (*pos != os))
         ASN1_OCTET_STRING_free(os);
     OCSPerr(OCSP_F_D2I_OCSP_NONCE, ERR_R_MALLOC_FAILURE);
     return NULL;
diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
index 6f4c104..071dbb8 100644
--- a/crypto/rsa/rsa_ameth.c
+++ b/crypto/rsa/rsa_ameth.c
@@ -484,8 +484,7 @@ static int rsa_md_to_mgf1(X509_ALGOR **palg, const EVP_MD *mgf1md)
     X509_ALGOR_set0(*palg, OBJ_nid2obj(NID_mgf1), V_ASN1_SEQUENCE, stmp);
     stmp = NULL;
  err:
-    if (stmp)
-        ASN1_STRING_free(stmp);
+    ASN1_STRING_free(stmp);
     if (algtmp)
         X509_ALGOR_free(algtmp);
     if (*palg)
@@ -576,8 +575,7 @@ static ASN1_STRING *rsa_ctx_to_pss(EVP_PKEY_CTX *pkctx)
         RSA_PSS_PARAMS_free(pss);
     if (rv)
         return os;
-    if (os)
-        ASN1_STRING_free(os);
+    ASN1_STRING_free(os);
     return NULL;
 }
 
@@ -921,8 +919,7 @@ static int rsa_cms_encrypt(CMS_RecipientInfo *ri)
  err:
     if (oaep)
         RSA_OAEP_PARAMS_free(oaep);
-    if (os)
-        ASN1_STRING_free(os);
+    ASN1_STRING_free(os);
     return rv;
 }
 
diff --git a/crypto/rsa/rsa_saos.c b/crypto/rsa/rsa_saos.c
index 6ebab3d..0f15f00 100644
--- a/crypto/rsa/rsa_saos.c
+++ b/crypto/rsa/rsa_saos.c
@@ -138,8 +138,7 @@ int RSA_verify_ASN1_OCTET_STRING(int dtype,
     } else
         ret = 1;
  err:
-    if (sig != NULL)
-        ASN1_OCTET_STRING_free(sig);
+    ASN1_OCTET_STRING_free(sig);
     if (s != NULL) {
         OPENSSL_cleanse(s, (unsigned int)siglen);
         OPENSSL_free(s);
diff --git a/crypto/x509v3/pcy_data.c b/crypto/x509v3/pcy_data.c
index 90e9970..3a8d432 100644
--- a/crypto/x509v3/pcy_data.c
+++ b/crypto/x509v3/pcy_data.c
@@ -102,8 +102,7 @@ X509_POLICY_DATA *policy_data_new(POLICYINFO *policy,
     ret->expected_policy_set = sk_ASN1_OBJECT_new_null();
     if (!ret->expected_policy_set) {
         OPENSSL_free(ret);
-        if (id)
-            ASN1_OBJECT_free(id);
+        ASN1_OBJECT_free(id);
         return NULL;
     }
 
diff --git a/crypto/x509v3/v3_conf.c b/crypto/x509v3/v3_conf.c
index 9631e57..eb9cfea 100644
--- a/crypto/x509v3/v3_conf.c
+++ b/crypto/x509v3/v3_conf.c
@@ -212,8 +212,7 @@ static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method,
     X509V3err(X509V3_F_DO_EXT_I2D, ERR_R_MALLOC_FAILURE);
     if (ext_der != NULL)
         OPENSSL_free(ext_der);
-    if (ext_oct != NULL)
-        ASN1_OCTET_STRING_free(ext_oct);
+    ASN1_OCTET_STRING_free(ext_oct);
     return NULL;
 
 }
diff --git a/crypto/x509v3/v3_pci.c b/crypto/x509v3/v3_pci.c
index 5a93717..4139b34 100644
--- a/crypto/x509v3/v3_pci.c
+++ b/crypto/x509v3/v3_pci.c
@@ -305,10 +305,7 @@ static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
     pathlen = NULL;
     goto end;
  err:
-    if (language) {
-        ASN1_OBJECT_free(language);
-        language = NULL;
-    }
+    ASN1_OBJECT_free(language);
     if (pathlen) {
         ASN1_INTEGER_free(pathlen);
         pathlen = NULL;
diff --git a/doc/crypto/ASN1_OBJECT_new.pod b/doc/crypto/ASN1_OBJECT_new.pod
index 338b726..36fc571 100644
--- a/doc/crypto/ASN1_OBJECT_new.pod
+++ b/doc/crypto/ASN1_OBJECT_new.pod
@@ -19,6 +19,7 @@ ASN1_OBJECT structure, which represents an ASN1 OBJECT IDENTIFIER.
 ASN1_OBJECT_new() allocates and initializes a ASN1_OBJECT structure.
 
 ASN1_OBJECT_free() frees up the B<ASN1_OBJECT> structure B<a>.
+If B<a> is NULL, nothing is done.
 
 =head1 NOTES
 
diff --git a/doc/crypto/ASN1_STRING_new.pod b/doc/crypto/ASN1_STRING_new.pod
index 8ac2a03..6c0b303 100644
--- a/doc/crypto/ASN1_STRING_new.pod
+++ b/doc/crypto/ASN1_STRING_new.pod
@@ -22,6 +22,7 @@ ASN1_STRING_type_new() returns an allocated B<ASN1_STRING> structure of
 type B<type>.
 
 ASN1_STRING_free() frees up B<a>.
+If B<a> is NULL nothing is done.
 
 =head1 NOTES
 

From steve at openssl.org  Tue Mar 24 12:11:58 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Tue, 24 Mar 2015 12:11:58 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427199118.635453.14346.nullmailer@dev.openssl.org>

The branch master has been updated
       via  86d20cb6fd3267a603a3e4ec549ef1113c13a374 (commit)
       via  27af42f9ac7aa88006dd4cf73abda8abbf67e6d6 (commit)
       via  5fe736e5fc29353706c2c1a5ae8bd97f3d7a35e9 (commit)
      from  0dfb9398bb6493d5a56216e0c7039cb3f9fc88c6 (commit)


- Log -----------------------------------------------------------------
commit 86d20cb6fd3267a603a3e4ec549ef1113c13a374
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Mar 24 12:05:05 2015 +0000

    make depend
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 27af42f9ac7aa88006dd4cf73abda8abbf67e6d6
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 23 22:57:47 2015 +0000

    Move some EVP internals to evp_int.h
    
    Move EVP internals to evp_int.h, remove -Ievp hack from crypto/Makefile
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 5fe736e5fc29353706c2c1a5ae8bd97f3d7a35e9
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 23 18:42:42 2015 +0000

    Move some ASN.1 internals to asn1_int.h
    
    Move ASN.1 internals used across multiple directories into new internal
    header file asn1_int.h remove crypto/Makefile hack which allowed other
    directories to include "asn1_locl.h"
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 apps/Makefile                                      |  96 ++++++-----
 crypto/Makefile                                    |   2 +-
 crypto/asn1/Makefile                               |  28 ++--
 crypto/asn1/a_sign.c                               |   2 +-
 crypto/asn1/a_verify.c                             |   2 +-
 crypto/asn1/ameth_lib.c                            |   2 +-
 crypto/asn1/asn1_locl.h                            |  45 -----
 crypto/asn1/d2i_pr.c                               |   2 +-
 crypto/asn1/i2d_pr.c                               |   2 +-
 crypto/asn1/t_x509.c                               |   2 +-
 crypto/asn1/x_pubkey.c                             |   2 +-
 crypto/cmac/Makefile                               |   6 +-
 crypto/cmac/cm_ameth.c                             |   2 +-
 crypto/cmac/cm_pmeth.c                             |   2 +-
 crypto/cms/Makefile                                |  14 +-
 crypto/cms/cms_env.c                               |   2 +-
 crypto/cms/cms_kari.c                              |   2 +-
 crypto/cms/cms_pwri.c                              |   2 +-
 crypto/cms/cms_sd.c                                |   2 +-
 crypto/cms/cms_smime.c                             |   2 +-
 crypto/des/Makefile                                | 183 +++++++--------------
 crypto/dh/Makefile                                 |   8 +-
 crypto/dh/dh_ameth.c                               |   2 +-
 crypto/dh/dh_pmeth.c                               |   2 +-
 crypto/dsa/Makefile                                |   8 +-
 crypto/dsa/dsa_ameth.c                             |   2 +-
 crypto/dsa/dsa_pmeth.c                             |   2 +-
 crypto/ec/Makefile                                 |   8 +-
 crypto/ec/ec_ameth.c                               |   2 +-
 crypto/ec/ec_pmeth.c                               |   2 +-
 crypto/ecdsa/Makefile                              |  13 +-
 crypto/engine/Makefile                             |   4 +-
 crypto/engine/tb_asnmth.c                          |   2 +-
 crypto/evp/Makefile                                |  89 +++++-----
 crypto/evp/evp_locl.h                              |  65 --------
 crypto/evp/evp_pkey.c                              |   2 +-
 crypto/evp/m_sigver.c                              |   2 +-
 crypto/evp/p_lib.c                                 |   2 +-
 crypto/evp/pmeth_fn.c                              |   2 +-
 crypto/evp/pmeth_gn.c                              |   2 +-
 crypto/evp/pmeth_lib.c                             |   4 +-
 crypto/hmac/Makefile                               |   6 +-
 crypto/hmac/hm_ameth.c                             |   2 +-
 crypto/hmac/hm_pmeth.c                             |   2 +-
 .../asn1_locl.h => include/internal/asn1_int.h}    |  62 +------
 crypto/include/internal/evp_int.h                  | 123 ++++++++++++++
 crypto/mdc2/Makefile                               |  17 +-
 crypto/ocsp/Makefile                               |  28 +++-
 crypto/pem/Makefile                                |  32 ++--
 crypto/pem/pem_lib.c                               |   2 +-
 crypto/pem/pem_pkey.c                              |   2 +-
 crypto/pkcs7/Makefile                              |   2 +-
 crypto/pkcs7/pk7_lib.c                             |   2 +-
 crypto/rsa/Makefile                                |   6 +-
 crypto/rsa/rsa_ameth.c                             |   2 +-
 crypto/rsa/rsa_pmeth.c                             |   2 +-
 crypto/x509/Makefile                               |  30 +++-
 ssl/Makefile                                       |  24 +--
 test/Makefile                                      |  21 +--
 59 files changed, 452 insertions(+), 538 deletions(-)
 copy crypto/{asn1/asn1_locl.h => include/internal/asn1_int.h} (72%)
 create mode 100644 crypto/include/internal/evp_int.h

diff --git a/apps/Makefile b/apps/Makefile
index 12a72e0..ac2663a 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -593,21 +593,19 @@ openssl.o: openssl.c progs.h s_apps.h
 passwd.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 passwd.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 passwd.o: ../include/openssl/crypto.h ../include/openssl/des.h
-passwd.o: ../include/openssl/e_os2.h
-passwd.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
-passwd.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
-passwd.o: ../include/openssl/err.h ../include/openssl/evp.h
-passwd.o: ../include/openssl/lhash.h ../include/openssl/md5.h
-passwd.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
-passwd.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
-passwd.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-passwd.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-passwd.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-passwd.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-passwd.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
-passwd.o: ../include/openssl/x509.h
-passwd.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-passwd.o: passwd.c
+passwd.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+passwd.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+passwd.o: ../include/openssl/engine.h ../include/openssl/err.h
+passwd.o: ../include/openssl/evp.h ../include/openssl/lhash.h
+passwd.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h
+passwd.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
+passwd.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+passwd.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
+passwd.o: ../include/openssl/rand.h ../include/openssl/safestack.h
+passwd.o: ../include/openssl/sha.h ../include/openssl/stack.h
+passwd.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
+passwd.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+passwd.o: ../include/openssl/x509v3.h apps.h passwd.c
 pkcs12.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 pkcs12.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 pkcs12.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -936,27 +934,26 @@ speed.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
 speed.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 speed.o: ../include/openssl/camellia.h ../include/openssl/cast.h
 speed.o: ../include/openssl/conf.h ../include/openssl/crypto.h
-speed.o: ../include/openssl/des.h
-speed.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
-speed.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
-speed.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
-speed.o: ../include/openssl/err.h ../include/openssl/evp.h
-speed.o: ../include/openssl/hmac.h ../include/openssl/idea.h
-speed.o: ../include/openssl/lhash.h ../include/openssl/md4.h
-speed.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-speed.o: ../include/openssl/modes.h ../include/openssl/obj_mac.h
-speed.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
-speed.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-speed.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
-speed.o: ../include/openssl/rand.h ../include/openssl/rc2.h
-speed.o: ../include/openssl/rc4.h ../include/openssl/ripemd.h
-speed.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-speed.o: ../include/openssl/seed.h ../include/openssl/sha.h
-speed.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-speed.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
-speed.o: ../include/openssl/whrlpool.h
-speed.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-speed.o: ../include/openssl/x509v3.h apps.h speed.c testdsa.h testrsa.h
+speed.o: ../include/openssl/des.h ../include/openssl/dsa.h
+speed.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+speed.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+speed.o: ../include/openssl/engine.h ../include/openssl/err.h
+speed.o: ../include/openssl/evp.h ../include/openssl/hmac.h
+speed.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+speed.o: ../include/openssl/md4.h ../include/openssl/md5.h
+speed.o: ../include/openssl/mdc2.h ../include/openssl/modes.h
+speed.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+speed.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
+speed.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+speed.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+speed.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+speed.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+speed.o: ../include/openssl/safestack.h ../include/openssl/seed.h
+speed.o: ../include/openssl/sha.h ../include/openssl/stack.h
+speed.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
+speed.o: ../include/openssl/whrlpool.h ../include/openssl/x509.h
+speed.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
+speed.o: speed.c testdsa.h testrsa.h
 spkac.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 spkac.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 spkac.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -1026,20 +1023,19 @@ version.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 version.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 version.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 version.o: ../include/openssl/crypto.h ../include/openssl/des.h
-version.o: ../include/openssl/e_os2.h
-version.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
-version.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
-version.o: ../include/openssl/evp.h ../include/openssl/idea.h
-version.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
-version.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
-version.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-version.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
-version.o: ../include/openssl/rc4.h ../include/openssl/safestack.h
-version.o: ../include/openssl/sha.h ../include/openssl/stack.h
-version.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-version.o: ../include/openssl/ui.h
-version.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-version.o: ../include/openssl/x509v3.h apps.h version.c
+version.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+version.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+version.o: ../include/openssl/engine.h ../include/openssl/evp.h
+version.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+version.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+version.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
+version.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+version.o: ../include/openssl/pkcs7.h ../include/openssl/rc4.h
+version.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+version.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+version.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
+version.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
+version.o: version.c
 x509.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 x509.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 x509.o: ../include/openssl/conf.h ../include/openssl/crypto.h
diff --git a/crypto/Makefile b/crypto/Makefile
index 6e1c129..5eddc5a 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -7,7 +7,7 @@ TOP=		..
 CC=		cc
 INCLUDE=	-I. -I$(TOP) -I../include $(ZLIB_INCLUDE)
 # INCLUDES targets sudbirs!
-INCLUDES=	-I.. -I../.. -I../modes -I../asn1 -I../evp -I../include -I../../include $(ZLIB_INCLUDE)
+INCLUDES=	-I.. -I../.. -I../modes -I../include -I../../include $(ZLIB_INCLUDE)
 CFLAG=		-g
 MAKEDEPPROG=	makedepend
 MAKEDEPEND=	$(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
diff --git a/crypto/asn1/Makefile b/crypto/asn1/Makefile
index a2051f7..6c7c22a 100644
--- a/crypto/asn1/Makefile
+++ b/crypto/asn1/Makefile
@@ -117,14 +117,6 @@ a_bitstr.o: ../../include/openssl/opensslconf.h
 a_bitstr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 a_bitstr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 a_bitstr.o: ../../include/openssl/symhacks.h ../cryptlib.h a_bitstr.c
-a_bool.o: ../../e_os.h ../../include/openssl/asn1.h
-a_bool.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
-a_bool.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-a_bool.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_bool.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-a_bool.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-a_bool.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_bool.o: ../../include/openssl/symhacks.h ../cryptlib.h a_bool.c
 a_d2i_fp.o: ../../e_os.h ../../include/openssl/asn1.h
 a_d2i_fp.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
 a_d2i_fp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -230,7 +222,7 @@ a_sign.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
 a_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 a_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 a_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-a_sign.o: ../cryptlib.h a_sign.c asn1_locl.h
+a_sign.o: ../cryptlib.h ../include/internal/asn1_int.h a_sign.c
 a_strex.o: ../../e_os.h ../../include/openssl/asn1.h
 a_strex.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 a_strex.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -297,8 +289,8 @@ a_verify.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 a_verify.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 a_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 a_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-a_verify.o: ../../include/openssl/x509_vfy.h ../cryptlib.h a_verify.c
-a_verify.o: asn1_locl.h
+a_verify.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+a_verify.o: ../include/internal/asn1_int.h a_verify.c
 ameth_lib.o: ../../e_os.h ../../include/openssl/asn1.h
 ameth_lib.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 ameth_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -312,8 +304,8 @@ ameth_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 ameth_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 ameth_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 ameth_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-ameth_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ameth_lib.c
-ameth_lib.o: asn1_locl.h
+ameth_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+ameth_lib.o: ../include/internal/asn1_int.h ameth_lib.c
 asn1_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 asn1_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 asn1_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
@@ -428,7 +420,8 @@ d2i_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 d2i_pr.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 d2i_pr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 d2i_pr.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-d2i_pr.o: ../../include/openssl/x509_vfy.h ../cryptlib.h asn1_locl.h d2i_pr.c
+d2i_pr.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+d2i_pr.o: ../include/internal/asn1_int.h d2i_pr.c
 d2i_pu.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 d2i_pu.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 d2i_pu.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
@@ -481,7 +474,8 @@ i2d_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 i2d_pr.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 i2d_pr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 i2d_pr.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-i2d_pr.o: ../../include/openssl/x509_vfy.h ../cryptlib.h asn1_locl.h i2d_pr.c
+i2d_pr.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+i2d_pr.o: ../include/internal/asn1_int.h i2d_pr.c
 i2d_pu.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 i2d_pu.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 i2d_pu.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
@@ -640,7 +634,7 @@ t_x509.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 t_x509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 t_x509.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 t_x509.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-t_x509.o: ../cryptlib.h asn1_locl.h t_x509.c
+t_x509.o: ../cryptlib.h ../include/internal/asn1_int.h t_x509.c
 t_x509a.o: ../../e_os.h ../../include/openssl/asn1.h
 t_x509a.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 t_x509a.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -839,7 +833,7 @@ x_pubkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
 x_pubkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 x_pubkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 x_pubkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-x_pubkey.o: ../cryptlib.h asn1_locl.h x_pubkey.c
+x_pubkey.o: ../cryptlib.h ../include/internal/asn1_int.h x_pubkey.c
 x_req.o: ../../e_os.h ../../include/openssl/asn1.h
 x_req.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 x_req.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
diff --git a/crypto/asn1/a_sign.c b/crypto/asn1/a_sign.c
index 51c6a0c..9fe6665 100644
--- a/crypto/asn1/a_sign.c
+++ b/crypto/asn1/a_sign.c
@@ -123,7 +123,7 @@
 #include <openssl/x509.h>
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 #ifndef NO_ASN1_OLD
 
diff --git a/crypto/asn1/a_verify.c b/crypto/asn1/a_verify.c
index e242d83..6023b14 100644
--- a/crypto/asn1/a_verify.c
+++ b/crypto/asn1/a_verify.c
@@ -70,7 +70,7 @@
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
 #include <openssl/evp.h>
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 #ifndef NO_ASN1_OLD
 
diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index 67353e0..5c7d6bb 100644
--- a/crypto/asn1/ameth_lib.c
+++ b/crypto/asn1/ameth_lib.c
@@ -63,7 +63,7 @@
 #ifndef OPENSSL_NO_ENGINE
 # include <openssl/engine.h>
 #endif
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[];
 extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[];
diff --git a/crypto/asn1/asn1_locl.h b/crypto/asn1/asn1_locl.h
index 2113802..a7569e7 100644
--- a/crypto/asn1/asn1_locl.h
+++ b/crypto/asn1/asn1_locl.h
@@ -97,51 +97,6 @@ struct asn1_sctx_st {
     void *app_data;
 } /* ASN1_SCTX */ ;
 
-/* ASN1 public key method structure */
-
-struct evp_pkey_asn1_method_st {
-    int pkey_id;
-    int pkey_base_id;
-    unsigned long pkey_flags;
-    char *pem_str;
-    char *info;
-    int (*pub_decode) (EVP_PKEY *pk, X509_PUBKEY *pub);
-    int (*pub_encode) (X509_PUBKEY *pub, const EVP_PKEY *pk);
-    int (*pub_cmp) (const EVP_PKEY *a, const EVP_PKEY *b);
-    int (*pub_print) (BIO *out, const EVP_PKEY *pkey, int indent,
-                      ASN1_PCTX *pctx);
-    int (*priv_decode) (EVP_PKEY *pk, PKCS8_PRIV_KEY_INFO *p8inf);
-    int (*priv_encode) (PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk);
-    int (*priv_print) (BIO *out, const EVP_PKEY *pkey, int indent,
-                       ASN1_PCTX *pctx);
-    int (*pkey_size) (const EVP_PKEY *pk);
-    int (*pkey_bits) (const EVP_PKEY *pk);
-    int (*pkey_security_bits) (const EVP_PKEY *pk);
-    int (*param_decode) (EVP_PKEY *pkey,
-                         const unsigned char **pder, int derlen);
-    int (*param_encode) (const EVP_PKEY *pkey, unsigned char **pder);
-    int (*param_missing) (const EVP_PKEY *pk);
-    int (*param_copy) (EVP_PKEY *to, const EVP_PKEY *from);
-    int (*param_cmp) (const EVP_PKEY *a, const EVP_PKEY *b);
-    int (*param_print) (BIO *out, const EVP_PKEY *pkey, int indent,
-                        ASN1_PCTX *pctx);
-    int (*sig_print) (BIO *out,
-                      const X509_ALGOR *sigalg, const ASN1_STRING *sig,
-                      int indent, ASN1_PCTX *pctx);
-    void (*pkey_free) (EVP_PKEY *pkey);
-    int (*pkey_ctrl) (EVP_PKEY *pkey, int op, long arg1, void *arg2);
-    /* Legacy functions for old PEM */
-    int (*old_priv_decode) (EVP_PKEY *pkey,
-                            const unsigned char **pder, int derlen);
-    int (*old_priv_encode) (const EVP_PKEY *pkey, unsigned char **pder);
-    /* Custom ASN1 signature verification */
-    int (*item_verify) (EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,
-                        X509_ALGOR *a, ASN1_BIT_STRING *sig, EVP_PKEY *pkey);
-    int (*item_sign) (EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,
-                      X509_ALGOR *alg1, X509_ALGOR *alg2,
-                      ASN1_BIT_STRING *sig);
-} /* EVP_PKEY_ASN1_METHOD */ ;
-
 /*
  * Method to handle CRL access. In general a CRL could be very large (several
  * Mb) and can consume large amounts of resources if stored in memory by
diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c
index c96da09..5f1a96d 100644
--- a/crypto/asn1/d2i_pr.c
+++ b/crypto/asn1/d2i_pr.c
@@ -66,7 +66,7 @@
 #endif
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
                          long length)
diff --git a/crypto/asn1/i2d_pr.c b/crypto/asn1/i2d_pr.c
index 4d338ac..2a6aa19 100644
--- a/crypto/asn1/i2d_pr.c
+++ b/crypto/asn1/i2d_pr.c
@@ -60,7 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/x509.h>
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 int i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp)
 {
diff --git a/crypto/asn1/t_x509.c b/crypto/asn1/t_x509.c
index 667db26..e972220 100644
--- a/crypto/asn1/t_x509.c
+++ b/crypto/asn1/t_x509.c
@@ -72,7 +72,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 #ifndef OPENSSL_NO_STDIO
 int X509_print_fp(FILE *fp, X509 *x)
diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c
index 4b68201..cefaf3a 100644
--- a/crypto/asn1/x_pubkey.c
+++ b/crypto/asn1/x_pubkey.c
@@ -60,7 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 #ifndef OPENSSL_NO_RSA
 # include <openssl/rsa.h>
 #endif
diff --git a/crypto/cmac/Makefile b/crypto/cmac/Makefile
index 54e7cc3..2e92a14 100644
--- a/crypto/cmac/Makefile
+++ b/crypto/cmac/Makefile
@@ -83,8 +83,8 @@ cm_ameth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 cm_ameth.o: ../../include/openssl/opensslconf.h
 cm_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 cm_ameth.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-cm_ameth.o: ../../include/openssl/symhacks.h ../asn1/asn1_locl.h ../cryptlib.h
-cm_ameth.o: cm_ameth.c
+cm_ameth.o: ../../include/openssl/symhacks.h ../cryptlib.h
+cm_ameth.o: ../include/internal/asn1_int.h cm_ameth.c
 cm_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h
 cm_pmeth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 cm_pmeth.o: ../../include/openssl/cmac.h ../../include/openssl/conf.h
@@ -99,7 +99,7 @@ cm_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 cm_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 cm_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 cm_pmeth.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-cm_pmeth.o: ../cryptlib.h ../evp/evp_locl.h cm_pmeth.c
+cm_pmeth.o: ../cryptlib.h ../include/internal/evp_int.h cm_pmeth.c
 cmac.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 cmac.o: ../../include/openssl/buffer.h ../../include/openssl/cmac.h
 cmac.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
diff --git a/crypto/cmac/cm_ameth.c b/crypto/cmac/cm_ameth.c
index 0b6850e..98634c9 100644
--- a/crypto/cmac/cm_ameth.c
+++ b/crypto/cmac/cm_ameth.c
@@ -55,7 +55,7 @@
 #include "cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/cmac.h>
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 /*
  * CMAC "ASN1" method. This is just here to indicate the maximum CMAC output
diff --git a/crypto/cmac/cm_pmeth.c b/crypto/cmac/cm_pmeth.c
index a2300df..389ae5d 100644
--- a/crypto/cmac/cm_pmeth.c
+++ b/crypto/cmac/cm_pmeth.c
@@ -57,7 +57,7 @@
 #include <openssl/x509v3.h>
 #include <openssl/evp.h>
 #include <openssl/cmac.h>
-#include "evp_locl.h"
+#include "internal/evp_int.h"
 
 /* The context structure and "key" is simply a CMAC_CTX */
 
diff --git a/crypto/cms/Makefile b/crypto/cms/Makefile
index 2e957c7..b767e25 100644
--- a/crypto/cms/Makefile
+++ b/crypto/cms/Makefile
@@ -174,7 +174,7 @@ cms_env.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
 cms_env.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 cms_env.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 cms_env.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-cms_env.o: ../asn1/asn1_locl.h ../cryptlib.h cms_env.c cms_lcl.h
+cms_env.o: ../cryptlib.h ../include/internal/asn1_int.h cms_env.c cms_lcl.h
 cms_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 cms_err.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
 cms_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -234,8 +234,8 @@ cms_kari.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
 cms_kari.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 cms_kari.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 cms_kari.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-cms_kari.o: ../../include/openssl/x509v3.h ../asn1/asn1_locl.h ../cryptlib.h
-cms_kari.o: cms_kari.c cms_lcl.h
+cms_kari.o: ../../include/openssl/x509v3.h ../cryptlib.h
+cms_kari.o: ../include/internal/asn1_int.h cms_kari.c cms_lcl.h
 cms_lib.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
 cms_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 cms_lib.o: ../../include/openssl/cms.h ../../include/openssl/conf.h
@@ -267,8 +267,8 @@ cms_pwri.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
 cms_pwri.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 cms_pwri.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 cms_pwri.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-cms_pwri.o: ../../include/openssl/x509v3.h ../asn1/asn1_locl.h ../cryptlib.h
-cms_pwri.o: cms_lcl.h cms_pwri.c
+cms_pwri.o: ../../include/openssl/x509v3.h ../cryptlib.h
+cms_pwri.o: ../include/internal/asn1_int.h cms_lcl.h cms_pwri.c
 cms_sd.o: ../../e_os.h ../../include/openssl/asn1.h
 cms_sd.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 cms_sd.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
@@ -284,7 +284,7 @@ cms_sd.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 cms_sd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 cms_sd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 cms_sd.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-cms_sd.o: ../asn1/asn1_locl.h ../cryptlib.h cms_lcl.h cms_sd.c
+cms_sd.o: ../cryptlib.h ../include/internal/asn1_int.h cms_lcl.h cms_sd.c
 cms_smime.o: ../../e_os.h ../../include/openssl/asn1.h
 cms_smime.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 cms_smime.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
@@ -300,4 +300,4 @@ cms_smime.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 cms_smime.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 cms_smime.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 cms_smime.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-cms_smime.o: ../asn1/asn1_locl.h ../cryptlib.h cms_lcl.h cms_smime.c
+cms_smime.o: ../cryptlib.h ../include/internal/asn1_int.h cms_lcl.h cms_smime.c
diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c
index 624c3f2..d1252f8 100644
--- a/crypto/cms/cms_env.c
+++ b/crypto/cms/cms_env.c
@@ -61,7 +61,7 @@
 #include <openssl/rand.h>
 #include <openssl/aes.h>
 #include "cms_lcl.h"
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 /* CMS EnvelopedData Utilities */
 
diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c
index f8a6cba..196b5c6 100644
--- a/crypto/cms/cms_kari.c
+++ b/crypto/cms/cms_kari.c
@@ -61,7 +61,7 @@
 #include <openssl/rand.h>
 #include <openssl/aes.h>
 #include "cms_lcl.h"
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 DECLARE_ASN1_ITEM(CMS_KeyAgreeRecipientInfo)
 DECLARE_ASN1_ITEM(CMS_RecipientEncryptedKey)
diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c
index 6729930..dd5f636 100644
--- a/crypto/cms/cms_pwri.c
+++ b/crypto/cms/cms_pwri.c
@@ -61,7 +61,7 @@
 #include <openssl/rand.h>
 #include <openssl/aes.h>
 #include "cms_lcl.h"
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,
                                     unsigned char *pass, ossl_ssize_t passlen)
diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
index a936ded..b8ed1a1 100644
--- a/crypto/cms/cms_sd.c
+++ b/crypto/cms/cms_sd.c
@@ -60,7 +60,7 @@
 #include <openssl/err.h>
 #include <openssl/cms.h>
 #include "cms_lcl.h"
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 /* CMS SignedData Utilities */
 
diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c
index acf5c58..6f6f20d 100644
--- a/crypto/cms/cms_smime.c
+++ b/crypto/cms/cms_smime.c
@@ -59,7 +59,7 @@
 #include <openssl/err.h>
 #include <openssl/cms.h>
 #include "cms_lcl.h"
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 static BIO *cms_get_text_bio(BIO *out, unsigned int flags)
 {
diff --git a/crypto/des/Makefile b/crypto/des/Makefile
index eb955cf..10b7e34 100644
--- a/crypto/des/Makefile
+++ b/crypto/des/Makefile
@@ -106,156 +106,89 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-cbc_cksm.o: ../../include/openssl/des.h
-cbc_cksm.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-cbc_cksm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-cbc_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-cbc_cksm.o: ../../include/openssl/ui.h
-cbc_cksm.o: cbc_cksm.c des_locl.h
-cbc_enc.o: ../../include/openssl/des.h
-cbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-cbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-cbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-cbc_enc.o: ../../include/openssl/ui.h
-cbc_enc.o: cbc_enc.c des_locl.h ncbc_enc.c
+cbc_cksm.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+cbc_cksm.o: ../../include/openssl/opensslconf.h cbc_cksm.c des_locl.h
+cbc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+cbc_enc.o: ../../include/openssl/opensslconf.h cbc_enc.c des_locl.h ncbc_enc.c
 cfb64ede.o: ../../e_os.h ../../include/openssl/des.h
-cfb64ede.o: ../../include/openssl/e_os2.h
-cfb64ede.o: ../../include/openssl/opensslconf.h
-cfb64ede.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-cfb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-cfb64ede.o: ../../include/openssl/ui.h
+cfb64ede.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 cfb64ede.o: cfb64ede.c des_locl.h
-cfb64enc.o: ../../include/openssl/des.h
-cfb64enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-cfb64enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-cfb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-cfb64enc.o: ../../include/openssl/ui.h
-cfb64enc.o: cfb64enc.c des_locl.h
+cfb64enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+cfb64enc.o: ../../include/openssl/opensslconf.h cfb64enc.c des_locl.h
 cfb_enc.o: ../../e_os.h ../../include/openssl/des.h
-cfb_enc.o: ../../include/openssl/e_os2.h
-cfb_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/ossl_typ.h
-cfb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-cfb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+cfb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 cfb_enc.o: cfb_enc.c des_locl.h
 des_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-des_enc.o: ../../include/openssl/e_os2.h
-des_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-des_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-des_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-des_enc.o: ../../include/openssl/ui.h 
-des_enc.o: des_enc.c des_locl.h ncbc_enc.c spr.h
-ecb3_enc.o: ../../include/openssl/des.h
-ecb3_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-ecb3_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-ecb3_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-ecb3_enc.o: ../../include/openssl/ui.h 
-ecb3_enc.o: des_locl.h ecb3_enc.c
+des_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+des_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+des_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+des_enc.o: ../../include/openssl/symhacks.h des_enc.c des_locl.h ncbc_enc.c
+des_enc.o: spr.h
+ecb3_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+ecb3_enc.o: ../../include/openssl/opensslconf.h des_locl.h ecb3_enc.c
 ecb_enc.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
-ecb_enc.o: ../../include/openssl/des.h
-ecb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-ecb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-ecb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-ecb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+ecb_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+ecb_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+ecb_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+ecb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 ecb_enc.o: des_locl.h des_ver.h ecb_enc.c
 enc_read.o: ../../e_os.h ../../include/openssl/bio.h
 enc_read.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-enc_read.o: ../../include/openssl/des.h
-enc_read.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-enc_read.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+enc_read.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+enc_read.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+enc_read.o: ../../include/openssl/opensslconf.h
 enc_read.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 enc_read.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-enc_read.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-enc_read.o: ../cryptlib.h des_locl.h
+enc_read.o: ../../include/openssl/symhacks.h ../cryptlib.h des_locl.h
 enc_read.o: enc_read.c
 enc_writ.o: ../../e_os.h ../../include/openssl/bio.h
 enc_writ.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-enc_writ.o: ../../include/openssl/des.h
-enc_writ.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-enc_writ.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+enc_writ.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+enc_writ.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+enc_writ.o: ../../include/openssl/opensslconf.h
 enc_writ.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 enc_writ.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
 enc_writ.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-enc_writ.o: ../../include/openssl/ui.h
 enc_writ.o: ../cryptlib.h des_locl.h enc_writ.c
 fcrypt.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-fcrypt.o: ../../include/openssl/e_os2.h
-fcrypt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-fcrypt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-fcrypt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fcrypt.o: ../../include/openssl/ui.h
-fcrypt.o: des_locl.h fcrypt.c
-fcrypt_b.o: ../../include/openssl/des.h
-fcrypt_b.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-fcrypt_b.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-fcrypt_b.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fcrypt_b.o: ../../include/openssl/ui.h
-fcrypt_b.o: des_locl.h fcrypt_b.c
-ofb64ede.o: ../../include/openssl/des.h
-ofb64ede.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-ofb64ede.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-ofb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-ofb64ede.o: ../../include/openssl/ui.h
-ofb64ede.o: des_locl.h ofb64ede.c
-ofb64enc.o: ../../include/openssl/des.h
-ofb64enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-ofb64enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-ofb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-ofb64enc.o: ../../include/openssl/ui.h
-ofb64enc.o: des_locl.h ofb64enc.c
-ofb_enc.o: ../../include/openssl/des.h
-ofb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-ofb_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-ofb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-ofb_enc.o: ../../include/openssl/ui.h
-ofb_enc.o: des_locl.h ofb_enc.c
-pcbc_enc.o: ../../include/openssl/des.h
-pcbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-pcbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-pcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pcbc_enc.o: ../../include/openssl/ui.h
-pcbc_enc.o: des_locl.h pcbc_enc.c
-qud_cksm.o: ../../include/openssl/des.h
-qud_cksm.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-qud_cksm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-qud_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-qud_cksm.o: ../../include/openssl/ui.h
-qud_cksm.o: des_locl.h qud_cksm.c
-rand_key.o: ../../include/openssl/des.h
-rand_key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+fcrypt.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+fcrypt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+fcrypt.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+fcrypt.o: ../../include/openssl/symhacks.h des_locl.h fcrypt.c
+fcrypt_b.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+fcrypt_b.o: ../../include/openssl/opensslconf.h des_locl.h fcrypt_b.c
+ofb64ede.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+ofb64ede.o: ../../include/openssl/opensslconf.h des_locl.h ofb64ede.c
+ofb64enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+ofb64enc.o: ../../include/openssl/opensslconf.h des_locl.h ofb64enc.c
+ofb_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+ofb_enc.o: ../../include/openssl/opensslconf.h des_locl.h ofb_enc.c
+pcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+pcbc_enc.o: ../../include/openssl/opensslconf.h des_locl.h pcbc_enc.c
+qud_cksm.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+qud_cksm.o: ../../include/openssl/opensslconf.h des_locl.h qud_cksm.c
+rand_key.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+rand_key.o: ../../include/openssl/opensslconf.h
 rand_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-rand_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-rand_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 rand_key.o: rand_key.c
 read2pwd.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-read2pwd.o: ../../include/openssl/e_os2.h
-read2pwd.o: ../../include/openssl/opensslconf.h
+read2pwd.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 read2pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 read2pwd.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 read2pwd.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 read2pwd.o: read2pwd.c
-rpc_enc.o: ../../include/openssl/des.h
-rpc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-rpc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-rpc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-rpc_enc.o: ../../include/openssl/ui.h
-rpc_enc.o: des_locl.h des_ver.h rpc_des.h rpc_enc.c
+rpc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+rpc_enc.o: ../../include/openssl/opensslconf.h des_locl.h des_ver.h rpc_des.h
+rpc_enc.o: rpc_enc.c
 set_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-set_key.o: ../../include/openssl/e_os2.h
-set_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-set_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-set_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-set_key.o: ../../include/openssl/ui.h
-set_key.o: des_locl.h set_key.c
+set_key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+set_key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+set_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+set_key.o: ../../include/openssl/symhacks.h des_locl.h set_key.c
 str2key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-str2key.o: ../../include/openssl/e_os2.h
-str2key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-str2key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-str2key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-str2key.o: ../../include/openssl/ui.h
-str2key.o: des_locl.h str2key.c
-xcbc_enc.o: ../../include/openssl/des.h
-xcbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-xcbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-xcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-xcbc_enc.o: ../../include/openssl/ui.h
-xcbc_enc.o: des_locl.h xcbc_enc.c
+str2key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+str2key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+str2key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+str2key.o: ../../include/openssl/symhacks.h des_locl.h str2key.c
+xcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+xcbc_enc.o: ../../include/openssl/opensslconf.h des_locl.h xcbc_enc.c
diff --git a/crypto/dh/Makefile b/crypto/dh/Makefile
index 943e7c6..6af06d9 100644
--- a/crypto/dh/Makefile
+++ b/crypto/dh/Makefile
@@ -89,8 +89,8 @@ dh_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 dh_ameth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 dh_ameth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 dh_ameth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-dh_ameth.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h
-dh_ameth.o: dh_ameth.c
+dh_ameth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+dh_ameth.o: ../include/internal/asn1_int.h dh_ameth.c
 dh_asn1.o: ../../e_os.h ../../include/openssl/asn1.h
 dh_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 dh_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -182,8 +182,8 @@ dh_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 dh_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 dh_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 dh_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-dh_pmeth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ../evp/evp_locl.h
-dh_pmeth.o: dh_pmeth.c
+dh_pmeth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+dh_pmeth.o: ../include/internal/evp_int.h dh_pmeth.c
 dh_prn.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 dh_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 dh_prn.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index e7d56f1..17027c5 100644
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -62,7 +62,7 @@
 #include <openssl/asn1.h>
 #include <openssl/dh.h>
 #include <openssl/bn.h>
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 #ifndef OPENSSL_NO_CMS
 # include <openssl/cms.h>
 #endif
diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c
index 668f5f3..5e3a5e3 100644
--- a/crypto/dh/dh_pmeth.c
+++ b/crypto/dh/dh_pmeth.c
@@ -67,7 +67,7 @@
 # include <openssl/dsa.h>
 #endif
 #include <openssl/objects.h>
-#include "evp_locl.h"
+#include "internal/evp_int.h"
 
 /* DH pkey context structure */
 
diff --git a/crypto/dsa/Makefile b/crypto/dsa/Makefile
index 5fef4ca..5c1982c 100644
--- a/crypto/dsa/Makefile
+++ b/crypto/dsa/Makefile
@@ -90,8 +90,8 @@ dsa_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 dsa_ameth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 dsa_ameth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 dsa_ameth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-dsa_ameth.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h
-dsa_ameth.o: dsa_ameth.c
+dsa_ameth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+dsa_ameth.o: ../include/internal/asn1_int.h dsa_ameth.c
 dsa_asn1.o: ../../e_os.h ../../include/openssl/asn1.h
 dsa_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 dsa_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -178,8 +178,8 @@ dsa_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 dsa_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 dsa_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 dsa_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-dsa_pmeth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ../evp/evp_locl.h
-dsa_pmeth.o: dsa_locl.h dsa_pmeth.c
+dsa_pmeth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+dsa_pmeth.o: ../include/internal/evp_int.h dsa_locl.h dsa_pmeth.c
 dsa_prn.o: ../../e_os.h ../../include/openssl/asn1.h
 dsa_prn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 dsa_prn.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index 425144a..61a9d0f 100644
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -65,7 +65,7 @@
 #ifndef OPENSSL_NO_CMS
 # include <openssl/cms.h>
 #endif
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 static int dsa_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
 {
diff --git a/crypto/dsa/dsa_pmeth.c b/crypto/dsa/dsa_pmeth.c
index c26a0c3..6a47047 100644
--- a/crypto/dsa/dsa_pmeth.c
+++ b/crypto/dsa/dsa_pmeth.c
@@ -62,7 +62,7 @@
 #include <openssl/x509.h>
 #include <openssl/evp.h>
 #include <openssl/bn.h>
-#include "evp_locl.h"
+#include "internal/evp_int.h"
 #include "dsa_locl.h"
 
 /* DSA pkey context structure */
diff --git a/crypto/ec/Makefile b/crypto/ec/Makefile
index 7e9f7a6..b6d50c7 100644
--- a/crypto/ec/Makefile
+++ b/crypto/ec/Makefile
@@ -136,8 +136,8 @@ ec_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 ec_ameth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 ec_ameth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 ec_ameth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-ec_ameth.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h
-ec_ameth.o: ec_ameth.c
+ec_ameth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+ec_ameth.o: ../include/internal/asn1_int.h ec_ameth.c
 ec_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
 ec_asn1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 ec_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -224,8 +224,8 @@ ec_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 ec_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 ec_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 ec_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-ec_pmeth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ../evp/evp_locl.h
-ec_pmeth.o: ec_lcl.h ec_pmeth.c
+ec_pmeth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+ec_pmeth.o: ../include/internal/evp_int.h ec_lcl.h ec_pmeth.c
 ec_print.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 ec_print.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
 ec_print.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index bce0b16..de56c89 100644
--- a/crypto/ec/ec_ameth.c
+++ b/crypto/ec/ec_ameth.c
@@ -65,7 +65,7 @@
 # include <openssl/cms.h>
 #endif
 #include <openssl/asn1t.h>
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 static int ecdh_cms_decrypt(CMS_RecipientInfo *ri);
 static int ecdh_cms_encrypt(CMS_RecipientInfo *ri);
diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c
index d789e7e..4eda2ef 100644
--- a/crypto/ec/ec_pmeth.c
+++ b/crypto/ec/ec_pmeth.c
@@ -64,7 +64,7 @@
 #include "ec_lcl.h"
 #include <openssl/ecdsa.h>
 #include <openssl/evp.h>
-#include "evp_locl.h"
+#include "internal/evp_int.h"
 
 /* EC pkey context structure */
 
diff --git a/crypto/ecdsa/Makefile b/crypto/ecdsa/Makefile
index 7730f71..da08d2d 100644
--- a/crypto/ecdsa/Makefile
+++ b/crypto/ecdsa/Makefile
@@ -127,16 +127,15 @@ ecs_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 ecs_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 ecs_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 ecs_sign.o: ecs_locl.h ecs_sign.c
-ecs_vrf.o: ../../e_os.h ../../include/openssl/asn1.h
-ecs_vrf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
-ecs_vrf.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-ecs_vrf.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-ecs_vrf.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
-ecs_vrf.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+ecs_vrf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ecs_vrf.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+ecs_vrf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ecs_vrf.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+ecs_vrf.o: ../../include/openssl/engine.h ../../include/openssl/evp.h
 ecs_vrf.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 ecs_vrf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 ecs_vrf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 ecs_vrf.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 ecs_vrf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 ecs_vrf.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-ecs_vrf.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ecs_locl.h ecs_vrf.c
+ecs_vrf.o: ../../include/openssl/x509_vfy.h ecs_locl.h ecs_vrf.c
diff --git a/crypto/engine/Makefile b/crypto/engine/Makefile
index d39a45d..0bdd2aa 100644
--- a/crypto/engine/Makefile
+++ b/crypto/engine/Makefile
@@ -295,8 +295,8 @@ tb_asnmth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 tb_asnmth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 tb_asnmth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 tb_asnmth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-tb_asnmth.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h
-tb_asnmth.o: eng_int.h tb_asnmth.c
+tb_asnmth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+tb_asnmth.o: ../include/internal/asn1_int.h eng_int.h tb_asnmth.c
 tb_cipher.o: ../../e_os.h ../../include/openssl/asn1.h
 tb_cipher.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 tb_cipher.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c
index a1a9b88..4685fcf 100644
--- a/crypto/engine/tb_asnmth.c
+++ b/crypto/engine/tb_asnmth.c
@@ -53,8 +53,8 @@
  */
 
 #include "eng_int.h"
-#include "asn1_locl.h"
 #include <openssl/evp.h>
+#include "internal/asn1_int.h"
 
 /*
  * If this symbol is defined then ENGINE_get_pkey_asn1_meth_engine(), the
diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile
index 9b3095f..d72e6e7 100644
--- a/crypto/evp/Makefile
+++ b/crypto/evp/Makefile
@@ -263,27 +263,24 @@ e_cast.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 e_cast.o: ../../include/openssl/symhacks.h ../cryptlib.h e_cast.c evp_locl.h
 e_des.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_des.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-e_des.o: ../../include/openssl/des.h
-e_des.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-e_des.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
-e_des.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-e_des.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-e_des.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-e_des.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-e_des.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+e_des.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+e_des.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+e_des.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+e_des.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+e_des.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+e_des.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+e_des.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 e_des.o: ../cryptlib.h e_des.c evp_locl.h
 e_des3.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_des3.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-e_des3.o: ../../include/openssl/des.h
-e_des3.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-e_des3.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
-e_des3.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-e_des3.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-e_des3.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-e_des3.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-e_des3.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-e_des3.o: ../../include/openssl/ui.h
-e_des3.o: ../cryptlib.h e_des3.c evp_locl.h
+e_des3.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+e_des3.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+e_des3.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+e_des3.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+e_des3.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+e_des3.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+e_des3.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_des3.o: ../../include/openssl/symhacks.h ../cryptlib.h e_des3.c evp_locl.h
 e_idea.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_idea.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 e_idea.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
@@ -351,14 +348,13 @@ e_seed.o: e_seed.c evp_locl.h
 e_xcbc_d.o: ../../e_os.h ../../include/openssl/asn1.h
 e_xcbc_d.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 e_xcbc_d.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-e_xcbc_d.o: ../../include/openssl/e_os2.h
-e_xcbc_d.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-e_xcbc_d.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
-e_xcbc_d.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+e_xcbc_d.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+e_xcbc_d.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+e_xcbc_d.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+e_xcbc_d.o: ../../include/openssl/opensslconf.h
 e_xcbc_d.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 e_xcbc_d.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-e_xcbc_d.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-e_xcbc_d.o: ../cryptlib.h e_xcbc_d.c
+e_xcbc_d.o: ../../include/openssl/symhacks.h ../cryptlib.h e_xcbc_d.c
 e_xcbc_d.o: evp_locl.h
 encode.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 encode.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -463,7 +459,7 @@ evp_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
 evp_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 evp_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 evp_pkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-evp_pkey.o: ../asn1/asn1_locl.h ../cryptlib.h evp_pkey.c
+evp_pkey.o: ../cryptlib.h ../include/internal/asn1_int.h evp_pkey.c
 m_dss1.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_dss1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 m_dss1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
@@ -519,19 +515,18 @@ m_md5.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 m_md5.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_md5.c
 m_mdc2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_mdc2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-m_mdc2.o: ../../include/openssl/des.h
-m_mdc2.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-m_mdc2.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
-m_mdc2.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-m_mdc2.o: ../../include/openssl/lhash.h ../../include/openssl/mdc2.h
-m_mdc2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-m_mdc2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-m_mdc2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
-m_mdc2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-m_mdc2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-m_mdc2.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-m_mdc2.o: ../../include/openssl/x509.h
-m_mdc2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_mdc2.c
+m_mdc2.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+m_mdc2.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+m_mdc2.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+m_mdc2.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+m_mdc2.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
+m_mdc2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+m_mdc2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+m_mdc2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+m_mdc2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+m_mdc2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+m_mdc2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+m_mdc2.o: ../cryptlib.h m_mdc2.c
 m_null.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 m_null.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
@@ -580,8 +575,8 @@ m_sigver.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 m_sigver.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 m_sigver.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 m_sigver.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-m_sigver.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h
-m_sigver.o: m_sigver.c
+m_sigver.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+m_sigver.o: ../include/internal/evp_int.h m_sigver.c
 m_wp.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_wp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 m_wp.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
@@ -675,7 +670,7 @@ p_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
 p_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 p_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 p_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p_lib.o: ../asn1/asn1_locl.h ../cryptlib.h p_lib.c
+p_lib.o: ../cryptlib.h ../include/internal/asn1_int.h p_lib.c
 p_open.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 p_open.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 p_open.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
@@ -735,8 +730,8 @@ pmeth_fn.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 pmeth_fn.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 pmeth_fn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 pmeth_fn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-pmeth_fn.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_locl.h
-pmeth_fn.o: pmeth_fn.c
+pmeth_fn.o: ../../include/openssl/symhacks.h ../cryptlib.h
+pmeth_fn.o: ../include/internal/evp_int.h pmeth_fn.c
 pmeth_gn.o: ../../e_os.h ../../include/openssl/asn1.h
 pmeth_gn.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 pmeth_gn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -747,7 +742,8 @@ pmeth_gn.o: ../../include/openssl/opensslconf.h
 pmeth_gn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 pmeth_gn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 pmeth_gn.o: ../../include/openssl/symhacks.h ../cryptlib.h
-pmeth_gn.o: ../include/internal/bn_int.h evp_locl.h pmeth_gn.c
+pmeth_gn.o: ../include/internal/bn_int.h ../include/internal/evp_int.h
+pmeth_gn.o: pmeth_gn.c
 pmeth_lib.o: ../../e_os.h ../../include/openssl/asn1.h
 pmeth_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 pmeth_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -761,5 +757,6 @@ pmeth_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 pmeth_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 pmeth_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 pmeth_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-pmeth_lib.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h
-pmeth_lib.o: evp_locl.h pmeth_lib.c
+pmeth_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+pmeth_lib.o: ../include/internal/asn1_int.h ../include/internal/evp_int.h
+pmeth_lib.o: pmeth_lib.c
diff --git a/crypto/evp/evp_locl.h b/crypto/evp/evp_locl.h
index 56449c4..b70a54c 100644
--- a/crypto/evp/evp_locl.h
+++ b/crypto/evp/evp_locl.h
@@ -261,71 +261,6 @@ const EVP_CIPHER *EVP_##cname##_ecb(void) { return &cname##_ecb; }
                              (fl)|EVP_CIPH_FLAG_DEFAULT_ASN1, \
                              cipher##_init_key, NULL, NULL, NULL, NULL)
 
-struct evp_pkey_ctx_st {
-    /* Method associated with this operation */
-    const EVP_PKEY_METHOD *pmeth;
-    /* Engine that implements this method or NULL if builtin */
-    ENGINE *engine;
-    /* Key: may be NULL */
-    EVP_PKEY *pkey;
-    /* Peer key for key agreement, may be NULL */
-    EVP_PKEY *peerkey;
-    /* Actual operation */
-    int operation;
-    /* Algorithm specific data */
-    void *data;
-    /* Application specific data */
-    void *app_data;
-    /* Keygen callback */
-    EVP_PKEY_gen_cb *pkey_gencb;
-    /* implementation specific keygen data */
-    int *keygen_info;
-    int keygen_info_count;
-} /* EVP_PKEY_CTX */ ;
-
-#define EVP_PKEY_FLAG_DYNAMIC   1
-
-struct evp_pkey_method_st {
-    int pkey_id;
-    int flags;
-    int (*init) (EVP_PKEY_CTX *ctx);
-    int (*copy) (EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src);
-    void (*cleanup) (EVP_PKEY_CTX *ctx);
-    int (*paramgen_init) (EVP_PKEY_CTX *ctx);
-    int (*paramgen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey);
-    int (*keygen_init) (EVP_PKEY_CTX *ctx);
-    int (*keygen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey);
-    int (*sign_init) (EVP_PKEY_CTX *ctx);
-    int (*sign) (EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
-                 const unsigned char *tbs, size_t tbslen);
-    int (*verify_init) (EVP_PKEY_CTX *ctx);
-    int (*verify) (EVP_PKEY_CTX *ctx,
-                   const unsigned char *sig, size_t siglen,
-                   const unsigned char *tbs, size_t tbslen);
-    int (*verify_recover_init) (EVP_PKEY_CTX *ctx);
-    int (*verify_recover) (EVP_PKEY_CTX *ctx,
-                           unsigned char *rout, size_t *routlen,
-                           const unsigned char *sig, size_t siglen);
-    int (*signctx_init) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx);
-    int (*signctx) (EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
-                    EVP_MD_CTX *mctx);
-    int (*verifyctx_init) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx);
-    int (*verifyctx) (EVP_PKEY_CTX *ctx, const unsigned char *sig, int siglen,
-                      EVP_MD_CTX *mctx);
-    int (*encrypt_init) (EVP_PKEY_CTX *ctx);
-    int (*encrypt) (EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
-                    const unsigned char *in, size_t inlen);
-    int (*decrypt_init) (EVP_PKEY_CTX *ctx);
-    int (*decrypt) (EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
-                    const unsigned char *in, size_t inlen);
-    int (*derive_init) (EVP_PKEY_CTX *ctx);
-    int (*derive) (EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen);
-    int (*ctrl) (EVP_PKEY_CTX *ctx, int type, int p1, void *p2);
-    int (*ctrl_str) (EVP_PKEY_CTX *ctx, const char *type, const char *value);
-} /* EVP_PKEY_METHOD */ ;
-
-void evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx);
-
 int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass,
                              int passlen, ASN1_TYPE *param,
                              const EVP_CIPHER *c, const EVP_MD *md,
diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c
index 52c9a86..7e64e26 100644
--- a/crypto/evp/evp_pkey.c
+++ b/crypto/evp/evp_pkey.c
@@ -62,7 +62,7 @@
 #include "cryptlib.h"
 #include <openssl/x509.h>
 #include <openssl/rand.h>
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 /* Extract a private key from a PKCS8 structure */
 
diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
index 87507ff..65a49ad 100644
--- a/crypto/evp/m_sigver.c
+++ b/crypto/evp/m_sigver.c
@@ -62,7 +62,7 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
-#include "evp_locl.h"
+#include "internal/evp_int.h"
 
 static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
                           const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey,
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 1f98d71..604faf2 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -78,7 +78,7 @@
 # include <openssl/engine.h>
 #endif
 
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 static void EVP_PKEY_free_it(EVP_PKEY *x);
 
diff --git a/crypto/evp/pmeth_fn.c b/crypto/evp/pmeth_fn.c
index a8b7f2f..829b5f0 100644
--- a/crypto/evp/pmeth_fn.c
+++ b/crypto/evp/pmeth_fn.c
@@ -62,7 +62,7 @@
 #include "cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/evp.h>
-#include "evp_locl.h"
+#include "internal/evp_int.h"
 
 #define M_check_autoarg(ctx, arg, arglen, err) \
         if (ctx->pmeth->flags & EVP_PKEY_FLAG_AUTOARGLEN) \
diff --git a/crypto/evp/pmeth_gn.c b/crypto/evp/pmeth_gn.c
index 45559eb..a5ae484 100644
--- a/crypto/evp/pmeth_gn.c
+++ b/crypto/evp/pmeth_gn.c
@@ -63,7 +63,7 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include "internal/bn_int.h"
-#include "evp_locl.h"
+#include "internal/evp_int.h"
 
 int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx)
 {
diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index 9f81d10..9183e40 100644
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -65,8 +65,8 @@
 #ifndef OPENSSL_NO_ENGINE
 # include <openssl/engine.h>
 #endif
-#include "asn1_locl.h"
-#include "evp_locl.h"
+#include "internal/asn1_int.h"
+#include "internal/evp_int.h"
 
 typedef int sk_cmp_fn_type(const char *const *a, const char *const *b);
 
diff --git a/crypto/hmac/Makefile b/crypto/hmac/Makefile
index 0e91709..42a9778 100644
--- a/crypto/hmac/Makefile
+++ b/crypto/hmac/Makefile
@@ -82,8 +82,8 @@ hm_ameth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 hm_ameth.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 hm_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 hm_ameth.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-hm_ameth.o: ../../include/openssl/symhacks.h ../asn1/asn1_locl.h ../cryptlib.h
-hm_ameth.o: hm_ameth.c
+hm_ameth.o: ../../include/openssl/symhacks.h ../cryptlib.h
+hm_ameth.o: ../include/internal/asn1_int.h hm_ameth.c
 hm_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h
 hm_pmeth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 hm_pmeth.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
@@ -98,7 +98,7 @@ hm_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 hm_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 hm_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 hm_pmeth.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-hm_pmeth.o: ../cryptlib.h ../evp/evp_locl.h hm_pmeth.c
+hm_pmeth.o: ../cryptlib.h ../include/internal/evp_int.h hm_pmeth.c
 hmac.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 hmac.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 hmac.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
diff --git a/crypto/hmac/hm_ameth.c b/crypto/hmac/hm_ameth.c
index f72d668..1b0f3b9 100644
--- a/crypto/hmac/hm_ameth.c
+++ b/crypto/hmac/hm_ameth.c
@@ -59,7 +59,7 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/evp.h>
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 #define HMAC_TEST_PRIVATE_KEY_FORMAT
 
diff --git a/crypto/hmac/hm_pmeth.c b/crypto/hmac/hm_pmeth.c
index 0ffff79..f2be144 100644
--- a/crypto/hmac/hm_pmeth.c
+++ b/crypto/hmac/hm_pmeth.c
@@ -62,7 +62,7 @@
 #include <openssl/x509v3.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
-#include "evp_locl.h"
+#include "internal/evp_int.h"
 
 /* HMAC pkey context structure */
 
diff --git a/crypto/asn1/asn1_locl.h b/crypto/include/internal/asn1_int.h
similarity index 72%
copy from crypto/asn1/asn1_locl.h
copy to crypto/include/internal/asn1_int.h
index 2113802..58759be 100644
--- a/crypto/asn1/asn1_locl.h
+++ b/crypto/include/internal/asn1_int.h
@@ -1,10 +1,10 @@
-/* asn1t.h */
+/* asn1_int.h */
 /*
  * Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL project
- * 2006.
+ * 2015.
  */
 /* ====================================================================
- * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2015 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -59,44 +59,6 @@
 
 /* Internal ASN1 structures and functions: not for application use */
 
-int asn1_utctime_to_tm(struct tm *tm, const ASN1_UTCTIME *d);
-int asn1_generalizedtime_to_tm(struct tm *tm, const ASN1_GENERALIZEDTIME *d);
-
-/* ASN1 print context structure */
-
-struct asn1_pctx_st {
-    unsigned long flags;
-    unsigned long nm_flags;
-    unsigned long cert_flags;
-    unsigned long oid_flags;
-    unsigned long str_flags;
-} /* ASN1_PCTX */ ;
-
-/* ASN1 scan context structure */
-
-struct asn1_sctx_st {
-    /* The ASN1_ITEM associated with this field */
-    const ASN1_ITEM *it;
-    /* If ASN1_TEMPLATE associated with this field */
-    const ASN1_TEMPLATE *tt;
-    /* Various flags associated with field and context */
-    unsigned long flags;
-    /* If SEQUENCE OF or SET OF, field index */
-    int skidx;
-    /* ASN1 depth of field */
-    int depth;
-    /* Structure and field name */
-    const char *sname, *fname;
-    /* If a primitive type the type of underlying field */
-    int prim_type;
-    /* The field value itself */
-    ASN1_VALUE **field;
-    /* Callback to pass information to */
-    int (*scan_cb) (ASN1_SCTX *ctx);
-    /* Context specific application data */
-    void *app_data;
-} /* ASN1_SCTX */ ;
-
 /* ASN1 public key method structure */
 
 struct evp_pkey_asn1_method_st {
@@ -141,21 +103,3 @@ struct evp_pkey_asn1_method_st {
                       X509_ALGOR *alg1, X509_ALGOR *alg2,
                       ASN1_BIT_STRING *sig);
 } /* EVP_PKEY_ASN1_METHOD */ ;
-
-/*
- * Method to handle CRL access. In general a CRL could be very large (several
- * Mb) and can consume large amounts of resources if stored in memory by
- * multiple processes. This method allows general CRL operations to be
- * redirected to more efficient callbacks: for example a CRL entry database.
- */
-
-#define X509_CRL_METHOD_DYNAMIC         1
-
-struct x509_crl_method_st {
-    int flags;
-    int (*crl_init) (X509_CRL *crl);
-    int (*crl_free) (X509_CRL *crl);
-    int (*crl_lookup) (X509_CRL *crl, X509_REVOKED **ret,
-                       ASN1_INTEGER *ser, X509_NAME *issuer);
-    int (*crl_verify) (X509_CRL *crl, EVP_PKEY *pk);
-};
diff --git a/crypto/include/internal/evp_int.h b/crypto/include/internal/evp_int.h
new file mode 100644
index 0000000..ea7a61c
--- /dev/null
+++ b/crypto/include/internal/evp_int.h
@@ -0,0 +1,123 @@
+/* evp_int.h */
+/*
+ * Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL project
+ * 2015.
+ */
+/* ====================================================================
+ * Copyright (c) 2015 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing at OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
+
+struct evp_pkey_ctx_st {
+    /* Method associated with this operation */
+    const EVP_PKEY_METHOD *pmeth;
+    /* Engine that implements this method or NULL if builtin */
+    ENGINE *engine;
+    /* Key: may be NULL */
+    EVP_PKEY *pkey;
+    /* Peer key for key agreement, may be NULL */
+    EVP_PKEY *peerkey;
+    /* Actual operation */
+    int operation;
+    /* Algorithm specific data */
+    void *data;
+    /* Application specific data */
+    void *app_data;
+    /* Keygen callback */
+    EVP_PKEY_gen_cb *pkey_gencb;
+    /* implementation specific keygen data */
+    int *keygen_info;
+    int keygen_info_count;
+} /* EVP_PKEY_CTX */ ;
+
+#define EVP_PKEY_FLAG_DYNAMIC   1
+
+struct evp_pkey_method_st {
+    int pkey_id;
+    int flags;
+    int (*init) (EVP_PKEY_CTX *ctx);
+    int (*copy) (EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src);
+    void (*cleanup) (EVP_PKEY_CTX *ctx);
+    int (*paramgen_init) (EVP_PKEY_CTX *ctx);
+    int (*paramgen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey);
+    int (*keygen_init) (EVP_PKEY_CTX *ctx);
+    int (*keygen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey);
+    int (*sign_init) (EVP_PKEY_CTX *ctx);
+    int (*sign) (EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
+                 const unsigned char *tbs, size_t tbslen);
+    int (*verify_init) (EVP_PKEY_CTX *ctx);
+    int (*verify) (EVP_PKEY_CTX *ctx,
+                   const unsigned char *sig, size_t siglen,
+                   const unsigned char *tbs, size_t tbslen);
+    int (*verify_recover_init) (EVP_PKEY_CTX *ctx);
+    int (*verify_recover) (EVP_PKEY_CTX *ctx,
+                           unsigned char *rout, size_t *routlen,
+                           const unsigned char *sig, size_t siglen);
+    int (*signctx_init) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx);
+    int (*signctx) (EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
+                    EVP_MD_CTX *mctx);
+    int (*verifyctx_init) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx);
+    int (*verifyctx) (EVP_PKEY_CTX *ctx, const unsigned char *sig, int siglen,
+                      EVP_MD_CTX *mctx);
+    int (*encrypt_init) (EVP_PKEY_CTX *ctx);
+    int (*encrypt) (EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
+                    const unsigned char *in, size_t inlen);
+    int (*decrypt_init) (EVP_PKEY_CTX *ctx);
+    int (*decrypt) (EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
+                    const unsigned char *in, size_t inlen);
+    int (*derive_init) (EVP_PKEY_CTX *ctx);
+    int (*derive) (EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen);
+    int (*ctrl) (EVP_PKEY_CTX *ctx, int type, int p1, void *p2);
+    int (*ctrl_str) (EVP_PKEY_CTX *ctx, const char *type, const char *value);
+} /* EVP_PKEY_METHOD */ ;
+
+void evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx);
diff --git a/crypto/mdc2/Makefile b/crypto/mdc2/Makefile
index 7811764..766008e 100644
--- a/crypto/mdc2/Makefile
+++ b/crypto/mdc2/Makefile
@@ -76,18 +76,15 @@ clean:
 
 mdc2_one.o: ../../e_os.h ../../include/openssl/bio.h
 mdc2_one.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-mdc2_one.o: ../../include/openssl/des.h
-mdc2_one.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-mdc2_one.o: ../../include/openssl/lhash.h ../../include/openssl/mdc2.h
-mdc2_one.o: ../../include/openssl/opensslconf.h
+mdc2_one.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
+mdc2_one.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+mdc2_one.o: ../../include/openssl/mdc2.h ../../include/openssl/opensslconf.h
 mdc2_one.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 mdc2_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-mdc2_one.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-mdc2_one.o: ../cryptlib.h mdc2_one.c
+mdc2_one.o: ../../include/openssl/symhacks.h ../cryptlib.h mdc2_one.c
 mdc2dgst.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-mdc2dgst.o: ../../include/openssl/e_os2.h
-mdc2dgst.o: ../../include/openssl/mdc2.h ../../include/openssl/opensslconf.h
+mdc2dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/mdc2.h
+mdc2dgst.o: ../../include/openssl/opensslconf.h
 mdc2dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 mdc2dgst.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-mdc2dgst.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-mdc2dgst.o: mdc2dgst.c
+mdc2dgst.o: ../../include/openssl/symhacks.h mdc2dgst.c
diff --git a/crypto/ocsp/Makefile b/crypto/ocsp/Makefile
index f5b8445..098e663 100644
--- a/crypto/ocsp/Makefile
+++ b/crypto/ocsp/Makefile
@@ -90,7 +90,7 @@ ocsp_asn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 ocsp_asn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 ocsp_asn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 ocsp_asn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-ocsp_asn.o: ocsp_asn.c
+ocsp_asn.o: ocsp_asn.c ocsp_lcl.h
 ocsp_cl.o: ../../e_os.h ../../include/openssl/asn1.h
 ocsp_cl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 ocsp_cl.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
@@ -106,7 +106,7 @@ ocsp_cl.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
 ocsp_cl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 ocsp_cl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 ocsp_cl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-ocsp_cl.o: ../cryptlib.h ocsp_cl.c
+ocsp_cl.o: ../cryptlib.h ocsp_cl.c ocsp_lcl.h
 ocsp_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 ocsp_err.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
 ocsp_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -135,7 +135,7 @@ ocsp_ext.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
 ocsp_ext.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 ocsp_ext.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 ocsp_ext.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-ocsp_ext.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_ext.c
+ocsp_ext.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_ext.c ocsp_lcl.h
 ocsp_ht.o: ../../e_os.h ../../include/openssl/asn1.h
 ocsp_ht.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 ocsp_ht.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
@@ -165,7 +165,7 @@ ocsp_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
 ocsp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 ocsp_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 ocsp_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-ocsp_lib.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_lib.c
+ocsp_lib.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_lcl.h ocsp_lib.c
 ocsp_prn.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 ocsp_prn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
 ocsp_prn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -180,7 +180,7 @@ ocsp_prn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 ocsp_prn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 ocsp_prn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 ocsp_prn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-ocsp_prn.o: ocsp_prn.c
+ocsp_prn.o: ocsp_lcl.h ocsp_prn.c
 ocsp_srv.o: ../../e_os.h ../../include/openssl/asn1.h
 ocsp_srv.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 ocsp_srv.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
@@ -196,7 +196,7 @@ ocsp_srv.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
 ocsp_srv.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 ocsp_srv.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 ocsp_srv.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-ocsp_srv.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_srv.c
+ocsp_srv.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_lcl.h ocsp_srv.c
 ocsp_vfy.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 ocsp_vfy.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
 ocsp_vfy.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -210,4 +210,18 @@ ocsp_vfy.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 ocsp_vfy.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 ocsp_vfy.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 ocsp_vfy.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-ocsp_vfy.o: ocsp_vfy.c
+ocsp_vfy.o: ocsp_lcl.h ocsp_vfy.c
+v3_ocsp.o: ../../e_os.h ../../include/openssl/asn1.h
+v3_ocsp.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+v3_ocsp.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+v3_ocsp.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+v3_ocsp.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+v3_ocsp.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+v3_ocsp.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+v3_ocsp.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
+v3_ocsp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+v3_ocsp.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+v3_ocsp.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+v3_ocsp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+v3_ocsp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+v3_ocsp.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_lcl.h v3_ocsp.c
diff --git a/crypto/pem/Makefile b/crypto/pem/Makefile
index 3664055..b3e554a 100644
--- a/crypto/pem/Makefile
+++ b/crypto/pem/Makefile
@@ -123,21 +123,19 @@ pem_info.o: ../cryptlib.h pem_info.c
 pem_lib.o: ../../e_os.h ../../include/openssl/asn1.h
 pem_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 pem_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-pem_lib.o: ../../include/openssl/e_os2.h
-pem_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-pem_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
-pem_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pem_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
-pem_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-pem_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-pem_lib.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
-pem_lib.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
-pem_lib.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
-pem_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pem_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-pem_lib.o: ../../include/openssl/x509.h
-pem_lib.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h
-pem_lib.o: pem_lib.c
+pem_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+pem_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+pem_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+pem_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+pem_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+pem_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+pem_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
+pem_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h
+pem_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+pem_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+pem_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+pem_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+pem_lib.o: ../cryptlib.h ../include/internal/asn1_int.h pem_lib.c
 pem_oth.o: ../../e_os.h ../../include/openssl/asn1.h
 pem_oth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 pem_oth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -182,8 +180,8 @@ pem_pkey.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
 pem_pkey.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
 pem_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 pem_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-pem_pkey.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h
-pem_pkey.o: pem_pkey.c
+pem_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+pem_pkey.o: ../include/internal/asn1_int.h pem_pkey.c
 pem_seal.o: ../../e_os.h ../../include/openssl/asn1.h
 pem_seal.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 pem_seal.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index 4d4e886..410c2b2 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -66,7 +66,7 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/pkcs12.h>
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 #ifndef OPENSSL_NO_DES
 # include <openssl/des.h>
 #endif
diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c
index 25b1095..fd7e8b0 100644
--- a/crypto/pem/pem_pkey.c
+++ b/crypto/pem/pem_pkey.c
@@ -71,7 +71,7 @@
 #ifndef OPENSSL_NO_DH
 # include <openssl/dh.h>
 #endif
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 int pem_check_suffix(const char *pem_str, const char *suffix);
 
diff --git a/crypto/pkcs7/Makefile b/crypto/pkcs7/Makefile
index effe05f..987bddf 100644
--- a/crypto/pkcs7/Makefile
+++ b/crypto/pkcs7/Makefile
@@ -140,7 +140,7 @@ pk7_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
 pk7_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 pk7_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 pk7_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-pk7_lib.o: ../asn1/asn1_locl.h ../cryptlib.h pk7_lib.c
+pk7_lib.o: ../cryptlib.h ../include/internal/asn1_int.h pk7_lib.c
 pk7_mime.o: ../../e_os.h ../../include/openssl/asn1.h
 pk7_mime.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 pk7_mime.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index 511ae8c..6409d28 100644
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -60,7 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/x509.h>
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
 {
diff --git a/crypto/rsa/Makefile b/crypto/rsa/Makefile
index 18b172c..28213bf 100644
--- a/crypto/rsa/Makefile
+++ b/crypto/rsa/Makefile
@@ -95,7 +95,7 @@ rsa_ameth.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
 rsa_ameth.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 rsa_ameth.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rsa_ameth.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-rsa_ameth.o: ../asn1/asn1_locl.h ../cryptlib.h rsa_ameth.c
+rsa_ameth.o: ../cryptlib.h ../include/internal/asn1_int.h rsa_ameth.c
 rsa_asn1.o: ../../e_os.h ../../include/openssl/asn1.h
 rsa_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 rsa_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -234,8 +234,8 @@ rsa_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
 rsa_pmeth.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 rsa_pmeth.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rsa_pmeth.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-rsa_pmeth.o: ../../include/openssl/x509v3.h ../cryptlib.h ../evp/evp_locl.h
-rsa_pmeth.o: rsa_locl.h rsa_pmeth.c
+rsa_pmeth.o: ../../include/openssl/x509v3.h ../cryptlib.h
+rsa_pmeth.o: ../include/internal/evp_int.h rsa_locl.h rsa_pmeth.c
 rsa_prn.o: ../../e_os.h ../../include/openssl/asn1.h
 rsa_prn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 rsa_prn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
index 071dbb8..46b0fdc 100644
--- a/crypto/rsa/rsa_ameth.c
+++ b/crypto/rsa/rsa_ameth.c
@@ -66,7 +66,7 @@
 #ifndef OPENSSL_NO_CMS
 # include <openssl/cms.h>
 #endif
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 static int rsa_cms_sign(CMS_SignerInfo *si);
 static int rsa_cms_verify(CMS_SignerInfo *si);
diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c
index 0476bf7..0aaca9e 100644
--- a/crypto/rsa/rsa_pmeth.c
+++ b/crypto/rsa/rsa_pmeth.c
@@ -68,7 +68,7 @@
 #ifndef OPENSSL_NO_CMS
 # include <openssl/cms.h>
 #endif
-#include "evp_locl.h"
+#include "internal/evp_int.h"
 #include "rsa_locl.h"
 
 /* RSA pkey context structure */
diff --git a/crypto/x509/Makefile b/crypto/x509/Makefile
index f6cfbec..2a576e0 100644
--- a/crypto/x509/Makefile
+++ b/crypto/x509/Makefile
@@ -123,7 +123,7 @@ x509_att.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 x509_att.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509_att.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 x509_att.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-x509_att.o: ../cryptlib.h x509_att.c
+x509_att.o: ../cryptlib.h x509_att.c x509_lcl.h
 x509_cmp.o: ../../e_os.h ../../include/openssl/asn1.h
 x509_cmp.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 x509_cmp.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
@@ -298,7 +298,7 @@ x509_v3.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 x509_v3.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509_v3.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 x509_v3.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-x509_v3.o: ../cryptlib.h x509_v3.c
+x509_v3.o: ../cryptlib.h x509_lcl.h x509_v3.c
 x509_vfy.o: ../../e_os.h ../../include/openssl/asn1.h
 x509_vfy.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 x509_vfy.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
@@ -407,3 +407,29 @@ x_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x_all.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 x_all.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
 x_all.o: ../cryptlib.h x_all.c
+x_attrib.o: ../../e_os.h ../../include/openssl/asn1.h
+x_attrib.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+x_attrib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+x_attrib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+x_attrib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+x_attrib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+x_attrib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+x_attrib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x_attrib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x_attrib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+x_attrib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x_attrib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+x_attrib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_lcl.h
+x_attrib.o: x_attrib.c
+x_exten.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+x_exten.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+x_exten.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+x_exten.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+x_exten.o: ../../include/openssl/ecdsa.h ../../include/openssl/evp.h
+x_exten.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+x_exten.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x_exten.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x_exten.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+x_exten.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x_exten.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+x_exten.o: ../../include/openssl/x509_vfy.h x509_lcl.h x_exten.c
diff --git a/ssl/Makefile b/ssl/Makefile
index 087f796..90b6ac5 100644
--- a/ssl/Makefile
+++ b/ssl/Makefile
@@ -105,24 +105,26 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-bio_ssl.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+bio_ssl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 bio_ssl.o: ../include/openssl/buffer.h ../include/openssl/comp.h
-bio_ssl.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
-bio_ssl.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
-bio_ssl.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
-bio_ssl.o: ../include/openssl/err.h ../include/openssl/evp.h
-bio_ssl.o: ../include/openssl/hmac.h ../include/openssl/kssl.h
-bio_ssl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
-bio_ssl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-bio_ssl.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-bio_ssl.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-bio_ssl.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
+bio_ssl.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
+bio_ssl.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h
+bio_ssl.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
+bio_ssl.o: ../include/openssl/ecdsa.h ../include/openssl/err.h
+bio_ssl.o: ../include/openssl/evp.h ../include/openssl/hmac.h
+bio_ssl.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
+bio_ssl.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+bio_ssl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+bio_ssl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+bio_ssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+bio_ssl.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
 bio_ssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 bio_ssl.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
 bio_ssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
 bio_ssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 bio_ssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
 bio_ssl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h bio_ssl.c
+bio_ssl.o: ssl_locl.h
 d1_both.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 d1_both.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 d1_both.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
diff --git a/test/Makefile b/test/Makefile
index 6c85b04..fc16227 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -657,19 +657,20 @@ evp_extra_test.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 evp_extra_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 evp_extra_test.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
 evp_extra_test.o: evp_extra_test.c
-evp_test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
+evp_test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 evp_test.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 evp_test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 evp_test.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
-evp_test.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
-evp_test.o: ../include/openssl/err.h ../include/openssl/evp.h
-evp_test.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
-evp_test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-evp_test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-evp_test.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
-evp_test.o: ../include/openssl/sha.h ../include/openssl/stack.h
-evp_test.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
-evp_test.o: ../include/openssl/x509_vfy.h evp_test.c
+evp_test.o: ../include/openssl/ecdsa.h ../include/openssl/err.h
+evp_test.o: ../include/openssl/evp.h ../include/openssl/lhash.h
+evp_test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+evp_test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+evp_test.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+evp_test.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+evp_test.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+evp_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+evp_test.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+evp_test.o: ../include/openssl/x509v3.h evp_test.c
 exptest.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/bn.h
 exptest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 exptest.o: ../include/openssl/err.h ../include/openssl/lhash.h

From steve at openssl.org  Tue Mar 24 12:13:38 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Tue, 24 Mar 2015 12:13:38 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427199218.901657.15326.nullmailer@dev.openssl.org>

The branch master has been updated
       via  4ca5efc2874e094d6382b30416824eda6dde52fe (commit)
      from  86d20cb6fd3267a603a3e4ec549ef1113c13a374 (commit)


- Log -----------------------------------------------------------------
commit 4ca5efc2874e094d6382b30416824eda6dde52fe
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Mar 22 17:34:56 2015 +0000

    Make OCSP response verification more flexible.
    
    If a set of certificates is supplied to OCSP_basic_verify use those in
    addition to any present in the OCSP response as untrusted CAs when
    verifying a certificate chain.
    
    PR#3668
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/ocsp/ocsp_vfy.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/crypto/ocsp/ocsp_vfy.c b/crypto/ocsp/ocsp_vfy.c
index 8beadf7..40a3b01 100644
--- a/crypto/ocsp/ocsp_vfy.c
+++ b/crypto/ocsp/ocsp_vfy.c
@@ -84,6 +84,7 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
 {
     X509 *signer, *x;
     STACK_OF(X509) *chain = NULL;
+    STACK_OF(X509) *untrusted = NULL;
     X509_STORE_CTX ctx;
     int i, ret = 0;
     ret = ocsp_find_signer(&signer, bs, certs, st, flags);
@@ -108,10 +109,20 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
     }
     if (!(flags & OCSP_NOVERIFY)) {
         int init_res;
-        if (flags & OCSP_NOCHAIN)
-            init_res = X509_STORE_CTX_init(&ctx, st, signer, NULL);
-        else
-            init_res = X509_STORE_CTX_init(&ctx, st, signer, bs->certs);
+        if (flags & OCSP_NOCHAIN) {
+            untrusted = NULL;
+        } else if (bs->certs && certs) {
+            untrusted = sk_X509_dup(bs->certs);
+            for (i = 0; i < sk_X509_num(certs); i++) {
+                if (!sk_X509_push(untrusted, sk_X509_value(certs, i))) {
+                    OCSPerr(OCSP_F_OCSP_BASIC_VERIFY, ERR_R_MALLOC_FAILURE);
+                    goto end;
+                }
+            }
+        } else {
+            untrusted = bs->certs;
+        }
+        init_res = X509_STORE_CTX_init(&ctx, st, signer, untrusted);
         if (!init_res) {
             ret = -1;
             OCSPerr(OCSP_F_OCSP_BASIC_VERIFY, ERR_R_X509_LIB);
@@ -162,6 +173,8 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
  end:
     if (chain)
         sk_X509_pop_free(chain, X509_free);
+    if (bs->certs && certs)
+        sk_X509_free(untrusted);
     return ret;
 }
 

From steve at openssl.org  Tue Mar 24 12:19:47 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Tue, 24 Mar 2015 12:19:47 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_0_9_8-stable update
Message-ID: <1427199587.616661.17156.nullmailer@dev.openssl.org>

The branch OpenSSL_0_9_8-stable has been updated
       via  246b35a96e6402583825fcee6a4ce5305e26ec76 (commit)
      from  79cc5417a4099c3e61c806a918665570e9aa3c57 (commit)


- Log -----------------------------------------------------------------
commit 246b35a96e6402583825fcee6a4ce5305e26ec76
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Mar 22 17:34:56 2015 +0000

    Make OCSP response verification more flexible.
    
    If a set of certificates is supplied to OCSP_basic_verify use those in
    addition to any present in the OCSP response as untrusted CAs when
    verifying a certificate chain.
    
    PR#3668
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 4ca5efc2874e094d6382b30416824eda6dde52fe)

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

Summary of changes:
 crypto/ocsp/ocsp_vfy.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/crypto/ocsp/ocsp_vfy.c b/crypto/ocsp/ocsp_vfy.c
index 726ea03..e1ede11 100644
--- a/crypto/ocsp/ocsp_vfy.c
+++ b/crypto/ocsp/ocsp_vfy.c
@@ -83,6 +83,7 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
 {
     X509 *signer, *x;
     STACK_OF(X509) *chain = NULL;
+    STACK_OF(X509) *untrusted = NULL;
     X509_STORE_CTX ctx;
     int i, ret = 0;
     ret = ocsp_find_signer(&signer, bs, certs, st, flags);
@@ -107,10 +108,20 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
     }
     if (!(flags & OCSP_NOVERIFY)) {
         int init_res;
-        if (flags & OCSP_NOCHAIN)
-            init_res = X509_STORE_CTX_init(&ctx, st, signer, NULL);
-        else
-            init_res = X509_STORE_CTX_init(&ctx, st, signer, bs->certs);
+        if (flags & OCSP_NOCHAIN) {
+            untrusted = NULL;
+        } else if (bs->certs && certs) {
+            untrusted = sk_X509_dup(bs->certs);
+            for (i = 0; i < sk_X509_num(certs); i++) {
+                if (!sk_X509_push(untrusted, sk_X509_value(certs, i))) {
+                    OCSPerr(OCSP_F_OCSP_BASIC_VERIFY, ERR_R_MALLOC_FAILURE);
+                    goto end;
+                }
+            }
+        } else {
+            untrusted = bs->certs;
+        }
+        init_res = X509_STORE_CTX_init(&ctx, st, signer, untrusted);
         if (!init_res) {
             ret = -1;
             OCSPerr(OCSP_F_OCSP_BASIC_VERIFY, ERR_R_X509_LIB);
@@ -161,6 +172,8 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
  end:
     if (chain)
         sk_X509_pop_free(chain, X509_free);
+    if (bs->certs && certs)
+        sk_X509_free(untrusted);
     return ret;
 }
 

From steve at openssl.org  Tue Mar 24 12:19:47 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Tue, 24 Mar 2015 12:19:47 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_0-stable update
Message-ID: <1427199587.677941.17179.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_0-stable has been updated
       via  e35e22e1d930217fa0b879e0a7ae34efd94465e4 (commit)
      from  06cf4418cf45253afe401fd4270effd439103dca (commit)


- Log -----------------------------------------------------------------
commit e35e22e1d930217fa0b879e0a7ae34efd94465e4
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Mar 22 17:34:56 2015 +0000

    Make OCSP response verification more flexible.
    
    If a set of certificates is supplied to OCSP_basic_verify use those in
    addition to any present in the OCSP response as untrusted CAs when
    verifying a certificate chain.
    
    PR#3668
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 4ca5efc2874e094d6382b30416824eda6dde52fe)

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

Summary of changes:
 crypto/ocsp/ocsp_vfy.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/crypto/ocsp/ocsp_vfy.c b/crypto/ocsp/ocsp_vfy.c
index 957c5dd..a498731 100644
--- a/crypto/ocsp/ocsp_vfy.c
+++ b/crypto/ocsp/ocsp_vfy.c
@@ -83,6 +83,7 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
 {
     X509 *signer, *x;
     STACK_OF(X509) *chain = NULL;
+    STACK_OF(X509) *untrusted = NULL;
     X509_STORE_CTX ctx;
     int i, ret = 0;
     ret = ocsp_find_signer(&signer, bs, certs, st, flags);
@@ -107,10 +108,20 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
     }
     if (!(flags & OCSP_NOVERIFY)) {
         int init_res;
-        if (flags & OCSP_NOCHAIN)
-            init_res = X509_STORE_CTX_init(&ctx, st, signer, NULL);
-        else
-            init_res = X509_STORE_CTX_init(&ctx, st, signer, bs->certs);
+        if (flags & OCSP_NOCHAIN) {
+            untrusted = NULL;
+        } else if (bs->certs && certs) {
+            untrusted = sk_X509_dup(bs->certs);
+            for (i = 0; i < sk_X509_num(certs); i++) {
+                if (!sk_X509_push(untrusted, sk_X509_value(certs, i))) {
+                    OCSPerr(OCSP_F_OCSP_BASIC_VERIFY, ERR_R_MALLOC_FAILURE);
+                    goto end;
+                }
+            }
+        } else {
+            untrusted = bs->certs;
+        }
+        init_res = X509_STORE_CTX_init(&ctx, st, signer, untrusted);
         if (!init_res) {
             ret = -1;
             OCSPerr(OCSP_F_OCSP_BASIC_VERIFY, ERR_R_X509_LIB);
@@ -161,6 +172,8 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
  end:
     if (chain)
         sk_X509_pop_free(chain, X509_free);
+    if (bs->certs && certs)
+        sk_X509_free(untrusted);
     return ret;
 }
 

From steve at openssl.org  Tue Mar 24 12:19:47 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Tue, 24 Mar 2015 12:19:47 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1427199587.850967.17226.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  4ba9a4265bd445428bf5bc94b6adf469de90297e (commit)
      from  bc0eb82b852cb10a3f34cbd17fdda7d8b4bdeb0e (commit)


- Log -----------------------------------------------------------------
commit 4ba9a4265bd445428bf5bc94b6adf469de90297e
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Mar 22 17:34:56 2015 +0000

    Make OCSP response verification more flexible.
    
    If a set of certificates is supplied to OCSP_basic_verify use those in
    addition to any present in the OCSP response as untrusted CAs when
    verifying a certificate chain.
    
    PR#3668
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 4ca5efc2874e094d6382b30416824eda6dde52fe)

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

Summary of changes:
 crypto/ocsp/ocsp_vfy.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/crypto/ocsp/ocsp_vfy.c b/crypto/ocsp/ocsp_vfy.c
index 6c0ccb5..d4a257c 100644
--- a/crypto/ocsp/ocsp_vfy.c
+++ b/crypto/ocsp/ocsp_vfy.c
@@ -83,6 +83,7 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
 {
     X509 *signer, *x;
     STACK_OF(X509) *chain = NULL;
+    STACK_OF(X509) *untrusted = NULL;
     X509_STORE_CTX ctx;
     int i, ret = 0;
     ret = ocsp_find_signer(&signer, bs, certs, st, flags);
@@ -107,10 +108,20 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
     }
     if (!(flags & OCSP_NOVERIFY)) {
         int init_res;
-        if (flags & OCSP_NOCHAIN)
-            init_res = X509_STORE_CTX_init(&ctx, st, signer, NULL);
-        else
-            init_res = X509_STORE_CTX_init(&ctx, st, signer, bs->certs);
+        if (flags & OCSP_NOCHAIN) {
+            untrusted = NULL;
+        } else if (bs->certs && certs) {
+            untrusted = sk_X509_dup(bs->certs);
+            for (i = 0; i < sk_X509_num(certs); i++) {
+                if (!sk_X509_push(untrusted, sk_X509_value(certs, i))) {
+                    OCSPerr(OCSP_F_OCSP_BASIC_VERIFY, ERR_R_MALLOC_FAILURE);
+                    goto end;
+                }
+            }
+        } else {
+            untrusted = bs->certs;
+        }
+        init_res = X509_STORE_CTX_init(&ctx, st, signer, untrusted);
         if (!init_res) {
             ret = -1;
             OCSPerr(OCSP_F_OCSP_BASIC_VERIFY, ERR_R_X509_LIB);
@@ -161,6 +172,8 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
  end:
     if (chain)
         sk_X509_pop_free(chain, X509_free);
+    if (bs->certs && certs)
+        sk_X509_free(untrusted);
     return ret;
 }
 

From steve at openssl.org  Tue Mar 24 12:19:47 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Tue, 24 Mar 2015 12:19:47 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1427199587.758377.17205.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  d635f4bb36ed65340f288822738f65e3c8d16af8 (commit)
      from  117476ba30f6afa3a634c2e2c4860d59fbe06572 (commit)


- Log -----------------------------------------------------------------
commit d635f4bb36ed65340f288822738f65e3c8d16af8
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Mar 22 17:34:56 2015 +0000

    Make OCSP response verification more flexible.
    
    If a set of certificates is supplied to OCSP_basic_verify use those in
    addition to any present in the OCSP response as untrusted CAs when
    verifying a certificate chain.
    
    PR#3668
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 4ca5efc2874e094d6382b30416824eda6dde52fe)

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

Summary of changes:
 crypto/ocsp/ocsp_vfy.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/crypto/ocsp/ocsp_vfy.c b/crypto/ocsp/ocsp_vfy.c
index 6c0ccb5..d4a257c 100644
--- a/crypto/ocsp/ocsp_vfy.c
+++ b/crypto/ocsp/ocsp_vfy.c
@@ -83,6 +83,7 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
 {
     X509 *signer, *x;
     STACK_OF(X509) *chain = NULL;
+    STACK_OF(X509) *untrusted = NULL;
     X509_STORE_CTX ctx;
     int i, ret = 0;
     ret = ocsp_find_signer(&signer, bs, certs, st, flags);
@@ -107,10 +108,20 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
     }
     if (!(flags & OCSP_NOVERIFY)) {
         int init_res;
-        if (flags & OCSP_NOCHAIN)
-            init_res = X509_STORE_CTX_init(&ctx, st, signer, NULL);
-        else
-            init_res = X509_STORE_CTX_init(&ctx, st, signer, bs->certs);
+        if (flags & OCSP_NOCHAIN) {
+            untrusted = NULL;
+        } else if (bs->certs && certs) {
+            untrusted = sk_X509_dup(bs->certs);
+            for (i = 0; i < sk_X509_num(certs); i++) {
+                if (!sk_X509_push(untrusted, sk_X509_value(certs, i))) {
+                    OCSPerr(OCSP_F_OCSP_BASIC_VERIFY, ERR_R_MALLOC_FAILURE);
+                    goto end;
+                }
+            }
+        } else {
+            untrusted = bs->certs;
+        }
+        init_res = X509_STORE_CTX_init(&ctx, st, signer, untrusted);
         if (!init_res) {
             ret = -1;
             OCSPerr(OCSP_F_OCSP_BASIC_VERIFY, ERR_R_X509_LIB);
@@ -161,6 +172,8 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
  end:
     if (chain)
         sk_X509_pop_free(chain, X509_free);
+    if (bs->certs && certs)
+        sk_X509_free(untrusted);
     return ret;
 }
 

From steve at openssl.org  Tue Mar 24 12:26:29 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Tue, 24 Mar 2015 12:26:29 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427199989.738670.18750.nullmailer@dev.openssl.org>

The branch master has been updated
       via  7b68c30da01b4eedcd546f81844156646387cacb (commit)
      from  4ca5efc2874e094d6382b30416824eda6dde52fe (commit)


- Log -----------------------------------------------------------------
commit 7b68c30da01b4eedcd546f81844156646387cacb
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Fri Mar 13 14:16:32 2015 +0000

    Configuration file examples.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 doc/apps/config.pod | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/doc/apps/config.pod b/doc/apps/config.pod
index d5cce54..e125915 100644
--- a/doc/apps/config.pod
+++ b/doc/apps/config.pod
@@ -277,6 +277,59 @@ priority and B</tmp> used if neither is defined:
  # The above value is used if TEMP isn't in the environment
  tmpfile=${ENV::TEMP}/tmp.filename
 
+Simple OpenSSL library configuration example to enter FIPS mode:
+
+ # Default appname: should match "appname" parameter (if any)
+ # supplied to CONF_modules_load_file et al.
+ openssl_conf = openssl_conf_section
+
+ [openssl_conf_section]
+ # Configuration module list
+ alg_section = evp_sect
+
+ [evp_sect]
+ # Set to "yes" to enter FIPS mode if supported
+ fips_mode = yes
+
+Note: in the above example you will get an error in non FIPS capable versions
+of OpenSSL.
+
+More complex OpenSSL library configuration. Add OID and don't enter FIPS mode:
+
+ # Default appname: should match "appname" parameter (if any)
+ # supplied to CONF_modules_load_file et al.
+ openssl_conf = openssl_conf_section
+
+ [openssl_conf_section]
+ # Configuration module list
+ alg_section = evp_sect
+ oid_section = new_oids
+
+ [evp_sect]
+ # This will have no effect as FIPS mode is off by default.
+ # Set to "yes" to enter FIPS mode, if supported
+ fips_mode = no
+
+ [new_oids]
+ # New OID, just short name
+ newoid1 = 1.2.3.4.1
+ # New OID shortname and long name
+ newoid2 = New OID 2 long name, 1.2.3.4.2
+
+The above examples can be used with with any application supporting library
+configuration if "openssl_conf" is modified to match the appropriate "appname".
+
+For example if the second sample file above is saved to "example.cnf" then
+the command line:
+
+ OPENSSL_CONF=example.cnf openssl asn1parse -genstr OID:1.2.3.4.1
+
+will output:
+
+    0:d=0  hl=2 l=   4 prim: OBJECT            :newoid1
+
+showing that the OID "newoid1" has been added as "1.2.3.4.1".
+
 =head1 BUGS
 
 Currently there is no way to include characters using the octal B<\nnn>

From steve at openssl.org  Tue Mar 24 12:28:08 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Tue, 24 Mar 2015 12:28:08 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1427200088.923252.26508.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  d3a9eaccc1a043cc32ab5cfe9ffba02b679810cc (commit)
      from  4ba9a4265bd445428bf5bc94b6adf469de90297e (commit)


- Log -----------------------------------------------------------------
commit d3a9eaccc1a043cc32ab5cfe9ffba02b679810cc
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Fri Mar 13 14:16:32 2015 +0000

    Configuration file examples.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 7b68c30da01b4eedcd546f81844156646387cacb)

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

Summary of changes:
 doc/apps/config.pod | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/doc/apps/config.pod b/doc/apps/config.pod
index d5cce54..e125915 100644
--- a/doc/apps/config.pod
+++ b/doc/apps/config.pod
@@ -277,6 +277,59 @@ priority and B</tmp> used if neither is defined:
  # The above value is used if TEMP isn't in the environment
  tmpfile=${ENV::TEMP}/tmp.filename
 
+Simple OpenSSL library configuration example to enter FIPS mode:
+
+ # Default appname: should match "appname" parameter (if any)
+ # supplied to CONF_modules_load_file et al.
+ openssl_conf = openssl_conf_section
+
+ [openssl_conf_section]
+ # Configuration module list
+ alg_section = evp_sect
+
+ [evp_sect]
+ # Set to "yes" to enter FIPS mode if supported
+ fips_mode = yes
+
+Note: in the above example you will get an error in non FIPS capable versions
+of OpenSSL.
+
+More complex OpenSSL library configuration. Add OID and don't enter FIPS mode:
+
+ # Default appname: should match "appname" parameter (if any)
+ # supplied to CONF_modules_load_file et al.
+ openssl_conf = openssl_conf_section
+
+ [openssl_conf_section]
+ # Configuration module list
+ alg_section = evp_sect
+ oid_section = new_oids
+
+ [evp_sect]
+ # This will have no effect as FIPS mode is off by default.
+ # Set to "yes" to enter FIPS mode, if supported
+ fips_mode = no
+
+ [new_oids]
+ # New OID, just short name
+ newoid1 = 1.2.3.4.1
+ # New OID shortname and long name
+ newoid2 = New OID 2 long name, 1.2.3.4.2
+
+The above examples can be used with with any application supporting library
+configuration if "openssl_conf" is modified to match the appropriate "appname".
+
+For example if the second sample file above is saved to "example.cnf" then
+the command line:
+
+ OPENSSL_CONF=example.cnf openssl asn1parse -genstr OID:1.2.3.4.1
+
+will output:
+
+    0:d=0  hl=2 l=   4 prim: OBJECT            :newoid1
+
+showing that the OID "newoid1" has been added as "1.2.3.4.1".
+
 =head1 BUGS
 
 Currently there is no way to include characters using the octal B<\nnn>

From steve at openssl.org  Tue Mar 24 12:28:08 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Tue, 24 Mar 2015 12:28:08 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1427200088.856933.26485.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  5d74b4b4b3562ebb192cbebcbfadcce751625054 (commit)
      from  d635f4bb36ed65340f288822738f65e3c8d16af8 (commit)


- Log -----------------------------------------------------------------
commit 5d74b4b4b3562ebb192cbebcbfadcce751625054
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Fri Mar 13 14:16:32 2015 +0000

    Configuration file examples.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 7b68c30da01b4eedcd546f81844156646387cacb)

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

Summary of changes:
 doc/apps/config.pod | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/doc/apps/config.pod b/doc/apps/config.pod
index d5cce54..e125915 100644
--- a/doc/apps/config.pod
+++ b/doc/apps/config.pod
@@ -277,6 +277,59 @@ priority and B</tmp> used if neither is defined:
  # The above value is used if TEMP isn't in the environment
  tmpfile=${ENV::TEMP}/tmp.filename
 
+Simple OpenSSL library configuration example to enter FIPS mode:
+
+ # Default appname: should match "appname" parameter (if any)
+ # supplied to CONF_modules_load_file et al.
+ openssl_conf = openssl_conf_section
+
+ [openssl_conf_section]
+ # Configuration module list
+ alg_section = evp_sect
+
+ [evp_sect]
+ # Set to "yes" to enter FIPS mode if supported
+ fips_mode = yes
+
+Note: in the above example you will get an error in non FIPS capable versions
+of OpenSSL.
+
+More complex OpenSSL library configuration. Add OID and don't enter FIPS mode:
+
+ # Default appname: should match "appname" parameter (if any)
+ # supplied to CONF_modules_load_file et al.
+ openssl_conf = openssl_conf_section
+
+ [openssl_conf_section]
+ # Configuration module list
+ alg_section = evp_sect
+ oid_section = new_oids
+
+ [evp_sect]
+ # This will have no effect as FIPS mode is off by default.
+ # Set to "yes" to enter FIPS mode, if supported
+ fips_mode = no
+
+ [new_oids]
+ # New OID, just short name
+ newoid1 = 1.2.3.4.1
+ # New OID shortname and long name
+ newoid2 = New OID 2 long name, 1.2.3.4.2
+
+The above examples can be used with with any application supporting library
+configuration if "openssl_conf" is modified to match the appropriate "appname".
+
+For example if the second sample file above is saved to "example.cnf" then
+the command line:
+
+ OPENSSL_CONF=example.cnf openssl asn1parse -genstr OID:1.2.3.4.1
+
+will output:
+
+    0:d=0  hl=2 l=   4 prim: OBJECT            :newoid1
+
+showing that the OID "newoid1" has been added as "1.2.3.4.1".
+
 =head1 BUGS
 
 Currently there is no way to include characters using the octal B<\nnn>

From steve at openssl.org  Tue Mar 24 17:38:07 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Tue, 24 Mar 2015 17:38:07 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427218687.938349.28889.nullmailer@dev.openssl.org>

The branch master has been updated
       via  e5991ec528b1c339062440811e2641f5ea2b328b (commit)
       via  2e430277578d3dd586cd005682a54a59d6158146 (commit)
      from  7b68c30da01b4eedcd546f81844156646387cacb (commit)


- Log -----------------------------------------------------------------
commit e5991ec528b1c339062440811e2641f5ea2b328b
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Mar 24 16:21:21 2015 +0000

    Fix verify algorithm.
    
    Disable loop checking when we retry verification with an alternative path.
    This fixes the case where an intermediate CA is explicitly trusted and part
    of the untrusted certificate list. By disabling loop checking for this case
    the untrusted CA can be replaced by the explicitly trusted case and
    verification will succeed.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 2e430277578d3dd586cd005682a54a59d6158146
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Mar 15 16:26:04 2015 +0000

    make ASN1_OBJECT opaque
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/asn1/a_object.c             |  1 +
 crypto/asn1/asn1.h                 | 16 ----------------
 crypto/asn1/asn_moid.c             |  1 +
 crypto/asn1/tasn_enc.c             |  1 +
 crypto/evp/evp_lib.c               |  2 +-
 crypto/include/internal/asn1_int.h | 16 ++++++++++++++++
 crypto/objects/obj_dat.c           | 15 +++++++++++++++
 crypto/objects/obj_lib.c           |  1 +
 crypto/objects/objects.h           |  3 +++
 crypto/rsa/rsa_sign.c              |  2 +-
 crypto/x509/x509_vfy.c             |  8 ++++++++
 doc/crypto/OBJ_nid2obj.pod         | 14 ++++++++++++++
 engines/e_4758cca.c                |  4 ++--
 13 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c
index c780d8e..ddc3aaf 100644
--- a/crypto/asn1/a_object.c
+++ b/crypto/asn1/a_object.c
@@ -63,6 +63,7 @@
 #include <openssl/asn1.h>
 #include <openssl/objects.h>
 #include <openssl/bn.h>
+#include "internal/asn1_int.h"
 
 int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp)
 {
diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index ef5b9e8..a00c08a 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -194,22 +194,6 @@ typedef struct asn1_const_ctx_st {
     int line;                   /* used in error processing */
 } ASN1_const_CTX;
 
-/*
- * These are used internally in the ASN1_OBJECT to keep track of whether the
- * names and data need to be free()ed
- */
-# define ASN1_OBJECT_FLAG_DYNAMIC         0x01/* internal use */
-# define ASN1_OBJECT_FLAG_CRITICAL        0x02/* critical x509v3 object id */
-# define ASN1_OBJECT_FLAG_DYNAMIC_STRINGS 0x04/* internal use */
-# define ASN1_OBJECT_FLAG_DYNAMIC_DATA    0x08/* internal use */
-struct asn1_object_st {
-    const char *sn, *ln;
-    int nid;
-    int length;
-    const unsigned char *data;  /* data remains const after init */
-    int flags;                  /* Should we free this one */
-};
-
 # define ASN1_STRING_FLAG_BITS_LEFT 0x08/* Set if 0x07 has bits left value */
 /*
  * This indicates that the ASN1_STRING is not a real value but just a place
diff --git a/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c
index fab2dd9..da7e291 100644
--- a/crypto/asn1/asn_moid.c
+++ b/crypto/asn1/asn_moid.c
@@ -64,6 +64,7 @@
 #include <openssl/conf.h>
 #include <openssl/dso.h>
 #include <openssl/x509.h>
+#include "internal/asn1_int.h"
 
 /* Simple ASN1 OID module: add all objects in a given section */
 
diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c
index 1c200b0..1d1f838 100644
--- a/crypto/asn1/tasn_enc.c
+++ b/crypto/asn1/tasn_enc.c
@@ -63,6 +63,7 @@
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/objects.h>
+#include "internal/asn1_int.h"
 
 static int asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out,
                                  const ASN1_ITEM *it, int tag, int aclass);
diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index 966d9fb..8d00029 100644
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -176,7 +176,7 @@ int EVP_CIPHER_type(const EVP_CIPHER *ctx)
     default:
         /* Check it has an OID and it is valid */
         otmp = OBJ_nid2obj(nid);
-        if (!otmp || !otmp->data)
+        if (OBJ_get0_data(otmp) == NULL)
             nid = NID_undef;
         ASN1_OBJECT_free(otmp);
         return nid;
diff --git a/crypto/include/internal/asn1_int.h b/crypto/include/internal/asn1_int.h
index 58759be..20c8f40 100644
--- a/crypto/include/internal/asn1_int.h
+++ b/crypto/include/internal/asn1_int.h
@@ -103,3 +103,19 @@ struct evp_pkey_asn1_method_st {
                       X509_ALGOR *alg1, X509_ALGOR *alg2,
                       ASN1_BIT_STRING *sig);
 } /* EVP_PKEY_ASN1_METHOD */ ;
+
+/*
+ * These are used internally in the ASN1_OBJECT to keep track of whether the
+ * names and data need to be free()ed
+ */
+# define ASN1_OBJECT_FLAG_DYNAMIC         0x01/* internal use */
+# define ASN1_OBJECT_FLAG_CRITICAL        0x02/* critical x509v3 object id */
+# define ASN1_OBJECT_FLAG_DYNAMIC_STRINGS 0x04/* internal use */
+# define ASN1_OBJECT_FLAG_DYNAMIC_DATA    0x08/* internal use */
+struct asn1_object_st {
+    const char *sn, *ln;
+    int nid;
+    int length;
+    const unsigned char *data;  /* data remains const after init */
+    int flags;                  /* Should we free this one */
+};
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index e7366af..5c861d1 100644
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -64,6 +64,7 @@
 #include <openssl/asn1.h>
 #include <openssl/objects.h>
 #include <openssl/bn.h>
+#include "internal/asn1_int.h"
 
 /* obj_dat.h is generated from objects.h by obj_dat.pl */
 #include "obj_dat.h"
@@ -781,3 +782,17 @@ int OBJ_create(const char *oid, const char *sn, const char *ln)
     OPENSSL_free(buf);
     return (ok);
 }
+
+size_t OBJ_length(const ASN1_OBJECT *obj)
+{
+    if (obj == NULL)
+        return 0;
+    return obj->length;
+}
+
+const unsigned char *OBJ_get0_data(const ASN1_OBJECT *obj)
+{
+    if (obj == NULL)
+        return NULL;
+    return obj->data;
+}
diff --git a/crypto/objects/obj_lib.c b/crypto/objects/obj_lib.c
index 8851baf..0bcb5df 100644
--- a/crypto/objects/obj_lib.c
+++ b/crypto/objects/obj_lib.c
@@ -61,6 +61,7 @@
 #include <openssl/lhash.h>
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
+#include "internal/asn1_int.h"
 
 ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o)
 {
diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h
index b8dafa8..165817f 100644
--- a/crypto/objects/objects.h
+++ b/crypto/objects/objects.h
@@ -1107,6 +1107,9 @@ int OBJ_create(const char *oid, const char *sn, const char *ln);
 void OBJ_cleanup(void);
 int OBJ_create_objects(BIO *in);
 
+size_t OBJ_length(const ASN1_OBJECT *obj);
+const unsigned char *OBJ_get0_data(const ASN1_OBJECT *obj);
+
 int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid);
 int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid);
 int OBJ_add_sigid(int signid, int dig_id, int pkey_id);
diff --git a/crypto/rsa/rsa_sign.c b/crypto/rsa/rsa_sign.c
index cc45e40..a521d11 100644
--- a/crypto/rsa/rsa_sign.c
+++ b/crypto/rsa/rsa_sign.c
@@ -95,7 +95,7 @@ int RSA_sign(int type, const unsigned char *m, unsigned int m_len,
             RSAerr(RSA_F_RSA_SIGN, RSA_R_UNKNOWN_ALGORITHM_TYPE);
             return (0);
         }
-        if (sig.algor->algorithm->length == 0) {
+        if (OBJ_length(sig.algor->algorithm) == 0) {
             RSAerr(RSA_F_RSA_SIGN,
                    RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD);
             return (0);
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index bb6e1ce..61f02b5 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -365,8 +365,16 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
             && !(ctx->param->flags & X509_V_FLAG_TRUSTED_FIRST)
             && !(ctx->param->flags & X509_V_FLAG_NO_ALT_CHAINS)) {
             while (j-- > 1) {
+                STACK_OF(X509) *chtmp = ctx->chain;
                 xtmp2 = sk_X509_value(ctx->chain, j - 1);
+                /*
+                 * Temporarily set chain to NULL so we don't discount
+                 * duplicates: the same certificate could be an untrusted
+                 * CA found in the trusted store.
+                 */
+                ctx->chain = NULL;
                 ok = ctx->get_issuer(&xtmp, ctx, xtmp2);
+                ctx->chain = chtmp;
                 if (ok < 0)
                     goto end;
                 /* Check if we found an alternate chain */
diff --git a/doc/crypto/OBJ_nid2obj.pod b/doc/crypto/OBJ_nid2obj.pod
index 1e45dd4..648204e 100644
--- a/doc/crypto/OBJ_nid2obj.pod
+++ b/doc/crypto/OBJ_nid2obj.pod
@@ -29,6 +29,9 @@ functions
  int OBJ_create(const char *oid,const char *sn,const char *ln);
  void OBJ_cleanup(void);
 
+ size_t OBJ_length(const ASN1_OBJECT *obj);
+ const unsigned char *OBJ_get0_data(const ASN1_OBJECT *obj);
+
 =head1 DESCRIPTION
 
 The ASN1 object utility functions process ASN1_OBJECT structures which are
@@ -70,6 +73,11 @@ OBJ_cleanup() cleans up OpenSSLs internal object table: this should
 be called before an application exits if any new objects were added
 using OBJ_create().
 
+OBJ_length() returns the size of the content octets of B<obj>.
+
+OBJ_get0_data() returns a pointer to the content octets of B<obj>.
+The returned pointer is an internal pointer which B<must not> be freed.
+
 =head1 NOTES
 
 Objects in OpenSSL can have a short name, a long name and a numerical
@@ -96,6 +104,12 @@ Objects do not need to be in the internal tables to be processed,
 the functions OBJ_txt2obj() and OBJ_obj2txt() can process the numerical
 form of an OID.
 
+Some objects are used to reprsent algorithms which do not have a
+corresponding ASN.1 OBJECT IDENTIFIER encoding (for example no OID currently
+exists for a particular algorithm). As a result they B<cannot> be encoded or
+decoded as part of ASN.1 structures. Applications can determine if there
+is a corresponding OBJECT IDENTIFIER by checking OBJ_length() is not zero.
+
 =head1 EXAMPLES
 
 Create an object for B<commonName>:
diff --git a/engines/e_4758cca.c b/engines/e_4758cca.c
index 5f77198..3b593c7 100644
--- a/engines/e_4758cca.c
+++ b/engines/e_4758cca.c
@@ -641,7 +641,7 @@ static int cca_rsa_verify(int type, const unsigned char *m,
             return 0;
         }
 
-        if (!algorithm.algorithm->length) {
+        if (!OBJ_length(algorithm.algorithm)) {
             CCA4758err(CCA4758_F_CCA_RSA_VERIFY,
                        CCA4758_R_ASN1_OID_UNKNOWN_FOR_MD);
             return 0;
@@ -754,7 +754,7 @@ static int cca_rsa_sign(int type, const unsigned char *m, unsigned int m_len,
             return 0;
         }
 
-        if (!algorithm.algorithm->length) {
+        if (!OBJ_length(algorithm.algorithm)) {
             CCA4758err(CCA4758_F_CCA_RSA_SIGN,
                        CCA4758_R_ASN1_OID_UNKNOWN_FOR_MD);
             return 0;

From levitte at openssl.org  Tue Mar 24 18:47:47 2015
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 24 Mar 2015 18:47:47 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427222867.914600.16461.nullmailer@dev.openssl.org>

The branch master has been updated
       via  e30a64fae76a3eea6e512eacd06aa5e487427fbc (commit)
       via  fa327fafe2184e6f1d7f3f2a663d00034c5d22b3 (commit)
      from  e5991ec528b1c339062440811e2641f5ea2b328b (commit)


- Log -----------------------------------------------------------------
commit e30a64fae76a3eea6e512eacd06aa5e487427fbc
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 24 15:11:29 2015 +0100

    Update ordinals
    
    Thanks to the change of mkdef.pl, a few more deprecated functions were
    properly defined in util/libeay.num.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit fa327fafe2184e6f1d7f3f2a663d00034c5d22b3
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 24 15:02:51 2015 +0100

    Teach mkdef.pl to handle multiline declarations.
    
    For the moment, this is specially crafted for DECLARE_DEPRECATED because
    that's where we found the problem, but it can easily be expanded to other
    types of special delarations when needed.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 util/libeay.num |  8 ++++----
 util/mkdef.pl   | 19 ++++++++++++++++---
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/util/libeay.num b/util/libeay.num
index 623f639..957ef3f 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -126,7 +126,7 @@ BN_gcd                                  131	EXIST::FUNCTION:
 BN_generate_prime                       132	EXIST::FUNCTION:DEPRECATED
 BN_get_word                             133	EXIST::FUNCTION:
 BN_is_bit_set                           134	EXIST::FUNCTION:
-BN_is_prime                             135	NOEXIST::FUNCTION:
+BN_is_prime                             135	EXIST::FUNCTION:DEPRECATED
 BN_lshift                               136	EXIST::FUNCTION:
 BN_lshift1                              137	EXIST::FUNCTION:
 BN_mask_bits                            138	EXIST::FUNCTION:
@@ -1744,7 +1744,7 @@ X509_REQ_add1_attr_by_txt               2217	EXIST::FUNCTION:
 X509_ATTRIBUTE_create_by_txt            2218	EXIST::FUNCTION:
 X509at_add1_attr_by_txt                 2219	EXIST::FUNCTION:
 BN_pseudo_rand                          2239	EXIST::FUNCTION:
-BN_is_prime_fasttest                    2240	NOEXIST::FUNCTION:
+BN_is_prime_fasttest                    2240	EXIST::FUNCTION:DEPRECATED
 BN_CTX_end                              2241	EXIST::FUNCTION:
 BN_CTX_start                            2242	EXIST::FUNCTION:
 BN_CTX_get                              2243	EXIST::FUNCTION:
@@ -2900,7 +2900,7 @@ STORE_method_set_list_start_function    3336	NOEXIST::FUNCTION:
 BN_BLINDING_invert_ex                   3337	EXIST::FUNCTION:
 NAME_CONSTRAINTS_free                   3338	EXIST::FUNCTION:
 STORE_ATTR_INFO_set_number              3339	NOEXIST::FUNCTION:
-BN_BLINDING_get_thread_id               3340	NOEXIST::FUNCTION:
+BN_BLINDING_get_thread_id               3340	EXIST::FUNCTION:DEPRECATED
 X509_STORE_CTX_set0_param               3341	EXIST::FUNCTION:
 POLICY_MAPPING_it                       3342	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 POLICY_MAPPING_it                       3342	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -3368,7 +3368,7 @@ pqueue_insert                           3766	EXIST::FUNCTION:
 pitem_free                              3767	EXIST::FUNCTION:
 BN_GF2m_mod_inv_arr                     3768	EXIST::FUNCTION:EC2M
 ENGINE_unregister_ECDSA                 3769	EXIST::FUNCTION:ENGINE
-BN_BLINDING_set_thread_id               3770	NOEXIST::FUNCTION:
+BN_BLINDING_set_thread_id               3770	EXIST::FUNCTION:DEPRECATED
 get_rfc3526_prime_8192                  3771	EXIST::FUNCTION:
 X509_VERIFY_PARAM_clear_flags           3772	EXIST::FUNCTION:
 get_rfc2409_prime_1024                  3773	EXIST::FUNCTION:
diff --git a/util/mkdef.pl b/util/mkdef.pl
index b549a60..1d47561 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -487,7 +487,14 @@ sub do_defs
 		while(<IN>) {
 			if($parens > 0) {
 				#Inside a DECLARE_DEPRECATED
-				$parens += count_parens($_);
+				$stored_multiline .= $_;
+				chomp $stored_multiline;
+				print STDERR "DEBUG: Continuing multiline DEPRECATED: $stored_multiline\n" if $debug;
+				$parens = count_parens($stored_multiline);
+				if ($parens == 0) {
+					$stored_multiline =~ /^\s*DECLARE_DEPRECATED\s*\(\s*(\w*(\s|\*|\w)*)/;
+					$def .= "$1(void);";
+				}
 				next;
 			}
 			if (/\/\* Error codes for the \w+ functions\. \*\//)
@@ -881,9 +888,15 @@ sub do_defs
 						      "EXPORT_VAR_AS_FUNCTION",
 						      "FUNCTION");
 				} elsif (/^\s*DECLARE_DEPRECATED\s*\(\s*(\w*(\s|\*|\w)*)/) {
-					$def .= "$1(void);";
 					$parens = count_parens($_);
-					next;
+					if ($parens == 0) {
+						$def .= "$1(void);";
+					} else {
+						$stored_multiline = $_;
+						chomp $stored_multiline;
+						print STDERR "DEBUG: Found multiline DEPRECATED starting with: $stored_multiline\n" if $debug;
+						next;
+					}
 				} elsif ($tag{'CONST_STRICT'} != 1) {
 					if (/\{|\/\*|\([^\)]*$/) {
 						$line = $_;

From steve at openssl.org  Tue Mar 24 19:12:03 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Tue, 24 Mar 2015 19:12:03 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427224323.640240.22548.nullmailer@dev.openssl.org>

The branch master has been updated
       via  1300705a47b9c9498b15a384c6c5348adc342e2c (commit)
      from  e30a64fae76a3eea6e512eacd06aa5e487427fbc (commit)


- Log -----------------------------------------------------------------
commit 1300705a47b9c9498b15a384c6c5348adc342e2c
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Mar 24 18:58:51 2015 +0000

    update ordinals
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 util/libeay.num | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/util/libeay.num b/util/libeay.num
index 957ef3f..8930f2c 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4550,3 +4550,5 @@ EVP_camellia_128_ctr                    4908	EXIST::FUNCTION:CAMELLIA
 EVP_camellia_256_ctr                    4909	EXIST::FUNCTION:CAMELLIA
 EVP_camellia_192_ctr                    4910	EXIST::FUNCTION:CAMELLIA
 OCSP_resp_get0_signature                4911	EXIST::FUNCTION:
+OBJ_length                              4912	EXIST::FUNCTION:
+OBJ_get0_data                           4913	EXIST::FUNCTION:

From steve at openssl.org  Tue Mar 24 21:23:26 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Tue, 24 Mar 2015 21:23:26 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1427232206.995144.12031.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  8509128179a93e0b797ab80dadc2dff63ae194b3 (commit)
      from  d3a9eaccc1a043cc32ab5cfe9ffba02b679810cc (commit)


- Log -----------------------------------------------------------------
commit 8509128179a93e0b797ab80dadc2dff63ae194b3
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Mar 24 13:15:33 2015 +0000

    Fix OCSP tests.
    
    OCSP verification changes mean the OCSP tests now need -trusted_first
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 test/tocsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/tocsp b/test/tocsp
index 5fc291c..48e81bf 100644
--- a/test/tocsp
+++ b/test/tocsp
@@ -8,7 +8,7 @@ check_time="-attime 1355875200"
 test_ocsp () {
 
 	$cmd base64 -d -in $ocspdir/$1 | \
-		$cmd ocsp -respin - -partial_chain $check_time \
+		$cmd ocsp -respin - -partial_chain $check_time -trusted_first \
 		-CAfile $ocspdir/$2 -verify_other $ocspdir/$2 -CApath /dev/null
 	[ $? != $3 ] && exit 1
 }

From kurt at openssl.org  Tue Mar 24 21:55:14 2015
From: kurt at openssl.org (Kurt Roeckx)
Date: Tue, 24 Mar 2015 21:55:14 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1427234114.640009.17386.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  fe82be2b33714949e24f107af94b5b75206a28cd (commit)
      from  8509128179a93e0b797ab80dadc2dff63ae194b3 (commit)


- Log -----------------------------------------------------------------
commit fe82be2b33714949e24f107af94b5b75206a28cd
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sat Mar 14 23:23:26 2015 +0100

    Don't send a for ServerKeyExchange for kDHr and kDHd
    
    The certificate already contains the DH parameters in that case.
    ssl3_send_server_key_exchange() would fail in that case anyway.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 93f1c13619c5b41f2dcfdbf6ae666f867922a87a)

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

Summary of changes:
 ssl/d1_srvr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c
index eafa012..a184150 100644
--- a/ssl/d1_srvr.c
+++ b/ssl/d1_srvr.c
@@ -486,7 +486,7 @@ int dtls1_accept(SSL *s)
 #ifndef OPENSSL_NO_PSK
                 || ((alg_k & SSL_kPSK) && s->ctx->psk_identity_hint)
 #endif
-                || (alg_k & (SSL_kEDH | SSL_kDHr | SSL_kDHd))
+                || (alg_k & SSL_kDHE)
                 || (alg_k & SSL_kEECDH)
                 || ((alg_k & SSL_kRSA)
                     && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL

From kurt at openssl.org  Tue Mar 24 21:59:36 2015
From: kurt at openssl.org (Kurt Roeckx)
Date: Tue, 24 Mar 2015 21:59:36 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1427234376.246151.18299.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  23a9b24aa100cc1c5c7d2c95252f2520680d2e58 (commit)
      from  5d74b4b4b3562ebb192cbebcbfadcce751625054 (commit)


- Log -----------------------------------------------------------------
commit 23a9b24aa100cc1c5c7d2c95252f2520680d2e58
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sat Mar 14 23:23:26 2015 +0100

    Don't send a for ServerKeyExchange for kDHr and kDHd
    
    The certificate already contains the DH parameters in that case.
    ssl3_send_server_key_exchange() would fail in that case anyway.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 93f1c13619c5b41f2dcfdbf6ae666f867922a87a)

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

Summary of changes:
 ssl/d1_srvr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c
index c4ec9fe..d12ad6d 100644
--- a/ssl/d1_srvr.c
+++ b/ssl/d1_srvr.c
@@ -470,7 +470,7 @@ int dtls1_accept(SSL *s)
 #ifndef OPENSSL_NO_PSK
                 || ((alg_k & SSL_kPSK) && s->ctx->psk_identity_hint)
 #endif
-                || (alg_k & (SSL_kEDH | SSL_kDHr | SSL_kDHd))
+                || (alg_k & SSL_kEDH)
                 || (alg_k & SSL_kEECDH)
                 || ((alg_k & SSL_kRSA)
                     && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL

From rsalz at openssl.org  Wed Mar 25 03:17:45 2015
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 25 Mar 2015 03:17:45 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427253465.913043.9352.nullmailer@dev.openssl.org>

The branch master has been updated
       via  d64070838ebba86f00fb3755df5d3e65106e1628 (commit)
      from  1300705a47b9c9498b15a384c6c5348adc342e2c (commit)


- Log -----------------------------------------------------------------
commit d64070838ebba86f00fb3755df5d3e65106e1628
Author: Rich Salz <rsalz at akamai.com>
Date:   Tue Mar 24 10:17:37 2015 -0400

    free NULL cleanup
    
    Start ensuring all OpenSSL "free" routines allow NULL, and remove
    any if check before calling them.
    This gets DH_free, DSA_free, RSA_free
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 apps/dh.c                   |  3 +--
 apps/dhparam.c              |  6 ++----
 apps/dsa.c                  |  3 +--
 apps/dsaparam.c             |  3 +--
 apps/gendh.c                |  3 +--
 apps/gendsa.c               |  3 +--
 apps/genrsa.c               |  3 +--
 apps/rsa.c                  |  3 +--
 apps/s_server.c             |  3 +--
 apps/speed.c                |  6 ++----
 crypto/dh/dh_ameth.c        |  6 ++----
 crypto/dh/dh_asn1.c         |  3 +--
 crypto/dh/dh_lib.c          |  1 +
 crypto/dh/dhtest.c          |  6 ++----
 crypto/dsa/dsa_ameth.c      |  3 +--
 crypto/dsa/dsa_depr.c       |  7 +++----
 crypto/dsa/dsa_lib.c        |  3 +--
 crypto/dsa/dsatest.c        |  3 +--
 crypto/evp/evp_extra_test.c |  4 +---
 crypto/pem/pvkfmt.c         |  6 ++----
 crypto/rsa/rsa_depr.c       |  3 +--
 demos/easy_tls/easy-tls.c   |  3 +--
 doc/crypto/DH_new.pod       |  1 +
 doc/crypto/DSA_new.pod      |  1 +
 doc/crypto/RSA_new.pod      |  1 +
 engines/ccgost/gost_ameth.c |  4 +---
 engines/e_capi.c            |  6 ++----
 engines/e_chil.c            |  3 +--
 engines/e_sureware.c        |  6 ++----
 ssl/s3_clnt.c               | 18 ++++++------------
 ssl/s3_lib.c                | 21 +++++++--------------
 ssl/ssl_cert.c              | 12 ++++--------
 ssl/ssl_conf.c              |  3 +--
 ssl/ssltest.c               |  6 ++----
 34 files changed, 58 insertions(+), 108 deletions(-)

diff --git a/apps/dh.c b/apps/dh.c
index cdb5f4a..a921633 100644
--- a/apps/dh.c
+++ b/apps/dh.c
@@ -314,8 +314,7 @@ int MAIN(int argc, char **argv)
         BIO_free(in);
     if (out != NULL)
         BIO_free_all(out);
-    if (dh != NULL)
-        DH_free(dh);
+    DH_free(dh);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
diff --git a/apps/dhparam.c b/apps/dhparam.c
index 0e6a3c3..12a2be6 100644
--- a/apps/dhparam.c
+++ b/apps/dhparam.c
@@ -319,8 +319,7 @@ int MAIN(int argc, char **argv)
             if (!dsa
                 || !DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL,
                                                cb)) {
-                if (dsa)
-                    DSA_free(dsa);
+                DSA_free(dsa);
                 BN_GENCB_free(cb);
                 ERR_print_errors(bio_err);
                 goto end;
@@ -520,8 +519,7 @@ int MAIN(int argc, char **argv)
         BIO_free(in);
     if (out != NULL)
         BIO_free_all(out);
-    if (dh != NULL)
-        DH_free(dh);
+    DH_free(dh);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
diff --git a/apps/dsa.c b/apps/dsa.c
index 7ff6ee9..8d085bc 100644
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -360,8 +360,7 @@ int MAIN(int argc, char **argv)
         BIO_free(in);
     if (out != NULL)
         BIO_free_all(out);
-    if (dsa != NULL)
-        DSA_free(dsa);
+    DSA_free(dsa);
     if (passin)
         OPENSSL_free(passin);
     if (passout)
diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index 74eefdc..fc1c817 100644
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -438,8 +438,7 @@ int MAIN(int argc, char **argv)
         BIO_free(in);
     if (out != NULL)
         BIO_free_all(out);
-    if (dsa != NULL)
-        DSA_free(dsa);
+    DSA_free(dsa);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
diff --git a/apps/gendh.c b/apps/gendh.c
index bbeba06..6102b79 100644
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -212,8 +212,7 @@ int MAIN(int argc, char **argv)
         ERR_print_errors(bio_err);
     if (out != NULL)
         BIO_free_all(out);
-    if (dh != NULL)
-        DH_free(dh);
+    DH_free(dh);
     if (cb != NULL)
         BN_GENCB_free(cb);
     apps_shutdown();
diff --git a/apps/gendsa.c b/apps/gendsa.c
index fd1360a..d330a01 100644
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -271,8 +271,7 @@ int MAIN(int argc, char **argv)
         BIO_free(in);
     if (out != NULL)
         BIO_free_all(out);
-    if (dsa != NULL)
-        DSA_free(dsa);
+    DSA_free(dsa);
     if (passout)
         OPENSSL_free(passout);
     apps_shutdown();
diff --git a/apps/genrsa.c b/apps/genrsa.c
index 5770c8d..1b06c82 100644
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -311,8 +311,7 @@ int MAIN(int argc, char **argv)
         BN_free(bn);
     if (cb)
         BN_GENCB_free(cb);
-    if (rsa)
-        RSA_free(rsa);
+    RSA_free(rsa);
     if (out)
         BIO_free_all(out);
     if (passout)
diff --git a/apps/rsa.c b/apps/rsa.c
index 419e504..ac4a3c4 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -424,8 +424,7 @@ int MAIN(int argc, char **argv)
  end:
     if (out != NULL)
         BIO_free_all(out);
-    if (rsa != NULL)
-        RSA_free(rsa);
+    RSA_free(rsa);
     if (passin)
         OPENSSL_free(passin);
     if (passout)
diff --git a/apps/s_server.c b/apps/s_server.c
index 298e665..97aa23d 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -3180,8 +3180,7 @@ static RSA *tmp_rsa_cb(SSL *s, int is_export, int keylength)
         }
         if (!BN_set_word(bn, RSA_F4) || ((rsa_tmp = RSA_new()) == NULL) ||
             !RSA_generate_key_ex(rsa_tmp, keylength, bn, NULL)) {
-            if (rsa_tmp)
-                RSA_free(rsa_tmp);
+            RSA_free(rsa_tmp);
             rsa_tmp = NULL;
         }
         if (!s_quiet) {
diff --git a/apps/speed.c b/apps/speed.c
index 44c276a..b023f28 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -2448,13 +2448,11 @@ int MAIN(int argc, char **argv)
         OPENSSL_free(buf2_malloc);
 #ifndef OPENSSL_NO_RSA
     for (i = 0; i < RSA_NUM; i++)
-        if (rsa_key[i] != NULL)
-            RSA_free(rsa_key[i]);
+        RSA_free(rsa_key[i]);
 #endif
 #ifndef OPENSSL_NO_DSA
     for (i = 0; i < DSA_NUM; i++)
-        if (dsa_key[i] != NULL)
-            DSA_free(dsa_key[i]);
+        DSA_free(dsa_key[i]);
 #endif
 
 #ifndef OPENSSL_NO_EC
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index 17027c5..c71538f 100644
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -142,8 +142,7 @@ static int dh_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
  err:
     if (public_key)
         ASN1_INTEGER_free(public_key);
-    if (dh)
-        DH_free(dh);
+    DH_free(dh);
     return 0;
 
 }
@@ -711,8 +710,7 @@ static int dh_cms_set_peerkey(EVP_PKEY_CTX *pctx,
         ASN1_INTEGER_free(public_key);
     if (pkpeer)
         EVP_PKEY_free(pkpeer);
-    if (dhpeer)
-        DH_free(dhpeer);
+    DH_free(dhpeer);
     return rv;
 }
 
diff --git a/crypto/dh/dh_asn1.c b/crypto/dh/dh_asn1.c
index f470214..7066caf 100644
--- a/crypto/dh/dh_asn1.c
+++ b/crypto/dh/dh_asn1.c
@@ -142,8 +142,7 @@ DH *d2i_DHxparams(DH **a, const unsigned char **pp, long length)
     }
 
     if (a) {
-        if (*a)
-            DH_free(*a);
+        DH_free(*a);
         *a = dh;
     }
 
diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c
index 46d1a2b..4f07a27 100644
--- a/crypto/dh/dh_lib.c
+++ b/crypto/dh/dh_lib.c
@@ -170,6 +170,7 @@ DH *DH_new_method(ENGINE *engine)
 void DH_free(DH *r)
 {
     int i;
+
     if (r == NULL)
         return;
     i = CRYPTO_add(&r->references, -1, CRYPTO_LOCK_DH);
diff --git a/crypto/dh/dhtest.c b/crypto/dh/dhtest.c
index 9bb9a00..6c063da 100644
--- a/crypto/dh/dhtest.c
+++ b/crypto/dh/dhtest.c
@@ -199,10 +199,8 @@ int main(int argc, char *argv[])
         OPENSSL_free(abuf);
     if (bbuf != NULL)
         OPENSSL_free(bbuf);
-    if (b != NULL)
-        DH_free(b);
-    if (a != NULL)
-        DH_free(a);
+    DH_free(b);
+    DH_free(a);
     if (_cb)
         BN_GENCB_free(_cb);
     BIO_free(out);
diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index 61a9d0f..96d5c5a 100644
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -120,8 +120,7 @@ static int dsa_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
  err:
     if (public_key)
         ASN1_INTEGER_free(public_key);
-    if (dsa)
-        DSA_free(dsa);
+    DSA_free(dsa);
     return 0;
 
 }
diff --git a/crypto/dsa/dsa_depr.c b/crypto/dsa/dsa_depr.c
index be1df13..10f0314 100644
--- a/crypto/dsa/dsa_depr.c
+++ b/crypto/dsa/dsa_depr.c
@@ -89,10 +89,8 @@ DSA *DSA_generate_parameters(int bits,
     if ((ret = DSA_new()) == NULL)
         return NULL;
     cb = BN_GENCB_new();
-    if (!cb) {
-        DSA_free(ret);
-        return NULL;
-    }
+    if (!cb)
+        goto err;
 
     BN_GENCB_set_old(cb, callback, cb_arg);
 
@@ -102,6 +100,7 @@ DSA *DSA_generate_parameters(int bits,
         return ret;
     }
     BN_GENCB_free(cb);
+err:
     DSA_free(ret);
     return NULL;
 }
diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index eb13fbb..bfd9106 100644
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -315,8 +315,7 @@ DH *DSA_dup_DH(const DSA *r)
     return ret;
 
  err:
-    if (ret != NULL)
-        DH_free(ret);
+    DH_free(ret);
     return NULL;
 }
 #endif
diff --git a/crypto/dsa/dsatest.c b/crypto/dsa/dsatest.c
index 9b13089..bf47816 100644
--- a/crypto/dsa/dsatest.c
+++ b/crypto/dsa/dsatest.c
@@ -211,8 +211,7 @@ int main(int argc, char **argv)
  end:
     if (!ret)
         ERR_print_errors(bio_err);
-    if (dsa != NULL)
-        DSA_free(dsa);
+    DSA_free(dsa);
     if (cb != NULL)
         BN_GENCB_free(cb);
     CRYPTO_cleanup_all_ex_data();
diff --git a/crypto/evp/evp_extra_test.c b/crypto/evp/evp_extra_test.c
index 0f7b011..c474134 100644
--- a/crypto/evp/evp_extra_test.c
+++ b/crypto/evp/evp_extra_test.c
@@ -268,9 +268,7 @@ static EVP_PKEY *load_example_rsa_key(void)
     if (pkey) {
         EVP_PKEY_free(pkey);
     }
-    if (rsa) {
-        RSA_free(rsa);
-    }
+    RSA_free(rsa);
 
     return ret;
 }
diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c
index ee4b6a8..0f2390d 100644
--- a/crypto/pem/pvkfmt.c
+++ b/crypto/pem/pvkfmt.c
@@ -335,8 +335,7 @@ static EVP_PKEY *b2i_dss(const unsigned char **in, unsigned int length,
 
  memerr:
     PEMerr(PEM_F_B2I_DSS, ERR_R_MALLOC_FAILURE);
-    if (dsa)
-        DSA_free(dsa);
+    DSA_free(dsa);
     if (ret)
         EVP_PKEY_free(ret);
     if (ctx)
@@ -385,8 +384,7 @@ static EVP_PKEY *b2i_rsa(const unsigned char **in, unsigned int length,
     return ret;
  memerr:
     PEMerr(PEM_F_B2I_RSA, ERR_R_MALLOC_FAILURE);
-    if (rsa)
-        RSA_free(rsa);
+    RSA_free(rsa);
     if (ret)
         EVP_PKEY_free(ret);
     return NULL;
diff --git a/crypto/rsa/rsa_depr.c b/crypto/rsa/rsa_depr.c
index a6ec385..8da6ec1 100644
--- a/crypto/rsa/rsa_depr.c
+++ b/crypto/rsa/rsa_depr.c
@@ -101,8 +101,7 @@ RSA *RSA_generate_key(int bits, unsigned long e_value,
  err:
     if (e)
         BN_free(e);
-    if (rsa)
-        RSA_free(rsa);
+    RSA_free(rsa);
     if (cb)
         BN_GENCB_free(cb);
     return 0;
diff --git a/demos/easy_tls/easy-tls.c b/demos/easy_tls/easy-tls.c
index 610b4f9..33303cc 100644
--- a/demos/easy_tls/easy-tls.c
+++ b/demos/easy_tls/easy-tls.c
@@ -637,8 +637,7 @@ void tls_set_dhe1024(int i, void *apparg)
         tls_openssl_errors("", "", NULL, apparg);
         return;
     }
-    if (tls_dhe1024 != NULL)
-        DH_free(tls_dhe1024);
+    DH_free(tls_dhe1024);
     tls_dhe1024 = dhparams;
 }
 
diff --git a/doc/crypto/DH_new.pod b/doc/crypto/DH_new.pod
index 60c9300..6245e4a 100644
--- a/doc/crypto/DH_new.pod
+++ b/doc/crypto/DH_new.pod
@@ -18,6 +18,7 @@ DH_new() allocates and initializes a B<DH> structure.
 
 DH_free() frees the B<DH> structure and its components. The values are
 erased before the memory is returned to the system.
+If B<dh> is NULL nothing is done.
 
 =head1 RETURN VALUES
 
diff --git a/doc/crypto/DSA_new.pod b/doc/crypto/DSA_new.pod
index 48e9b82..3a6d582 100644
--- a/doc/crypto/DSA_new.pod
+++ b/doc/crypto/DSA_new.pod
@@ -19,6 +19,7 @@ calling DSA_new_method(NULL).
 
 DSA_free() frees the B<DSA> structure and its components. The values are
 erased before the memory is returned to the system.
+If B<dsa> is NULL nothing is done.
 
 =head1 RETURN VALUES
 
diff --git a/doc/crypto/RSA_new.pod b/doc/crypto/RSA_new.pod
index 3d15b92..70901a5 100644
--- a/doc/crypto/RSA_new.pod
+++ b/doc/crypto/RSA_new.pod
@@ -19,6 +19,7 @@ calling RSA_new_method(NULL).
 
 RSA_free() frees the B<RSA> structure and its components. The key is
 erased before the memory is returned to the system.
+If B<rsa> is NULL nothing is done.
 
 =head1 RETURN VALUES
 
diff --git a/engines/ccgost/gost_ameth.c b/engines/ccgost/gost_ameth.c
index ad8480d..a5d80a1 100644
--- a/engines/ccgost/gost_ameth.c
+++ b/engines/ccgost/gost_ameth.c
@@ -276,9 +276,7 @@ static int pkey_ctrl_gost(EVP_PKEY *pkey, int op, long arg1, void *arg2)
 /* --------------------- free functions * ------------------------------*/
 static void pkey_free_gost94(EVP_PKEY *key)
 {
-    if (key->pkey.dsa) {
-        DSA_free(key->pkey.dsa);
-    }
+    DSA_free(key->pkey.dsa);
 }
 
 static void pkey_free_gost01(EVP_PKEY *key)
diff --git a/engines/e_capi.c b/engines/e_capi.c
index f280397..2373d69 100644
--- a/engines/e_capi.c
+++ b/engines/e_capi.c
@@ -754,10 +754,8 @@ static EVP_PKEY *capi_get_pkey(ENGINE *eng, CAPI_KEY * key)
     if (pubkey)
         OPENSSL_free(pubkey);
     if (!ret) {
-        if (rkey)
-            RSA_free(rkey);
-        if (dkey)
-            DSA_free(dkey);
+        RSA_free(rkey);
+        DSA_free(dkey);
     }
 
     return ret;
diff --git a/engines/e_chil.c b/engines/e_chil.c
index 69d49d7..19d29d7 100644
--- a/engines/e_chil.c
+++ b/engines/e_chil.c
@@ -849,8 +849,7 @@ static EVP_PKEY *hwcrhk_load_privkey(ENGINE *eng, const char *key_id,
     return res;
  err:
 #  ifndef OPENSSL_NO_RSA
-    if (rtmp)
-        RSA_free(rtmp);
+    RSA_free(rtmp);
 #  endif
     return NULL;
 }
diff --git a/engines/e_sureware.c b/engines/e_sureware.c
index 36f6f43..262766c 100644
--- a/engines/e_sureware.c
+++ b/engines/e_sureware.c
@@ -801,12 +801,10 @@ static EVP_PKEY *sureware_load_public(ENGINE *e, const char *key_id,
     return res;
  err:
 #  ifndef OPENSSL_NO_RSA
-    if (rsatmp)
-        RSA_free(rsatmp);
+    RSA_free(rsatmp);
 #  endif
 #  ifndef OPENSSL_NO_DSA
-    if (dsatmp)
-        DSA_free(dsatmp);
+    DSA_free(dsatmp);
 #  endif
     return NULL;
 }
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index f4b60be..27f03d4 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1380,16 +1380,12 @@ int ssl3_get_key_exchange(SSL *s)
     param = p = (unsigned char *)s->init_msg;
     if (s->session->sess_cert != NULL) {
 #ifndef OPENSSL_NO_RSA
-        if (s->session->sess_cert->peer_rsa_tmp != NULL) {
-            RSA_free(s->session->sess_cert->peer_rsa_tmp);
-            s->session->sess_cert->peer_rsa_tmp = NULL;
-        }
+        RSA_free(s->session->sess_cert->peer_rsa_tmp);
+        s->session->sess_cert->peer_rsa_tmp = NULL;
 #endif
 #ifndef OPENSSL_NO_DH
-        if (s->session->sess_cert->peer_dh_tmp) {
-            DH_free(s->session->sess_cert->peer_dh_tmp);
-            s->session->sess_cert->peer_dh_tmp = NULL;
-        }
+        DH_free(s->session->sess_cert->peer_dh_tmp);
+        s->session->sess_cert->peer_dh_tmp = NULL;
 #endif
 #ifndef OPENSSL_NO_EC
         if (s->session->sess_cert->peer_ecdh_tmp) {
@@ -1955,12 +1951,10 @@ int ssl3_get_key_exchange(SSL *s)
  err:
     EVP_PKEY_free(pkey);
 #ifndef OPENSSL_NO_RSA
-    if (rsa != NULL)
-        RSA_free(rsa);
+    RSA_free(rsa);
 #endif
 #ifndef OPENSSL_NO_DH
-    if (dh != NULL)
-        DH_free(dh);
+    DH_free(dh);
 #endif
 #ifndef OPENSSL_NO_EC
     BN_CTX_free(bn_ctx);
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 6c59824..9893930 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3138,8 +3138,7 @@ void ssl3_free(SSL *s)
     if (s->s3->rrec.comp != NULL)
         OPENSSL_free(s->s3->rrec.comp);
 #ifndef OPENSSL_NO_DH
-    if (s->s3->tmp.dh != NULL)
-        DH_free(s->s3->tmp.dh);
+    DH_free(s->s3->tmp.dh);
 #endif
 #ifndef OPENSSL_NO_EC
     if (s->s3->tmp.ecdh != NULL)
@@ -3181,10 +3180,8 @@ void ssl3_clear(SSL *s)
         s->s3->rrec.comp = NULL;
     }
 #ifndef OPENSSL_NO_DH
-    if (s->s3->tmp.dh != NULL) {
-        DH_free(s->s3->tmp.dh);
-        s->s3->tmp.dh = NULL;
-    }
+    DH_free(s->s3->tmp.dh);
+    s->s3->tmp.dh = NULL;
 #endif
 #ifndef OPENSSL_NO_EC
     if (s->s3->tmp.ecdh != NULL) {
@@ -3293,8 +3290,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
                 SSLerr(SSL_F_SSL3_CTRL, ERR_R_RSA_LIB);
                 return (ret);
             }
-            if (s->cert->rsa_tmp != NULL)
-                RSA_free(s->cert->rsa_tmp);
+            RSA_free(s->cert->rsa_tmp);
             s->cert->rsa_tmp = rsa;
             ret = 1;
         }
@@ -3329,8 +3325,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
                     return (ret);
                 }
             }
-            if (s->cert->dh_tmp != NULL)
-                DH_free(s->cert->dh_tmp);
+            DH_free(s->cert->dh_tmp);
             s->cert->dh_tmp = dh;
             ret = 1;
         }
@@ -3766,8 +3761,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
                 SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_RSA_LIB);
                 return (0);
             } else {
-                if (cert->rsa_tmp != NULL)
-                    RSA_free(cert->rsa_tmp);
+                RSA_free(cert->rsa_tmp);
                 cert->rsa_tmp = rsa;
                 return (1);
             }
@@ -3801,8 +3795,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
                     return 0;
                 }
             }
-            if (cert->dh_tmp != NULL)
-                DH_free(cert->dh_tmp);
+            DH_free(cert->dh_tmp);
             cert->dh_tmp = new;
             return 1;
         }
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index a88d211..cbfe7bb 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -443,12 +443,10 @@ void ssl_cert_free(CERT *c)
 #endif
 
 #ifndef OPENSSL_NO_RSA
-    if (c->rsa_tmp)
-        RSA_free(c->rsa_tmp);
+    RSA_free(c->rsa_tmp);
 #endif
 #ifndef OPENSSL_NO_DH
-    if (c->dh_tmp)
-        DH_free(c->dh_tmp);
+    DH_free(c->dh_tmp);
 #endif
 #ifndef OPENSSL_NO_EC
     if (c->ecdh_tmp)
@@ -651,12 +649,10 @@ void ssl_sess_cert_free(SESS_CERT *sc)
     }
 
 #ifndef OPENSSL_NO_RSA
-    if (sc->peer_rsa_tmp != NULL)
-        RSA_free(sc->peer_rsa_tmp);
+    RSA_free(sc->peer_rsa_tmp);
 #endif
 #ifndef OPENSSL_NO_DH
-    if (sc->peer_dh_tmp != NULL)
-        DH_free(sc->peer_dh_tmp);
+    DH_free(sc->peer_dh_tmp);
 #endif
 #ifndef OPENSSL_NO_EC
     if (sc->peer_ecdh_tmp != NULL)
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c
index cfed40d..25af065 100644
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c
@@ -421,8 +421,7 @@ static int cmd_DHParameters(SSL_CONF_CTX *cctx, const char *value)
     if (cctx->ssl)
         rv = SSL_set_tmp_dh(cctx->ssl, dh);
  end:
-    if (dh)
-        DH_free(dh);
+    DH_free(dh);
     if (in)
         BIO_free(in);
     return rv > 0;
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 457ba86..d244ba3 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -2968,10 +2968,8 @@ static RSA *tmp_rsa_cb(SSL *s, int is_export, int keylength)
 
 static void free_tmp_rsa(void)
 {
-    if (rsa_tmp != NULL) {
-        RSA_free(rsa_tmp);
-        rsa_tmp = NULL;
-    }
+    RSA_free(rsa_tmp);
+    rsa_tmp = NULL;
 }
 #endif
 

From matt at openssl.org  Wed Mar 25 11:57:11 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 25 Mar 2015 11:57:11 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1427284631.665515.21779.nullmailer@dev.openssl.org>

The branch master has been updated
       via  d36a327537cccbde097051add3bde356451ec16d (commit)
      from  ca73e95bc4ae7bbc28119ef1998425fd1b6ae0a0 (commit)


- Log -----------------------------------------------------------------
commit d36a327537cccbde097051add3bde356451ec16d
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 25 11:56:59 2015 +0000

    Update TLS versions supported

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

Summary of changes:
 about/index.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/index.wml b/about/index.wml
index ba912e5..7df98f3 100644
--- a/about/index.wml
+++ b/about/index.wml
@@ -12,7 +12,7 @@ commercial-grade, full-featured, and <a
 href="http://www.opensource.org/">Open Source</a> toolkit implementing the
 Secure Sockets Layer (SSL v2/v3) and
 Transport Layer Security (TLS
-v1) protocols as well as a full-strength general purpose cryptography library
+v1.0/v1.1/v1.2) protocols as well as a full-strength general purpose cryptography library
 managed by a worldwide community of volunteers that use the Internet to
 communicate, plan, and develop the OpenSSL toolkit and its related
 documentation.

From matt at openssl.org  Wed Mar 25 12:31:52 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 25 Mar 2015 12:31:52 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1427286712.546503.2696.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  a20718fa2c0a45e6acb975cf6c0438c3ebd45b13 (commit)
       via  4285b851637a3da8bd6e96848f0deffb6be5e626 (commit)
      from  fe82be2b33714949e24f107af94b5b75206a28cd (commit)


- Log -----------------------------------------------------------------
commit a20718fa2c0a45e6acb975cf6c0438c3ebd45b13
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Feb 5 13:59:16 2015 +0000

    Add ticket length before buffering DTLS message
    
    In ssl3_send_new_session_ticket the message to be sent is constructed. We
    skip adding the length of the session ticket initially, then call
    ssl_set_handshake_header, and finally go back and add in the length of the
    ticket. Unfortunately, in DTLS, ssl_set_handshake_header also has the side
    effect of buffering the message for subsequent retransmission if required.
    By adding the ticket length after the call to ssl_set_handshake_header the
    message that is buffered is incomplete, causing an invalid message to be
    sent on retransmission.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 4f9fab6bd0253416eeace5a45142c7c4a83bc511)
    
    Conflicts:
    	ssl/s3_srvr.c

commit 4285b851637a3da8bd6e96848f0deffb6be5e626
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Feb 5 13:54:37 2015 +0000

    Ensure last_write_sequence is saved in DTLS1.2
    
    In DTLS, immediately prior to epoch change, the write_sequence is supposed
    to be stored in s->d1->last_write_sequence. The write_sequence is then reset
    back to 00000000. In the event of retransmits of records from the previous
    epoch, the last_write_sequence is restored. This commit fixes a bug in
    DTLS1.2 where the write_sequence was being reset before last_write_sequence
    was saved, and therefore retransmits are sent with incorrect sequence
    numbers.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit d5d0a1cb1347d4a8547e78aec56c50c528186e50)

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

Summary of changes:
 ssl/s3_srvr.c | 2 +-
 ssl/t1_enc.c  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index c016139..f7ffa06 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -3391,10 +3391,10 @@ int ssl3_send_newsession_ticket(SSL *s)
         /* Now write out lengths: p points to end of data written */
         /* Total length */
         len = p - ssl_handshake_start(s);
-        ssl_set_handshake_header(s, SSL3_MT_NEWSESSION_TICKET, len);
         /* Skip ticket lifetime hint */
         p = ssl_handshake_start(s) + 4;
         s2n(len - 6, p);
+        ssl_set_handshake_header(s, SSL3_MT_NEWSESSION_TICKET, len);
         s->state = SSL3_ST_SW_SESSION_TICKET_B;
         OPENSSL_free(senc);
     }
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 577885f..6869909 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -404,9 +404,9 @@ int tls1_change_cipher_state(SSL *s, int which)
         }
 #endif
         /*
-         * this is done by dtls1_reset_seq_numbers for DTLS1_VERSION
+         * this is done by dtls1_reset_seq_numbers for DTLS
          */
-        if (s->version != DTLS1_VERSION)
+        if (!SSL_IS_DTLS(s))
             memset(&(s->s3->read_sequence[0]), 0, 8);
         mac_secret = &(s->s3->read_mac_secret[0]);
         mac_secret_size = &(s->s3->read_mac_secret_size);
@@ -442,9 +442,9 @@ int tls1_change_cipher_state(SSL *s, int which)
         }
 #endif
         /*
-         * this is done by dtls1_reset_seq_numbers for DTLS1_VERSION
+         * this is done by dtls1_reset_seq_numbers for DTLS
          */
-        if (s->version != DTLS1_VERSION)
+        if (!SSL_IS_DTLS(s))
             memset(&(s->s3->write_sequence[0]), 0, 8);
         mac_secret = &(s->s3->write_mac_secret[0]);
         mac_secret_size = &(s->s3->write_mac_secret_size);

From matt at openssl.org  Wed Mar 25 12:31:59 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 25 Mar 2015 12:31:59 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427286719.565541.2969.nullmailer@dev.openssl.org>

The branch master has been updated
       via  4f9fab6bd0253416eeace5a45142c7c4a83bc511 (commit)
       via  d5d0a1cb1347d4a8547e78aec56c50c528186e50 (commit)
      from  d64070838ebba86f00fb3755df5d3e65106e1628 (commit)


- Log -----------------------------------------------------------------
commit 4f9fab6bd0253416eeace5a45142c7c4a83bc511
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Feb 5 13:59:16 2015 +0000

    Add ticket length before buffering DTLS message
    
    In ssl3_send_new_session_ticket the message to be sent is constructed. We
    skip adding the length of the session ticket initially, then call
    ssl_set_handshake_header, and finally go back and add in the length of the
    ticket. Unfortunately, in DTLS, ssl_set_handshake_header also has the side
    effect of buffering the message for subsequent retransmission if required.
    By adding the ticket length after the call to ssl_set_handshake_header the
    message that is buffered is incomplete, causing an invalid message to be
    sent on retransmission.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit d5d0a1cb1347d4a8547e78aec56c50c528186e50
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Feb 5 13:54:37 2015 +0000

    Ensure last_write_sequence is saved in DTLS1.2
    
    In DTLS, immediately prior to epoch change, the write_sequence is supposed
    to be stored in s->d1->last_write_sequence. The write_sequence is then reset
    back to 00000000. In the event of retransmits of records from the previous
    epoch, the last_write_sequence is restored. This commit fixes a bug in
    DTLS1.2 where the write_sequence was being reset before last_write_sequence
    was saved, and therefore retransmits are sent with incorrect sequence
    numbers.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 ssl/s3_srvr.c | 4 ++--
 ssl/t1_enc.c  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 0efe3dd..ce52854 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -3431,11 +3431,11 @@ int ssl3_send_newsession_ticket(SSL *s)
         /* Now write out lengths: p points to end of data written */
         /* Total length */
         len = p - ssl_handshake_start(s);
-        if(!ssl_set_handshake_header(s, SSL3_MT_NEWSESSION_TICKET, len))
-            goto err;
         /* Skip ticket lifetime hint */
         p = ssl_handshake_start(s) + 4;
         s2n(len - 6, p);
+        if(!ssl_set_handshake_header(s, SSL3_MT_NEWSESSION_TICKET, len))
+            goto err;
         s->state = SSL3_ST_SW_SESSION_TICKET_B;
         OPENSSL_free(senc);
     }
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index df97f19..e4a689e 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -404,9 +404,9 @@ int tls1_change_cipher_state(SSL *s, int which)
         }
 #endif
         /*
-         * this is done by dtls1_reset_seq_numbers for DTLS1_VERSION
+         * this is done by dtls1_reset_seq_numbers for DTLS
          */
-        if (s->version != DTLS1_VERSION)
+        if (!SSL_IS_DTLS(s))
             memset(&(s->s3->read_sequence[0]), 0, 8);
         mac_secret = &(s->s3->read_mac_secret[0]);
         mac_secret_size = &(s->s3->read_mac_secret_size);
@@ -442,9 +442,9 @@ int tls1_change_cipher_state(SSL *s, int which)
         }
 #endif
         /*
-         * this is done by dtls1_reset_seq_numbers for DTLS1_VERSION
+         * this is done by dtls1_reset_seq_numbers for DTLS
          */
-        if (s->version != DTLS1_VERSION)
+        if (!SSL_IS_DTLS(s))
             memset(&(s->s3->write_sequence[0]), 0, 8);
         mac_secret = &(s->s3->write_mac_secret[0]);
         mac_secret_size = &(s->s3->write_mac_secret_size);

From matt at openssl.org  Wed Mar 25 12:35:43 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 25 Mar 2015 12:35:43 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427286943.112716.4141.nullmailer@dev.openssl.org>

The branch master has been updated
       via  8817e2e0c998757d3bd036d7f45fe8d0a49fbe2d (commit)
       via  7b611e5fe8eaac9512f72094c460f3ed6040076a (commit)
      from  4f9fab6bd0253416eeace5a45142c7c4a83bc511 (commit)


- Log -----------------------------------------------------------------
commit 8817e2e0c998757d3bd036d7f45fe8d0a49fbe2d
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Mar 13 16:48:01 2015 +0000

    Fix return checks in GOST engine
    
    Filled in lots of return value checks that were missing the GOST engine, and
    added appropriate error handling.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 7b611e5fe8eaac9512f72094c460f3ed6040076a
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Mar 13 15:04:54 2015 +0000

    Fix misc NULL derefs in sureware engine
    
    Fix miscellaneous NULL pointer derefs in the sureware engine.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 engines/ccgost/e_gost_err.c |   3 +-
 engines/ccgost/e_gost_err.h |   1 +
 engines/ccgost/gost2001.c   | 229 ++++++++++++++++++++++++++++++++++----------
 engines/ccgost/gost_ameth.c |  36 ++++++-
 engines/ccgost/gost_pmeth.c |   2 +-
 engines/ccgost/gost_sign.c  |  79 ++++++++++++---
 engines/e_sureware.c        |  27 +++---
 7 files changed, 295 insertions(+), 82 deletions(-)

diff --git a/engines/ccgost/e_gost_err.c b/engines/ccgost/e_gost_err.c
index 47022b1..0afd913 100644
--- a/engines/ccgost/e_gost_err.c
+++ b/engines/ccgost/e_gost_err.c
@@ -1,6 +1,6 @@
 /* e_gost_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2009 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2015 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -90,6 +90,7 @@ static ERR_STRING_DATA GOST_str_functs[] = {
     {ERR_FUNC(GOST_F_GOST_IMIT_CTRL), "GOST_IMIT_CTRL"},
     {ERR_FUNC(GOST_F_GOST_IMIT_FINAL), "GOST_IMIT_FINAL"},
     {ERR_FUNC(GOST_F_GOST_IMIT_UPDATE), "GOST_IMIT_UPDATE"},
+    {ERR_FUNC(GOST_F_GOST_SIGN_KEYGEN), "GOST_SIGN_KEYGEN"},
     {ERR_FUNC(GOST_F_PARAM_COPY_GOST01), "PARAM_COPY_GOST01"},
     {ERR_FUNC(GOST_F_PARAM_COPY_GOST94), "PARAM_COPY_GOST94"},
     {ERR_FUNC(GOST_F_PKEY_GOST01CP_DECRYPT), "PKEY_GOST01CP_DECRYPT"},
diff --git a/engines/ccgost/e_gost_err.h b/engines/ccgost/e_gost_err.h
index e55ebf8..b183957 100644
--- a/engines/ccgost/e_gost_err.h
+++ b/engines/ccgost/e_gost_err.h
@@ -90,6 +90,7 @@ void ERR_GOST_error(int function, int reason, char *file, int line);
 # define GOST_F_GOST_IMIT_CTRL                            114
 # define GOST_F_GOST_IMIT_FINAL                           140
 # define GOST_F_GOST_IMIT_UPDATE                          115
+# define GOST_F_GOST_SIGN_KEYGEN                          142
 # define GOST_F_PARAM_COPY_GOST01                         116
 # define GOST_F_PARAM_COPY_GOST94                         117
 # define GOST_F_PKEY_GOST01CP_DECRYPT                     118
diff --git a/engines/ccgost/gost2001.c b/engines/ccgost/gost2001.c
index b3eec8a..5c4efd6 100644
--- a/engines/ccgost/gost2001.c
+++ b/engines/ccgost/gost2001.c
@@ -41,6 +41,11 @@ int fill_GOST2001_params(EC_KEY *eckey, int nid)
     BN_CTX *ctx = BN_CTX_new();
     int ok = 0;
 
+    if(!ctx) {
+        GOSTerr(GOST_F_FILL_GOST2001_PARAMS, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
+
     BN_CTX_start(ctx);
     p = BN_CTX_get(ctx);
     a = BN_CTX_get(ctx);
@@ -48,6 +53,10 @@ int fill_GOST2001_params(EC_KEY *eckey, int nid)
     x = BN_CTX_get(ctx);
     y = BN_CTX_get(ctx);
     q = BN_CTX_get(ctx);
+    if(!p || !a || !b || !x || !y || !q) {
+        GOSTerr(GOST_F_FILL_GOST2001_PARAMS, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
     while (params->nid != NID_undef && params->nid != nid)
         params++;
     if (params->nid == NID_undef) {
@@ -55,18 +64,33 @@ int fill_GOST2001_params(EC_KEY *eckey, int nid)
                 GOST_R_UNSUPPORTED_PARAMETER_SET);
         goto err;
     }
-    BN_hex2bn(&p, params->p);
-    BN_hex2bn(&a, params->a);
-    BN_hex2bn(&b, params->b);
+    if(!BN_hex2bn(&p, params->p)
+        || !BN_hex2bn(&a, params->a)
+        || !BN_hex2bn(&b, params->b)) {
+        GOSTerr(GOST_F_FILL_GOST2001_PARAMS,
+                ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
     grp = EC_GROUP_new_curve_GFp(p, a, b, ctx);
+    if(!grp)  {
+        GOSTerr(GOST_F_FILL_GOST2001_PARAMS, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
 
     P = EC_POINT_new(grp);
+    if(!P)  {
+        GOSTerr(GOST_F_FILL_GOST2001_PARAMS, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
 
-    BN_hex2bn(&x, params->x);
-    BN_hex2bn(&y, params->y);
-    EC_POINT_set_affine_coordinates_GFp(grp, P, x, y, ctx);
-    BN_hex2bn(&q, params->q);
+    if(!BN_hex2bn(&x, params->x)
+        || !BN_hex2bn(&y, params->y)
+        || !EC_POINT_set_affine_coordinates_GFp(grp, P, x, y, ctx)
+        || !BN_hex2bn(&q, params->q))  {
+        GOSTerr(GOST_F_FILL_GOST2001_PARAMS, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 #ifdef DEBUG_KEYS
     fprintf(stderr, "Set params index %d oid %s\nq=",
             (params - R3410_2001_paramset), OBJ_nid2sn(params->nid));
@@ -74,16 +98,23 @@ int fill_GOST2001_params(EC_KEY *eckey, int nid)
     fprintf(stderr, "\n");
 #endif
 
-    EC_GROUP_set_generator(grp, P, q, NULL);
+    if(!EC_GROUP_set_generator(grp, P, q, NULL)) {
+        GOSTerr(GOST_F_FILL_GOST2001_PARAMS, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
     EC_GROUP_set_curve_name(grp, params->nid);
-
-    EC_KEY_set_group(eckey, grp);
+    if(!EC_KEY_set_group(eckey, grp)) {
+        GOSTerr(GOST_F_FILL_GOST2001_PARAMS, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
     ok = 1;
  err:
-    EC_POINT_free(P);
-    EC_GROUP_free(grp);
-    BN_CTX_end(ctx);
-    BN_CTX_free(ctx);
+    if (P) EC_POINT_free(P);
+    if (grp) EC_GROUP_free(grp);
+    if (ctx) {
+        BN_CTX_end(ctx);
+        BN_CTX_free(ctx);
+    }
     return ok;
 }
 
@@ -94,7 +125,7 @@ int fill_GOST2001_params(EC_KEY *eckey, int nid)
  */
 DSA_SIG *gost2001_do_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey)
 {
-    DSA_SIG *newsig = NULL;
+    DSA_SIG *newsig = NULL, *ret = NULL;
     BIGNUM *md = hashsum2bn(dgst);
     BIGNUM *order = NULL;
     const EC_GROUP *group;
@@ -103,6 +134,10 @@ DSA_SIG *gost2001_do_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey)
         NULL, *e = NULL;
     EC_POINT *C = NULL;
     BN_CTX *ctx = BN_CTX_new();
+    if(!ctx || !md) {
+        GOSTerr(GOST_F_GOST2001_DO_SIGN, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
     BN_CTX_start(ctx);
     OPENSSL_assert(dlen == 32);
     newsig = DSA_SIG_new();
@@ -111,11 +146,25 @@ DSA_SIG *gost2001_do_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey)
         goto err;
     }
     group = EC_KEY_get0_group(eckey);
+    if(!group) {
+        GOSTerr(GOST_F_GOST2001_DO_SIGN, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
     order = BN_CTX_get(ctx);
-    EC_GROUP_get_order(group, order, ctx);
+    if(!order || !EC_GROUP_get_order(group, order, ctx)) {
+        GOSTerr(GOST_F_GOST2001_DO_SIGN, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
     priv_key = EC_KEY_get0_private_key(eckey);
+    if(!priv_key) {
+        GOSTerr(GOST_F_GOST2001_DO_SIGN, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
     e = BN_CTX_get(ctx);
-    BN_mod(e, md, order, ctx);
+    if(!e || !BN_mod(e, md, order, ctx)) {
+        GOSTerr(GOST_F_GOST2001_DO_SIGN, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 #ifdef DEBUG_SIGN
     fprintf(stderr, "digest as bignum=");
     BN_print_fp(stderr, md);
@@ -128,55 +177,80 @@ DSA_SIG *gost2001_do_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey)
     }
     k = BN_CTX_get(ctx);
     C = EC_POINT_new(group);
+    if(!k || !C) {
+        GOSTerr(GOST_F_GOST2001_DO_SIGN, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
     do {
         do {
             if (!BN_rand_range(k, order)) {
                 GOSTerr(GOST_F_GOST2001_DO_SIGN,
                         GOST_R_RANDOM_NUMBER_GENERATOR_FAILED);
-                DSA_SIG_free(newsig);
-                newsig = NULL;
                 goto err;
             }
             if (!EC_POINT_mul(group, C, k, NULL, NULL, ctx)) {
                 GOSTerr(GOST_F_GOST2001_DO_SIGN, ERR_R_EC_LIB);
-                DSA_SIG_free(newsig);
-                newsig = NULL;
                 goto err;
             }
             if (!X)
                 X = BN_CTX_get(ctx);
+            if (!r)
+                r = BN_CTX_get(ctx);
+            if (!X || !r) {
+                GOSTerr(GOST_F_GOST2001_DO_SIGN, ERR_R_MALLOC_FAILURE);
+                goto err;
+            }
             if (!EC_POINT_get_affine_coordinates_GFp(group, C, X, NULL, ctx)) {
                 GOSTerr(GOST_F_GOST2001_DO_SIGN, ERR_R_EC_LIB);
-                DSA_SIG_free(newsig);
-                newsig = NULL;
                 goto err;
             }
-            if (!r)
-                r = BN_CTX_get(ctx);
-            BN_nnmod(r, X, order, ctx);
+
+            if(!BN_nnmod(r, X, order, ctx)) {
+                GOSTerr(GOST_F_GOST2001_DO_SIGN, ERR_R_INTERNAL_ERROR);
+                goto err;
+            }
         }
         while (BN_is_zero(r));
         /* s =  (r*priv_key+k*e) mod order */
         if (!tmp)
             tmp = BN_CTX_get(ctx);
-        BN_mod_mul(tmp, priv_key, r, order, ctx);
         if (!tmp2)
             tmp2 = BN_CTX_get(ctx);
-        BN_mod_mul(tmp2, k, e, order, ctx);
         if (!s)
             s = BN_CTX_get(ctx);
-        BN_mod_add(s, tmp, tmp2, order, ctx);
+        if (!tmp || !tmp2 || !s) {
+            GOSTerr(GOST_F_GOST2001_DO_SIGN, ERR_R_MALLOC_FAILURE);
+            goto err;
+        }
+
+        if(!BN_mod_mul(tmp, priv_key, r, order, ctx)
+            || !BN_mod_mul(tmp2, k, e, order, ctx)
+            || !BN_mod_add(s, tmp, tmp2, order, ctx)) {
+            GOSTerr(GOST_F_GOST2001_DO_SIGN, ERR_R_INTERNAL_ERROR);
+            goto err;
+        }
     }
     while (BN_is_zero(s));
 
     newsig->s = BN_dup(s);
     newsig->r = BN_dup(r);
+    if(!newsig->s || !newsig->r) {
+        GOSTerr(GOST_F_GOST2001_DO_SIGN, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
+
+    ret = newsig;
  err:
-    BN_CTX_end(ctx);
-    BN_CTX_free(ctx);
-    EC_POINT_free(C);
-    BN_free(md);
-    return newsig;
+    if(ctx) {
+        BN_CTX_end(ctx);
+        BN_CTX_free(ctx);
+    }
+    if (C) EC_POINT_free(C);
+    if (md) BN_free(md);
+    if (!ret && newsig) {
+        DSA_SIG_free(newsig);
+    }
+    return ret;
 }
 
 /*
@@ -196,6 +270,11 @@ int gost2001_do_verify(const unsigned char *dgst, int dgst_len,
     const EC_POINT *pub_key = NULL;
     int ok = 0;
 
+    if(!ctx || !group) {
+        GOSTerr(GOST_F_GOST2001_DO_VERIFY, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
+
     BN_CTX_start(ctx);
     order = BN_CTX_get(ctx);
     e = BN_CTX_get(ctx);
@@ -205,9 +284,17 @@ int gost2001_do_verify(const unsigned char *dgst, int dgst_len,
     X = BN_CTX_get(ctx);
     R = BN_CTX_get(ctx);
     v = BN_CTX_get(ctx);
+    if(!order || !e || !z1 || !z2 || !tmp || !X || !R || !v) {
+        GOSTerr(GOST_F_GOST2001_DO_VERIFY, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
 
-    EC_GROUP_get_order(group, order, ctx);
     pub_key = EC_KEY_get0_public_key(ec);
+    if(!pub_key || !EC_GROUP_get_order(group, order, ctx)) {
+        GOSTerr(GOST_F_GOST2001_DO_VERIFY, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
+
     if (BN_is_zero(sig->s) || BN_is_zero(sig->r) ||
         (BN_cmp(sig->s, order) >= 1) || (BN_cmp(sig->r, order) >= 1)) {
         GOSTerr(GOST_F_GOST2001_DO_VERIFY,
@@ -217,19 +304,28 @@ int gost2001_do_verify(const unsigned char *dgst, int dgst_len,
     }
     md = hashsum2bn(dgst);
 
-    BN_mod(e, md, order, ctx);
+    if(!md || !BN_mod(e, md, order, ctx)) {
+        GOSTerr(GOST_F_GOST2001_DO_VERIFY, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 #ifdef DEBUG_SIGN
     fprintf(stderr, "digest as bignum: ");
     BN_print_fp(stderr, md);
     fprintf(stderr, "\ndigest mod q: ");
     BN_print_fp(stderr, e);
 #endif
-    if (BN_is_zero(e))
-        BN_one(e);
+    if (BN_is_zero(e) && !BN_one(e)) {
+        GOSTerr(GOST_F_GOST2001_DO_VERIFY, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
     v = BN_mod_inverse(v, e, order, ctx);
-    BN_mod_mul(z1, sig->s, v, order, ctx);
-    BN_sub(tmp, order, sig->r);
-    BN_mod_mul(z2, tmp, v, order, ctx);
+    if(!v
+        || !BN_mod_mul(z1, sig->s, v, order, ctx)
+        || !BN_sub(tmp, order, sig->r)
+        || !BN_mod_mul(z2, tmp, v, order, ctx)) {
+        GOSTerr(GOST_F_GOST2001_DO_VERIFY, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 #ifdef DEBUG_SIGN
     fprintf(stderr, "\nInverted digest value: ");
     BN_print_fp(stderr, v);
@@ -239,6 +335,10 @@ int gost2001_do_verify(const unsigned char *dgst, int dgst_len,
     BN_print_fp(stderr, z2);
 #endif
     C = EC_POINT_new(group);
+    if (!C) {
+        GOSTerr(GOST_F_GOST2001_DO_VERIFY, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
     if (!EC_POINT_mul(group, C, z1, pub_key, z2, ctx)) {
         GOSTerr(GOST_F_GOST2001_DO_VERIFY, ERR_R_EC_LIB);
         goto err;
@@ -247,7 +347,10 @@ int gost2001_do_verify(const unsigned char *dgst, int dgst_len,
         GOSTerr(GOST_F_GOST2001_DO_VERIFY, ERR_R_EC_LIB);
         goto err;
     }
-    BN_mod(R, X, order, ctx);
+    if(!BN_mod(R, X, order, ctx)) {
+        GOSTerr(GOST_F_GOST2001_DO_VERIFY, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 #ifdef DEBUG_SIGN
     fprintf(stderr, "\nX=");
     BN_print_fp(stderr, X);
@@ -261,10 +364,12 @@ int gost2001_do_verify(const unsigned char *dgst, int dgst_len,
         ok = 1;
     }
  err:
-    EC_POINT_free(C);
-    BN_CTX_end(ctx);
-    BN_CTX_free(ctx);
-    BN_free(md);
+    if (C) EC_POINT_free(C);
+    if (ctx) {
+        BN_CTX_end(ctx);
+        BN_CTX_free(ctx);
+    }
+    if (md) BN_free(md);
     return ok;
 }
 
@@ -287,6 +392,10 @@ int gost2001_compute_public(EC_KEY *ec)
         return 0;
     }
     ctx = BN_CTX_new();
+    if(!ctx) {
+        GOSTerr(GOST_F_GOST2001_COMPUTE_PUBLIC, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
     BN_CTX_start(ctx);
     if (!(priv_key = EC_KEY_get0_private_key(ec))) {
         GOSTerr(GOST_F_GOST2001_COMPUTE_PUBLIC, ERR_R_EC_LIB);
@@ -294,6 +403,10 @@ int gost2001_compute_public(EC_KEY *ec)
     }
 
     pub_key = EC_POINT_new(group);
+    if(!pub_key) {
+        GOSTerr(GOST_F_GOST2001_COMPUTE_PUBLIC, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
     if (!EC_POINT_mul(group, pub_key, priv_key, NULL, NULL, ctx)) {
         GOSTerr(GOST_F_GOST2001_COMPUTE_PUBLIC, ERR_R_EC_LIB);
         goto err;
@@ -304,9 +417,11 @@ int gost2001_compute_public(EC_KEY *ec)
     }
     ok = 256;
  err:
-    BN_CTX_end(ctx);
-    EC_POINT_free(pub_key);
-    BN_CTX_free(ctx);
+    if (pub_key) EC_POINT_free(pub_key);
+    if (ctx) {
+        BN_CTX_end(ctx);
+        BN_CTX_free(ctx);
+    }
     return ok;
 }
 
@@ -320,7 +435,13 @@ int gost2001_keygen(EC_KEY *ec)
 {
     BIGNUM *order = BN_new(), *d = BN_new();
     const EC_GROUP *group = EC_KEY_get0_group(ec);
-    EC_GROUP_get_order(group, order, NULL);
+
+    if(!group || !EC_GROUP_get_order(group, order, NULL)) {
+        GOSTerr(GOST_F_GOST2001_KEYGEN, ERR_R_INTERNAL_ERROR);
+        BN_free(d);
+        BN_free(order);
+        return 0;
+    }
 
     do {
         if (!BN_rand_range(d, order)) {
@@ -332,7 +453,13 @@ int gost2001_keygen(EC_KEY *ec)
         }
     }
     while (BN_is_zero(d));
-    EC_KEY_set_private_key(ec, d);
+
+    if(!EC_KEY_set_private_key(ec, d)) {
+        GOSTerr(GOST_F_GOST2001_KEYGEN, ERR_R_INTERNAL_ERROR);
+        BN_free(d);
+        BN_free(order);
+        return 0;
+    }
     BN_free(d);
     BN_free(order);
     return gost2001_compute_public(ec);
diff --git a/engines/ccgost/gost_ameth.c b/engines/ccgost/gost_ameth.c
index a5d80a1..bc45325 100644
--- a/engines/ccgost/gost_ameth.c
+++ b/engines/ccgost/gost_ameth.c
@@ -115,7 +115,10 @@ static int decode_gost_algor_params(EVP_PKEY *pkey, X509_ALGOR *palg)
     }
     param_nid = OBJ_obj2nid(gkp->key_params);
     GOST_KEY_PARAMS_free(gkp);
-    EVP_PKEY_set_type(pkey, pkey_nid);
+    if(!EVP_PKEY_set_type(pkey, pkey_nid)) {
+        GOSTerr(GOST_F_DECODE_GOST_ALGOR_PARAMS, ERR_R_INTERNAL_ERROR);
+        return 0;
+    }
     switch (pkey_nid) {
     case NID_id_GostR3410_94:
         {
@@ -548,9 +551,19 @@ static int param_copy_gost01(EVP_PKEY *to, const EVP_PKEY *from)
     }
     if (!eto) {
         eto = EC_KEY_new();
-        EVP_PKEY_assign(to, EVP_PKEY_base_id(from), eto);
+        if(!eto) {
+            GOSTerr(GOST_F_PARAM_COPY_GOST01, ERR_R_MALLOC_FAILURE);
+            return 0;
+        }
+        if(!EVP_PKEY_assign(to, EVP_PKEY_base_id(from), eto)) {
+            GOSTerr(GOST_F_PARAM_COPY_GOST01, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
+    }
+    if(!EC_KEY_set_group(eto, EC_KEY_get0_group(efrom))) {
+        GOSTerr(GOST_F_PARAM_COPY_GOST01, ERR_R_INTERNAL_ERROR);
+        return 0;
     }
-    EC_KEY_set_group(eto, EC_KEY_get0_group(efrom));
     if (EC_KEY_get0_private_key(eto)) {
         gost2001_compute_public(eto);
     }
@@ -745,8 +758,21 @@ static int pub_encode_gost01(X509_PUBKEY *pub, const EVP_PKEY *pk)
     }
     X = BN_new();
     Y = BN_new();
-    EC_POINT_get_affine_coordinates_GFp(EC_KEY_get0_group(ec),
-                                        pub_key, X, Y, NULL);
+    if(!X || !Y) {
+        GOSTerr(GOST_F_PUB_ENCODE_GOST01, ERR_R_MALLOC_FAILURE);
+        if(X) BN_free(X);
+        if(Y) BN_free(Y);
+        BN_free(order);
+        return 0;
+    }
+    if(!EC_POINT_get_affine_coordinates_GFp(EC_KEY_get0_group(ec),
+                                        pub_key, X, Y, NULL)) {
+        GOSTerr(GOST_F_PUB_ENCODE_GOST01, ERR_R_INTERNAL_ERROR);
+        BN_free(X);
+        BN_free(Y);
+        BN_free(order);
+        return 0;
+    }
     data_len = 2 * BN_num_bytes(order);
     BN_free(order);
     databuf = OPENSSL_malloc(data_len);
diff --git a/engines/ccgost/gost_pmeth.c b/engines/ccgost/gost_pmeth.c
index f1220e8..673b538 100644
--- a/engines/ccgost/gost_pmeth.c
+++ b/engines/ccgost/gost_pmeth.c
@@ -509,7 +509,7 @@ static int pkey_gost_mac_ctrl_str(EVP_PKEY_CTX *ctx,
         long keylen;
         int ret;
         unsigned char *keybuf = string_to_hex(value, &keylen);
-        if (keylen != 32) {
+        if (!keybuf || keylen != 32) {
             GOSTerr(GOST_F_PKEY_GOST_MAC_CTRL_STR,
                     GOST_R_INVALID_MAC_KEY_LENGTH);
             OPENSSL_free(keybuf);
diff --git a/engines/ccgost/gost_sign.c b/engines/ccgost/gost_sign.c
index 5bcc296..b3e1007 100644
--- a/engines/ccgost/gost_sign.c
+++ b/engines/ccgost/gost_sign.c
@@ -13,6 +13,7 @@
 #include <openssl/dsa.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
+#include <openssl/err.h>
 
 #include "gost_params.h"
 #include "gost_lcl.h"
@@ -53,11 +54,16 @@ void dump_dsa_sig(const char *message, DSA_SIG *sig)
 DSA_SIG *gost_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
 {
     BIGNUM *k = NULL, *tmp = NULL, *tmp2 = NULL;
-    DSA_SIG *newsig = DSA_SIG_new();
+    DSA_SIG *newsig, *ret = NULL;
     BIGNUM *md = hashsum2bn(dgst);
     /* check if H(M) mod q is zero */
     BN_CTX *ctx = BN_CTX_new();
+    if(!ctx) {
+        GOSTerr(GOST_F_GOST_DO_SIGN, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
     BN_CTX_start(ctx);
+    newsig = DSA_SIG_new();
     if (!newsig) {
         GOSTerr(GOST_F_GOST_DO_SIGN, ERR_R_MALLOC_FAILURE);
         goto err;
@@ -65,6 +71,10 @@ DSA_SIG *gost_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
     tmp = BN_CTX_get(ctx);
     k = BN_CTX_get(ctx);
     tmp2 = BN_CTX_get(ctx);
+    if(!tmp || !k || !tmp2) {
+        GOSTerr(GOST_F_GOST_DO_SIGN, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
     BN_mod(tmp, md, dsa->q, ctx);
     if (BN_is_zero(tmp)) {
         BN_one(md);
@@ -77,24 +87,41 @@ DSA_SIG *gost_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
             BN_rand_range(k, dsa->q);
             /* generate r = (a^x mod p) mod q */
             BN_mod_exp(tmp, dsa->g, k, dsa->p, ctx);
-            if (!(newsig->r))
+            if (!(newsig->r)) {
                 newsig->r = BN_new();
+                if(!newsig->r) {
+                    GOSTerr(GOST_F_GOST_DO_SIGN, ERR_R_MALLOC_FAILURE);
+                    goto err;
+                }
+            }
             BN_mod(newsig->r, tmp, dsa->q, ctx);
         }
         while (BN_is_zero(newsig->r));
         /* generate s = (xr + k(Hm)) mod q */
         BN_mod_mul(tmp, dsa->priv_key, newsig->r, dsa->q, ctx);
         BN_mod_mul(tmp2, k, md, dsa->q, ctx);
-        if (!newsig->s)
+        if (!newsig->s) {
             newsig->s = BN_new();
+            if(!newsig->s) {
+                GOSTerr(GOST_F_GOST_DO_SIGN, ERR_R_MALLOC_FAILURE);
+                goto err;
+            }
+        }
         BN_mod_add(newsig->s, tmp, tmp2, dsa->q, ctx);
     }
     while (BN_is_zero(newsig->s));
+
+    ret = newsig;
  err:
     BN_free(md);
-    BN_CTX_end(ctx);
-    BN_CTX_free(ctx);
-    return newsig;
+    if(ctx) {
+        BN_CTX_end(ctx);
+        BN_CTX_free(ctx);
+    }
+    if(!ret && newsig) {
+        DSA_SIG_free(newsig);
+    }
+    return ret;
 }
 
 /*
@@ -136,17 +163,21 @@ int pack_sign_cp(DSA_SIG *s, int order, unsigned char *sig, size_t *siglen)
 int gost_do_verify(const unsigned char *dgst, int dgst_len,
                    DSA_SIG *sig, DSA *dsa)
 {
-    BIGNUM *md, *tmp = NULL;
+    BIGNUM *md = NULL, *tmp = NULL;
     BIGNUM *q2 = NULL;
     BIGNUM *u = NULL, *v = NULL, *z1 = NULL, *z2 = NULL;
     BIGNUM *tmp2 = NULL, *tmp3 = NULL;
     int ok;
     BN_CTX *ctx = BN_CTX_new();
+    if(!ctx) {
+        GOSTerr(GOST_F_GOST_DO_VERIFY, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
 
     BN_CTX_start(ctx);
     if (BN_cmp(sig->s, dsa->q) >= 1 || BN_cmp(sig->r, dsa->q) >= 1) {
         GOSTerr(GOST_F_GOST_DO_VERIFY, GOST_R_SIGNATURE_PARTS_GREATER_THAN_Q);
-        return 0;
+        goto err;
     }
     md = hashsum2bn(dgst);
 
@@ -158,6 +189,10 @@ int gost_do_verify(const unsigned char *dgst, int dgst_len,
     tmp2 = BN_CTX_get(ctx);
     tmp3 = BN_CTX_get(ctx);
     u = BN_CTX_get(ctx);
+    if(!tmp || !v || !q2 || !z1 || !z2 || !tmp2 || !tmp3 || !u) {
+        GOSTerr(GOST_F_GOST_DO_VERIFY, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
 
     BN_mod(tmp, md, dsa->q, ctx);
     if (BN_is_zero(tmp)) {
@@ -175,12 +210,15 @@ int gost_do_verify(const unsigned char *dgst, int dgst_len,
     BN_mod(u, tmp3, dsa->q, ctx);
     ok = BN_cmp(u, sig->r);
 
-    BN_free(md);
-    BN_CTX_end(ctx);
-    BN_CTX_free(ctx);
     if (ok != 0) {
         GOSTerr(GOST_F_GOST_DO_VERIFY, GOST_R_SIGNATURE_MISMATCH);
     }
+err:
+    if(md) BN_free(md);
+    if(ctx) {
+        BN_CTX_end(ctx);
+        BN_CTX_free(ctx);
+    }
     return (ok == 0);
 }
 
@@ -191,13 +229,24 @@ int gost_do_verify(const unsigned char *dgst, int dgst_len,
 int gost94_compute_public(DSA *dsa)
 {
     /* Now fill algorithm parameters with correct values */
-    BN_CTX *ctx = BN_CTX_new();
+    BN_CTX *ctx;
     if (!dsa->g) {
         GOSTerr(GOST_F_GOST94_COMPUTE_PUBLIC, GOST_R_KEY_IS_NOT_INITALIZED);
         return 0;
     }
-    /* Compute public key  y = a^x mod p */
+    ctx = BN_CTX_new();
+    if(!ctx) {
+        GOSTerr(GOST_F_GOST94_COMPUTE_PUBLIC, ERR_R_MALLOC_FAILURE);
+        return 0;
+    }
+
     dsa->pub_key = BN_new();
+    if(!dsa->pub_key) {
+        GOSTerr(GOST_F_GOST94_COMPUTE_PUBLIC, ERR_R_MALLOC_FAILURE);
+        BN_CTX_free(ctx);
+        return 0;
+    }
+    /* Compute public key  y = a^x mod p */
     BN_mod_exp(dsa->pub_key, dsa->g, dsa->priv_key, dsa->p, ctx);
     BN_CTX_free(ctx);
     return 1;
@@ -244,6 +293,10 @@ int fill_GOST94_params(DSA *dsa, int nid)
 int gost_sign_keygen(DSA *dsa)
 {
     dsa->priv_key = BN_new();
+    if(!dsa->priv_key) {
+        GOSTerr(GOST_F_GOST_SIGN_KEYGEN, ERR_R_MALLOC_FAILURE);
+        return 0;
+    }
     BN_rand_range(dsa->priv_key, dsa->q);
     return gost94_compute_public(dsa);
 }
diff --git a/engines/e_sureware.c b/engines/e_sureware.c
index 262766c..3c7b2b2 100644
--- a/engines/e_sureware.c
+++ b/engines/e_sureware.c
@@ -713,10 +713,12 @@ static EVP_PKEY *sureware_load_public(ENGINE *e, const char *key_id,
         /* set public big nums */
         rsatmp->e = BN_new();
         rsatmp->n = BN_new();
+        if(!rsatmp->e || !rsatmp->n)
+            goto err;
         bn_expand2(rsatmp->e, el / sizeof(BN_ULONG));
         bn_expand2(rsatmp->n, el / sizeof(BN_ULONG));
-        if (!rsatmp->e || rsatmp->e->dmax != (int)(el / sizeof(BN_ULONG)) ||
-            !rsatmp->n || rsatmp->n->dmax != (int)(el / sizeof(BN_ULONG)))
+        if (rsatmp->e->dmax != (int)(el / sizeof(BN_ULONG)) ||
+            rsatmp->n->dmax != (int)(el / sizeof(BN_ULONG)))
             goto err;
         ret = p_surewarehk_Load_Rsa_Pubkey(msg, key_id, el,
                                            (unsigned long *)rsatmp->n->d,
@@ -753,15 +755,16 @@ static EVP_PKEY *sureware_load_public(ENGINE *e, const char *key_id,
         dsatmp->p = BN_new();
         dsatmp->q = BN_new();
         dsatmp->g = BN_new();
+        if(!dsatmp->pub_key || !dsatmp->p || !dsatmp->q || !dsatmp->g)
+            goto err;
         bn_expand2(dsatmp->pub_key, el / sizeof(BN_ULONG));
         bn_expand2(dsatmp->p, el / sizeof(BN_ULONG));
         bn_expand2(dsatmp->q, 20 / sizeof(BN_ULONG));
         bn_expand2(dsatmp->g, el / sizeof(BN_ULONG));
-        if (!dsatmp->pub_key
-            || dsatmp->pub_key->dmax != (int)(el / sizeof(BN_ULONG))
-            || !dsatmp->p || dsatmp->p->dmax != (int)(el / sizeof(BN_ULONG))
-            || !dsatmp->q || dsatmp->q->dmax != 20 / sizeof(BN_ULONG)
-            || !dsatmp->g || dsatmp->g->dmax != (int)(el / sizeof(BN_ULONG)))
+        if (dsatmp->pub_key->dmax != (int)(el / sizeof(BN_ULONG))
+            || dsatmp->p->dmax != (int)(el / sizeof(BN_ULONG))
+            || dsatmp->q->dmax != 20 / sizeof(BN_ULONG)
+            || dsatmp->g->dmax != (int)(el / sizeof(BN_ULONG)))
             goto err;
 
         ret = p_surewarehk_Load_Dsa_Pubkey(msg, key_id, el,
@@ -1018,10 +1021,12 @@ static DSA_SIG *surewarehk_dsa_do_sign(const unsigned char *from, int flen,
         }
         psign->r = BN_new();
         psign->s = BN_new();
+        if(!psign->r || !psign->s)
+            goto err;
         bn_expand2(psign->r, 20 / sizeof(BN_ULONG));
         bn_expand2(psign->s, 20 / sizeof(BN_ULONG));
-        if (!psign->r || psign->r->dmax != 20 / sizeof(BN_ULONG) ||
-            !psign->s || psign->s->dmax != 20 / sizeof(BN_ULONG))
+        if (psign->r->dmax != 20 / sizeof(BN_ULONG) ||
+            psign->s->dmax != 20 / sizeof(BN_ULONG))
             goto err;
         ret = p_surewarehk_Dsa_Sign(msg, flen, from,
                                     (unsigned long *)psign->r->d,
@@ -1050,9 +1055,9 @@ static int surewarehk_modexp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
     char msg[64] = "ENGINE_modexp";
     if (!p_surewarehk_Mod_Exp) {
         SUREWAREerr(SUREWARE_F_SUREWAREHK_MODEXP, ENGINE_R_NOT_INITIALISED);
-    } else {
+    } else if (r) {
         bn_expand2(r, m->top);
-        if (r && r->dmax == m->top) {
+        if (r->dmax == m->top) {
             /* do it */
             ret = p_surewarehk_Mod_Exp(msg,
                                        m->top * sizeof(BN_ULONG),

From matt at openssl.org  Wed Mar 25 12:40:25 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 25 Mar 2015 12:40:25 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427287225.683387.5656.nullmailer@dev.openssl.org>

The branch master has been updated
       via  302d38e3f73d5fd2ba2fd30bb7798778cb9f18dd (commit)
       via  266483d2f56b0764849797f31866bfd84f9c3aa8 (commit)
      from  8817e2e0c998757d3bd036d7f45fe8d0a49fbe2d (commit)


- Log -----------------------------------------------------------------
commit 302d38e3f73d5fd2ba2fd30bb7798778cb9f18dd
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Feb 26 13:52:30 2015 +0000

    Deprecate RAND_pseudo_bytes
    
    The justification for RAND_pseudo_bytes is somewhat dubious, and the reality
    is that it is frequently being misused. RAND_bytes and RAND_pseudo_bytes in
    the default implementation both end up calling ssleay_rand_bytes. Both may
    return -1 in an error condition. If there is insufficient entropy then
    both will return 0, but RAND_bytes will additionally add an error to the
    error queue. They both return 1 on success.
    Therefore the fundamental difference between the two is that one will add an
    error to the error queue with insufficient entory whilst the other will not.
    Frequently there are constructions of this form:
    
    if(RAND_pseudo_bytes(...) <= 1)
    	goto err;
    
    In the above form insufficient entropy is treated as an error anyway, so
    RAND_bytes is probably the better form to use.
    
    This form is also seen:
    if(!RAND_pseudo_bytes(...))
    	goto err;
    
    This is technically not correct at all since a -1 return value is
    incorrectly handled - but this form will also treat insufficient entropy as
    an error.
    
    Within libssl it is required that you have correctly seeded your entropy
    pool and so there seems little benefit in using RAND_pseudo_bytes.
    Similarly in libcrypto many operations also require a correctly seeded
    entropy pool and so in most interesting cases you would be better off
    using RAND_bytes anyway. There is a significant risk of RAND_pseudo_bytes
    being incorrectly used in scenarios where security can be compromised by
    insufficient entropy.
    
    If you are not using the default implementation, then most engines use the
    same function to implement RAND_bytes and RAND_pseudo_bytes in any case.
    
    Given its misuse, limited benefit, and potential to compromise security,
    RAND_pseudo_bytes has been deprecated.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 266483d2f56b0764849797f31866bfd84f9c3aa8
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Feb 26 11:57:37 2015 +0000

    RAND_bytes updates
    
    Ensure RAND_bytes return value is checked correctly, and that we no longer
    use RAND_pseudo_bytes.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 CHANGES                   |  2 ++
 apps/enc.c                |  2 +-
 apps/passwd.c             |  4 ++--
 apps/s_cb.c               |  2 +-
 apps/s_server.c           |  3 ++-
 apps/speed.c              |  4 ++--
 crypto/asn1/asn_mime.c    |  3 ++-
 crypto/asn1/p5_pbe.c      |  2 +-
 crypto/asn1/p5_pbev2.c    |  4 ++--
 crypto/bio/bf_nbio.c      |  6 ++++--
 crypto/bn/bn_lcl.h        |  2 +-
 crypto/bn/bn_rand.c       |  5 +++--
 crypto/cms/cms_enc.c      |  2 +-
 crypto/cms/cms_ess.c      |  3 +--
 crypto/cms/cms_pwri.c     |  7 ++++---
 crypto/des/enc_writ.c     |  3 ++-
 crypto/dsa/dsa_gen.c      |  4 ++--
 crypto/ecdsa/ecdsatest.c  |  3 +--
 crypto/evp/bio_ok.c       |  3 ++-
 crypto/evp/e_des3.c       |  3 ++-
 crypto/evp/p_seal.c       |  5 +++--
 crypto/ocsp/ocsp_ext.c    |  4 ++--
 crypto/pem/pem_lib.c      |  2 +-
 crypto/pkcs12/p12_mutl.c  |  2 +-
 crypto/pkcs7/pk7_doit.c   |  2 +-
 crypto/rand/md_rand.c     |  8 ++++++++
 crypto/rand/rand.h        |  4 +++-
 crypto/rand/rand_lib.c    |  2 ++
 crypto/rand/randtest.c    |  4 ++--
 crypto/srp/srp_vfy.c      |  9 ++++++---
 crypto/srp/srptest.c      |  4 ++--
 demos/easy_tls/easy-tls.c |  3 ++-
 doc/crypto/RAND_bytes.pod |  3 +++
 ssl/d1_both.c             | 18 ++++++++++++++----
 ssl/s23_clnt.c            |  5 +++--
 ssl/s3_clnt.c             |  7 ++++++-
 ssl/s3_srvr.c             |  5 +----
 ssl/ssl_lib.c             |  2 +-
 ssl/ssl_sess.c            |  2 +-
 ssl/t1_lib.c              | 19 ++++++++++++++-----
 test/igetest.c            |  8 ++++----
 41 files changed, 118 insertions(+), 67 deletions(-)

diff --git a/CHANGES b/CHANGES
index ab5b482..7c57410 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,8 @@
 
  Changes between 1.0.2 and 1.1.0  [xx XXX xxxx]
 
+  *) RAND_pseudo_bytes has been deprecated. Users should use RAND bytes instead.
+
   *) Added support for TLS extended master secret from
      draft-ietf-tls-session-hash-03.txt. Thanks for Alfredo Pironti for an
      initial patch which was a great help during development.
diff --git a/apps/enc.c b/apps/enc.c
index 3bf4a6e..1739b7e 100644
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -505,7 +505,7 @@ int MAIN(int argc, char **argv)
                             BIO_printf(bio_err, "invalid hex salt value\n");
                             goto end;
                         }
-                    } else if (RAND_pseudo_bytes(salt, sizeof salt) < 0)
+                    } else if (RAND_bytes(salt, sizeof salt) <= 0)
                         goto end;
                     /*
                      * If -P option then don't bother writing
diff --git a/apps/passwd.c b/apps/passwd.c
index 5ff53b5..798a6d5 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -416,7 +416,7 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
                 if (*salt_malloc_p == NULL)
                     goto err;
             }
-            if (RAND_pseudo_bytes((unsigned char *)*salt_p, 2) < 0)
+            if (RAND_bytes((unsigned char *)*salt_p, 2) <= 0)
                 goto err;
             (*salt_p)[0] = cov_2char[(*salt_p)[0] & 0x3f]; /* 6 bits */
             (*salt_p)[1] = cov_2char[(*salt_p)[1] & 0x3f]; /* 6 bits */
@@ -437,7 +437,7 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
                 if (*salt_malloc_p == NULL)
                     goto err;
             }
-            if (RAND_pseudo_bytes((unsigned char *)*salt_p, 8) < 0)
+            if (RAND_bytes((unsigned char *)*salt_p, 8) <= 0)
                 goto err;
 
             for (i = 0; i < 8; i++)
diff --git a/apps/s_cb.c b/apps/s_cb.c
index 8bc4b81..ea7d35c 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -949,7 +949,7 @@ int generate_cookie_callback(SSL *ssl, unsigned char *cookie,
 
     /* Initialize a random secret */
     if (!cookie_initialized) {
-        if (!RAND_bytes(cookie_secret, COOKIE_SECRET_LENGTH)) {
+        if (RAND_bytes(cookie_secret, COOKIE_SECRET_LENGTH) <= 0) {
             BIO_printf(bio_err, "error setting random cookie secret\n");
             return 0;
         }
diff --git a/apps/s_server.c b/apps/s_server.c
index 97aa23d..c3884d2 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -3199,7 +3199,8 @@ static int generate_session_id(const SSL *ssl, unsigned char *id,
 {
     unsigned int count = 0;
     do {
-        RAND_pseudo_bytes(id, *id_len);
+        if (RAND_bytes(id, *id_len) <= 0)
+            return 0;
         /*
          * Prefix the session_id with the required prefix. NB: If our prefix
          * is too long, clip it - but there will be worse effects anyway, eg.
diff --git a/apps/speed.c b/apps/speed.c
index b023f28..d2034a4 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -1967,7 +1967,7 @@ int MAIN(int argc, char **argv)
     }
 #ifndef OPENSSL_SYS_WIN32
 #endif
-    RAND_pseudo_bytes(buf, 36);
+    RAND_bytes(buf, 36);
 #ifndef OPENSSL_NO_RSA
     for (j = 0; j < RSA_NUM; j++) {
         int ret;
@@ -2039,7 +2039,7 @@ int MAIN(int argc, char **argv)
     }
 #endif
 
-    RAND_pseudo_bytes(buf, 20);
+    RAND_bytes(buf, 20);
 #ifndef OPENSSL_NO_DSA
     if (RAND_status() != 1) {
         RAND_seed(rnd_seed, sizeof rnd_seed);
diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index 28622f2..e96fb02 100644
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -286,7 +286,8 @@ int SMIME_write_ASN1(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
     if ((flags & SMIME_DETACHED) && data) {
         /* We want multipart/signed */
         /* Generate a random boundary */
-        RAND_pseudo_bytes((unsigned char *)bound, 32);
+        if (RAND_bytes((unsigned char *)bound, 32) <= 0)
+            return 0;
         for (i = 0; i < 32; i++) {
             c = bound[i] & 0xf;
             if (c < 10)
diff --git a/crypto/asn1/p5_pbe.c b/crypto/asn1/p5_pbe.c
index d54b094..a65b659 100644
--- a/crypto/asn1/p5_pbe.c
+++ b/crypto/asn1/p5_pbe.c
@@ -101,7 +101,7 @@ int PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter,
     sstr = ASN1_STRING_data(pbe->salt);
     if (salt)
         memcpy(sstr, salt, saltlen);
-    else if (RAND_pseudo_bytes(sstr, saltlen) < 0)
+    else if (RAND_bytes(sstr, saltlen) <= 0)
         goto err;
 
     if (!ASN1_item_pack(pbe, ASN1_ITEM_rptr(PBEPARAM), &pbe_str)) {
diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c
index c56d850..60abbe2 100644
--- a/crypto/asn1/p5_pbev2.c
+++ b/crypto/asn1/p5_pbev2.c
@@ -120,7 +120,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
     if (EVP_CIPHER_iv_length(cipher)) {
         if (aiv)
             memcpy(iv, aiv, EVP_CIPHER_iv_length(cipher));
-        else if (RAND_pseudo_bytes(iv, EVP_CIPHER_iv_length(cipher)) < 0)
+        else if (RAND_bytes(iv, EVP_CIPHER_iv_length(cipher)) <= 0)
             goto err;
     }
 
@@ -225,7 +225,7 @@ X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen,
 
     if (salt)
         memcpy(osalt->data, salt, saltlen);
-    else if (RAND_pseudo_bytes(osalt->data, saltlen) < 0)
+    else if (RAND_bytes(osalt->data, saltlen) <= 0)
         goto merr;
 
     if (iter <= 0)
diff --git a/crypto/bio/bf_nbio.c b/crypto/bio/bf_nbio.c
index 3af58bd..0ba6055 100644
--- a/crypto/bio/bf_nbio.c
+++ b/crypto/bio/bf_nbio.c
@@ -136,7 +136,8 @@ static int nbiof_read(BIO *b, char *out, int outl)
         return (0);
 
     BIO_clear_retry_flags(b);
-    RAND_pseudo_bytes(&n, 1);
+    if (RAND_bytes(&n, 1) <= 0)
+        return -1;
     num = (n & 0x07);
 
     if (outl > num)
@@ -172,7 +173,8 @@ static int nbiof_write(BIO *b, const char *in, int inl)
         num = nt->lwn;
         nt->lwn = 0;
     } else {
-        RAND_pseudo_bytes(&n, 1);
+        if (RAND_bytes(&n, 1) <= 0)
+            return -1;
         num = (n & 7);
     }
 
diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h
index ba22f3a..a24ae7f 100644
--- a/crypto/bn/bn_lcl.h
+++ b/crypto/bn/bn_lcl.h
@@ -168,7 +168,7 @@ int RAND_pseudo_bytes(unsigned char *buf, int num);
                          * wouldn't be constructed with top!=dmax. */ \
                         BN_ULONG *_not_const; \
                         memcpy(&_not_const, &_bnum1->d, sizeof(BN_ULONG*)); \
-                        RAND_pseudo_bytes(&_tmp_char, 1); \
+                        RAND_bytes(&_tmp_char, 1); /* Debug only - safe to ignore error return */\
                         memset((unsigned char *)(_not_const + _bnum1->top), _tmp_char, \
                                 (_bnum1->dmax - _bnum1->top) * sizeof(BN_ULONG)); \
                 } \
diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index 9488454..be58a5a 100644
--- a/crypto/bn/bn_rand.c
+++ b/crypto/bn/bn_rand.c
@@ -142,7 +142,7 @@ static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom)
     RAND_add(&tim, sizeof(tim), 0.0);
 
     if (pseudorand) {
-        if (RAND_pseudo_bytes(buf, bytes) == -1)
+        if (RAND_bytes(buf, bytes) <= 0)
             goto err;
     } else {
         if (RAND_bytes(buf, bytes) <= 0)
@@ -157,7 +157,8 @@ static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom)
         unsigned char c;
 
         for (i = 0; i < bytes; i++) {
-            RAND_pseudo_bytes(&c, 1);
+            if (RAND_bytes(&c, 1) <= 0)
+                goto err;
             if (c >= 128 && i > 0)
                 buf[i] = buf[i - 1];
             else if (c < 42)
diff --git a/crypto/cms/cms_enc.c b/crypto/cms/cms_enc.c
index 85ae928..ffa85fc 100644
--- a/crypto/cms/cms_enc.c
+++ b/crypto/cms/cms_enc.c
@@ -119,7 +119,7 @@ BIO *cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec)
         /* Generate a random IV if we need one */
         ivlen = EVP_CIPHER_CTX_iv_length(ctx);
         if (ivlen > 0) {
-            if (RAND_pseudo_bytes(iv, ivlen) <= 0)
+            if (RAND_bytes(iv, ivlen) <= 0)
                 goto err;
             piv = iv;
         }
diff --git a/crypto/cms/cms_ess.c b/crypto/cms/cms_ess.c
index 8631a2e..8212560 100644
--- a/crypto/cms/cms_ess.c
+++ b/crypto/cms/cms_ess.c
@@ -107,8 +107,7 @@ CMS_ReceiptRequest *CMS_ReceiptRequest_create0(unsigned char *id, int idlen,
     else {
         if (!ASN1_STRING_set(rr->signedContentIdentifier, NULL, 32))
             goto merr;
-        if (RAND_pseudo_bytes(rr->signedContentIdentifier->data, 32)
-            <= 0)
+        if (RAND_bytes(rr->signedContentIdentifier->data, 32) <= 0)
             goto err;
     }
 
diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c
index dd5f636..83a65d2 100644
--- a/crypto/cms/cms_pwri.c
+++ b/crypto/cms/cms_pwri.c
@@ -131,7 +131,7 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
     ivlen = EVP_CIPHER_CTX_iv_length(&ctx);
 
     if (ivlen > 0) {
-        if (RAND_pseudo_bytes(iv, ivlen) <= 0)
+        if (RAND_bytes(iv, ivlen) <= 0)
             goto err;
         if (EVP_EncryptInit_ex(&ctx, NULL, NULL, NULL, iv) <= 0) {
             CMSerr(CMS_F_CMS_ADD0_RECIPIENT_PASSWORD, ERR_R_EVP_LIB);
@@ -299,8 +299,9 @@ static int kek_wrap_key(unsigned char *out, size_t *outlen,
         out[3] = in[2] ^ 0xFF;
         memcpy(out + 4, in, inlen);
         /* Add random padding to end */
-        if (olen > inlen + 4)
-            RAND_pseudo_bytes(out + 4 + inlen, olen - 4 - inlen);
+        if (olen > inlen + 4
+            && RAND_bytes(out + 4 + inlen, olen - 4 - inlen) <= 0)
+            return 0;
         /* Encrypt twice */
         if (!EVP_EncryptUpdate(ctx, out, &dummy, out, olen)
             || !EVP_EncryptUpdate(ctx, out, &dummy, out, olen))
diff --git a/crypto/des/enc_writ.c b/crypto/des/enc_writ.c
index b4eecc3..55cc7fc 100644
--- a/crypto/des/enc_writ.c
+++ b/crypto/des/enc_writ.c
@@ -132,7 +132,8 @@ int DES_enc_write(int fd, const void *_buf, int len,
     if (len < 8) {
         cp = shortbuf;
         memcpy(shortbuf, buf, len);
-        RAND_pseudo_bytes(shortbuf + len, 8 - len);
+        if (RAND_bytes(shortbuf + len, 8 - len) <= 0)
+            return -1;
         rnum = 8;
     } else {
         cp = buf;
diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index 37b23c9..3506bc3 100644
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -173,7 +173,7 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
                 goto err;
 
             if (!seed_len) {
-                if (RAND_pseudo_bytes(seed, qsize) < 0)
+                if (RAND_bytes(seed, qsize) <= 0)
                     goto err;
                 seed_is_random = 1;
             } else {
@@ -448,7 +448,7 @@ int dsa_builtin_paramgen2(DSA *ret, size_t L, size_t N,
                 goto err;
 
             if (!seed_in) {
-                if (RAND_pseudo_bytes(seed, seed_len) < 0)
+                if (RAND_bytes(seed, seed_len) <= 0)
                     goto err;
             }
             /* step 2 */
diff --git a/crypto/ecdsa/ecdsatest.c b/crypto/ecdsa/ecdsatest.c
index 31d9c84..c2132da 100644
--- a/crypto/ecdsa/ecdsatest.c
+++ b/crypto/ecdsa/ecdsatest.c
@@ -311,8 +311,7 @@ int test_builtin(BIO *out)
     int nid, ret = 0;
 
     /* fill digest values with some random data */
-    if (!RAND_pseudo_bytes(digest, 20) ||
-        !RAND_pseudo_bytes(wrong_digest, 20)) {
+    if (RAND_bytes(digest, 20) <= 0 || RAND_bytes(wrong_digest, 20) <= 0) {
         BIO_printf(out, "ERROR: unable to get random data\n");
         goto builtin_err;
     }
diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c
index b097a4d..ffdde6c 100644
--- a/crypto/evp/bio_ok.c
+++ b/crypto/evp/bio_ok.c
@@ -491,7 +491,8 @@ static int sig_out(BIO *b)
      * FIXME: there's absolutely no guarantee this makes any sense at all,
      * particularly now EVP_MD_CTX has been restructured.
      */
-    RAND_pseudo_bytes(md->md_data, md->digest->md_size);
+    if (RAND_bytes(md->md_data, md->digest->md_size) <= 0)
+        goto berr;
     memcpy(&(ctx->buf[ctx->buf_len]), md->md_data, md->digest->md_size);
     longswap(&(ctx->buf[ctx->buf_len]), md->digest->md_size);
     ctx->buf_len += md->digest->md_size;
diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c
index 73d7923..c720242 100644
--- a/crypto/evp/e_des3.c
+++ b/crypto/evp/e_des3.c
@@ -439,7 +439,8 @@ static int des_ede3_wrap(EVP_CIPHER_CTX *ctx, unsigned char *out,
     memcpy(out + inl + 8, sha1tmp, 8);
     OPENSSL_cleanse(sha1tmp, SHA_DIGEST_LENGTH);
     /* Generate random IV */
-    RAND_bytes(ctx->iv, 8);
+    if (RAND_bytes(ctx->iv, 8) <= 0)
+        return -1;
     memcpy(out, ctx->iv, 8);
     /* Encrypt everything after IV in place */
     des_ede_cbc_cipher(ctx, out + 8, out + 8, inl + 8);
diff --git a/crypto/evp/p_seal.c b/crypto/evp/p_seal.c
index caabbf4..ba9dfff 100644
--- a/crypto/evp/p_seal.c
+++ b/crypto/evp/p_seal.c
@@ -82,8 +82,9 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
         return 1;
     if (EVP_CIPHER_CTX_rand_key(ctx, key) <= 0)
         return 0;
-    if (EVP_CIPHER_CTX_iv_length(ctx))
-        RAND_pseudo_bytes(iv, EVP_CIPHER_CTX_iv_length(ctx));
+    if (EVP_CIPHER_CTX_iv_length(ctx)
+        && RAND_bytes(iv, EVP_CIPHER_CTX_iv_length(ctx)) <= 0)
+        return 0;
 
     if (!EVP_EncryptInit_ex(ctx, NULL, NULL, key, iv))
         return 0;
diff --git a/crypto/ocsp/ocsp_ext.c b/crypto/ocsp/ocsp_ext.c
index 4c6edb1..b564259 100644
--- a/crypto/ocsp/ocsp_ext.c
+++ b/crypto/ocsp/ocsp_ext.c
@@ -319,8 +319,8 @@ static int ocsp_add1_nonce(STACK_OF(X509_EXTENSION) **exts,
     ASN1_put_object(&tmpval, 0, len, V_ASN1_OCTET_STRING, V_ASN1_UNIVERSAL);
     if (val)
         memcpy(tmpval, val, len);
-    else
-        RAND_pseudo_bytes(tmpval, len);
+    else if (RAND_bytes(tmpval, len) <= 0)
+        goto err;
     if (!X509V3_add1_i2d(exts, NID_id_pkix_OCSP_Nonce,
                          &os, 0, X509V3_ADD_REPLACE))
         goto err;
diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index 410c2b2..70e6a70 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -387,7 +387,7 @@ int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp,
         }
         RAND_add(data, i, 0);   /* put in the RSA key. */
         OPENSSL_assert(enc->iv_len <= (int)sizeof(iv));
-        if (RAND_pseudo_bytes(iv, enc->iv_len) < 0) /* Generate a salt */
+        if (RAND_bytes(iv, enc->iv_len) <= 0) /* Generate a salt */
             goto err;
         /*
          * The 'iv' is used as the iv and as a salt.  It is NOT taken from
diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c
index d5eb8ff..252aca0 100644
--- a/crypto/pkcs12/p12_mutl.c
+++ b/crypto/pkcs12/p12_mutl.c
@@ -177,7 +177,7 @@ int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
         return 0;
     }
     if (!salt) {
-        if (RAND_pseudo_bytes(p12->mac->salt->data, saltlen) < 0)
+        if (RAND_bytes(p12->mac->salt->data, saltlen) <= 0)
             return 0;
     } else
         memcpy(p12->mac->salt->data, salt, saltlen);
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index 0200b3b..f77326b 100644
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -340,7 +340,7 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
         ivlen = EVP_CIPHER_iv_length(evp_cipher);
         xalg->algorithm = OBJ_nid2obj(EVP_CIPHER_type(evp_cipher));
         if (ivlen > 0)
-            if (RAND_pseudo_bytes(iv, ivlen) <= 0)
+            if (RAND_bytes(iv, ivlen) <= 0)
                 goto err;
         if (EVP_CipherInit_ex(ctx, evp_cipher, NULL, NULL, NULL, 1) <= 0)
             goto err;
diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index ef43966..27e785d 100644
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -173,7 +173,9 @@ static int ssleay_rand_seed(const void *buf, int num);
 static int ssleay_rand_add(const void *buf, int num, double add_entropy);
 static int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo);
 static int ssleay_rand_nopseudo_bytes(unsigned char *buf, int num);
+#ifndef OPENSSL_NO_DEPRECATED
 static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num);
+#endif
 static int ssleay_rand_status(void);
 
 static RAND_METHOD rand_ssleay_meth = {
@@ -181,7 +183,11 @@ static RAND_METHOD rand_ssleay_meth = {
     ssleay_rand_nopseudo_bytes,
     ssleay_rand_cleanup,
     ssleay_rand_add,
+#ifndef OPENSSL_NO_DEPRECATED
     ssleay_rand_pseudo_bytes,
+#else
+    NULL,
+#endif
     ssleay_rand_status
 };
 
@@ -601,6 +607,7 @@ static int ssleay_rand_nopseudo_bytes(unsigned char *buf, int num)
     return ssleay_rand_bytes(buf, num, 0);
 }
 
+#ifndef OPENSSL_NO_DEPRECATED
 /*
  * pseudo-random bytes that are guaranteed to be unique but not unpredictable
  */
@@ -608,6 +615,7 @@ static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num)
 {
     return ssleay_rand_bytes(buf, num, 1);
 }
+#endif
 
 static int ssleay_rand_status(void)
 {
diff --git a/crypto/rand/rand.h b/crypto/rand/rand.h
index 145edb2..14b4793 100644
--- a/crypto/rand/rand.h
+++ b/crypto/rand/rand.h
@@ -95,7 +95,9 @@ int RAND_set_rand_engine(ENGINE *engine);
 RAND_METHOD *RAND_SSLeay(void);
 void RAND_cleanup(void);
 int RAND_bytes(unsigned char *buf, int num);
-int RAND_pseudo_bytes(unsigned char *buf, int num);
+#ifdef OPENSSL_USE_DEPRECATED
+DECLARE_DEPRECATED(int RAND_pseudo_bytes(unsigned char *buf, int num));
+#endif
 void RAND_seed(const void *buf, int num);
 void RAND_add(const void *buf, int num, double entropy);
 int RAND_load_file(const char *file, long max_bytes);
diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index 2f4dc09..0bbaf67 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -159,6 +159,7 @@ int RAND_bytes(unsigned char *buf, int num)
     return (-1);
 }
 
+#ifndef OPENSSL_NO_DEPRECATED
 int RAND_pseudo_bytes(unsigned char *buf, int num)
 {
     const RAND_METHOD *meth = RAND_get_rand_method();
@@ -166,6 +167,7 @@ int RAND_pseudo_bytes(unsigned char *buf, int num)
         return meth->pseudorand(buf, num);
     return (-1);
 }
+#endif
 
 int RAND_status(void)
 {
diff --git a/crypto/rand/randtest.c b/crypto/rand/randtest.c
index 267752e..67acf70 100644
--- a/crypto/rand/randtest.c
+++ b/crypto/rand/randtest.c
@@ -77,8 +77,8 @@ int main(int argc, char **argv)
      */
     long d;
 
-    i = RAND_pseudo_bytes(buf, 2500);
-    if (i < 0) {
+    i = RAND_bytes(buf, 2500);
+    if (i <= 0) {
         printf("init failed, the rand method is not properly installed\n");
         err++;
         goto err;
diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c
index 4aed5b4..9d83a8f 100644
--- a/crypto/srp/srp_vfy.c
+++ b/crypto/srp/srp_vfy.c
@@ -498,7 +498,8 @@ SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username)
     if (!SRP_user_pwd_set_ids(user, username, NULL))
         goto err;
 
-    RAND_pseudo_bytes(digv, SHA_DIGEST_LENGTH);
+    if (RAND_bytes(digv, SHA_DIGEST_LENGTH) <= 0)
+        goto err;
     EVP_MD_CTX_init(&ctxt);
     EVP_DigestInit_ex(&ctxt, EVP_sha1(), NULL);
     EVP_DigestUpdate(&ctxt, vb->seed_key, strlen(vb->seed_key));
@@ -550,7 +551,8 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt,
     }
 
     if (*salt == NULL) {
-        RAND_pseudo_bytes(tmp2, SRP_RANDOM_SALT_LEN);
+        if (RAND_bytes(tmp2, SRP_RANDOM_SALT_LEN) <= 0)
+            goto err;
 
         s = BN_bin2bn(tmp2, SRP_RANDOM_SALT_LEN, NULL);
     } else {
@@ -608,7 +610,8 @@ int SRP_create_verifier_BN(const char *user, const char *pass, BIGNUM **salt,
         goto err;
 
     if (*salt == NULL) {
-        RAND_pseudo_bytes(tmp2, SRP_RANDOM_SALT_LEN);
+        if (RAND_bytes(tmp2, SRP_RANDOM_SALT_LEN) <= 0)
+            goto err;
 
         *salt = BN_bin2bn(tmp2, SRP_RANDOM_SALT_LEN, NULL);
     }
diff --git a/crypto/srp/srptest.c b/crypto/srp/srptest.c
index 17a8256..1d463cd 100644
--- a/crypto/srp/srptest.c
+++ b/crypto/srp/srptest.c
@@ -59,7 +59,7 @@ static int run_srp(const char *username, const char *client_pass,
     showbn("Verifier", v);
 
     /* Server random */
-    RAND_pseudo_bytes(rand_tmp, sizeof(rand_tmp));
+    RAND_bytes(rand_tmp, sizeof(rand_tmp));
     b = BN_bin2bn(rand_tmp, sizeof(rand_tmp), NULL);
     /* TODO - check b != 0 */
     showbn("b", b);
@@ -74,7 +74,7 @@ static int run_srp(const char *username, const char *client_pass,
     }
 
     /* Client random */
-    RAND_pseudo_bytes(rand_tmp, sizeof(rand_tmp));
+    RAND_bytes(rand_tmp, sizeof(rand_tmp));
     a = BN_bin2bn(rand_tmp, sizeof(rand_tmp), NULL);
     /* TODO - check a != 0 */
     showbn("a", a);
diff --git a/demos/easy_tls/easy-tls.c b/demos/easy_tls/easy-tls.c
index 33303cc..3475551 100644
--- a/demos/easy_tls/easy-tls.c
+++ b/demos/easy_tls/easy-tls.c
@@ -760,7 +760,8 @@ SSL_CTX *tls_create_ctx(struct tls_create_ctx_args a, void *apparg)
         if (tls_dhe1024 == NULL) {
             int i;
 
-            RAND_bytes((unsigned char *)&i, sizeof i);
+            if (RAND_bytes((unsigned char *)&i, sizeof i) <= 0)
+                goto err_return;
             /*
              * make sure that i is non-negative -- pick one of the provided
              * seeds
diff --git a/doc/crypto/RAND_bytes.pod b/doc/crypto/RAND_bytes.pod
index 1a9b91e..f3a5ed2 100644
--- a/doc/crypto/RAND_bytes.pod
+++ b/doc/crypto/RAND_bytes.pod
@@ -10,6 +10,8 @@ RAND_bytes, RAND_pseudo_bytes - generate random data
 
  int RAND_bytes(unsigned char *buf, int num);
 
+Deprecated:
+
  int RAND_pseudo_bytes(unsigned char *buf, int num);
 
 =head1 DESCRIPTION
@@ -18,6 +20,7 @@ RAND_bytes() puts B<num> cryptographically strong pseudo-random bytes
 into B<buf>. An error occurs if the PRNG has not been seeded with
 enough randomness to ensure an unpredictable byte sequence.
 
+RAND_pseudo_bytes() has been deprecated. Users should use RAND_bytes() instead.
 RAND_pseudo_bytes() puts B<num> pseudo-random bytes into B<buf>.
 Pseudo-random byte sequences generated by RAND_pseudo_bytes() will be
 unique if they are of sufficient length, but are not necessarily
diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index 22626f1..8d15f70 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -1396,7 +1396,10 @@ int dtls1_process_heartbeat(SSL *s)
         memcpy(bp, pl, payload);
         bp += payload;
         /* Random padding */
-        RAND_pseudo_bytes(bp, padding);
+        if (RAND_bytes(bp, padding) <= 0) {
+            OPENSSL_free(buffer);
+            return -1;
+        }
 
         r = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buffer, write_length);
 
@@ -1430,7 +1433,7 @@ int dtls1_process_heartbeat(SSL *s)
 int dtls1_heartbeat(SSL *s)
 {
     unsigned char *buf, *p;
-    int ret;
+    int ret = -1;
     unsigned int payload = 18;  /* Sequence number + random bytes */
     unsigned int padding = 16;  /* Use minimum padding */
 
@@ -1482,10 +1485,16 @@ int dtls1_heartbeat(SSL *s)
     /* Sequence number */
     s2n(s->tlsext_hb_seq, p);
     /* 16 random bytes */
-    RAND_pseudo_bytes(p, 16);
+    if (RAND_bytes(p, 16) <= 0) {
+        SSLerr(SSL_F_DTLS1_HEARTBEAT, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
     p += 16;
     /* Random padding */
-    RAND_pseudo_bytes(p, padding);
+    if (RAND_bytes(p, padding) <= 0) {
+        SSLerr(SSL_F_DTLS1_HEARTBEAT, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
     ret = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buf, 3 + payload + padding);
     if (ret >= 0) {
@@ -1498,6 +1507,7 @@ int dtls1_heartbeat(SSL *s)
         s->tlsext_hb_pending = 1;
     }
 
+ err:
     OPENSSL_free(buf);
 
     return ret;
diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c
index 21a32bc..3451b7c 100644
--- a/ssl/s23_clnt.c
+++ b/ssl/s23_clnt.c
@@ -263,6 +263,7 @@ int ssl23_connect(SSL *s)
 int ssl_fill_hello_random(SSL *s, int server, unsigned char *result, int len)
 {
     int send_time = 0;
+
     if (len < 4)
         return 0;
     if (server)
@@ -273,9 +274,9 @@ int ssl_fill_hello_random(SSL *s, int server, unsigned char *result, int len)
         unsigned long Time = (unsigned long)time(NULL);
         unsigned char *p = result;
         l2n(Time, p);
-        return RAND_pseudo_bytes(p, len - 4);
+        return RAND_bytes(p, len - 4);
     } else
-        return RAND_pseudo_bytes(result, len);
+        return RAND_bytes(result, len);
 }
 
 static int ssl23_client_hello(SSL *s)
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 27f03d4..bab95f3 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -2810,7 +2810,12 @@ int ssl3_send_client_key_exchange(SSL *s)
 
             EVP_PKEY_encrypt_init(pkey_ctx);
             /* Generate session key */
-            RAND_bytes(pms, pmslen);
+            if (RAND_bytes(pms, pmslen) <= 0) {
+                EVP_PKEY_CTX_free(pkey_ctx);
+                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
+                       ERR_R_INTERNAL_ERROR);
+                goto err;
+            };
             /*
              * If we have client certificate, use its secret as peer key
              */
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index ce52854..05dc439 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -2168,10 +2168,7 @@ int ssl3_get_client_key_exchange(SSL *s)
          * fails. See https://tools.ietf.org/html/rfc5246#section-7.4.7.1
          */
 
-        /*
-         * should be RAND_bytes, but we cannot work around a failure.
-         */
-        if (RAND_pseudo_bytes(rand_premaster_secret,
+        if (RAND_bytes(rand_premaster_secret,
                               sizeof(rand_premaster_secret)) <= 0)
             goto err;
         decrypt_len =
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 54974df..29bbc03 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1957,7 +1957,7 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth)
     ret->tlsext_servername_callback = 0;
     ret->tlsext_servername_arg = NULL;
     /* Setup RFC4507 ticket keys */
-    if ((RAND_pseudo_bytes(ret->tlsext_tick_key_name, 16) <= 0)
+    if ((RAND_bytes(ret->tlsext_tick_key_name, 16) <= 0)
         || (RAND_bytes(ret->tlsext_tick_hmac_key, 16) <= 0)
         || (RAND_bytes(ret->tlsext_tick_aes_key, 16) <= 0))
         ret->options |= SSL_OP_NO_TICKET;
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 22d2e66..9273eb6 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -257,7 +257,7 @@ static int def_generate_session_id(const SSL *ssl, unsigned char *id,
 {
     unsigned int retry = 0;
     do
-        if (RAND_pseudo_bytes(id, *id_len) <= 0)
+        if (RAND_bytes(id, *id_len) <= 0)
             return 0;
     while (SSL_has_matching_session_id(ssl, id, *id_len) &&
            (++retry < MAX_SESS_ID_ATTEMPTS)) ;
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index dd28cd6..b5eb4bf 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -3634,7 +3634,10 @@ int tls1_process_heartbeat(SSL *s)
         memcpy(bp, pl, payload);
         bp += payload;
         /* Random padding */
-        RAND_pseudo_bytes(bp, padding);
+        if (RAND_bytes(bp, padding) <= 0) {
+            OPENSSL_free(buffer);
+            return -1;
+        }
 
         r = ssl3_write_bytes(s, TLS1_RT_HEARTBEAT, buffer,
                              3 + payload + padding);
@@ -3669,7 +3672,7 @@ int tls1_process_heartbeat(SSL *s)
 int tls1_heartbeat(SSL *s)
 {
     unsigned char *buf, *p;
-    int ret;
+    int ret = -1;
     unsigned int payload = 18;  /* Sequence number + random bytes */
     unsigned int padding = 16;  /* Use minimum padding */
 
@@ -3721,10 +3724,16 @@ int tls1_heartbeat(SSL *s)
     /* Sequence number */
     s2n(s->tlsext_hb_seq, p);
     /* 16 random bytes */
-    RAND_pseudo_bytes(p, 16);
+    if (RAND_bytes(p, 16) <= 0) {
+        SSLerr(SSL_F_TLS1_HEARTBEAT, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
     p += 16;
     /* Random padding */
-    RAND_pseudo_bytes(p, padding);
+    if (RAND_bytes(p, padding) <= 0) {
+        SSLerr(SSL_F_TLS1_HEARTBEAT, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
     ret = ssl3_write_bytes(s, TLS1_RT_HEARTBEAT, buf, 3 + payload + padding);
     if (ret >= 0) {
@@ -3736,8 +3745,8 @@ int tls1_heartbeat(SSL *s)
         s->tlsext_hb_pending = 1;
     }
 
+ err:
     OPENSSL_free(buf);
-
     return ret;
 }
 # endif
diff --git a/test/igetest.c b/test/igetest.c
index f3d10a9..96e9884 100644
--- a/test/igetest.c
+++ b/test/igetest.c
@@ -289,9 +289,9 @@ int main(int argc, char **argv)
 
     assert(BIG_TEST_SIZE >= TEST_SIZE);
 
-    RAND_pseudo_bytes(rkey, sizeof rkey);
-    RAND_pseudo_bytes(plaintext, sizeof plaintext);
-    RAND_pseudo_bytes(iv, sizeof iv);
+    RAND_bytes(rkey, sizeof rkey);
+    RAND_bytes(plaintext, sizeof plaintext);
+    RAND_bytes(iv, sizeof iv);
     memcpy(saved_iv, iv, sizeof saved_iv);
 
     /* Forward IGE only... */
@@ -390,7 +390,7 @@ int main(int argc, char **argv)
      */
     /* possible with biIGE, so the IV is not updated. */
 
-    RAND_pseudo_bytes(rkey2, sizeof rkey2);
+    RAND_bytes(rkey2, sizeof rkey2);
 
     /* Straight encrypt/decrypt */
     AES_set_encrypt_key(rkey, 8 * sizeof rkey, &key);

From matt at openssl.org  Wed Mar 25 12:47:34 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 25 Mar 2015 12:47:34 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1427287654.990529.14038.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  750190567a43d827fa16c58e79ae3ec6ff6c91d3 (commit)
      from  23a9b24aa100cc1c5c7d2c95252f2520680d2e58 (commit)


- Log -----------------------------------------------------------------
commit 750190567a43d827fa16c58e79ae3ec6ff6c91d3
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Feb 26 16:28:59 2015 +0000

    Fix RAND_(pseudo_)?_bytes returns
    
    Ensure all calls to RAND_bytes and RAND_pseudo_bytes have their return
    value checked correctly
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 8f8e4e4f5253085ab673bb74094c3e492c56af44)
    
    Conflicts:
    	crypto/evp/e_des3.c

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

Summary of changes:
 apps/s_cb.c               |  2 +-
 apps/s_server.c           |  3 ++-
 crypto/asn1/asn_mime.c    |  3 ++-
 crypto/bio/bf_nbio.c      |  6 ++++--
 crypto/bn/bn.h            |  1 +
 crypto/bn/bn_rand.c       |  3 ++-
 crypto/cms/cms_pwri.c     |  5 +++--
 crypto/des/des.c          |  6 ++++--
 crypto/des/enc_writ.c     |  4 +++-
 crypto/dsa/dsa_gen.c      |  3 ++-
 crypto/ecdsa/ecdsatest.c  |  4 ++--
 crypto/evp/bio_ok.c       |  3 ++-
 crypto/evp/p_seal.c       |  5 +++--
 crypto/ocsp/ocsp_ext.c    |  4 ++--
 crypto/srp/srp_vfy.c      |  9 ++++++---
 demos/easy_tls/easy-tls.c |  3 ++-
 ssl/d1_both.c             | 14 ++++++++++----
 ssl/s3_clnt.c             |  5 ++++-
 ssl/t1_lib.c              | 18 ++++++++++++++----
 ssl/tls_srp.c             |  3 ++-
 20 files changed, 71 insertions(+), 33 deletions(-)

diff --git a/apps/s_cb.c b/apps/s_cb.c
index 7918500..9ab11cf 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -747,7 +747,7 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie,
 
     /* Initialize a random secret */
     if (!cookie_initialized) {
-        if (!RAND_bytes(cookie_secret, COOKIE_SECRET_LENGTH)) {
+        if (RAND_bytes(cookie_secret, COOKIE_SECRET_LENGTH) <= 0) {
             BIO_printf(bio_err, "error setting random cookie secret\n");
             return 0;
         }
diff --git a/apps/s_server.c b/apps/s_server.c
index bcf5c33..1220f49 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2916,7 +2916,8 @@ static int generate_session_id(const SSL *ssl, unsigned char *id,
 {
     unsigned int count = 0;
     do {
-        RAND_pseudo_bytes(id, *id_len);
+        if(RAND_pseudo_bytes(id, *id_len) < 0)
+            return 0;
         /*
          * Prefix the session_id with the required prefix. NB: If our prefix
          * is too long, clip it - but there will be worse effects anyway, eg.
diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index 7e2f28e..fa4dd82 100644
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -289,7 +289,8 @@ int SMIME_write_ASN1(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
     if ((flags & SMIME_DETACHED) && data) {
         /* We want multipart/signed */
         /* Generate a random boundary */
-        RAND_pseudo_bytes((unsigned char *)bound, 32);
+        if(RAND_pseudo_bytes((unsigned char *)bound, 32) < 0)
+            return 0;
         for (i = 0; i < 32; i++) {
             c = bound[i] & 0xf;
             if (c < 10)
diff --git a/crypto/bio/bf_nbio.c b/crypto/bio/bf_nbio.c
index da88a8a..44d1029 100644
--- a/crypto/bio/bf_nbio.c
+++ b/crypto/bio/bf_nbio.c
@@ -139,7 +139,8 @@ static int nbiof_read(BIO *b, char *out, int outl)
 
     BIO_clear_retry_flags(b);
 #if 1
-    RAND_pseudo_bytes(&n, 1);
+    if(RAND_pseudo_bytes(&n, 1) < 0)
+        return -1;
     num = (n & 0x07);
 
     if (outl > num)
@@ -178,7 +179,8 @@ static int nbiof_write(BIO *b, const char *in, int inl)
         num = nt->lwn;
         nt->lwn = 0;
     } else {
-        RAND_pseudo_bytes(&n, 1);
+        if(RAND_pseudo_bytes(&n, 1) < 0)
+            return -1;
         num = (n & 7);
     }
 
diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h
index 7d57e98..d615be6 100644
--- a/crypto/bn/bn.h
+++ b/crypto/bn/bn.h
@@ -797,6 +797,7 @@ int RAND_pseudo_bytes(unsigned char *buf, int num);
                          * wouldn't be constructed with top!=dmax. */ \
                         BN_ULONG *_not_const; \
                         memcpy(&_not_const, &_bnum1->d, sizeof(BN_ULONG*)); \
+                        /* Debug only - safe to ignore error return */ \
                         RAND_pseudo_bytes(&_tmp_char, 1); \
                         memset((unsigned char *)(_not_const + _bnum1->top), _tmp_char, \
                                 (_bnum1->dmax - _bnum1->top) * sizeof(BN_ULONG)); \
diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index 7ac71ec..48de9cb 100644
--- a/crypto/bn/bn_rand.c
+++ b/crypto/bn/bn_rand.c
@@ -157,7 +157,8 @@ static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom)
         unsigned char c;
 
         for (i = 0; i < bytes; i++) {
-            RAND_pseudo_bytes(&c, 1);
+            if(RAND_pseudo_bytes(&c, 1) < 0)
+                goto err;
             if (c >= 128 && i > 0)
                 buf[i] = buf[i - 1];
             else if (c < 42)
diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c
index 076b545..b9c560d 100644
--- a/crypto/cms/cms_pwri.c
+++ b/crypto/cms/cms_pwri.c
@@ -297,8 +297,9 @@ static int kek_wrap_key(unsigned char *out, size_t *outlen,
         out[3] = in[2] ^ 0xFF;
         memcpy(out + 4, in, inlen);
         /* Add random padding to end */
-        if (olen > inlen + 4)
-            RAND_pseudo_bytes(out + 4 + inlen, olen - 4 - inlen);
+        if (olen > inlen + 4
+            && RAND_pseudo_bytes(out + 4 + inlen, olen - 4 - inlen) < 0)
+            return 0;
         /* Encrypt twice */
         EVP_EncryptUpdate(ctx, out, &dummy, out, olen);
         EVP_EncryptUpdate(ctx, out, &dummy, out, olen);
diff --git a/crypto/des/des.c b/crypto/des/des.c
index 2bff281..dcdb8dd 100644
--- a/crypto/des/des.c
+++ b/crypto/des/des.c
@@ -455,8 +455,10 @@ void doencryption(void)
             rem = l % 8;
             len = l - rem;
             if (feof(DES_IN)) {
-                for (i = 7 - rem; i > 0; i--)
-                    RAND_pseudo_bytes(buf + l++, 1);
+                for (i = 7 - rem; i > 0; i--) {
+                    if(RAND_pseudo_bytes(buf + l++, 1) < 0)
+                        goto problems;
+                }
                 buf[l++] = rem;
                 ex = 1;
                 len += rem;
diff --git a/crypto/des/enc_writ.c b/crypto/des/enc_writ.c
index b4eecc3..0777b4f 100644
--- a/crypto/des/enc_writ.c
+++ b/crypto/des/enc_writ.c
@@ -132,7 +132,9 @@ int DES_enc_write(int fd, const void *_buf, int len,
     if (len < 8) {
         cp = shortbuf;
         memcpy(shortbuf, buf, len);
-        RAND_pseudo_bytes(shortbuf + len, 8 - len);
+        if(RAND_pseudo_bytes(shortbuf + len, 8 - len) < 0) {
+            return -1;
+        }
         rnum = 8;
     } else {
         cp = buf;
diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index c808ab6..3123352 100644
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -202,7 +202,8 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
                 goto err;
 
             if (!seed_len) {
-                RAND_pseudo_bytes(seed, qsize);
+                if(RAND_pseudo_bytes(seed, qsize) < 0)
+                    goto err;
                 seed_is_random = 1;
             } else {
                 seed_is_random = 0;
diff --git a/crypto/ecdsa/ecdsatest.c b/crypto/ecdsa/ecdsatest.c
index b2d78f3..0f301f8 100644
--- a/crypto/ecdsa/ecdsatest.c
+++ b/crypto/ecdsa/ecdsatest.c
@@ -296,8 +296,8 @@ int test_builtin(BIO *out)
     int nid, ret = 0;
 
     /* fill digest values with some random data */
-    if (!RAND_pseudo_bytes(digest, 20) ||
-        !RAND_pseudo_bytes(wrong_digest, 20)) {
+    if (RAND_pseudo_bytes(digest, 20) <= 0 ||
+        RAND_pseudo_bytes(wrong_digest, 20) <= 0) {
         BIO_printf(out, "ERROR: unable to get random data\n");
         goto builtin_err;
     }
diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c
index a455034..859712f 100644
--- a/crypto/evp/bio_ok.c
+++ b/crypto/evp/bio_ok.c
@@ -491,7 +491,8 @@ static int sig_out(BIO *b)
      * FIXME: there's absolutely no guarantee this makes any sense at all,
      * particularly now EVP_MD_CTX has been restructured.
      */
-    RAND_pseudo_bytes(md->md_data, md->digest->md_size);
+    if(RAND_pseudo_bytes(md->md_data, md->digest->md_size) < 0)
+        goto berr;
     memcpy(&(ctx->buf[ctx->buf_len]), md->md_data, md->digest->md_size);
     longswap(&(ctx->buf[ctx->buf_len]), md->digest->md_size);
     ctx->buf_len += md->digest->md_size;
diff --git a/crypto/evp/p_seal.c b/crypto/evp/p_seal.c
index caabbf4..ba9dfff 100644
--- a/crypto/evp/p_seal.c
+++ b/crypto/evp/p_seal.c
@@ -82,8 +82,9 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
         return 1;
     if (EVP_CIPHER_CTX_rand_key(ctx, key) <= 0)
         return 0;
-    if (EVP_CIPHER_CTX_iv_length(ctx))
-        RAND_pseudo_bytes(iv, EVP_CIPHER_CTX_iv_length(ctx));
+    if (EVP_CIPHER_CTX_iv_length(ctx)
+        && RAND_bytes(iv, EVP_CIPHER_CTX_iv_length(ctx)) <= 0)
+        return 0;
 
     if (!EVP_EncryptInit_ex(ctx, NULL, NULL, key, iv))
         return 0;
diff --git a/crypto/ocsp/ocsp_ext.c b/crypto/ocsp/ocsp_ext.c
index 849cb2f..fdfddf9 100644
--- a/crypto/ocsp/ocsp_ext.c
+++ b/crypto/ocsp/ocsp_ext.c
@@ -361,8 +361,8 @@ static int ocsp_add1_nonce(STACK_OF(X509_EXTENSION) **exts,
     ASN1_put_object(&tmpval, 0, len, V_ASN1_OCTET_STRING, V_ASN1_UNIVERSAL);
     if (val)
         memcpy(tmpval, val, len);
-    else
-        RAND_pseudo_bytes(tmpval, len);
+    else if(RAND_pseudo_bytes(tmpval, len) < 0)
+        goto err;
     if (!X509V3_add1_i2d(exts, NID_id_pkix_OCSP_Nonce,
                          &os, 0, X509V3_ADD_REPLACE))
         goto err;
diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c
index 701b5cd..902df10 100644
--- a/crypto/srp/srp_vfy.c
+++ b/crypto/srp/srp_vfy.c
@@ -497,7 +497,8 @@ SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username)
     if (!SRP_user_pwd_set_ids(user, username, NULL))
         goto err;
 
-    RAND_pseudo_bytes(digv, SHA_DIGEST_LENGTH);
+    if(RAND_pseudo_bytes(digv, SHA_DIGEST_LENGTH) < 0)
+        goto err;
     EVP_MD_CTX_init(&ctxt);
     EVP_DigestInit_ex(&ctxt, EVP_sha1(), NULL);
     EVP_DigestUpdate(&ctxt, vb->seed_key, strlen(vb->seed_key));
@@ -549,7 +550,8 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt,
     }
 
     if (*salt == NULL) {
-        RAND_pseudo_bytes(tmp2, SRP_RANDOM_SALT_LEN);
+        if(RAND_pseudo_bytes(tmp2, SRP_RANDOM_SALT_LEN) < 0)
+            goto err;
 
         s = BN_bin2bn(tmp2, SRP_RANDOM_SALT_LEN, NULL);
     } else {
@@ -609,7 +611,8 @@ int SRP_create_verifier_BN(const char *user, const char *pass, BIGNUM **salt,
     srp_bn_print(g);
 
     if (*salt == NULL) {
-        RAND_pseudo_bytes(tmp2, SRP_RANDOM_SALT_LEN);
+        if(RAND_pseudo_bytes(tmp2, SRP_RANDOM_SALT_LEN) < 0)
+            goto err;
 
         *salt = BN_bin2bn(tmp2, SRP_RANDOM_SALT_LEN, NULL);
     }
diff --git a/demos/easy_tls/easy-tls.c b/demos/easy_tls/easy-tls.c
index acc688a..df6ae6c 100644
--- a/demos/easy_tls/easy-tls.c
+++ b/demos/easy_tls/easy-tls.c
@@ -761,7 +761,8 @@ SSL_CTX *tls_create_ctx(struct tls_create_ctx_args a, void *apparg)
         if (tls_dhe1024 == NULL) {
             int i;
 
-            RAND_bytes((unsigned char *)&i, sizeof i);
+            if(RAND_bytes((unsigned char *)&i, sizeof i) <= 0)
+                goto err_return;
             /*
              * make sure that i is non-negative -- pick one of the provided
              * seeds
diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index c18ec03..5cb30a5 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -1540,7 +1540,10 @@ int dtls1_process_heartbeat(SSL *s)
         memcpy(bp, pl, payload);
         bp += payload;
         /* Random padding */
-        RAND_pseudo_bytes(bp, padding);
+        if(RAND_pseudo_bytes(bp, padding) < 0) {
+            OPENSSL_free(buffer);
+            return -1;
+        }
 
         r = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buffer, write_length);
 
@@ -1574,7 +1577,7 @@ int dtls1_process_heartbeat(SSL *s)
 int dtls1_heartbeat(SSL *s)
 {
     unsigned char *buf, *p;
-    int ret;
+    int ret = -1;
     unsigned int payload = 18;  /* Sequence number + random bytes */
     unsigned int padding = 16;  /* Use minimum padding */
 
@@ -1622,10 +1625,12 @@ int dtls1_heartbeat(SSL *s)
     /* Sequence number */
     s2n(s->tlsext_hb_seq, p);
     /* 16 random bytes */
-    RAND_pseudo_bytes(p, 16);
+    if(RAND_pseudo_bytes(p, 16) < 0)
+        goto err;
     p += 16;
     /* Random padding */
-    RAND_pseudo_bytes(p, padding);
+    if(RAND_pseudo_bytes(p, padding) < 0)
+        goto err;
 
     ret = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buf, 3 + payload + padding);
     if (ret >= 0) {
@@ -1638,6 +1643,7 @@ int dtls1_heartbeat(SSL *s)
         s->tlsext_hb_pending = 1;
     }
 
+err:
     OPENSSL_free(buf);
 
     return ret;
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 0e5acec..30ca11a 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -2729,7 +2729,10 @@ int ssl3_send_client_key_exchange(SSL *s)
 
             EVP_PKEY_encrypt_init(pkey_ctx);
             /* Generate session key */
-            RAND_bytes(premaster_secret, 32);
+            if(RAND_bytes(premaster_secret, 32) <= 0) {
+                EVP_PKEY_CTX_free(pkey_ctx);
+                goto err;
+            }
             /*
              * If we have client certificate, use its secret as peer key
              */
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 243a70f..f011248 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -2612,7 +2612,10 @@ int tls1_process_heartbeat(SSL *s)
         memcpy(bp, pl, payload);
         bp += payload;
         /* Random padding */
-        RAND_pseudo_bytes(bp, padding);
+        if(RAND_pseudo_bytes(bp, padding) < 0) {
+            OPENSSL_free(buffer);
+            return -1;
+        }
 
         r = ssl3_write_bytes(s, TLS1_RT_HEARTBEAT, buffer,
                              3 + payload + padding);
@@ -2647,7 +2650,7 @@ int tls1_process_heartbeat(SSL *s)
 int tls1_heartbeat(SSL *s)
 {
     unsigned char *buf, *p;
-    int ret;
+    int ret = -1;
     unsigned int payload = 18;  /* Sequence number + random bytes */
     unsigned int padding = 16;  /* Use minimum padding */
 
@@ -2695,10 +2698,16 @@ int tls1_heartbeat(SSL *s)
     /* Sequence number */
     s2n(s->tlsext_hb_seq, p);
     /* 16 random bytes */
-    RAND_pseudo_bytes(p, 16);
+    if(RAND_pseudo_bytes(p, 16) < 0) {
+        SSLerr(SSL_F_TLS1_HEARTBEAT, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
     p += 16;
     /* Random padding */
-    RAND_pseudo_bytes(p, padding);
+    if(RAND_pseudo_bytes(p, padding) < 0) {
+        SSLerr(SSL_F_TLS1_HEARTBEAT, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
     ret = ssl3_write_bytes(s, TLS1_RT_HEARTBEAT, buf, 3 + payload + padding);
     if (ret >= 0) {
@@ -2710,6 +2719,7 @@ int tls1_heartbeat(SSL *s)
         s->tlsext_hb_pending = 1;
     }
 
+err:
     OPENSSL_free(buf);
 
     return ret;
diff --git a/ssl/tls_srp.c b/ssl/tls_srp.c
index d36cfa0..6bdf7f3 100644
--- a/ssl/tls_srp.c
+++ b/ssl/tls_srp.c
@@ -454,7 +454,8 @@ int SRP_Calc_A_param(SSL *s)
 {
     unsigned char rnd[SSL_MAX_MASTER_KEY_LENGTH];
 
-    RAND_bytes(rnd, sizeof(rnd));
+    if(RAND_bytes(rnd, sizeof(rnd)) <= 0)
+        return -1;
     s->srp_ctx.a = BN_bin2bn(rnd, sizeof(rnd), s->srp_ctx.a);
     OPENSSL_cleanse(rnd, sizeof(rnd));
 

From matt at openssl.org  Wed Mar 25 12:47:45 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 25 Mar 2015 12:47:45 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1427287665.030374.14330.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  8f8e4e4f5253085ab673bb74094c3e492c56af44 (commit)
      from  a20718fa2c0a45e6acb975cf6c0438c3ebd45b13 (commit)


- Log -----------------------------------------------------------------
commit 8f8e4e4f5253085ab673bb74094c3e492c56af44
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Feb 26 16:28:59 2015 +0000

    Fix RAND_(pseudo_)?_bytes returns
    
    Ensure all calls to RAND_bytes and RAND_pseudo_bytes have their return
    value checked correctly
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 apps/s_cb.c               |  2 +-
 apps/s_server.c           |  3 ++-
 crypto/asn1/asn_mime.c    |  3 ++-
 crypto/bio/bf_nbio.c      |  6 ++++--
 crypto/bn/bn.h            |  1 +
 crypto/bn/bn_rand.c       |  3 ++-
 crypto/cms/cms_pwri.c     |  5 +++--
 crypto/des/des.c          |  6 ++++--
 crypto/des/enc_writ.c     |  4 +++-
 crypto/dsa/dsa_gen.c      |  3 ++-
 crypto/ecdsa/ecdsatest.c  |  4 ++--
 crypto/evp/bio_ok.c       |  3 ++-
 crypto/evp/e_des3.c       |  3 ++-
 crypto/evp/p_seal.c       |  5 +++--
 crypto/ocsp/ocsp_ext.c    |  4 ++--
 crypto/srp/srp_vfy.c      |  9 ++++++---
 demos/easy_tls/easy-tls.c |  3 ++-
 ssl/d1_both.c             | 14 ++++++++++----
 ssl/s3_clnt.c             |  5 ++++-
 ssl/t1_lib.c              | 18 ++++++++++++++----
 ssl/tls_srp.c             |  3 ++-
 21 files changed, 73 insertions(+), 34 deletions(-)

diff --git a/apps/s_cb.c b/apps/s_cb.c
index f6e6bcd..36e2284 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -1012,7 +1012,7 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie,
 
     /* Initialize a random secret */
     if (!cookie_initialized) {
-        if (!RAND_bytes(cookie_secret, COOKIE_SECRET_LENGTH)) {
+        if (RAND_bytes(cookie_secret, COOKIE_SECRET_LENGTH) <= 0) {
             BIO_printf(bio_err, "error setting random cookie secret\n");
             return 0;
         }
diff --git a/apps/s_server.c b/apps/s_server.c
index a8491ac..083cc4c 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -3281,7 +3281,8 @@ static int generate_session_id(const SSL *ssl, unsigned char *id,
 {
     unsigned int count = 0;
     do {
-        RAND_pseudo_bytes(id, *id_len);
+        if(RAND_pseudo_bytes(id, *id_len) < 0)
+            return 0;
         /*
          * Prefix the session_id with the required prefix. NB: If our prefix
          * is too long, clip it - but there will be worse effects anyway, eg.
diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index 7e2f28e..fa4dd82 100644
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -289,7 +289,8 @@ int SMIME_write_ASN1(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
     if ((flags & SMIME_DETACHED) && data) {
         /* We want multipart/signed */
         /* Generate a random boundary */
-        RAND_pseudo_bytes((unsigned char *)bound, 32);
+        if(RAND_pseudo_bytes((unsigned char *)bound, 32) < 0)
+            return 0;
         for (i = 0; i < 32; i++) {
             c = bound[i] & 0xf;
             if (c < 10)
diff --git a/crypto/bio/bf_nbio.c b/crypto/bio/bf_nbio.c
index da88a8a..44d1029 100644
--- a/crypto/bio/bf_nbio.c
+++ b/crypto/bio/bf_nbio.c
@@ -139,7 +139,8 @@ static int nbiof_read(BIO *b, char *out, int outl)
 
     BIO_clear_retry_flags(b);
 #if 1
-    RAND_pseudo_bytes(&n, 1);
+    if(RAND_pseudo_bytes(&n, 1) < 0)
+        return -1;
     num = (n & 0x07);
 
     if (outl > num)
@@ -178,7 +179,8 @@ static int nbiof_write(BIO *b, const char *in, int inl)
         num = nt->lwn;
         nt->lwn = 0;
     } else {
-        RAND_pseudo_bytes(&n, 1);
+        if(RAND_pseudo_bytes(&n, 1) < 0)
+            return -1;
         num = (n & 7);
     }
 
diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h
index 78709d3..9996b4a 100644
--- a/crypto/bn/bn.h
+++ b/crypto/bn/bn.h
@@ -779,6 +779,7 @@ int RAND_pseudo_bytes(unsigned char *buf, int num);
                          * wouldn't be constructed with top!=dmax. */ \
                         BN_ULONG *_not_const; \
                         memcpy(&_not_const, &_bnum1->d, sizeof(BN_ULONG*)); \
+                        /* Debug only - safe to ignore error return */ \
                         RAND_pseudo_bytes(&_tmp_char, 1); \
                         memset((unsigned char *)(_not_const + _bnum1->top), _tmp_char, \
                                 (_bnum1->dmax - _bnum1->top) * sizeof(BN_ULONG)); \
diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index 7ac71ec..48de9cb 100644
--- a/crypto/bn/bn_rand.c
+++ b/crypto/bn/bn_rand.c
@@ -157,7 +157,8 @@ static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom)
         unsigned char c;
 
         for (i = 0; i < bytes; i++) {
-            RAND_pseudo_bytes(&c, 1);
+            if(RAND_pseudo_bytes(&c, 1) < 0)
+                goto err;
             if (c >= 128 && i > 0)
                 buf[i] = buf[i - 1];
             else if (c < 42)
diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c
index 076b545..b9c560d 100644
--- a/crypto/cms/cms_pwri.c
+++ b/crypto/cms/cms_pwri.c
@@ -297,8 +297,9 @@ static int kek_wrap_key(unsigned char *out, size_t *outlen,
         out[3] = in[2] ^ 0xFF;
         memcpy(out + 4, in, inlen);
         /* Add random padding to end */
-        if (olen > inlen + 4)
-            RAND_pseudo_bytes(out + 4 + inlen, olen - 4 - inlen);
+        if (olen > inlen + 4
+            && RAND_pseudo_bytes(out + 4 + inlen, olen - 4 - inlen) < 0)
+            return 0;
         /* Encrypt twice */
         EVP_EncryptUpdate(ctx, out, &dummy, out, olen);
         EVP_EncryptUpdate(ctx, out, &dummy, out, olen);
diff --git a/crypto/des/des.c b/crypto/des/des.c
index 2bff281..dcdb8dd 100644
--- a/crypto/des/des.c
+++ b/crypto/des/des.c
@@ -455,8 +455,10 @@ void doencryption(void)
             rem = l % 8;
             len = l - rem;
             if (feof(DES_IN)) {
-                for (i = 7 - rem; i > 0; i--)
-                    RAND_pseudo_bytes(buf + l++, 1);
+                for (i = 7 - rem; i > 0; i--) {
+                    if(RAND_pseudo_bytes(buf + l++, 1) < 0)
+                        goto problems;
+                }
                 buf[l++] = rem;
                 ex = 1;
                 len += rem;
diff --git a/crypto/des/enc_writ.c b/crypto/des/enc_writ.c
index b4eecc3..0777b4f 100644
--- a/crypto/des/enc_writ.c
+++ b/crypto/des/enc_writ.c
@@ -132,7 +132,9 @@ int DES_enc_write(int fd, const void *_buf, int len,
     if (len < 8) {
         cp = shortbuf;
         memcpy(shortbuf, buf, len);
-        RAND_pseudo_bytes(shortbuf + len, 8 - len);
+        if(RAND_pseudo_bytes(shortbuf + len, 8 - len) < 0) {
+            return -1;
+        }
         rnum = 8;
     } else {
         cp = buf;
diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index 8920036..4a6560d 100644
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -204,7 +204,8 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
                 goto err;
 
             if (!seed_len) {
-                RAND_pseudo_bytes(seed, qsize);
+                if(RAND_pseudo_bytes(seed, qsize) < 0)
+                    goto err;
                 seed_is_random = 1;
             } else {
                 seed_is_random = 0;
diff --git a/crypto/ecdsa/ecdsatest.c b/crypto/ecdsa/ecdsatest.c
index b2d78f3..0f301f8 100644
--- a/crypto/ecdsa/ecdsatest.c
+++ b/crypto/ecdsa/ecdsatest.c
@@ -296,8 +296,8 @@ int test_builtin(BIO *out)
     int nid, ret = 0;
 
     /* fill digest values with some random data */
-    if (!RAND_pseudo_bytes(digest, 20) ||
-        !RAND_pseudo_bytes(wrong_digest, 20)) {
+    if (RAND_pseudo_bytes(digest, 20) <= 0 ||
+        RAND_pseudo_bytes(wrong_digest, 20) <= 0) {
         BIO_printf(out, "ERROR: unable to get random data\n");
         goto builtin_err;
     }
diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c
index a455034..859712f 100644
--- a/crypto/evp/bio_ok.c
+++ b/crypto/evp/bio_ok.c
@@ -491,7 +491,8 @@ static int sig_out(BIO *b)
      * FIXME: there's absolutely no guarantee this makes any sense at all,
      * particularly now EVP_MD_CTX has been restructured.
      */
-    RAND_pseudo_bytes(md->md_data, md->digest->md_size);
+    if(RAND_pseudo_bytes(md->md_data, md->digest->md_size) < 0)
+        goto berr;
     memcpy(&(ctx->buf[ctx->buf_len]), md->md_data, md->digest->md_size);
     longswap(&(ctx->buf[ctx->buf_len]), md->digest->md_size);
     ctx->buf_len += md->digest->md_size;
diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c
index 301d93e..6aa4d09 100644
--- a/crypto/evp/e_des3.c
+++ b/crypto/evp/e_des3.c
@@ -447,7 +447,8 @@ static int des_ede3_wrap(EVP_CIPHER_CTX *ctx, unsigned char *out,
     memcpy(out + inl + 8, sha1tmp, 8);
     OPENSSL_cleanse(sha1tmp, SHA_DIGEST_LENGTH);
     /* Generate random IV */
-    RAND_bytes(ctx->iv, 8);
+    if(RAND_bytes(ctx->iv, 8) <= 0)
+        return -1;
     memcpy(out, ctx->iv, 8);
     /* Encrypt everything after IV in place */
     des_ede_cbc_cipher(ctx, out + 8, out + 8, inl + 8);
diff --git a/crypto/evp/p_seal.c b/crypto/evp/p_seal.c
index caabbf4..ba9dfff 100644
--- a/crypto/evp/p_seal.c
+++ b/crypto/evp/p_seal.c
@@ -82,8 +82,9 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
         return 1;
     if (EVP_CIPHER_CTX_rand_key(ctx, key) <= 0)
         return 0;
-    if (EVP_CIPHER_CTX_iv_length(ctx))
-        RAND_pseudo_bytes(iv, EVP_CIPHER_CTX_iv_length(ctx));
+    if (EVP_CIPHER_CTX_iv_length(ctx)
+        && RAND_bytes(iv, EVP_CIPHER_CTX_iv_length(ctx)) <= 0)
+        return 0;
 
     if (!EVP_EncryptInit_ex(ctx, NULL, NULL, key, iv))
         return 0;
diff --git a/crypto/ocsp/ocsp_ext.c b/crypto/ocsp/ocsp_ext.c
index 849cb2f..fdfddf9 100644
--- a/crypto/ocsp/ocsp_ext.c
+++ b/crypto/ocsp/ocsp_ext.c
@@ -361,8 +361,8 @@ static int ocsp_add1_nonce(STACK_OF(X509_EXTENSION) **exts,
     ASN1_put_object(&tmpval, 0, len, V_ASN1_OCTET_STRING, V_ASN1_UNIVERSAL);
     if (val)
         memcpy(tmpval, val, len);
-    else
-        RAND_pseudo_bytes(tmpval, len);
+    else if(RAND_pseudo_bytes(tmpval, len) < 0)
+        goto err;
     if (!X509V3_add1_i2d(exts, NID_id_pkix_OCSP_Nonce,
                          &os, 0, X509V3_ADD_REPLACE))
         goto err;
diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c
index 701b5cd..902df10 100644
--- a/crypto/srp/srp_vfy.c
+++ b/crypto/srp/srp_vfy.c
@@ -497,7 +497,8 @@ SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username)
     if (!SRP_user_pwd_set_ids(user, username, NULL))
         goto err;
 
-    RAND_pseudo_bytes(digv, SHA_DIGEST_LENGTH);
+    if(RAND_pseudo_bytes(digv, SHA_DIGEST_LENGTH) < 0)
+        goto err;
     EVP_MD_CTX_init(&ctxt);
     EVP_DigestInit_ex(&ctxt, EVP_sha1(), NULL);
     EVP_DigestUpdate(&ctxt, vb->seed_key, strlen(vb->seed_key));
@@ -549,7 +550,8 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt,
     }
 
     if (*salt == NULL) {
-        RAND_pseudo_bytes(tmp2, SRP_RANDOM_SALT_LEN);
+        if(RAND_pseudo_bytes(tmp2, SRP_RANDOM_SALT_LEN) < 0)
+            goto err;
 
         s = BN_bin2bn(tmp2, SRP_RANDOM_SALT_LEN, NULL);
     } else {
@@ -609,7 +611,8 @@ int SRP_create_verifier_BN(const char *user, const char *pass, BIGNUM **salt,
     srp_bn_print(g);
 
     if (*salt == NULL) {
-        RAND_pseudo_bytes(tmp2, SRP_RANDOM_SALT_LEN);
+        if(RAND_pseudo_bytes(tmp2, SRP_RANDOM_SALT_LEN) < 0)
+            goto err;
 
         *salt = BN_bin2bn(tmp2, SRP_RANDOM_SALT_LEN, NULL);
     }
diff --git a/demos/easy_tls/easy-tls.c b/demos/easy_tls/easy-tls.c
index acc688a..df6ae6c 100644
--- a/demos/easy_tls/easy-tls.c
+++ b/demos/easy_tls/easy-tls.c
@@ -761,7 +761,8 @@ SSL_CTX *tls_create_ctx(struct tls_create_ctx_args a, void *apparg)
         if (tls_dhe1024 == NULL) {
             int i;
 
-            RAND_bytes((unsigned char *)&i, sizeof i);
+            if(RAND_bytes((unsigned char *)&i, sizeof i) <= 0)
+                goto err_return;
             /*
              * make sure that i is non-negative -- pick one of the provided
              * seeds
diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index 2104800..d4150cb 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -1420,7 +1420,10 @@ int dtls1_process_heartbeat(SSL *s)
         memcpy(bp, pl, payload);
         bp += payload;
         /* Random padding */
-        RAND_pseudo_bytes(bp, padding);
+        if(RAND_pseudo_bytes(bp, padding) < 0) {
+            OPENSSL_free(buffer);
+            return -1;
+        }
 
         r = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buffer, write_length);
 
@@ -1454,7 +1457,7 @@ int dtls1_process_heartbeat(SSL *s)
 int dtls1_heartbeat(SSL *s)
 {
     unsigned char *buf, *p;
-    int ret;
+    int ret = -1;
     unsigned int payload = 18;  /* Sequence number + random bytes */
     unsigned int padding = 16;  /* Use minimum padding */
 
@@ -1502,10 +1505,12 @@ int dtls1_heartbeat(SSL *s)
     /* Sequence number */
     s2n(s->tlsext_hb_seq, p);
     /* 16 random bytes */
-    RAND_pseudo_bytes(p, 16);
+    if(RAND_pseudo_bytes(p, 16) < 0)
+        goto err;
     p += 16;
     /* Random padding */
-    RAND_pseudo_bytes(p, padding);
+    if(RAND_pseudo_bytes(p, padding) < 0)
+        goto err;
 
     ret = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buf, 3 + payload + padding);
     if (ret >= 0) {
@@ -1518,6 +1523,7 @@ int dtls1_heartbeat(SSL *s)
         s->tlsext_hb_pending = 1;
     }
 
+err:
     OPENSSL_free(buf);
 
     return ret;
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 91053d5..c7f3f1d 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -2847,7 +2847,10 @@ int ssl3_send_client_key_exchange(SSL *s)
 
             EVP_PKEY_encrypt_init(pkey_ctx);
             /* Generate session key */
-            RAND_bytes(premaster_secret, 32);
+            if(RAND_bytes(premaster_secret, 32) <= 0) {
+                EVP_PKEY_CTX_free(pkey_ctx);
+                goto err;
+            }
             /*
              * If we have client certificate, use its secret as peer key
              */
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 3e01b6a..5568df6 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -3849,7 +3849,10 @@ int tls1_process_heartbeat(SSL *s)
         memcpy(bp, pl, payload);
         bp += payload;
         /* Random padding */
-        RAND_pseudo_bytes(bp, padding);
+        if(RAND_pseudo_bytes(bp, padding) < 0) {
+            OPENSSL_free(buffer);
+            return -1;
+        }
 
         r = ssl3_write_bytes(s, TLS1_RT_HEARTBEAT, buffer,
                              3 + payload + padding);
@@ -3884,7 +3887,7 @@ int tls1_process_heartbeat(SSL *s)
 int tls1_heartbeat(SSL *s)
 {
     unsigned char *buf, *p;
-    int ret;
+    int ret = -1;
     unsigned int payload = 18;  /* Sequence number + random bytes */
     unsigned int padding = 16;  /* Use minimum padding */
 
@@ -3932,10 +3935,16 @@ int tls1_heartbeat(SSL *s)
     /* Sequence number */
     s2n(s->tlsext_hb_seq, p);
     /* 16 random bytes */
-    RAND_pseudo_bytes(p, 16);
+    if(RAND_pseudo_bytes(p, 16) < 0) {
+        SSLerr(SSL_F_TLS1_HEARTBEAT, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
     p += 16;
     /* Random padding */
-    RAND_pseudo_bytes(p, padding);
+    if(RAND_pseudo_bytes(p, padding) < 0) {
+        SSLerr(SSL_F_TLS1_HEARTBEAT, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
     ret = ssl3_write_bytes(s, TLS1_RT_HEARTBEAT, buf, 3 + payload + padding);
     if (ret >= 0) {
@@ -3947,6 +3956,7 @@ int tls1_heartbeat(SSL *s)
         s->tlsext_hb_pending = 1;
     }
 
+err:
     OPENSSL_free(buf);
 
     return ret;
diff --git a/ssl/tls_srp.c b/ssl/tls_srp.c
index d36cfa0..6bdf7f3 100644
--- a/ssl/tls_srp.c
+++ b/ssl/tls_srp.c
@@ -454,7 +454,8 @@ int SRP_Calc_A_param(SSL *s)
 {
     unsigned char rnd[SSL_MAX_MASTER_KEY_LENGTH];
 
-    RAND_bytes(rnd, sizeof(rnd));
+    if(RAND_bytes(rnd, sizeof(rnd)) <= 0)
+        return -1;
     s->srp_ctx.a = BN_bin2bn(rnd, sizeof(rnd), s->srp_ctx.a);
     OPENSSL_cleanse(rnd, sizeof(rnd));
 

From matt at openssl.org  Wed Mar 25 12:50:46 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 25 Mar 2015 12:50:46 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427287846.499268.15610.nullmailer@dev.openssl.org>

The branch master has been updated
       via  969467466cde0049aa7157fad6ca3753e7aa0493 (commit)
      from  302d38e3f73d5fd2ba2fd30bb7798778cb9f18dd (commit)


- Log -----------------------------------------------------------------
commit 969467466cde0049aa7157fad6ca3753e7aa0493
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Feb 5 16:04:58 2015 +0000

    SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG was disabled in 0.9.8q and 1.0.0c.
    This commit sets the value of SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG to
    zero.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 ssl/ssl.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ssl/ssl.h b/ssl/ssl.h
index dec3abc..84de6a8 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -390,7 +390,8 @@ typedef int (*custom_ext_parse_cb) (SSL *s, unsigned int ext_type,
 
 /* Allow initial connection to servers that don't support RI */
 # define SSL_OP_LEGACY_SERVER_CONNECT                    0x00000004L
-# define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG         0x00000008L
+/* Removed from OpenSSL 0.9.8q and 1.0.0c */
+# define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG         0x0L
 # define SSL_OP_TLSEXT_PADDING                           0x00000010L
 # define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER               0x00000020L
 # define SSL_OP_SAFARI_ECDHE_ECDSA_BUG                   0x00000040L

From matt at openssl.org  Wed Mar 25 13:02:30 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 25 Mar 2015 13:02:30 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1427288550.133409.18762.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  42c9c7103c8e7fd73dafa0500120f8e34fd659c3 (commit)
       via  4ebc70cc5148d6ffbf539faca249469778c12f96 (commit)
       via  2674af2f790aa1c869dcf5f2024e9eb6758edf56 (commit)
       via  bae9b9915a302f2f6a9146287d761e55cf458351 (commit)
      from  750190567a43d827fa16c58e79ae3ec6ff6c91d3 (commit)


- Log -----------------------------------------------------------------
commit 42c9c7103c8e7fd73dafa0500120f8e34fd659c3
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 10 13:15:25 2015 +0000

    Fix HMAC to pass invalid key len test
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 4ebc70cc5148d6ffbf539faca249469778c12f96
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 10 13:15:05 2015 +0000

    Add HMAC test for invalid key len
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 2674af2f790aa1c869dcf5f2024e9eb6758edf56
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 10 11:39:52 2015 +0000

    Ensure that both the MD and key have been initialised before attempting to
    create an HMAC
    
    Inspired by BoringSSL commit 2fe7f2d0d9a6fcc75b4e594eeec306cc55acd594
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    
    Conflicts:
    	crypto/hmac/hmac.c

commit bae9b9915a302f2f6a9146287d761e55cf458351
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 10 12:38:04 2015 +0000

    Add more HMAC tests
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/hmac/hmac.c     |  27 ++++++--
 crypto/hmac/hmac.h     |   1 +
 crypto/hmac/hmactest.c | 174 +++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 191 insertions(+), 11 deletions(-)

diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
index 5477816..2daacf6 100644
--- a/crypto/hmac/hmac.c
+++ b/crypto/hmac/hmac.c
@@ -91,8 +91,14 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
     if (md != NULL) {
         reset = 1;
         ctx->md = md;
-    } else
+    } else if(ctx->md) {
         md = ctx->md;
+    } else {
+        return 0;
+    }
+
+    if(!ctx->key_init && key == NULL)
+        return 0;
 
     if (key != NULL) {
         reset = 1;
@@ -107,13 +113,15 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
                                     &ctx->key_length))
                 goto err;
         } else {
-            OPENSSL_assert(len >= 0 && len <= (int)sizeof(ctx->key));
+            if(len < 0 || len > (int)sizeof(ctx->key))
+                return 0;
             memcpy(ctx->key, key, len);
             ctx->key_length = len;
         }
         if (ctx->key_length != HMAC_MAX_MD_CBLOCK)
             memset(&ctx->key[ctx->key_length], 0,
                    HMAC_MAX_MD_CBLOCK - ctx->key_length);
+        ctx->key_init = 1;
     }
 
     if (reset) {
@@ -151,6 +159,9 @@ int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len)
     if (FIPS_mode() && !ctx->i_ctx.engine)
         return FIPS_hmac_update(ctx, data, len);
 #endif
+    if(!ctx->key_init)
+        return 0;
+
     return EVP_DigestUpdate(&ctx->md_ctx, data, len);
 }
 
@@ -163,6 +174,9 @@ int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
         return FIPS_hmac_final(ctx, md, len);
 #endif
 
+    if(!ctx->key_init)
+        goto err;
+
     if (!EVP_DigestFinal_ex(&ctx->md_ctx, buf, &i))
         goto err;
     if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx, &ctx->o_ctx))
@@ -181,6 +195,8 @@ void HMAC_CTX_init(HMAC_CTX *ctx)
     EVP_MD_CTX_init(&ctx->i_ctx);
     EVP_MD_CTX_init(&ctx->o_ctx);
     EVP_MD_CTX_init(&ctx->md_ctx);
+    ctx->key_init = 0;
+    ctx->md = NULL;
 }
 
 int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
@@ -191,8 +207,11 @@ int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
         goto err;
     if (!EVP_MD_CTX_copy(&dctx->md_ctx, &sctx->md_ctx))
         goto err;
-    memcpy(dctx->key, sctx->key, HMAC_MAX_MD_CBLOCK);
-    dctx->key_length = sctx->key_length;
+    dctx->key_init = sctx->key_init;
+    if(sctx->key_init) {
+        memcpy(dctx->key, sctx->key, HMAC_MAX_MD_CBLOCK);
+        dctx->key_length = sctx->key_length;
+    }
     dctx->md = sctx->md;
     return 1;
  err:
diff --git a/crypto/hmac/hmac.h b/crypto/hmac/hmac.h
index b8b55cd..f8e9f5e 100644
--- a/crypto/hmac/hmac.h
+++ b/crypto/hmac/hmac.h
@@ -79,6 +79,7 @@ typedef struct hmac_ctx_st {
     EVP_MD_CTX o_ctx;
     unsigned int key_length;
     unsigned char key[HMAC_MAX_MD_CBLOCK];
+    int key_init;
 } HMAC_CTX;
 
 # define HMAC_size(e)    (EVP_MD_size((e)->md))
diff --git a/crypto/hmac/hmactest.c b/crypto/hmac/hmactest.c
index 3d130a0..5c8ec4c 100644
--- a/crypto/hmac/hmactest.c
+++ b/crypto/hmac/hmactest.c
@@ -85,7 +85,7 @@ static struct test_st {
     unsigned char data[64];
     int data_len;
     unsigned char *digest;
-} test[4] = {
+} test[8] = {
     {
         "", 0, "More text test vectors to stuff up EBCDIC machines :-)", 54,
         (unsigned char *)"e9139d1e6ee064ef8cf514fc7dc83e86",
@@ -113,10 +113,27 @@ static struct test_st {
             0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd
         }, 50, (unsigned char *)"56be34521d144c88dbb8c733f0e8b3f6",
     },
+    {
+        "", 0, "My test data", 12,
+        (unsigned char *)"61afdecb95429ef494d61fdee15990cabf0826fc"
+    },
+    {
+        "", 0, "My test data", 12,
+        (unsigned char *)"2274b195d90ce8e03406f4b526a47e0787a88a65479938f1a5baa3ce0f079776"
+    },
+    {
+        "123456", 6, "My test data", 12,
+        (unsigned char *)"bab53058ae861a7f191abe2d0145cbb123776a6369ee3f9d79ce455667e411dd"
+    },
+    {
+        "12345", 5, "My test data again", 12,
+        (unsigned char *)"7dbe8c764c068e3bcd6e6b0fbcd5e6fc197b15bb"
+    }
 };
 # endif
 
-static char *pt(unsigned char *md);
+static char *pt(unsigned char *md, unsigned int len);
+
 int main(int argc, char *argv[])
 {
 # ifndef OPENSSL_NO_MD5
@@ -124,6 +141,9 @@ int main(int argc, char *argv[])
     char *p;
 # endif
     int err = 0;
+    HMAC_CTX ctx, ctx2;
+    unsigned char buf[EVP_MAX_MD_SIZE];
+    unsigned int len;
 
 # ifdef OPENSSL_NO_MD5
     printf("test skipped: MD5 disabled\n");
@@ -139,27 +159,167 @@ int main(int argc, char *argv[])
     for (i = 0; i < 4; i++) {
         p = pt(HMAC(EVP_md5(),
                     test[i].key, test[i].key_len,
-                    test[i].data, test[i].data_len, NULL, NULL));
+                    test[i].data, test[i].data_len, NULL, NULL),
+                    MD5_DIGEST_LENGTH);
 
         if (strcmp(p, (char *)test[i].digest) != 0) {
-            printf("error calculating HMAC on %d entry'\n", i);
+            printf("Error calculating HMAC on %d entry'\n", i);
             printf("got %s instead of %s\n", p, test[i].digest);
             err++;
         } else
             printf("test %d ok\n", i);
     }
 # endif                         /* OPENSSL_NO_MD5 */
+
+/* test4 */
+    HMAC_CTX_init(&ctx);
+    if(HMAC_Init_ex(&ctx, NULL, 0, NULL, NULL)) {
+        printf("Should fail to initialise HMAC with empty MD and key (test 4)\n");
+        err++;
+        goto test5;
+    }
+    if(HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
+        printf("Should fail HMAC_Update with ctx not set up (test 4)\n");
+        err++;
+        goto test5;
+    }
+    if(HMAC_Init_ex(&ctx, NULL, 0, EVP_sha1(), NULL)) {
+        printf("Should fail to initialise HMAC with empty key (test 4)\n");
+        err++;
+        goto test5;
+    }
+    if(HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
+        printf("Should fail HMAC_Update with ctx not set up (test 4)\n");
+        err++;
+        goto test5;
+    }
+    printf("test 4 ok\n");
+test5:
+    HMAC_CTX_init(&ctx);
+    if(HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, NULL, NULL)) {
+        printf("Should fail to initialise HMAC with empty MD (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
+        printf("Should fail HMAC_Update with ctx not set up (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(HMAC_Init_ex(&ctx, test[4].key, -1, EVP_sha1(), NULL)) {
+        printf("Should fail to initialise HMAC with invalid key len(test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, EVP_sha1(), NULL)) {
+        printf("Failed to initialise HMAC (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
+        printf("Error updating HMAC with data (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Final(&ctx, buf, &len)) {
+        printf("Error finalising data (test 5)\n");
+        err++;
+        goto test6;
+    }
+    p = pt(buf, len);
+    if (strcmp(p, (char *)test[4].digest) != 0) {
+        printf("Error calculating interim HMAC on test 5\n");
+        printf("got %s instead of %s\n", p, test[4].digest);
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Init_ex(&ctx, NULL, 0, EVP_sha256(), NULL)) {
+        printf("Failed to reinitialise HMAC (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Update(&ctx, test[5].data, test[5].data_len)) {
+        printf("Error updating HMAC with data (sha256) (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Final(&ctx, buf, &len)) {
+        printf("Error finalising data (sha256) (test 5)\n");
+        err++;
+        goto test6;
+    }
+    p = pt(buf, len);
+    if (strcmp(p, (char *)test[5].digest) != 0) {
+        printf("Error calculating 2nd interim HMAC on test 5\n");
+        printf("got %s instead of %s\n", p, test[5].digest);
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Init_ex(&ctx, test[6].key, test[6].key_len, NULL, NULL)) {
+        printf("Failed to reinitialise HMAC with key (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Update(&ctx, test[6].data, test[6].data_len)) {
+        printf("Error updating HMAC with data (new key) (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Final(&ctx, buf, &len)) {
+        printf("Error finalising data (new key) (test 5)\n");
+        err++;
+        goto test6;
+    }
+    p = pt(buf, len);
+    if (strcmp(p, (char *)test[6].digest) != 0) {
+        printf("error calculating HMAC on test 5\n");
+        printf("got %s instead of %s\n", p, test[6].digest);
+        err++;
+    } else {
+        printf("test 5 ok\n");
+    }
+test6:
+    HMAC_CTX_init(&ctx);
+    if(!HMAC_Init_ex(&ctx, test[7].key, test[7].key_len, EVP_sha1(), NULL)) {
+        printf("Failed to initialise HMAC (test 6)\n");
+        err++;
+        goto end;
+    }
+    if(!HMAC_Update(&ctx, test[7].data, test[7].data_len)) {
+        printf("Error updating HMAC with data (test 6)\n");
+        err++;
+        goto end;
+    }
+    if(!HMAC_CTX_copy(&ctx2, &ctx)) {
+        printf("Failed to copy HMAC_CTX (test 6)\n");
+        err++;
+        goto end;
+    }
+    if(!HMAC_Final(&ctx2, buf, &len)) {
+        printf("Error finalising data (test 6)\n");
+        err++;
+        goto end;
+    }
+    p = pt(buf, len);
+    if (strcmp(p, (char *)test[7].digest) != 0) {
+        printf("Error calculating HMAC on test 6\n");
+        printf("got %s instead of %s\n", p, test[7].digest);
+        err++;
+    } else {
+        printf("test 6 ok\n");
+    }
+end:
     EXIT(err);
     return (0);
 }
 
 # ifndef OPENSSL_NO_MD5
-static char *pt(unsigned char *md)
+static char *pt(unsigned char *md, unsigned int len)
 {
-    int i;
+    unsigned int i;
     static char buf[80];
 
-    for (i = 0; i < MD5_DIGEST_LENGTH; i++)
+    for (i = 0; i < len; i++)
         sprintf(&(buf[i * 2]), "%02x", md[i]);
     return (buf);
 }

From matt at openssl.org  Wed Mar 25 13:02:39 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 25 Mar 2015 13:02:39 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1427288559.853399.19050.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  ddbf312fb4ae31eb2e87af736e0a3b5b347d736a (commit)
       via  e7c2ad508d50144bc0ba480c75a2ee3367e98ee4 (commit)
       via  929b0d70c19f60227f89fac63f22a21f21950823 (commit)
       via  b7279ed55c8bc11f78123f987e46f7772bd2047c (commit)
      from  8f8e4e4f5253085ab673bb74094c3e492c56af44 (commit)


- Log -----------------------------------------------------------------
commit ddbf312fb4ae31eb2e87af736e0a3b5b347d736a
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 10 13:15:25 2015 +0000

    Fix HMAC to pass invalid key len test
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit e7c2ad508d50144bc0ba480c75a2ee3367e98ee4
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 10 13:15:05 2015 +0000

    Add HMAC test for invalid key len
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 929b0d70c19f60227f89fac63f22a21f21950823
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 10 11:39:52 2015 +0000

    Ensure that both the MD and key have been initialised before attempting to
    create an HMAC
    
    Inspired by BoringSSL commit 2fe7f2d0d9a6fcc75b4e594eeec306cc55acd594
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    
    Conflicts:
    	crypto/hmac/hmac.c

commit b7279ed55c8bc11f78123f987e46f7772bd2047c
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 10 12:38:04 2015 +0000

    Add more HMAC tests
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/hmac/hmac.c     |  27 ++++++--
 crypto/hmac/hmac.h     |   1 +
 crypto/hmac/hmactest.c | 174 +++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 191 insertions(+), 11 deletions(-)

diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
index 1fc9e2c..0eea562 100644
--- a/crypto/hmac/hmac.c
+++ b/crypto/hmac/hmac.c
@@ -101,8 +101,14 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
     if (md != NULL) {
         reset = 1;
         ctx->md = md;
-    } else
+    } else if(ctx->md) {
         md = ctx->md;
+    } else {
+        return 0;
+    }
+
+    if(!ctx->key_init && key == NULL)
+        return 0;
 
     if (key != NULL) {
         reset = 1;
@@ -117,13 +123,15 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
                                     &ctx->key_length))
                 goto err;
         } else {
-            OPENSSL_assert(len >= 0 && len <= (int)sizeof(ctx->key));
+            if(len < 0 || len > (int)sizeof(ctx->key))
+                return 0;
             memcpy(ctx->key, key, len);
             ctx->key_length = len;
         }
         if (ctx->key_length != HMAC_MAX_MD_CBLOCK)
             memset(&ctx->key[ctx->key_length], 0,
                    HMAC_MAX_MD_CBLOCK - ctx->key_length);
+        ctx->key_init = 1;
     }
 
     if (reset) {
@@ -161,6 +169,9 @@ int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len)
     if (FIPS_mode() && !ctx->i_ctx.engine)
         return FIPS_hmac_update(ctx, data, len);
 #endif
+    if(!ctx->key_init)
+        return 0;
+
     return EVP_DigestUpdate(&ctx->md_ctx, data, len);
 }
 
@@ -173,6 +184,9 @@ int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
         return FIPS_hmac_final(ctx, md, len);
 #endif
 
+    if(!ctx->key_init)
+        goto err;
+
     if (!EVP_DigestFinal_ex(&ctx->md_ctx, buf, &i))
         goto err;
     if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx, &ctx->o_ctx))
@@ -191,6 +205,8 @@ void HMAC_CTX_init(HMAC_CTX *ctx)
     EVP_MD_CTX_init(&ctx->i_ctx);
     EVP_MD_CTX_init(&ctx->o_ctx);
     EVP_MD_CTX_init(&ctx->md_ctx);
+    ctx->key_init = 0;
+    ctx->md = NULL;
 }
 
 int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
@@ -201,8 +217,11 @@ int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
         goto err;
     if (!EVP_MD_CTX_copy(&dctx->md_ctx, &sctx->md_ctx))
         goto err;
-    memcpy(dctx->key, sctx->key, HMAC_MAX_MD_CBLOCK);
-    dctx->key_length = sctx->key_length;
+    dctx->key_init = sctx->key_init;
+    if(sctx->key_init) {
+        memcpy(dctx->key, sctx->key, HMAC_MAX_MD_CBLOCK);
+        dctx->key_length = sctx->key_length;
+    }
     dctx->md = sctx->md;
     return 1;
  err:
diff --git a/crypto/hmac/hmac.h b/crypto/hmac/hmac.h
index b8b55cd..f8e9f5e 100644
--- a/crypto/hmac/hmac.h
+++ b/crypto/hmac/hmac.h
@@ -79,6 +79,7 @@ typedef struct hmac_ctx_st {
     EVP_MD_CTX o_ctx;
     unsigned int key_length;
     unsigned char key[HMAC_MAX_MD_CBLOCK];
+    int key_init;
 } HMAC_CTX;
 
 # define HMAC_size(e)    (EVP_MD_size((e)->md))
diff --git a/crypto/hmac/hmactest.c b/crypto/hmac/hmactest.c
index 3d130a0..5c8ec4c 100644
--- a/crypto/hmac/hmactest.c
+++ b/crypto/hmac/hmactest.c
@@ -85,7 +85,7 @@ static struct test_st {
     unsigned char data[64];
     int data_len;
     unsigned char *digest;
-} test[4] = {
+} test[8] = {
     {
         "", 0, "More text test vectors to stuff up EBCDIC machines :-)", 54,
         (unsigned char *)"e9139d1e6ee064ef8cf514fc7dc83e86",
@@ -113,10 +113,27 @@ static struct test_st {
             0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd
         }, 50, (unsigned char *)"56be34521d144c88dbb8c733f0e8b3f6",
     },
+    {
+        "", 0, "My test data", 12,
+        (unsigned char *)"61afdecb95429ef494d61fdee15990cabf0826fc"
+    },
+    {
+        "", 0, "My test data", 12,
+        (unsigned char *)"2274b195d90ce8e03406f4b526a47e0787a88a65479938f1a5baa3ce0f079776"
+    },
+    {
+        "123456", 6, "My test data", 12,
+        (unsigned char *)"bab53058ae861a7f191abe2d0145cbb123776a6369ee3f9d79ce455667e411dd"
+    },
+    {
+        "12345", 5, "My test data again", 12,
+        (unsigned char *)"7dbe8c764c068e3bcd6e6b0fbcd5e6fc197b15bb"
+    }
 };
 # endif
 
-static char *pt(unsigned char *md);
+static char *pt(unsigned char *md, unsigned int len);
+
 int main(int argc, char *argv[])
 {
 # ifndef OPENSSL_NO_MD5
@@ -124,6 +141,9 @@ int main(int argc, char *argv[])
     char *p;
 # endif
     int err = 0;
+    HMAC_CTX ctx, ctx2;
+    unsigned char buf[EVP_MAX_MD_SIZE];
+    unsigned int len;
 
 # ifdef OPENSSL_NO_MD5
     printf("test skipped: MD5 disabled\n");
@@ -139,27 +159,167 @@ int main(int argc, char *argv[])
     for (i = 0; i < 4; i++) {
         p = pt(HMAC(EVP_md5(),
                     test[i].key, test[i].key_len,
-                    test[i].data, test[i].data_len, NULL, NULL));
+                    test[i].data, test[i].data_len, NULL, NULL),
+                    MD5_DIGEST_LENGTH);
 
         if (strcmp(p, (char *)test[i].digest) != 0) {
-            printf("error calculating HMAC on %d entry'\n", i);
+            printf("Error calculating HMAC on %d entry'\n", i);
             printf("got %s instead of %s\n", p, test[i].digest);
             err++;
         } else
             printf("test %d ok\n", i);
     }
 # endif                         /* OPENSSL_NO_MD5 */
+
+/* test4 */
+    HMAC_CTX_init(&ctx);
+    if(HMAC_Init_ex(&ctx, NULL, 0, NULL, NULL)) {
+        printf("Should fail to initialise HMAC with empty MD and key (test 4)\n");
+        err++;
+        goto test5;
+    }
+    if(HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
+        printf("Should fail HMAC_Update with ctx not set up (test 4)\n");
+        err++;
+        goto test5;
+    }
+    if(HMAC_Init_ex(&ctx, NULL, 0, EVP_sha1(), NULL)) {
+        printf("Should fail to initialise HMAC with empty key (test 4)\n");
+        err++;
+        goto test5;
+    }
+    if(HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
+        printf("Should fail HMAC_Update with ctx not set up (test 4)\n");
+        err++;
+        goto test5;
+    }
+    printf("test 4 ok\n");
+test5:
+    HMAC_CTX_init(&ctx);
+    if(HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, NULL, NULL)) {
+        printf("Should fail to initialise HMAC with empty MD (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
+        printf("Should fail HMAC_Update with ctx not set up (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(HMAC_Init_ex(&ctx, test[4].key, -1, EVP_sha1(), NULL)) {
+        printf("Should fail to initialise HMAC with invalid key len(test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, EVP_sha1(), NULL)) {
+        printf("Failed to initialise HMAC (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
+        printf("Error updating HMAC with data (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Final(&ctx, buf, &len)) {
+        printf("Error finalising data (test 5)\n");
+        err++;
+        goto test6;
+    }
+    p = pt(buf, len);
+    if (strcmp(p, (char *)test[4].digest) != 0) {
+        printf("Error calculating interim HMAC on test 5\n");
+        printf("got %s instead of %s\n", p, test[4].digest);
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Init_ex(&ctx, NULL, 0, EVP_sha256(), NULL)) {
+        printf("Failed to reinitialise HMAC (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Update(&ctx, test[5].data, test[5].data_len)) {
+        printf("Error updating HMAC with data (sha256) (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Final(&ctx, buf, &len)) {
+        printf("Error finalising data (sha256) (test 5)\n");
+        err++;
+        goto test6;
+    }
+    p = pt(buf, len);
+    if (strcmp(p, (char *)test[5].digest) != 0) {
+        printf("Error calculating 2nd interim HMAC on test 5\n");
+        printf("got %s instead of %s\n", p, test[5].digest);
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Init_ex(&ctx, test[6].key, test[6].key_len, NULL, NULL)) {
+        printf("Failed to reinitialise HMAC with key (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Update(&ctx, test[6].data, test[6].data_len)) {
+        printf("Error updating HMAC with data (new key) (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Final(&ctx, buf, &len)) {
+        printf("Error finalising data (new key) (test 5)\n");
+        err++;
+        goto test6;
+    }
+    p = pt(buf, len);
+    if (strcmp(p, (char *)test[6].digest) != 0) {
+        printf("error calculating HMAC on test 5\n");
+        printf("got %s instead of %s\n", p, test[6].digest);
+        err++;
+    } else {
+        printf("test 5 ok\n");
+    }
+test6:
+    HMAC_CTX_init(&ctx);
+    if(!HMAC_Init_ex(&ctx, test[7].key, test[7].key_len, EVP_sha1(), NULL)) {
+        printf("Failed to initialise HMAC (test 6)\n");
+        err++;
+        goto end;
+    }
+    if(!HMAC_Update(&ctx, test[7].data, test[7].data_len)) {
+        printf("Error updating HMAC with data (test 6)\n");
+        err++;
+        goto end;
+    }
+    if(!HMAC_CTX_copy(&ctx2, &ctx)) {
+        printf("Failed to copy HMAC_CTX (test 6)\n");
+        err++;
+        goto end;
+    }
+    if(!HMAC_Final(&ctx2, buf, &len)) {
+        printf("Error finalising data (test 6)\n");
+        err++;
+        goto end;
+    }
+    p = pt(buf, len);
+    if (strcmp(p, (char *)test[7].digest) != 0) {
+        printf("Error calculating HMAC on test 6\n");
+        printf("got %s instead of %s\n", p, test[7].digest);
+        err++;
+    } else {
+        printf("test 6 ok\n");
+    }
+end:
     EXIT(err);
     return (0);
 }
 
 # ifndef OPENSSL_NO_MD5
-static char *pt(unsigned char *md)
+static char *pt(unsigned char *md, unsigned int len)
 {
-    int i;
+    unsigned int i;
     static char buf[80];
 
-    for (i = 0; i < MD5_DIGEST_LENGTH; i++)
+    for (i = 0; i < len; i++)
         sprintf(&(buf[i * 2]), "%02x", md[i]);
     return (buf);
 }

From matt at openssl.org  Wed Mar 25 13:02:46 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 25 Mar 2015 13:02:46 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427288566.472223.19301.nullmailer@dev.openssl.org>

The branch master has been updated
       via  c62e94d805fa2900a0d6d723715aaf45f75b6c14 (commit)
       via  b352160f816585d2be1bcd8862efae647968f406 (commit)
       via  e2095c6531da1207a936b65730db0222831a93ed (commit)
       via  2cfbdd71dde0c3ddf4597eb20cc3e3fb8485fc15 (commit)
      from  969467466cde0049aa7157fad6ca3753e7aa0493 (commit)


- Log -----------------------------------------------------------------
commit c62e94d805fa2900a0d6d723715aaf45f75b6c14
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 10 13:15:25 2015 +0000

    Fix HMAC to pass invalid key len test
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit b352160f816585d2be1bcd8862efae647968f406
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 10 13:15:05 2015 +0000

    Add HMAC test for invalid key len
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit e2095c6531da1207a936b65730db0222831a93ed
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 10 11:39:52 2015 +0000

    Ensure that both the MD and key have been initialised before attempting to
    create an HMAC
    
    Inspired by BoringSSL commit 2fe7f2d0d9a6fcc75b4e594eeec306cc55acd594
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 2cfbdd71dde0c3ddf4597eb20cc3e3fb8485fc15
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 10 12:38:04 2015 +0000

    Add more HMAC tests
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/hmac/hmac.c     |  26 ++++++--
 crypto/hmac/hmac.h     |   1 +
 crypto/hmac/hmactest.c | 174 +++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 190 insertions(+), 11 deletions(-)

diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
index 3a4dfa4..8ee5b2a 100644
--- a/crypto/hmac/hmac.c
+++ b/crypto/hmac/hmac.c
@@ -71,8 +71,14 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
     if (md != NULL) {
         reset = 1;
         ctx->md = md;
-    } else
+    } else if(ctx->md) {
         md = ctx->md;
+    } else {
+        return 0;
+    }
+
+    if(!ctx->key_init && key == NULL)
+        return 0;
 
     if (key != NULL) {
         reset = 1;
@@ -87,13 +93,15 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
                                     &ctx->key_length))
                 goto err;
         } else {
-            OPENSSL_assert(len >= 0 && len <= (int)sizeof(ctx->key));
+            if(len < 0 || len > (int)sizeof(ctx->key))
+                return 0;
             memcpy(ctx->key, key, len);
             ctx->key_length = len;
         }
         if (ctx->key_length != HMAC_MAX_MD_CBLOCK)
             memset(&ctx->key[ctx->key_length], 0,
                    HMAC_MAX_MD_CBLOCK - ctx->key_length);
+        ctx->key_init = 1;
     }
 
     if (reset) {
@@ -129,6 +137,8 @@ int HMAC_Init(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md)
 
 int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len)
 {
+    if(!ctx->key_init)
+        return 0;
     return EVP_DigestUpdate(&ctx->md_ctx, data, len);
 }
 
@@ -137,6 +147,9 @@ int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
     unsigned int i;
     unsigned char buf[EVP_MAX_MD_SIZE];
 
+    if(!ctx->key_init)
+        goto err;
+
     if (!EVP_DigestFinal_ex(&ctx->md_ctx, buf, &i))
         goto err;
     if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx, &ctx->o_ctx))
@@ -155,6 +168,8 @@ void HMAC_CTX_init(HMAC_CTX *ctx)
     EVP_MD_CTX_init(&ctx->i_ctx);
     EVP_MD_CTX_init(&ctx->o_ctx);
     EVP_MD_CTX_init(&ctx->md_ctx);
+    ctx->key_init = 0;
+    ctx->md = NULL;
 }
 
 int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
@@ -166,8 +181,11 @@ int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
         goto err;
     if (!EVP_MD_CTX_copy_ex(&dctx->md_ctx, &sctx->md_ctx))
         goto err;
-    memcpy(dctx->key, sctx->key, HMAC_MAX_MD_CBLOCK);
-    dctx->key_length = sctx->key_length;
+    dctx->key_init = sctx->key_init;
+    if(sctx->key_init) {
+        memcpy(dctx->key, sctx->key, HMAC_MAX_MD_CBLOCK);
+        dctx->key_length = sctx->key_length;
+    }
     dctx->md = sctx->md;
     return 1;
  err:
diff --git a/crypto/hmac/hmac.h b/crypto/hmac/hmac.h
index 81aa49d..61946fc 100644
--- a/crypto/hmac/hmac.h
+++ b/crypto/hmac/hmac.h
@@ -75,6 +75,7 @@ typedef struct hmac_ctx_st {
     EVP_MD_CTX o_ctx;
     unsigned int key_length;
     unsigned char key[HMAC_MAX_MD_CBLOCK];
+    int key_init;
 } HMAC_CTX;
 
 # define HMAC_size(e)    (EVP_MD_size((e)->md))
diff --git a/crypto/hmac/hmactest.c b/crypto/hmac/hmactest.c
index de8d1c9..5e90dba 100644
--- a/crypto/hmac/hmactest.c
+++ b/crypto/hmac/hmactest.c
@@ -78,7 +78,7 @@ static struct test_st {
     unsigned char data[64];
     int data_len;
     unsigned char *digest;
-} test[4] = {
+} test[8] = {
     {
         "", 0, "More text test vectors to stuff up EBCDIC machines :-)", 54,
         (unsigned char *)"e9139d1e6ee064ef8cf514fc7dc83e86",
@@ -106,10 +106,27 @@ static struct test_st {
             0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd
         }, 50, (unsigned char *)"56be34521d144c88dbb8c733f0e8b3f6",
     },
+    {
+        "", 0, "My test data", 12,
+        (unsigned char *)"61afdecb95429ef494d61fdee15990cabf0826fc"
+    },
+    {
+        "", 0, "My test data", 12,
+        (unsigned char *)"2274b195d90ce8e03406f4b526a47e0787a88a65479938f1a5baa3ce0f079776"
+    },
+    {
+        "123456", 6, "My test data", 12,
+        (unsigned char *)"bab53058ae861a7f191abe2d0145cbb123776a6369ee3f9d79ce455667e411dd"
+    },
+    {
+        "12345", 5, "My test data again", 12,
+        (unsigned char *)"7dbe8c764c068e3bcd6e6b0fbcd5e6fc197b15bb"
+    }
 };
 # endif
 
-static char *pt(unsigned char *md);
+static char *pt(unsigned char *md, unsigned int len);
+
 int main(int argc, char *argv[])
 {
 # ifndef OPENSSL_NO_MD5
@@ -117,6 +134,9 @@ int main(int argc, char *argv[])
     char *p;
 # endif
     int err = 0;
+    HMAC_CTX ctx, ctx2;
+    unsigned char buf[EVP_MAX_MD_SIZE];
+    unsigned int len;
 
 # ifdef OPENSSL_NO_MD5
     printf("test skipped: MD5 disabled\n");
@@ -132,26 +152,166 @@ int main(int argc, char *argv[])
     for (i = 0; i < 4; i++) {
         p = pt(HMAC(EVP_md5(),
                     test[i].key, test[i].key_len,
-                    test[i].data, test[i].data_len, NULL, NULL));
+                    test[i].data, test[i].data_len, NULL, NULL),
+                    MD5_DIGEST_LENGTH);
 
         if (strcmp(p, (char *)test[i].digest) != 0) {
-            printf("error calculating HMAC on %d entry'\n", i);
+            printf("Error calculating HMAC on %d entry'\n", i);
             printf("got %s instead of %s\n", p, test[i].digest);
             err++;
         } else
             printf("test %d ok\n", i);
     }
 # endif                         /* OPENSSL_NO_MD5 */
+
+/* test4 */
+    HMAC_CTX_init(&ctx);
+    if(HMAC_Init_ex(&ctx, NULL, 0, NULL, NULL)) {
+        printf("Should fail to initialise HMAC with empty MD and key (test 4)\n");
+        err++;
+        goto test5;
+    }
+    if(HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
+        printf("Should fail HMAC_Update with ctx not set up (test 4)\n");
+        err++;
+        goto test5;
+    }
+    if(HMAC_Init_ex(&ctx, NULL, 0, EVP_sha1(), NULL)) {
+        printf("Should fail to initialise HMAC with empty key (test 4)\n");
+        err++;
+        goto test5;
+    }
+    if(HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
+        printf("Should fail HMAC_Update with ctx not set up (test 4)\n");
+        err++;
+        goto test5;
+    }
+    printf("test 4 ok\n");
+test5:
+    HMAC_CTX_init(&ctx);
+    if(HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, NULL, NULL)) {
+        printf("Should fail to initialise HMAC with empty MD (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
+        printf("Should fail HMAC_Update with ctx not set up (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(HMAC_Init_ex(&ctx, test[4].key, -1, EVP_sha1(), NULL)) {
+        printf("Should fail to initialise HMAC with invalid key len(test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, EVP_sha1(), NULL)) {
+        printf("Failed to initialise HMAC (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
+        printf("Error updating HMAC with data (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Final(&ctx, buf, &len)) {
+        printf("Error finalising data (test 5)\n");
+        err++;
+        goto test6;
+    }
+    p = pt(buf, len);
+    if (strcmp(p, (char *)test[4].digest) != 0) {
+        printf("Error calculating interim HMAC on test 5\n");
+        printf("got %s instead of %s\n", p, test[4].digest);
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Init_ex(&ctx, NULL, 0, EVP_sha256(), NULL)) {
+        printf("Failed to reinitialise HMAC (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Update(&ctx, test[5].data, test[5].data_len)) {
+        printf("Error updating HMAC with data (sha256) (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Final(&ctx, buf, &len)) {
+        printf("Error finalising data (sha256) (test 5)\n");
+        err++;
+        goto test6;
+    }
+    p = pt(buf, len);
+    if (strcmp(p, (char *)test[5].digest) != 0) {
+        printf("Error calculating 2nd interim HMAC on test 5\n");
+        printf("got %s instead of %s\n", p, test[5].digest);
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Init_ex(&ctx, test[6].key, test[6].key_len, NULL, NULL)) {
+        printf("Failed to reinitialise HMAC with key (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Update(&ctx, test[6].data, test[6].data_len)) {
+        printf("Error updating HMAC with data (new key) (test 5)\n");
+        err++;
+        goto test6;
+    }
+    if(!HMAC_Final(&ctx, buf, &len)) {
+        printf("Error finalising data (new key) (test 5)\n");
+        err++;
+        goto test6;
+    }
+    p = pt(buf, len);
+    if (strcmp(p, (char *)test[6].digest) != 0) {
+        printf("error calculating HMAC on test 5\n");
+        printf("got %s instead of %s\n", p, test[6].digest);
+        err++;
+    } else {
+        printf("test 5 ok\n");
+    }
+test6:
+    HMAC_CTX_init(&ctx);
+    if(!HMAC_Init_ex(&ctx, test[7].key, test[7].key_len, EVP_sha1(), NULL)) {
+        printf("Failed to initialise HMAC (test 6)\n");
+        err++;
+        goto end;
+    }
+    if(!HMAC_Update(&ctx, test[7].data, test[7].data_len)) {
+        printf("Error updating HMAC with data (test 6)\n");
+        err++;
+        goto end;
+    }
+    if(!HMAC_CTX_copy(&ctx2, &ctx)) {
+        printf("Failed to copy HMAC_CTX (test 6)\n");
+        err++;
+        goto end;
+    }
+    if(!HMAC_Final(&ctx2, buf, &len)) {
+        printf("Error finalising data (test 6)\n");
+        err++;
+        goto end;
+    }
+    p = pt(buf, len);
+    if (strcmp(p, (char *)test[7].digest) != 0) {
+        printf("Error calculating HMAC on test 6\n");
+        printf("got %s instead of %s\n", p, test[7].digest);
+        err++;
+    } else {
+        printf("test 6 ok\n");
+    }
+end:
     EXIT(err);
 }
 
 # ifndef OPENSSL_NO_MD5
-static char *pt(unsigned char *md)
+static char *pt(unsigned char *md, unsigned int len)
 {
-    int i;
+    unsigned int i;
     static char buf[80];
 
-    for (i = 0; i < MD5_DIGEST_LENGTH; i++)
+    for (i = 0; i < len; i++)
         sprintf(&(buf[i * 2]), "%02x", md[i]);
     return (buf);
 }

From matt at openssl.org  Wed Mar 25 13:10:54 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 25 Mar 2015 13:10:54 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1427289054.388046.21712.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  fe9b85c3cb79f1e29e61f01de105b34ce8177190 (commit)
      from  42c9c7103c8e7fd73dafa0500120f8e34fd659c3 (commit)


- Log -----------------------------------------------------------------
commit fe9b85c3cb79f1e29e61f01de105b34ce8177190
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Feb 25 11:30:43 2015 +0000

    Fix bug in s_client. Previously default verify locations would only be loaded
    if CAfile or CApath were also supplied and successfully loaded first.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 70e5fd877890489a3972bf8bf50bfec1fca3875e)

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

Summary of changes:
 apps/s_client.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/s_client.c b/apps/s_client.c
index ef41cec..1f37239 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1177,13 +1177,12 @@ int MAIN(int argc, char **argv)
     if (!set_cert_key_stuff(ctx, cert, key))
         goto end;
 
-    if ((!SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) ||
-        (!SSL_CTX_set_default_verify_paths(ctx))) {
-        /*
-         * BIO_printf(bio_err,"error setting default verify locations\n");
-         */
+    if ((CAfile || CApath)
+        && !SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) {
+        ERR_print_errors(bio_err);
+    }
+    if (!SSL_CTX_set_default_verify_paths(ctx)) {
         ERR_print_errors(bio_err);
-        /* goto end; */
     }
 #ifndef OPENSSL_NO_TLSEXT
     if (servername != NULL) {

From matt at openssl.org  Wed Mar 25 13:11:07 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 25 Mar 2015 13:11:07 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1427289067.137043.22007.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  8338cf0bdb9a5b17cd46a0bf8f58c15f10960586 (commit)
      from  ddbf312fb4ae31eb2e87af736e0a3b5b347d736a (commit)


- Log -----------------------------------------------------------------
commit 8338cf0bdb9a5b17cd46a0bf8f58c15f10960586
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Feb 25 11:30:43 2015 +0000

    Fix bug in s_client. Previously default verify locations would only be loaded
    if CAfile or CApath were also supplied and successfully loaded first.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 apps/s_client.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/s_client.c b/apps/s_client.c
index 8fa2b73..6c244ac 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1336,13 +1336,12 @@ int MAIN(int argc, char **argv)
 
     SSL_CTX_set_verify(ctx, verify, verify_callback);
 
-    if ((!SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) ||
-        (!SSL_CTX_set_default_verify_paths(ctx))) {
-        /*
-         * BIO_printf(bio_err,"error setting default verify locations\n");
-         */
+    if ((CAfile || CApath)
+        && !SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) {
+        ERR_print_errors(bio_err);
+    }
+    if (!SSL_CTX_set_default_verify_paths(ctx)) {
         ERR_print_errors(bio_err);
-        /* goto end; */
     }
 
     ssl_ctx_add_crls(ctx, crls, crl_download);

From matt at openssl.org  Wed Mar 25 13:11:14 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 25 Mar 2015 13:11:14 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427289074.399197.22225.nullmailer@dev.openssl.org>

The branch master has been updated
       via  70e5fd877890489a3972bf8bf50bfec1fca3875e (commit)
      from  c62e94d805fa2900a0d6d723715aaf45f75b6c14 (commit)


- Log -----------------------------------------------------------------
commit 70e5fd877890489a3972bf8bf50bfec1fca3875e
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Feb 25 11:30:43 2015 +0000

    Fix bug in s_client. Previously default verify locations would only be loaded
    if CAfile or CApath were also supplied and successfully loaded first.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 apps/s_client.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/s_client.c b/apps/s_client.c
index c02ed3c..cdea322 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1352,13 +1352,12 @@ int MAIN(int argc, char **argv)
 
     SSL_CTX_set_verify(ctx, verify, verify_callback);
 
-    if ((!SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) ||
-        (!SSL_CTX_set_default_verify_paths(ctx))) {
-        /*
-         * BIO_printf(bio_err,"error setting default verify locations\n");
-         */
+    if ((CAfile || CApath)
+        && !SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) {
+        ERR_print_errors(bio_err);
+    }
+    if (!SSL_CTX_set_default_verify_paths(ctx)) {
         ERR_print_errors(bio_err);
-        /* goto end; */
     }
 
     ssl_ctx_add_crls(ctx, crls, crl_download);

From steve at openssl.org  Wed Mar 25 14:17:28 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Wed, 25 Mar 2015 14:17:28 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427293048.422537.1990.nullmailer@dev.openssl.org>

The branch master has been updated
       via  9837bfbfc7a53dd531081b4ba8fe369d9c99116e (commit)
       via  2743e38c2f4bcb00142d8c65e48a66f547033a64 (commit)
      from  70e5fd877890489a3972bf8bf50bfec1fca3875e (commit)


- Log -----------------------------------------------------------------
commit 9837bfbfc7a53dd531081b4ba8fe369d9c99116e
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Mar 25 12:25:16 2015 +0000

    make depend
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 2743e38c2f4bcb00142d8c65e48a66f547033a64
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 16 17:43:17 2015 +0000

    make X509_NAME opaque
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 apps/ca.c                                          |  2 +-
 crypto/asn1/Makefile                               | 28 ++++++------------
 crypto/asn1/a_strex.c                              |  4 +--
 crypto/asn1/asn1_locl.h                            | 10 -------
 crypto/asn1/tasn_prn.c                             |  2 +-
 crypto/include/internal/asn1_int.h                 | 10 +++++++
 .../v3_akeya.c => include/internal/x509_int.h}     | 34 ++++++++++++----------
 crypto/objects/Makefile                            |  5 ++--
 crypto/x509/Makefile                               | 29 ++++++++++++++----
 crypto/x509/x509.h                                 | 18 ++----------
 crypto/x509/x509_cmp.c                             |  1 +
 crypto/x509/x509_obj.c                             |  1 +
 crypto/x509/x509name.c                             |  6 ++++
 crypto/{asn1 => x509}/x_name.c                     |  3 +-
 crypto/x509v3/Makefile                             |  5 ++--
 crypto/x509v3/v3_crld.c                            |  2 ++
 crypto/x509v3/v3_ncons.c                           |  2 ++
 17 files changed, 88 insertions(+), 74 deletions(-)
 copy crypto/{x509v3/v3_akeya.c => include/internal/x509_int.h} (80%)
 rename crypto/{asn1 => x509}/x_name.c (99%)

diff --git a/apps/ca.c b/apps/ca.c
index 9ef0ce3..b498b0a 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -1688,7 +1688,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
 
         if (msie_hack) {
             /* assume all type should be strings */
-            nid = OBJ_obj2nid(ne->object);
+            nid = OBJ_obj2nid(X509_NAME_ENTRY_get_object(ne));
 
             if (str->type == V_ASN1_UNIVERSALSTRING)
                 ASN1_UNIVERSALSTRING_to_string(str);
diff --git a/crypto/asn1/Makefile b/crypto/asn1/Makefile
index 6c7c22a..9f00de6 100644
--- a/crypto/asn1/Makefile
+++ b/crypto/asn1/Makefile
@@ -21,7 +21,7 @@ LIBSRC=	a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \
 	a_print.c a_type.c a_dup.c a_d2i_fp.c a_i2d_fp.c \
 	a_enum.c a_utf8.c a_sign.c a_digest.c a_verify.c a_mbstr.c a_strex.c \
 	x_algor.c x_val.c x_pubkey.c x_sig.c x_req.c x_bignum.c \
-	x_long.c x_name.c x_x509.c x_x509a.c x_crl.c x_info.c x_spki.c nsseq.c \
+	x_long.c x_x509.c x_x509a.c x_crl.c x_info.c x_spki.c nsseq.c \
 	x_nx509.c d2i_pu.c d2i_pr.c i2d_pu.c i2d_pr.c\
 	t_req.c t_x509.c t_x509a.c t_crl.c t_pkey.c t_spki.c t_bitst.c \
 	tasn_new.c tasn_fre.c tasn_enc.c tasn_dec.c tasn_utl.c tasn_typ.c \
@@ -35,7 +35,7 @@ LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \
 	a_print.o a_type.o a_dup.o a_d2i_fp.o a_i2d_fp.o \
 	a_enum.o a_utf8.o a_sign.o a_digest.o a_verify.o a_mbstr.o a_strex.o \
 	x_algor.o x_val.o x_pubkey.o x_sig.o x_req.o x_bignum.o \
-	x_long.o x_name.o x_x509.o x_x509a.o x_crl.o x_info.o x_spki.o nsseq.o \
+	x_long.o x_x509.o x_x509a.o x_crl.o x_info.o x_spki.o nsseq.o \
 	x_nx509.o d2i_pu.o d2i_pr.o i2d_pu.o i2d_pr.o \
 	t_req.o t_x509.o t_x509a.o t_crl.o t_pkey.o t_spki.o t_bitst.o \
 	tasn_new.o tasn_fre.o tasn_enc.o tasn_dec.o tasn_utl.o tasn_typ.o \
@@ -193,7 +193,8 @@ a_object.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 a_object.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 a_object.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 a_object.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_object.o: ../../include/openssl/symhacks.h ../cryptlib.h a_object.c
+a_object.o: ../../include/openssl/symhacks.h ../cryptlib.h
+a_object.o: ../include/internal/asn1_int.h a_object.c
 a_octet.o: ../../e_os.h ../../include/openssl/asn1.h
 a_octet.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 a_octet.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -371,7 +372,8 @@ asn_moid.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 asn_moid.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 asn_moid.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 asn_moid.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-asn_moid.o: ../../include/openssl/x509_vfy.h ../cryptlib.h asn_moid.c
+asn_moid.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+asn_moid.o: ../include/internal/asn1_int.h asn_moid.c
 asn_mstbl.o: ../../e_os.h ../../include/openssl/asn1.h
 asn_mstbl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 asn_mstbl.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
@@ -665,7 +667,8 @@ tasn_enc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 tasn_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 tasn_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 tasn_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-tasn_enc.o: ../../include/openssl/symhacks.h ../cryptlib.h tasn_enc.c
+tasn_enc.o: ../../include/openssl/symhacks.h ../cryptlib.h
+tasn_enc.o: ../include/internal/asn1_int.h tasn_enc.c
 tasn_fre.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
 tasn_fre.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
 tasn_fre.o: ../../include/openssl/e_os2.h ../../include/openssl/obj_mac.h
@@ -695,7 +698,7 @@ tasn_prn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 tasn_prn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 tasn_prn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 tasn_prn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-tasn_prn.o: ../cryptlib.h asn1_locl.h tasn_prn.c
+tasn_prn.o: ../cryptlib.h ../include/internal/asn1_int.h tasn_prn.c
 tasn_scn.o: ../../e_os.h ../../include/openssl/asn1.h
 tasn_scn.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 tasn_scn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
@@ -781,19 +784,6 @@ x_long.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 x_long.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 x_long.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 x_long.o: ../cryptlib.h x_long.c
-x_name.o: ../../e_os.h ../../include/openssl/asn1.h
-x_name.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
-x_name.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-x_name.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-x_name.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
-x_name.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-x_name.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
-x_name.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_name.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-x_name.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
-x_name.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_name.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-x_name.o: ../../include/openssl/x509_vfy.h ../cryptlib.h asn1_locl.h x_name.c
 x_nx509.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
 x_nx509.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 x_nx509.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c
index 1744853..243e29a 100644
--- a/crypto/asn1/a_strex.c
+++ b/crypto/asn1/a_strex.c
@@ -501,7 +501,7 @@ static int do_name_ex(char_io *io_ch, void *arg, X509_NAME *n,
         else
             ent = X509_NAME_get_entry(n, i);
         if (prev != -1) {
-            if (prev == ent->set) {
+            if (prev == X509_NAME_ENTRY_set(ent)) {
                 if (!io_ch(arg, sep_mv, sep_mv_len))
                     return -1;
                 outlen += sep_mv_len;
@@ -514,7 +514,7 @@ static int do_name_ex(char_io *io_ch, void *arg, X509_NAME *n,
                 outlen += indent;
             }
         }
-        prev = ent->set;
+        prev = X509_NAME_ENTRY_set(ent);
         fn = X509_NAME_ENTRY_get_object(ent);
         val = X509_NAME_ENTRY_get_data(ent);
         fn_nid = OBJ_obj2nid(fn);
diff --git a/crypto/asn1/asn1_locl.h b/crypto/asn1/asn1_locl.h
index a7569e7..ec4c0e8 100644
--- a/crypto/asn1/asn1_locl.h
+++ b/crypto/asn1/asn1_locl.h
@@ -62,16 +62,6 @@
 int asn1_utctime_to_tm(struct tm *tm, const ASN1_UTCTIME *d);
 int asn1_generalizedtime_to_tm(struct tm *tm, const ASN1_GENERALIZEDTIME *d);
 
-/* ASN1 print context structure */
-
-struct asn1_pctx_st {
-    unsigned long flags;
-    unsigned long nm_flags;
-    unsigned long cert_flags;
-    unsigned long oid_flags;
-    unsigned long str_flags;
-} /* ASN1_PCTX */ ;
-
 /* ASN1 scan context structure */
 
 struct asn1_sctx_st {
diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
index d8450b3..cb3d35b 100644
--- a/crypto/asn1/tasn_prn.c
+++ b/crypto/asn1/tasn_prn.c
@@ -65,7 +65,7 @@
 #include <openssl/buffer.h>
 #include <openssl/err.h>
 #include <openssl/x509v3.h>
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 /*
  * Print routines.
diff --git a/crypto/include/internal/asn1_int.h b/crypto/include/internal/asn1_int.h
index 20c8f40..9e74f47 100644
--- a/crypto/include/internal/asn1_int.h
+++ b/crypto/include/internal/asn1_int.h
@@ -119,3 +119,13 @@ struct asn1_object_st {
     const unsigned char *data;  /* data remains const after init */
     int flags;                  /* Should we free this one */
 };
+
+/* ASN1 print context structure */
+
+struct asn1_pctx_st {
+    unsigned long flags;
+    unsigned long nm_flags;
+    unsigned long cert_flags;
+    unsigned long oid_flags;
+    unsigned long str_flags;
+} /* ASN1_PCTX */ ;
diff --git a/crypto/x509v3/v3_akeya.c b/crypto/include/internal/x509_int.h
similarity index 80%
copy from crypto/x509v3/v3_akeya.c
copy to crypto/include/internal/x509_int.h
index 2cc85b7..761f702 100644
--- a/crypto/x509v3/v3_akeya.c
+++ b/crypto/include/internal/x509_int.h
@@ -1,10 +1,10 @@
-/* v3_akey_asn1.c */
+/* x509_int.h */
 /*
  * Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL project
- * 1999.
+ * 2015.
  */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2015 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -57,17 +57,21 @@
  *
  */
 
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/conf.h>
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/x509v3.h>
+/* Internal X509 structures and functions: not for application use */
 
-ASN1_SEQUENCE(AUTHORITY_KEYID) = {
-        ASN1_IMP_OPT(AUTHORITY_KEYID, keyid, ASN1_OCTET_STRING, 0),
-        ASN1_IMP_SEQUENCE_OF_OPT(AUTHORITY_KEYID, issuer, GENERAL_NAME, 1),
-        ASN1_IMP_OPT(AUTHORITY_KEYID, serial, ASN1_INTEGER, 2)
-} ASN1_SEQUENCE_END(AUTHORITY_KEYID)
+struct X509_name_entry_st {
+    ASN1_OBJECT *object;
+    ASN1_STRING *value;
+    int set;
+    int size;                   /* temp variable */
+};
 
-IMPLEMENT_ASN1_FUNCTIONS(AUTHORITY_KEYID)
+/* we always keep X509_NAMEs in 2 forms. */
+struct X509_name_st {
+    STACK_OF(X509_NAME_ENTRY) *entries;
+    int modified;               /* true if 'bytes' needs to be built */
+    BUF_MEM *bytes;
+/*      unsigned long hash; Keep the hash around for lookups */
+    unsigned char *canon_enc;
+    int canon_enclen;
+} /* X509_NAME */ ;
diff --git a/crypto/objects/Makefile b/crypto/objects/Makefile
index a8aedbd..c6ea71e 100644
--- a/crypto/objects/Makefile
+++ b/crypto/objects/Makefile
@@ -103,7 +103,8 @@ obj_dat.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 obj_dat.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 obj_dat.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 obj_dat.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-obj_dat.o: ../../include/openssl/symhacks.h ../cryptlib.h obj_dat.c obj_dat.h
+obj_dat.o: ../../include/openssl/symhacks.h ../cryptlib.h
+obj_dat.o: ../include/internal/asn1_int.h obj_dat.c obj_dat.h
 obj_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 obj_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 obj_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
@@ -120,7 +121,7 @@ obj_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 obj_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 obj_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 obj_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-obj_lib.o: ../cryptlib.h obj_lib.c
+obj_lib.o: ../cryptlib.h ../include/internal/asn1_int.h obj_lib.c
 obj_xref.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 obj_xref.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 obj_xref.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
diff --git a/crypto/x509/Makefile b/crypto/x509/Makefile
index 2a576e0..9572ed2 100644
--- a/crypto/x509/Makefile
+++ b/crypto/x509/Makefile
@@ -22,13 +22,15 @@ LIBSRC=	x509_def.c x509_d2.c x509_r2x.c x509_cmp.c \
 	x509_set.c x509cset.c x509rset.c x509_err.c \
 	x509name.c x509_v3.c x509_ext.c x509_att.c \
 	x509type.c x509_lu.c x_all.c x509_txt.c \
-	x509_trs.c by_file.c by_dir.c x509_vpm.c x_attrib.c x_exten.c
+	x509_trs.c by_file.c by_dir.c x509_vpm.c \
+    x_attrib.c x_exten.c x_name.c
 LIBOBJ= x509_def.o x509_d2.o x509_r2x.o x509_cmp.o \
 	x509_obj.o x509_req.o x509spki.o x509_vfy.o \
 	x509_set.o x509cset.o x509rset.o x509_err.o \
 	x509name.o x509_v3.o x509_ext.o x509_att.o \
 	x509type.o x509_lu.o x_all.o x509_txt.o \
-	x509_trs.o by_file.o by_dir.o x509_vpm.o x_attrib.o x_exten.o
+	x509_trs.o by_file.o by_dir.o x509_vpm.o \
+    x_attrib.o x_exten.o x_name.o
 
 SRC= $(LIBSRC)
 
@@ -137,7 +139,7 @@ x509_cmp.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 x509_cmp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509_cmp.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 x509_cmp.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-x509_cmp.o: ../cryptlib.h x509_cmp.c
+x509_cmp.o: ../cryptlib.h ../include/internal/x509_int.h x509_cmp.c
 x509_d2.o: ../../e_os.h ../../include/openssl/asn1.h
 x509_d2.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 x509_d2.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -216,7 +218,8 @@ x509_obj.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 x509_obj.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 x509_obj.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509_obj.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-x509_obj.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_obj.c
+x509_obj.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+x509_obj.o: ../include/internal/x509_int.h x509_obj.c
 x509_r2x.o: ../../e_os.h ../../include/openssl/asn1.h
 x509_r2x.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 x509_r2x.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -352,7 +355,8 @@ x509name.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 x509name.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 x509name.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509name.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-x509name.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509name.c
+x509name.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+x509name.o: ../include/internal/x509_int.h x509name.c
 x509rset.o: ../../e_os.h ../../include/openssl/asn1.h
 x509rset.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 x509rset.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -433,3 +437,18 @@ x_exten.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 x_exten.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x_exten.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 x_exten.o: ../../include/openssl/x509_vfy.h x509_lcl.h x_exten.c
+x_name.o: ../../e_os.h ../../include/openssl/asn1.h
+x_name.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+x_name.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+x_name.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+x_name.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+x_name.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+x_name.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+x_name.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x_name.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x_name.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+x_name.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x_name.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+x_name.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+x_name.o: ../include/internal/asn1_int.h ../include/internal/x509_int.h
+x_name.o: x_name.c
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index 5fcea0c..7a59dab 100644
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -148,25 +148,10 @@ typedef struct X509_sig_st {
     ASN1_OCTET_STRING *digest;
 } X509_SIG;
 
-typedef struct X509_name_entry_st {
-    ASN1_OBJECT *object;
-    ASN1_STRING *value;
-    int set;
-    int size;                   /* temp variable */
-} X509_NAME_ENTRY;
+typedef struct X509_name_entry_st X509_NAME_ENTRY;
 
 DECLARE_STACK_OF(X509_NAME_ENTRY)
 
-/* we always keep X509_NAMEs in 2 forms. */
-struct X509_name_st {
-    STACK_OF(X509_NAME_ENTRY) *entries;
-    int modified;               /* true if 'bytes' needs to be built */
-    BUF_MEM *bytes;
-/*      unsigned long hash; Keep the hash around for lookups */
-    unsigned char *canon_enc;
-    int canon_enclen;
-} /* X509_NAME */ ;
-
 DECLARE_STACK_OF(X509_NAME)
 
 # define X509_EX_V_NETSCAPE_HACK         0x8000
@@ -980,6 +965,7 @@ int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
                              const unsigned char *bytes, int len);
 ASN1_OBJECT *X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *ne);
 ASN1_STRING *X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *ne);
+int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne);
 
 int X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x);
 int X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x,
diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
index eb46a67..51c47cc 100644
--- a/crypto/x509/x509_cmp.c
+++ b/crypto/x509/x509_cmp.c
@@ -63,6 +63,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
+#include "internal/x509_int.h"
 
 int X509_issuer_and_serial_cmp(const X509 *a, const X509 *b)
 {
diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
index d317f3a..4e80c1b 100644
--- a/crypto/x509/x509_obj.c
+++ b/crypto/x509/x509_obj.c
@@ -62,6 +62,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/buffer.h>
+#include "internal/x509_int.h"
 
 char *X509_NAME_oneline(X509_NAME *a, char *buf, int len)
 {
diff --git a/crypto/x509/x509name.c b/crypto/x509/x509name.c
index 6ea601f..6bb1e5d 100644
--- a/crypto/x509/x509name.c
+++ b/crypto/x509/x509name.c
@@ -63,6 +63,7 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
+#include "internal/x509_int.h"
 
 int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len)
 {
@@ -395,3 +396,8 @@ ASN1_STRING *X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *ne)
         return (NULL);
     return (ne->value);
 }
+
+int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne)
+{
+    return ne->set;
+}
diff --git a/crypto/asn1/x_name.c b/crypto/x509/x_name.c
similarity index 99%
rename from crypto/asn1/x_name.c
rename to crypto/x509/x_name.c
index b915050..e6a862e 100644
--- a/crypto/asn1/x_name.c
+++ b/crypto/x509/x_name.c
@@ -61,7 +61,8 @@
 #include "cryptlib.h"
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
-#include "asn1_locl.h"
+#include "internal/x509_int.h"
+#include "internal/asn1_int.h"
 
 typedef STACK_OF(X509_NAME_ENTRY) STACK_OF_X509_NAME_ENTRY;
 DECLARE_STACK_OF(STACK_OF_X509_NAME_ENTRY)
diff --git a/crypto/x509v3/Makefile b/crypto/x509v3/Makefile
index 284dfa8..f232e67 100644
--- a/crypto/x509v3/Makefile
+++ b/crypto/x509v3/Makefile
@@ -310,7 +310,8 @@ v3_crld.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
 v3_crld.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 v3_crld.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 v3_crld.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-v3_crld.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_crld.c
+v3_crld.o: ../../include/openssl/x509v3.h ../cryptlib.h
+v3_crld.o: ../include/internal/x509_int.h v3_crld.c
 v3_enum.o: ../../e_os.h ../../include/openssl/asn1.h
 v3_enum.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 v3_enum.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
@@ -421,7 +422,7 @@ v3_ncons.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 v3_ncons.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 v3_ncons.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 v3_ncons.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-v3_ncons.o: ../cryptlib.h v3_ncons.c
+v3_ncons.o: ../cryptlib.h ../include/internal/x509_int.h v3_ncons.c
 v3_pci.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 v3_pci.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
 v3_pci.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
diff --git a/crypto/x509v3/v3_crld.c b/crypto/x509v3/v3_crld.c
index 9363541..e38632f 100644
--- a/crypto/x509v3/v3_crld.c
+++ b/crypto/x509v3/v3_crld.c
@@ -64,6 +64,8 @@
 #include <openssl/asn1t.h>
 #include <openssl/x509v3.h>
 
+#include "internal/x509_int.h"
+
 static void *v2i_crld(const X509V3_EXT_METHOD *method,
                       X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
 static int i2r_crldp(const X509V3_EXT_METHOD *method, void *pcrldp, BIO *out,
diff --git a/crypto/x509v3/v3_ncons.c b/crypto/x509v3/v3_ncons.c
index 3672b68..c66e080 100644
--- a/crypto/x509v3/v3_ncons.c
+++ b/crypto/x509v3/v3_ncons.c
@@ -63,6 +63,8 @@
 #include <openssl/conf.h>
 #include <openssl/x509v3.h>
 
+#include "internal/x509_int.h"
+
 static void *v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method,
                                   X509V3_CTX *ctx,
                                   STACK_OF(CONF_VALUE) *nval);

From steve at openssl.org  Wed Mar 25 14:19:55 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Wed, 25 Mar 2015 14:19:55 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427293195.490222.3198.nullmailer@dev.openssl.org>

The branch master has been updated
       via  2011b169fa90edd4d986e7dbbd3d64587d316a22 (commit)
      from  9837bfbfc7a53dd531081b4ba8fe369d9c99116e (commit)


- Log -----------------------------------------------------------------
commit 2011b169fa90edd4d986e7dbbd3d64587d316a22
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Feb 16 13:44:22 2015 +0000

    Support key loading from certificate file
    
    Support loading of key and certificate from the same file if
    SSL_CONF_FLAG_REQUIRE_PRIVATE is set. This is done by remembering the
    filename used for each certificate type and attempting to load a private
    key from the file when SSL_CONF_CTX_finish is called.
    
    Update docs.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 doc/ssl/SSL_CONF_CTX_set_flags.pod |  7 ++++++
 doc/ssl/SSL_CONF_cmd.pod           |  6 ++---
 ssl/ssl.h                          |  1 +
 ssl/ssl_conf.c                     | 47 ++++++++++++++++++++++++++++++++++++--
 4 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/doc/ssl/SSL_CONF_CTX_set_flags.pod b/doc/ssl/SSL_CONF_CTX_set_flags.pod
index 4e34280..fdff470 100644
--- a/doc/ssl/SSL_CONF_CTX_set_flags.pod
+++ b/doc/ssl/SSL_CONF_CTX_set_flags.pod
@@ -40,6 +40,13 @@ both of these flags must be set.
 
 recognise certificate and private key options.
 
+=item SSL_CONF_FLAG_REQUIRE_PRIVATE
+
+If this option is set then if a private key is not specified for a certificate
+it will attempt to load a private key from the certificate file when
+SSL_CONF_CTX_finish() is called. If a key cannot be loaded from the certificate
+file an error occurs.
+
 =item SSL_CONF_FLAG_SHOW_ERRORS
 
 indicate errors relating to unrecognised options or missing arguments in
diff --git a/doc/ssl/SSL_CONF_cmd.pod b/doc/ssl/SSL_CONF_cmd.pod
index 90a20d6..c4f1309 100644
--- a/doc/ssl/SSL_CONF_cmd.pod
+++ b/doc/ssl/SSL_CONF_cmd.pod
@@ -101,7 +101,7 @@ are permitted.
 Attempts to use the file B<value> as the private key for the appropriate
 context. This option is only supported if certificate operations
 are permitted. Note: if no B<-key> option is set then a private key is
-not loaded: it does not currently use the B<-cert> file.
+not loaded unless the flag B<SSL_CONF_FLAG_REQUIRE_PRIVATE> is set.
 
 =item B<-dhparam>
 
@@ -192,8 +192,8 @@ are permitted.
 
 Attempts to use the file B<value> as the private key for the appropriate
 context. This option is only supported if certificate operations
-are permitted. Note: if no B<-key> option is set then a private key is
-not loaded: it does not currently use the B<Certificate> file.
+are permitted. Note: if no B<PrivateKey> option is set then a private key is
+not loaded unless the B<SSL_CONF_FLAG_REQUIRE_PRIVATE> is set.
 
 =item B<ServerInfoFile>
 
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 84de6a8..c0a368b 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -588,6 +588,7 @@ typedef int (*custom_ext_parse_cb) (SSL *s, unsigned int ext_type,
 # define SSL_CONF_FLAG_SERVER            0x8
 # define SSL_CONF_FLAG_SHOW_ERRORS       0x10
 # define SSL_CONF_FLAG_CERTIFICATE       0x20
+# define SSL_CONF_FLAG_REQUIRE_PRIVATE   0x40
 /* Configuration value types */
 # define SSL_CONF_TYPE_UNKNOWN           0x0
 # define SSL_CONF_TYPE_STRING            0x1
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c
index 25af065..0fd6c1f 100644
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c
@@ -119,6 +119,8 @@ struct ssl_conf_ctx_st {
     SSL *ssl;
     /* Pointer to SSL or SSL_CTX options field or NULL if none */
     unsigned long *poptions;
+    /* Certificate filenames for each type */
+    char *cert_filename[SSL_PKEY_NUM];
     /* Pointer to SSL or SSL_CTX cert_flags or NULL if none */
     unsigned int *pcert_flags;
     /* Current flag table being worked on */
@@ -364,12 +366,26 @@ static int cmd_Options(SSL_CONF_CTX *cctx, const char *value)
 static int cmd_Certificate(SSL_CONF_CTX *cctx, const char *value)
 {
     int rv = 1;
+    CERT *c = NULL;
     if (!(cctx->flags & SSL_CONF_FLAG_CERTIFICATE))
         return -2;
-    if (cctx->ctx)
+    if (cctx->ctx) {
         rv = SSL_CTX_use_certificate_chain_file(cctx->ctx, value);
-    if (cctx->ssl)
+        c = cctx->ctx->cert;
+    }
+    if (cctx->ssl) {
         rv = SSL_use_certificate_file(cctx->ssl, value, SSL_FILETYPE_PEM);
+        c = cctx->ssl->cert;
+    }
+    if (rv > 0 && c && cctx->flags & SSL_CONF_FLAG_REQUIRE_PRIVATE) {
+        char **pfilename = &cctx->cert_filename[c->key - c->pkeys];
+        if (*pfilename)
+            OPENSSL_free(*pfilename);
+        *pfilename = BUF_strdup(value);
+        if (!*pfilename)
+            rv = 0;
+    }
+
     return rv > 0;
 }
 
@@ -595,6 +611,7 @@ int SSL_CONF_cmd_value_type(SSL_CONF_CTX *cctx, const char *cmd)
 SSL_CONF_CTX *SSL_CONF_CTX_new(void)
 {
     SSL_CONF_CTX *ret;
+    size_t i;
     ret = OPENSSL_malloc(sizeof(SSL_CONF_CTX));
     if (ret) {
         ret->flags = 0;
@@ -606,18 +623,44 @@ SSL_CONF_CTX *SSL_CONF_CTX_new(void)
         ret->pcert_flags = NULL;
         ret->tbl = NULL;
         ret->ntbl = 0;
+        for (i = 0; i < SSL_PKEY_NUM; i++)
+            ret->cert_filename[i] = NULL;
     }
     return ret;
 }
 
 int SSL_CONF_CTX_finish(SSL_CONF_CTX *cctx)
 {
+    /* See if any certificates are missing private keys */
+    size_t i;
+    CERT *c = NULL;
+    if (cctx->ctx)
+        c = cctx->ctx->cert;
+    else if (cctx->ssl)
+        c = cctx->ssl->cert;
+    if (c && cctx->flags & SSL_CONF_FLAG_REQUIRE_PRIVATE) {
+        for (i = 0; i < SSL_PKEY_NUM; i++) {
+            const char *p = cctx->cert_filename[i];
+            /*
+             * If missing private key try to load one from certificate file
+             */
+            if (p && !c->pkeys[i].privatekey) {
+                if (!cmd_PrivateKey(cctx, p))
+                    return 0;
+            }
+        }
+    }
     return 1;
 }
 
 void SSL_CONF_CTX_free(SSL_CONF_CTX *cctx)
 {
     if (cctx) {
+        size_t i;
+        for (i = 0; i < SSL_PKEY_NUM; i++) {
+            if (cctx->cert_filename[i])
+                OPENSSL_free(cctx->cert_filename[i]);
+        }
         if (cctx->prefix)
             OPENSSL_free(cctx->prefix);
         OPENSSL_free(cctx);

From emilia at openssl.org  Wed Mar 25 14:20:09 2015
From: emilia at openssl.org (Emilia Kasper)
Date: Wed, 25 Mar 2015 14:20:09 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1427293209.413560.5225.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  8a46e51ed83300e16eb6daebf664f141f6c313df (commit)
      from  fe9b85c3cb79f1e29e61f01de105b34ce8177190 (commit)


- Log -----------------------------------------------------------------
commit 8a46e51ed83300e16eb6daebf664f141f6c313df
Author: Emilia Kasper <emilia at openssl.org>
Date:   Tue Mar 24 19:59:14 2015 +0100

    Fix uninitialized variable warning
    
    While a true positive, it's almost harmless because EVP_DecryptInit_ex would have to fail and that doesn't happen under normal operation.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/pem/pem_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index febb53e..5507161 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -435,7 +435,7 @@ int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp,
 int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
                   pem_password_cb *callback, void *u)
 {
-    int i, j, o, klen;
+    int i = 0, j, o, klen;
     long len;
     EVP_CIPHER_CTX ctx;
     unsigned char key[EVP_MAX_KEY_LENGTH];

From rsalz at openssl.org  Wed Mar 25 15:31:52 2015
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 25 Mar 2015 15:31:52 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427297512.688420.24741.nullmailer@dev.openssl.org>

The branch master has been updated
       via  ca3a82c3b364e1e584546f0f3bbb938b0b472580 (commit)
      from  2011b169fa90edd4d986e7dbbd3d64587d316a22 (commit)


- Log -----------------------------------------------------------------
commit ca3a82c3b364e1e584546f0f3bbb938b0b472580
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Mar 25 11:31:18 2015 -0400

    free NULL cleanup
    
    This commit handles BIO_ACCEPT_free BIO_CB_FREE BIO_CONNECT_free
    BIO_free BIO_free_all BIO_vfree
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 apps/apps.c              | 12 ++++--------
 apps/asn1pars.c          |  9 +++------
 apps/ca.c                |  3 +--
 apps/ciphers.c           |  3 +--
 apps/crl2p7.c            |  9 +++------
 apps/dgst.c              |  6 ++----
 apps/dh.c                |  6 ++----
 apps/dhparam.c           |  6 ++----
 apps/dsa.c               |  6 ++----
 apps/dsaparam.c          |  6 ++----
 apps/ec.c                |  6 ++----
 apps/ecparam.c           |  6 ++----
 apps/enc.c               | 15 +++++----------
 apps/engine.c            |  3 +--
 apps/errstr.c            |  3 +--
 apps/gendh.c             |  3 +--
 apps/gendsa.c            |  6 ++----
 apps/genpkey.c           |  3 +--
 apps/genrsa.c            |  3 +--
 apps/ocsp.c              |  3 +--
 apps/openssl.c           |  6 ++----
 apps/passwd.c            |  6 ++----
 apps/pkcs7.c             |  6 ++----
 apps/rand.c              |  3 +--
 apps/rsa.c               |  3 +--
 apps/s_client.c          | 12 ++++--------
 apps/s_server.c          | 25 ++++++++-----------------
 apps/sess_id.c           |  6 ++----
 apps/ts.c                |  2 +-
 crypto/asn1/asn_mime.c   |  3 +--
 crypto/asn1/bio_asn1.c   |  4 ++--
 crypto/asn1/bio_ndef.c   |  3 +--
 crypto/bio/bio_lib.c     |  3 +--
 crypto/bio/bss_acpt.c    | 12 ++++--------
 crypto/bio/bss_bio.c     | 12 ++++--------
 crypto/bio/bss_conn.c    |  6 ++----
 crypto/cms/cms_lib.c     |  3 +--
 crypto/cms/cms_sd.c      |  3 +--
 crypto/cms/cms_smime.c   |  8 +++-----
 crypto/dsa/dsatest.c     |  6 ++----
 crypto/ecdsa/ecdsatest.c |  3 +--
 crypto/ocsp/ocsp_ht.c    |  3 +--
 crypto/pkcs7/pk7_doit.c  | 29 ++++++++++-------------------
 crypto/srp/srp_vfy.c     |  3 +--
 crypto/threads/mttest.c  | 14 +++++---------
 crypto/x509/by_file.c    |  6 ++----
 demos/b64.c              | 12 ++++--------
 demos/bio/saccept.c      |  6 ++----
 demos/bio/server-arg.c   |  3 +--
 demos/bio/server-conf.c  |  3 +--
 demos/cms/cms_comp.c     |  6 ++----
 demos/cms/cms_ddec.c     | 12 ++++--------
 demos/cms/cms_dec.c      |  9 +++------
 demos/cms/cms_denc.c     | 12 ++++--------
 demos/cms/cms_enc.c      |  9 +++------
 demos/cms/cms_sign.c     |  9 +++------
 demos/cms/cms_sign2.c    |  9 +++------
 demos/cms/cms_uncomp.c   |  6 ++----
 demos/cms/cms_ver.c      |  9 +++------
 demos/smime/smdec.c      |  9 +++------
 demos/smime/smenc.c      |  9 +++------
 demos/smime/smsign.c     |  9 +++------
 demos/smime/smsign2.c    |  9 +++------
 demos/smime/smver.c      |  9 +++------
 doc/crypto/BIO_new.pod   |  5 ++++-
 engines/e_chil.c         |  9 +++------
 engines/e_sureware.c     |  9 +++------
 ssl/bio_ssl.c            |  9 +++------
 ssl/s3_enc.c             |  3 +--
 ssl/s3_lib.c             | 10 +++-------
 ssl/ssl_cert.c           |  6 ++----
 ssl/ssl_conf.c           |  3 +--
 ssl/ssl_lib.c            |  9 ++++-----
 ssl/ssl_rsa.c            | 24 ++++++++----------------
 ssl/ssl_task.c           | 12 ++++--------
 ssl/ssltest.c            | 36 ++++++++++++------------------------
 76 files changed, 202 insertions(+), 390 deletions(-)

diff --git a/apps/apps.c b/apps/apps.c
index 233d382..1dcaabf 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1114,8 +1114,7 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin,
         goto end;
     }
  end:
-    if (key != NULL)
-        BIO_free(key);
+    BIO_free(key);
     if (pkey == NULL)
         BIO_printf(err, "unable to load %s\n", key_descrip);
     return (pkey);
@@ -1682,8 +1681,7 @@ BIGNUM *load_serial(char *serialfile, int create, ASN1_INTEGER **retai)
         ai = NULL;
     }
  err:
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     if (ai != NULL)
         ASN1_INTEGER_free(ai);
     return (ret);
@@ -1741,8 +1739,7 @@ int save_serial(char *serialfile, char *suffix, BIGNUM *serial,
         ai = NULL;
     }
  err:
-    if (out != NULL)
-        BIO_free_all(out);
+    BIO_free_all(out);
     if (ai != NULL)
         ASN1_INTEGER_free(ai);
     return (ret);
@@ -1896,8 +1893,7 @@ CA_DB *load_index(char *dbfile, DB_ATTR *db_attr)
         NCONF_free(dbattr_conf);
     if (tmpdb)
         TXT_DB_free(tmpdb);
-    if (in)
-        BIO_free_all(in);
+    BIO_free_all(in);
     return retdb;
 }
 
diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index da95011..1576f1c 100644
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -370,12 +370,9 @@ int MAIN(int argc, char **argv)
     ret = 0;
  end:
     BIO_free(derout);
-    if (in != NULL)
-        BIO_free(in);
-    if (out != NULL)
-        BIO_free_all(out);
-    if (b64 != NULL)
-        BIO_free(b64);
+    BIO_free(in);
+    BIO_free_all(out);
+    BIO_free(b64);
     if (ret != 0)
         ERR_print_errors(bio_err);
     if (buf != NULL)
diff --git a/apps/ca.c b/apps/ca.c
index b498b0a..89bece8 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -1566,8 +1566,7 @@ static int certify(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
  err:
     if (req != NULL)
         X509_REQ_free(req);
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     return (ok);
 }
 
diff --git a/apps/ciphers.c b/apps/ciphers.c
index 803b021..6c7ff01 100644
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -227,8 +227,7 @@ int MAIN(int argc, char **argv)
         SSL_CTX_free(ctx);
     if (ssl != NULL)
         SSL_free(ssl);
-    if (STDout != NULL)
-        BIO_free_all(STDout);
+    BIO_free_all(STDout);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index 0763817..ab0c3d6 100644
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -268,10 +268,8 @@ int MAIN(int argc, char **argv)
     }
     ret = 0;
  end:
-    if (in != NULL)
-        BIO_free(in);
-    if (out != NULL)
-        BIO_free_all(out);
+    BIO_free(in);
+    BIO_free_all(out);
     if (p7 != NULL)
         PKCS7_free(p7);
     if (crl != NULL)
@@ -326,8 +324,7 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
     ret = count;
  end:
     /* never need to OPENSSL_free x */
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     if (sk != NULL)
         sk_X509_INFO_free(sk);
     return (ret);
diff --git a/apps/dgst.c b/apps/dgst.c
index 95e5fa3..ac3b583 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -518,8 +518,7 @@ int MAIN(int argc, char **argv)
         OPENSSL_cleanse(buf, BUFSIZE);
         OPENSSL_free(buf);
     }
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     if (passin)
         OPENSSL_free(passin);
     BIO_free_all(out);
@@ -530,8 +529,7 @@ int MAIN(int argc, char **argv)
         sk_OPENSSL_STRING_free(macopts);
     if (sigbuf)
         OPENSSL_free(sigbuf);
-    if (bmd != NULL)
-        BIO_free(bmd);
+    BIO_free(bmd);
     apps_shutdown();
     OPENSSL_EXIT(err);
 }
diff --git a/apps/dh.c b/apps/dh.c
index a921633..1b653f5 100644
--- a/apps/dh.c
+++ b/apps/dh.c
@@ -310,10 +310,8 @@ int MAIN(int argc, char **argv)
     }
     ret = 0;
  end:
-    if (in != NULL)
-        BIO_free(in);
-    if (out != NULL)
-        BIO_free_all(out);
+    BIO_free(in);
+    BIO_free_all(out);
     DH_free(dh);
     apps_shutdown();
     OPENSSL_EXIT(ret);
diff --git a/apps/dhparam.c b/apps/dhparam.c
index 12a2be6..fc5962a 100644
--- a/apps/dhparam.c
+++ b/apps/dhparam.c
@@ -515,10 +515,8 @@ int MAIN(int argc, char **argv)
     }
     ret = 0;
  end:
-    if (in != NULL)
-        BIO_free(in);
-    if (out != NULL)
-        BIO_free_all(out);
+    BIO_free(in);
+    BIO_free_all(out);
     DH_free(dh);
     apps_shutdown();
     OPENSSL_EXIT(ret);
diff --git a/apps/dsa.c b/apps/dsa.c
index 8d085bc..1ea0d73 100644
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -356,10 +356,8 @@ int MAIN(int argc, char **argv)
     } else
         ret = 0;
  end:
-    if (in != NULL)
-        BIO_free(in);
-    if (out != NULL)
-        BIO_free_all(out);
+    BIO_free(in);
+    BIO_free_all(out);
     DSA_free(dsa);
     if (passin)
         OPENSSL_free(passin);
diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index fc1c817..f63ecb2 100644
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -434,10 +434,8 @@ int MAIN(int argc, char **argv)
  end:
     if (cb != NULL)
         BN_GENCB_free(cb);
-    if (in != NULL)
-        BIO_free(in);
-    if (out != NULL)
-        BIO_free_all(out);
+    BIO_free(in);
+    BIO_free_all(out);
     DSA_free(dsa);
     apps_shutdown();
     OPENSSL_EXIT(ret);
diff --git a/apps/ec.c b/apps/ec.c
index b04dada..2064723 100644
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -343,10 +343,8 @@ int MAIN(int argc, char **argv)
     } else
         ret = 0;
  end:
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free_all(out);
+    BIO_free(in);
+    BIO_free_all(out);
     if (eckey)
         EC_KEY_free(eckey);
     if (passin)
diff --git a/apps/ecparam.c b/apps/ecparam.c
index 06ac77b..d417747 100644
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -621,10 +621,8 @@ int MAIN(int argc, char **argv)
         BN_free(ec_cofactor);
     if (buffer)
         OPENSSL_free(buffer);
-    if (in != NULL)
-        BIO_free(in);
-    if (out != NULL)
-        BIO_free_all(out);
+    BIO_free(in);
+    BIO_free_all(out);
     if (group != NULL)
         EC_GROUP_free(group);
     apps_shutdown();
diff --git a/apps/enc.c b/apps/enc.c
index 1739b7e..b95a6a2 100644
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -657,17 +657,12 @@ int MAIN(int argc, char **argv)
         OPENSSL_free(strbuf);
     if (buff != NULL)
         OPENSSL_free(buff);
-    if (in != NULL)
-        BIO_free(in);
-    if (out != NULL)
-        BIO_free_all(out);
-    if (benc != NULL)
-        BIO_free(benc);
-    if (b64 != NULL)
-        BIO_free(b64);
+    BIO_free(in);
+    BIO_free_all(out);
+    BIO_free(benc);
+    BIO_free(b64);
 #ifdef ZLIB
-    if (bzl != NULL)
-        BIO_free(bzl);
+    BIO_free(bzl);
 #endif
     if (pass)
         OPENSSL_free(pass);
diff --git a/apps/engine.c b/apps/engine.c
index 8a1e746..5386465 100644
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -497,8 +497,7 @@ int MAIN(int argc, char **argv)
     sk_OPENSSL_STRING_pop_free(engines, identity);
     sk_OPENSSL_STRING_pop_free(pre_cmds, identity);
     sk_OPENSSL_STRING_pop_free(post_cmds, identity);
-    if (bio_out != NULL)
-        BIO_free_all(bio_out);
+    BIO_free_all(bio_out);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
diff --git a/apps/errstr.c b/apps/errstr.c
index c2d4fde..668c5f3 100644
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -100,8 +100,7 @@ int MAIN(int argc, char **argv)
             lh_ERR_STRING_DATA_node_usage_stats_bio(ERR_get_string_table(),
                                                     out);
         }
-        if (out != NULL)
-            BIO_free_all(out);
+        BIO_free_all(out);
         argc--;
         argv++;
     }
diff --git a/apps/gendh.c b/apps/gendh.c
index 6102b79..904bcf3 100644
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -210,8 +210,7 @@ int MAIN(int argc, char **argv)
  end:
     if (ret != 0)
         ERR_print_errors(bio_err);
-    if (out != NULL)
-        BIO_free_all(out);
+    BIO_free_all(out);
     DH_free(dh);
     if (cb != NULL)
         BN_GENCB_free(cb);
diff --git a/apps/gendsa.c b/apps/gendsa.c
index d330a01..8288eb9 100644
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -267,10 +267,8 @@ int MAIN(int argc, char **argv)
  end:
     if (ret != 0)
         ERR_print_errors(bio_err);
-    if (in != NULL)
-        BIO_free(in);
-    if (out != NULL)
-        BIO_free_all(out);
+    BIO_free(in);
+    BIO_free_all(out);
     DSA_free(dsa);
     if (passout)
         OPENSSL_free(passout);
diff --git a/apps/genpkey.c b/apps/genpkey.c
index fc19a92..5b7f433 100644
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -272,8 +272,7 @@ int MAIN(int argc, char **argv)
         EVP_PKEY_free(pkey);
     if (ctx)
         EVP_PKEY_CTX_free(ctx);
-    if (out)
-        BIO_free_all(out);
+    BIO_free_all(out);
     BIO_free(in);
     if (pass)
         OPENSSL_free(pass);
diff --git a/apps/genrsa.c b/apps/genrsa.c
index 1b06c82..cf60219 100644
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -312,8 +312,7 @@ int MAIN(int argc, char **argv)
     if (cb)
         BN_GENCB_free(cb);
     RSA_free(rsa);
-    if (out)
-        BIO_free_all(out);
+    BIO_free_all(out);
     if (passout)
         OPENSSL_free(passout);
     if (ret != 0)
diff --git a/apps/ocsp.c b/apps/ocsp.c
index 83a7175..9538096 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -1362,8 +1362,7 @@ OCSP_RESPONSE *process_responder(BIO *err, OCSP_REQUEST *req,
     if (!resp)
         BIO_printf(bio_err, "Error querying OCSP responder\n");
  end:
-    if (cbio)
-        BIO_free_all(cbio);
+    BIO_free_all(cbio);
     if (ctx)
         SSL_CTX_free(ctx);
     return resp;
diff --git a/apps/openssl.c b/apps/openssl.c
index e070a44..e93aed7 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -431,10 +431,8 @@ int main(int Argc, char *ARGV[])
 #endif
     apps_shutdown();
     CRYPTO_mem_leaks(bio_err);
-    if (bio_err != NULL) {
-        BIO_free(bio_err);
-        bio_err = NULL;
-    }
+    BIO_free(bio_err);
+    bio_err = NULL;
 
     OPENSSL_EXIT(ret);
 }
diff --git a/apps/passwd.c b/apps/passwd.c
index 798a6d5..2814b32 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -273,10 +273,8 @@ int MAIN(int argc, char **argv)
         OPENSSL_free(salt_malloc);
     if (passwd_malloc)
         OPENSSL_free(passwd_malloc);
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free_all(out);
+    BIO_free(in);
+    BIO_free_all(out);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 643507f..1b07c02 100644
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -299,10 +299,8 @@ int MAIN(int argc, char **argv)
  end:
     if (p7 != NULL)
         PKCS7_free(p7);
-    if (in != NULL)
-        BIO_free(in);
-    if (out != NULL)
-        BIO_free_all(out);
+    BIO_free(in);
+    BIO_free_all(out);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
diff --git a/apps/rand.c b/apps/rand.c
index e159da3..45f16b9 100644
--- a/apps/rand.c
+++ b/apps/rand.c
@@ -222,8 +222,7 @@ int MAIN(int argc, char **argv)
 
  err:
     ERR_print_errors(bio_err);
-    if (out)
-        BIO_free_all(out);
+    BIO_free_all(out);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
diff --git a/apps/rsa.c b/apps/rsa.c
index ac4a3c4..2f3f871 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -422,8 +422,7 @@ int MAIN(int argc, char **argv)
     } else
         ret = 0;
  end:
-    if (out != NULL)
-        BIO_free_all(out);
+    BIO_free_all(out);
     RSA_free(rsa);
     if (passin)
         OPENSSL_free(passin);
diff --git a/apps/s_client.c b/apps/s_client.c
index cdea322..0874983 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -2059,14 +2059,10 @@ int MAIN(int argc, char **argv)
         OPENSSL_cleanse(mbuf, BUFSIZZ);
         OPENSSL_free(mbuf);
     }
-    if (bio_c_out != NULL) {
-        BIO_free(bio_c_out);
-        bio_c_out = NULL;
-    }
-    if (bio_c_msg != NULL) {
-        BIO_free(bio_c_msg);
-        bio_c_msg = NULL;
-    }
+    BIO_free(bio_c_out);
+    bio_c_out = NULL;
+    BIO_free(bio_c_msg);
+    bio_c_msg = NULL;
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
diff --git a/apps/s_server.c b/apps/s_server.c
index c3884d2..37c40cb 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2039,8 +2039,7 @@ int MAIN(int argc, char *argv[])
         X509_free(s_cert2);
     if (s_key2)
         EVP_PKEY_free(s_key2);
-    if (serverinfo_in != NULL)
-        BIO_free(serverinfo_in);
+    BIO_free(serverinfo_in);
 # ifndef OPENSSL_NO_NEXTPROTONEG
     if (next_proto.data)
         OPENSSL_free(next_proto.data);
@@ -2057,14 +2056,10 @@ int MAIN(int argc, char *argv[])
     if (jpake_secret && psk_key)
         OPENSSL_free(psk_key);
 #endif
-    if (bio_s_out != NULL) {
-        BIO_free(bio_s_out);
-        bio_s_out = NULL;
-    }
-    if (bio_s_msg != NULL) {
-        BIO_free(bio_s_msg);
-        bio_s_msg = NULL;
-    }
+    BIO_free(bio_s_out);
+    bio_s_out = NULL;
+    BIO_free(bio_s_msg);
+    bio_s_msg = NULL;
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
@@ -2661,8 +2656,7 @@ static DH *load_dh_param(const char *dhfile)
         goto err;
     ret = PEM_read_bio_DHparams(bio, NULL, NULL, NULL);
  err:
-    if (bio != NULL)
-        BIO_free(bio);
+    BIO_free(bio);
     return (ret);
 }
 #endif
@@ -3021,9 +3015,7 @@ static int www_body(char *hostname, int s, int stype, unsigned char *context)
 
     if (buf != NULL)
         OPENSSL_free(buf);
-    if (io != NULL)
-        BIO_free_all(io);
-/*      if (ssl_bio != NULL) BIO_free(ssl_bio);*/
+    BIO_free_all(io);
     return (ret);
 }
 
@@ -3159,8 +3151,7 @@ static int rev_body(char *hostname, int s, int stype, unsigned char *context)
 
     if (buf != NULL)
         OPENSSL_free(buf);
-    if (io != NULL)
-        BIO_free_all(io);
+    BIO_free_all(io);
     return (ret);
 }
 
diff --git a/apps/sess_id.c b/apps/sess_id.c
index 9400af9..53ccbb3 100644
--- a/apps/sess_id.c
+++ b/apps/sess_id.c
@@ -237,8 +237,7 @@ int MAIN(int argc, char **argv)
     }
     ret = 0;
  end:
-    if (out != NULL)
-        BIO_free_all(out);
+    BIO_free_all(out);
     if (x != NULL)
         SSL_SESSION_free(x);
     apps_shutdown();
@@ -279,7 +278,6 @@ static SSL_SESSION *load_sess_id(char *infile, int format)
     }
 
  end:
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     return (x);
 }
diff --git a/apps/ts.c b/apps/ts.c
index fb77d6a..4c32ada 100644
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -162,8 +162,8 @@ int MAIN(int argc, char **argv)
     apps_startup();
 
     if (bio_err == NULL && (bio_err = BIO_new(BIO_s_file())) != NULL) {
-        free_bio_err = 1;
         BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+        free_bio_err = 1;
     }
 
     if (!load_config(bio_err, NULL))
diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index e96fb02..e810345 100644
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -650,8 +650,7 @@ static int multi_split(BIO *bio, char *bound, STACK_OF(BIO) **ret)
                 BIO_write(bpart, linebuf, len);
         }
     }
-    if (bpart != NULL)
-        BIO_free(bpart);
+    BIO_free(bpart);
     return 0;
 }
 
diff --git a/crypto/asn1/bio_asn1.c b/crypto/asn1/bio_asn1.c
index 0b4fd1d..d4be23c 100644
--- a/crypto/asn1/bio_asn1.c
+++ b/crypto/asn1/bio_asn1.c
@@ -179,8 +179,8 @@ static int asn1_bio_init(BIO_ASN1_BUF_CTX *ctx, int size)
 
 static int asn1_bio_free(BIO *b)
 {
-    BIO_ASN1_BUF_CTX *ctx;
-    ctx = (BIO_ASN1_BUF_CTX *)b->ptr;
+    BIO_ASN1_BUF_CTX *ctx = (BIO_ASN1_BUF_CTX *)b->ptr;
+
     if (ctx == NULL)
         return 0;
     if (ctx->buf)
diff --git a/crypto/asn1/bio_ndef.c b/crypto/asn1/bio_ndef.c
index 4a73ca9..1018787 100644
--- a/crypto/asn1/bio_ndef.c
+++ b/crypto/asn1/bio_ndef.c
@@ -142,8 +142,7 @@ BIO *BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it)
     return sarg.ndef_bio;
 
  err:
-    if (asn_bio)
-        BIO_free(asn_bio);
+    BIO_free(asn_bio);
     if (ndef_aux)
         OPENSSL_free(ndef_aux);
     return NULL;
diff --git a/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c
index 11e0142..a5d8680 100644
--- a/crypto/bio/bio_lib.c
+++ b/crypto/bio/bio_lib.c
@@ -549,8 +549,7 @@ BIO *BIO_dup_chain(BIO *in)
     }
     return (ret);
  err:
-    if (ret != NULL)
-        BIO_free(ret);
+    BIO_free(ret);
     return (NULL);
 }
 
diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index 5aa06cf..72f7bd2 100644
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c
@@ -155,8 +155,7 @@ static void BIO_ACCEPT_free(BIO_ACCEPT *a)
         OPENSSL_free(a->param_addr);
     if (a->addr != NULL)
         OPENSSL_free(a->addr);
-    if (a->bio_chain != NULL)
-        BIO_free(a->bio_chain);
+    BIO_free(a->bio_chain);
     OPENSSL_free(a);
 }
 
@@ -360,8 +359,7 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
             } else if (num == 1) {
                 data->accept_nbio = (ptr != NULL);
             } else if (num == 2) {
-                if (data->bio_chain != NULL)
-                    BIO_free(data->bio_chain);
+                BIO_free(data->bio_chain);
                 data->bio_chain = (BIO *)ptr;
             }
         }
@@ -448,10 +446,8 @@ BIO *BIO_new_accept(const char *str)
         return (NULL);
     if (BIO_set_accept_port(ret, str))
         return (ret);
-    else {
-        BIO_free(ret);
-        return (NULL);
-    }
+    BIO_free(ret);
+    return (NULL);
 }
 
 #endif
diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index d629a37..c6bb3d6 100644
--- a/crypto/bio/bss_bio.c
+++ b/crypto/bio/bss_bio.c
@@ -788,14 +788,10 @@ int BIO_new_bio_pair(BIO **bio1_p, size_t writebuf1,
 
  err:
     if (ret == 0) {
-        if (bio1) {
-            BIO_free(bio1);
-            bio1 = NULL;
-        }
-        if (bio2) {
-            BIO_free(bio2);
-            bio2 = NULL;
-        }
+        BIO_free(bio1);
+        bio1 = NULL;
+        BIO_free(bio2);
+        bio2 = NULL;
     }
 
     *bio1_p = bio1;
diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index c7f57f1..e95b4b3 100644
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -588,10 +588,8 @@ BIO *BIO_new_connect(const char *str)
         return (NULL);
     if (BIO_set_conn_hostname(ret, str))
         return (ret);
-    else {
-        BIO_free(ret);
-        return (NULL);
-    }
+    BIO_free(ret);
+    return (NULL);
 }
 
 #endif
diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c
index 7e1c1e8..6d2a0e8 100644
--- a/crypto/cms/cms_lib.c
+++ b/crypto/cms/cms_lib.c
@@ -354,8 +354,7 @@ BIO *cms_DigestAlgorithm_init_bio(X509_ALGOR *digestAlgorithm)
     }
     return mdbio;
  err:
-    if (mdbio)
-        BIO_free(mdbio);
+    BIO_free(mdbio);
     return NULL;
 }
 
diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
index b8ed1a1..c45d30e 100644
--- a/crypto/cms/cms_sd.c
+++ b/crypto/cms/cms_sd.c
@@ -806,8 +806,7 @@ BIO *cms_SignedData_init_bio(CMS_ContentInfo *cms)
     }
     return chain;
  err:
-    if (chain)
-        BIO_free_all(chain);
+    BIO_free_all(chain);
     return NULL;
 }
 
diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c
index 6f6f20d..f491ec9 100644
--- a/crypto/cms/cms_smime.c
+++ b/crypto/cms/cms_smime.c
@@ -114,7 +114,7 @@ static int cms_copy_content(BIO *out, BIO *in, unsigned int flags)
     r = 1;
 
  err:
-    if (tmpout && (tmpout != out))
+    if (tmpout != out)
         BIO_free(tmpout);
     return r;
 
@@ -446,14 +446,13 @@ int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
         if (tmpin != dcont)
             BIO_free(tmpin);
     } else {
-
         if (dcont && (tmpin == dcont))
             do_free_upto(cmsbio, dcont);
         else
             BIO_free_all(cmsbio);
     }
 
-    if (tmpout && out != tmpout)
+    if (out != tmpout)
         BIO_free_all(tmpout);
 
     if (cms_certs)
@@ -580,8 +579,7 @@ CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si,
     r = 1;
 
  err:
-    if (rct_cont)
-        BIO_free(rct_cont);
+    BIO_free(rct_cont);
     if (r)
         return cms;
     CMS_ContentInfo_free(cms);
diff --git a/crypto/dsa/dsatest.c b/crypto/dsa/dsatest.c
index bf47816..a5d40f1 100644
--- a/crypto/dsa/dsatest.c
+++ b/crypto/dsa/dsatest.c
@@ -218,10 +218,8 @@ int main(int argc, char **argv)
     ERR_remove_thread_state(NULL);
     ERR_free_strings();
     CRYPTO_mem_leaks(bio_err);
-    if (bio_err != NULL) {
-        BIO_free(bio_err);
-        bio_err = NULL;
-    }
+    BIO_free(bio_err);
+    bio_err = NULL;
 # ifdef OPENSSL_SYS_NETWARE
     if (!ret)
         printf("ERROR\n");
diff --git a/crypto/ecdsa/ecdsatest.c b/crypto/ecdsa/ecdsatest.c
index c2132da..346ccd0 100644
--- a/crypto/ecdsa/ecdsatest.c
+++ b/crypto/ecdsa/ecdsatest.c
@@ -563,8 +563,7 @@ int main(void)
     ERR_remove_thread_state(NULL);
     ERR_free_strings();
     CRYPTO_mem_leaks(out);
-    if (out != NULL)
-        BIO_free(out);
+    BIO_free(out);
     return ret;
 }
 #endif
diff --git a/crypto/ocsp/ocsp_ht.c b/crypto/ocsp/ocsp_ht.c
index aca0d48..4a06a8e 100644
--- a/crypto/ocsp/ocsp_ht.c
+++ b/crypto/ocsp/ocsp_ht.c
@@ -136,8 +136,7 @@ OCSP_REQ_CTX *OCSP_REQ_CTX_new(BIO *io, int maxline)
 
 void OCSP_REQ_CTX_free(OCSP_REQ_CTX *rctx)
 {
-    if (rctx->mem)
-        BIO_free(rctx->mem);
+    BIO_free(rctx->mem);
     if (rctx->iobuf)
         OPENSSL_free(rctx->iobuf);
     OPENSSL_free(rctx);
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index f77326b..b7c66a3 100644
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -128,8 +128,7 @@ static int PKCS7_bio_add_digest(BIO **pbio, X509_ALGOR *alg)
     return 1;
 
  err:
-    if (btmp)
-        BIO_free(btmp);
+    BIO_free(btmp);
     return 0;
 
 }
@@ -390,16 +389,12 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
         BIO_push(out, bio);
     else
         out = bio;
-    bio = NULL;
-    if (0) {
+    return out;
+
  err:
-        if (out != NULL)
-            BIO_free_all(out);
-        if (btmp != NULL)
-            BIO_free_all(btmp);
-        out = NULL;
-    }
-    return (out);
+    BIO_free_all(out);
+    BIO_free_all(btmp);
+    return NULL;
 }
 
 static int pkcs7_cmp_ri(PKCS7_RECIP_INFO *ri, X509 *pcert)
@@ -637,14 +632,10 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
             OPENSSL_cleanse(tkey, tkeylen);
             OPENSSL_free(tkey);
         }
-        if (out != NULL)
-            BIO_free_all(out);
-        if (btmp != NULL)
-            BIO_free_all(btmp);
-        if (etmp != NULL)
-            BIO_free_all(etmp);
-        if (bio != NULL)
-            BIO_free_all(bio);
+        BIO_free_all(out);
+        BIO_free_all(btmp);
+        BIO_free_all(etmp);
+        BIO_free_all(bio);
         out = NULL;
     }
     return (out);
diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c
index 9d83a8f..82b9a77 100644
--- a/crypto/srp/srp_vfy.c
+++ b/crypto/srp/srp_vfy.c
@@ -460,8 +460,7 @@ int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file)
 
     if (tmpdb)
         TXT_DB_free(tmpdb);
-    if (in)
-        BIO_free_all(in);
+    BIO_free_all(in);
 
     sk_SRP_gN_free(SRP_gN_tab);
 
diff --git a/crypto/threads/mttest.c b/crypto/threads/mttest.c
index ea3784c..f6f8df2 100644
--- a/crypto/threads/mttest.c
+++ b/crypto/threads/mttest.c
@@ -612,15 +612,11 @@ int doit(char *ctx[4])
     }
 
     /* The SSL's are optionally freed in the following calls */
-    if (c_to_s != NULL)
-        BIO_free(c_to_s);
-    if (s_to_c != NULL)
-        BIO_free(s_to_c);
-
-    if (c_bio != NULL)
-        BIO_free(c_bio);
-    if (s_bio != NULL)
-        BIO_free(s_bio);
+    BIO_free(c_to_s);
+    BIO_free(s_to_c);
+
+    BIO_free(c_bio);
+    BIO_free(s_bio);
     return (0);
 }
 
diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c
index 43a0730..bc1c90c 100644
--- a/crypto/x509/by_file.c
+++ b/crypto/x509/by_file.c
@@ -176,8 +176,7 @@ int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type)
  err:
     if (x != NULL)
         X509_free(x);
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     return (ret);
 }
 
@@ -235,8 +234,7 @@ int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type)
  err:
     if (x != NULL)
         X509_CRL_free(x);
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     return (ret);
 }
 
diff --git a/demos/b64.c b/demos/b64.c
index d8ed2a6..fcc6956 100644
--- a/demos/b64.c
+++ b/demos/b64.c
@@ -243,13 +243,9 @@ char **argv;
         OPENSSL_free(strbuf);
     if (buff != NULL)
         OPENSSL_free(buff);
-    if (in != NULL)
-        BIO_free(in);
-    if (out != NULL)
-        BIO_free(out);
-    if (benc != NULL)
-        BIO_free(benc);
-    if (b64 != NULL)
-        BIO_free(b64);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(benc);
+    BIO_free(b64);
     EXIT(ret);
 }
diff --git a/demos/bio/saccept.c b/demos/bio/saccept.c
index 8c75029..505d98b 100644
--- a/demos/bio/saccept.c
+++ b/demos/bio/saccept.c
@@ -22,8 +22,7 @@ BIO *in = NULL;
 
 void close_up()
 {
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
 }
 
 int main(int argc, char *argv[])
@@ -101,8 +100,7 @@ int main(int argc, char *argv[])
     if (ret) {
         ERR_print_errors_fp(stderr);
     }
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     exit(ret);
     return (!ret);
 }
diff --git a/demos/bio/server-arg.c b/demos/bio/server-arg.c
index 7ba54db..4f65227 100644
--- a/demos/bio/server-arg.c
+++ b/demos/bio/server-arg.c
@@ -137,8 +137,7 @@ int main(int argc, char *argv[])
     if (ret) {
         ERR_print_errors_fp(stderr);
     }
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     exit(ret);
     return (!ret);
 }
diff --git a/demos/bio/server-conf.c b/demos/bio/server-conf.c
index a09bc93..5355839 100644
--- a/demos/bio/server-conf.c
+++ b/demos/bio/server-conf.c
@@ -131,8 +131,7 @@ int main(int argc, char *argv[])
     if (ret) {
         ERR_print_errors_fp(stderr);
     }
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     exit(ret);
     return (!ret);
 }
diff --git a/demos/cms/cms_comp.c b/demos/cms/cms_comp.c
index 059152f..e117d37 100644
--- a/demos/cms/cms_comp.c
+++ b/demos/cms/cms_comp.c
@@ -50,10 +50,8 @@ int main(int argc, char **argv)
 
     if (cms)
         CMS_ContentInfo_free(cms);
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
+    BIO_free(in);
+    BIO_free(out);
 
     return ret;
 
diff --git a/demos/cms/cms_ddec.c b/demos/cms/cms_ddec.c
index 37ac97f..7247e57 100644
--- a/demos/cms/cms_ddec.c
+++ b/demos/cms/cms_ddec.c
@@ -75,14 +75,10 @@ int main(int argc, char **argv)
     if (rkey)
         EVP_PKEY_free(rkey);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
-    if (dcont)
-        BIO_free(dcont);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
+    BIO_free(dcont);
 
     return ret;
 
diff --git a/demos/cms/cms_dec.c b/demos/cms/cms_dec.c
index 3291eac..e9782d7 100644
--- a/demos/cms/cms_dec.c
+++ b/demos/cms/cms_dec.c
@@ -66,12 +66,9 @@ int main(int argc, char **argv)
     if (rkey)
         EVP_PKEY_free(rkey);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/cms/cms_denc.c b/demos/cms/cms_denc.c
index c86a5fd..8526717 100644
--- a/demos/cms/cms_denc.c
+++ b/demos/cms/cms_denc.c
@@ -84,14 +84,10 @@ int main(int argc, char **argv)
     if (recips)
         sk_X509_pop_free(recips, X509_free);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (dout)
-        BIO_free(dout);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(dout);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/cms/cms_enc.c b/demos/cms/cms_enc.c
index e8ecb48..4395e6b 100644
--- a/demos/cms/cms_enc.c
+++ b/demos/cms/cms_enc.c
@@ -80,12 +80,9 @@ int main(int argc, char **argv)
     if (recips)
         sk_X509_pop_free(recips, X509_free);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/cms/cms_sign.c b/demos/cms/cms_sign.c
index 4bf85d1..9f2cff0 100644
--- a/demos/cms/cms_sign.c
+++ b/demos/cms/cms_sign.c
@@ -76,12 +76,9 @@ int main(int argc, char **argv)
     if (skey)
         EVP_PKEY_free(skey);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/cms/cms_sign2.c b/demos/cms/cms_sign2.c
index 7e98a51..23c6eb8 100644
--- a/demos/cms/cms_sign2.c
+++ b/demos/cms/cms_sign2.c
@@ -90,12 +90,9 @@ int main(int argc, char **argv)
     if (skey)
         EVP_PKEY_free(skey2);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/cms/cms_uncomp.c b/demos/cms/cms_uncomp.c
index 392f4b4..8d45834 100644
--- a/demos/cms/cms_uncomp.c
+++ b/demos/cms/cms_uncomp.c
@@ -45,10 +45,8 @@ int main(int argc, char **argv)
     if (cms)
         CMS_ContentInfo_free(cms);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
+    BIO_free(in);
+    BIO_free(out);
 
     return ret;
 
diff --git a/demos/cms/cms_ver.c b/demos/cms/cms_ver.c
index ca93551..4227531 100644
--- a/demos/cms/cms_ver.c
+++ b/demos/cms/cms_ver.c
@@ -73,12 +73,9 @@ int main(int argc, char **argv)
     if (cacert)
         X509_free(cacert);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/smime/smdec.c b/demos/smime/smdec.c
index 6814d51..b50f8df 100644
--- a/demos/smime/smdec.c
+++ b/demos/smime/smdec.c
@@ -66,12 +66,9 @@ int main(int argc, char **argv)
     if (rkey)
         EVP_PKEY_free(rkey);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/smime/smenc.c b/demos/smime/smenc.c
index 18bf7b1..5a85537 100644
--- a/demos/smime/smenc.c
+++ b/demos/smime/smenc.c
@@ -80,12 +80,9 @@ int main(int argc, char **argv)
     if (recips)
         sk_X509_pop_free(recips, X509_free);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/smime/smsign.c b/demos/smime/smsign.c
index c7bf86d..6b9dfdd 100644
--- a/demos/smime/smsign.c
+++ b/demos/smime/smsign.c
@@ -76,12 +76,9 @@ int main(int argc, char **argv)
     if (skey)
         EVP_PKEY_free(skey);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/smime/smsign2.c b/demos/smime/smsign2.c
index a116094..5d9de35 100644
--- a/demos/smime/smsign2.c
+++ b/demos/smime/smsign2.c
@@ -90,12 +90,9 @@ int main(int argc, char **argv)
     if (skey)
         EVP_PKEY_free(skey2);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/smime/smver.c b/demos/smime/smver.c
index 21937df..4088d3c 100644
--- a/demos/smime/smver.c
+++ b/demos/smime/smver.c
@@ -73,12 +73,9 @@ int main(int argc, char **argv)
     if (cacert)
         X509_free(cacert);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/doc/crypto/BIO_new.pod b/doc/crypto/BIO_new.pod
index 2a245fc..76679f3 100644
--- a/doc/crypto/BIO_new.pod
+++ b/doc/crypto/BIO_new.pod
@@ -21,13 +21,16 @@ The BIO_new() function returns a new BIO using method B<type>.
 BIO_set() sets the method of an already existing BIO.
 
 BIO_free() frees up a single BIO, BIO_vfree() also frees up a single BIO
-but it does not return a value. Calling BIO_free() may also have some effect
+but it does not return a value.
+If B<a> is NULL nothing is done.
+Calling BIO_free() may also have some effect
 on the underlying I/O structure, for example it may close the file being
 referred to under certain circumstances. For more details see the individual
 BIO_METHOD descriptions.
 
 BIO_free_all() frees up an entire BIO chain, it does not halt if an error
 occurs freeing up an individual BIO in the chain.
+If B<a> is NULL nothing is done.
 
 =head1 RETURN VALUES
 
diff --git a/engines/e_chil.c b/engines/e_chil.c
index 19d29d7..c06ab1a 100644
--- a/engines/e_chil.c
+++ b/engines/e_chil.c
@@ -656,8 +656,7 @@ static int hwcrhk_finish(ENGINE *e)
         goto err;
     }
  err:
-    if (logstream)
-        BIO_free(logstream);
+    BIO_free(logstream);
     hwcrhk_dso = NULL;
     p_hwcrhk_Init = NULL;
     p_hwcrhk_Finish = NULL;
@@ -693,10 +692,8 @@ static int hwcrhk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
             BIO *bio = (BIO *)p;
 
             CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-            if (logstream) {
-                BIO_free(logstream);
-                logstream = NULL;
-            }
+            BIO_free(logstream);
+            logstream = NULL;
             if (CRYPTO_add(&bio->references, 1, CRYPTO_LOCK_BIO) > 1)
                 logstream = bio;
             else
diff --git a/engines/e_sureware.c b/engines/e_sureware.c
index 3c7b2b2..5e1786c 100644
--- a/engines/e_sureware.c
+++ b/engines/e_sureware.c
@@ -404,10 +404,8 @@ static int surewarehk_ctrl(ENGINE *e, int cmd, long i, void *p,
         {
             BIO *bio = (BIO *)p;
             CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-            if (logstream) {
-                BIO_free(logstream);
-                logstream = NULL;
-            }
+            BIO_free(logstream);
+            logstream = NULL;
             if (CRYPTO_add(&bio->references, 1, CRYPTO_LOCK_BIO) > 1)
                 logstream = bio;
             else
@@ -596,8 +594,7 @@ static int surewarehk_finish(ENGINE *e)
         goto err;
     }
  err:
-    if (logstream)
-        BIO_free(logstream);
+    BIO_free(logstream);
     surewarehk_dso = NULL;
     p_surewarehk_Init = NULL;
     p_surewarehk_Finish = NULL;
diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index 99f8b5e..11a2aad 100644
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c
@@ -503,10 +503,8 @@ BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx)
         goto err;
     return (ret);
  err:
-    if (buf != NULL)
-        BIO_free(buf);
-    if (ssl != NULL)
-        BIO_free(ssl);
+    BIO_free(buf);
+    BIO_free(ssl);
 #endif
     return (NULL);
 }
@@ -524,8 +522,7 @@ BIO *BIO_new_ssl_connect(SSL_CTX *ctx)
         goto err;
     return (ret);
  err:
-    if (con != NULL)
-        BIO_free(con);
+    BIO_free(con);
 #endif
     return (NULL);
 }
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index bcefe12..94f6dd0 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -558,8 +558,7 @@ int ssl3_enc(SSL *s, int send)
 
 void ssl3_init_finished_mac(SSL *s)
 {
-    if (s->s3->handshake_buffer)
-        BIO_free(s->s3->handshake_buffer);
+    BIO_free(s->s3->handshake_buffer);
     if (s->s3->handshake_dgst)
         ssl3_free_digest_list(s);
     s->s3->handshake_buffer = BIO_new(BIO_s_mem());
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 9893930..bed4a4e 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3147,9 +3147,7 @@ void ssl3_free(SSL *s)
 
     if (s->s3->tmp.ca_names != NULL)
         sk_X509_NAME_pop_free(s->s3->tmp.ca_names, X509_NAME_free);
-    if (s->s3->handshake_buffer) {
-        BIO_free(s->s3->handshake_buffer);
-    }
+    BIO_free(s->s3->handshake_buffer);
     if (s->s3->handshake_dgst)
         ssl3_free_digest_list(s);
 #ifndef OPENSSL_NO_TLSEXT
@@ -3200,10 +3198,8 @@ void ssl3_clear(SSL *s)
     rlen = s->s3->rbuf.len;
     wlen = s->s3->wbuf.len;
     init_extra = s->s3->init_extra;
-    if (s->s3->handshake_buffer) {
-        BIO_free(s->s3->handshake_buffer);
-        s->s3->handshake_buffer = NULL;
-    }
+    BIO_free(s->s3->handshake_buffer);
+    s->s3->handshake_buffer = NULL;
     if (s->s3->handshake_dgst) {
         ssl3_free_digest_list(s);
     }
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index cbfe7bb..367f7a9 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -877,8 +877,7 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file)
     }
     if (sk != NULL)
         sk_X509_NAME_free(sk);
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     if (x != NULL)
         X509_free(x);
     if (ret != NULL)
@@ -938,8 +937,7 @@ int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
  err:
         ret = 0;
     }
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     if (x != NULL)
         X509_free(x);
 
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c
index 0fd6c1f..43821f6 100644
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c
@@ -438,8 +438,7 @@ static int cmd_DHParameters(SSL_CONF_CTX *cctx, const char *value)
         rv = SSL_set_tmp_dh(cctx->ssl, dh);
  end:
     DH_free(dh);
-    if (in)
-        BIO_free(in);
+    BIO_free(in);
     return rv > 0;
 }
 #endif
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 29bbc03..1e9ad91 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -543,9 +543,8 @@ void SSL_free(SSL *s)
         BIO_free(s->bbio);
         s->bbio = NULL;
     }
-    if (s->rbio != NULL)
-        BIO_free_all(s->rbio);
-    if ((s->wbio != NULL) && (s->wbio != s->rbio))
+    BIO_free_all(s->rbio);
+    if (s->wbio != s->rbio)
         BIO_free_all(s->wbio);
 
     if (s->init_buf != NULL)
@@ -621,7 +620,7 @@ void SSL_free(SSL *s)
 
 void SSL_set_rbio(SSL *s, BIO *rbio)
 {
-    if ((s->rbio != NULL) && (s->rbio != rbio))
+    if (s->rbio != rbio)
         BIO_free_all(s->rbio);
     s->rbio = rbio;
 }
@@ -637,7 +636,7 @@ void SSL_set_wbio(SSL *s, BIO *wbio)
             s->bbio->next_bio = NULL;
         }
     }
-    if ((s->wbio != NULL) && (s->wbio != wbio) && (s->rbio != s->wbio))
+    if (s->wbio != wbio && s->rbio != s->wbio)
         BIO_free_all(s->wbio);
     s->wbio = wbio;
 }
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index 60a6834..90fe8c8 100644
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -121,8 +121,7 @@ int SSL_use_certificate_file(SSL *ssl, const char *file, int type)
  end:
     if (x != NULL)
         X509_free(x);
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     return (ret);
 }
 #endif
@@ -262,8 +261,7 @@ int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type)
     ret = SSL_use_RSAPrivateKey(ssl, rsa);
     RSA_free(rsa);
  end:
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     return (ret);
 }
 # endif
@@ -335,8 +333,7 @@ int SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type)
     ret = SSL_use_PrivateKey(ssl, pkey);
     EVP_PKEY_free(pkey);
  end:
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     return (ret);
 }
 #endif
@@ -470,8 +467,7 @@ int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type)
  end:
     if (x != NULL)
         X509_free(x);
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     return (ret);
 }
 #endif
@@ -552,8 +548,7 @@ int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type)
     ret = SSL_CTX_use_RSAPrivateKey(ctx, rsa);
     RSA_free(rsa);
  end:
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     return (ret);
 }
 # endif
@@ -622,8 +617,7 @@ int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type)
     ret = SSL_CTX_use_PrivateKey(ctx, pkey);
     EVP_PKEY_free(pkey);
  end:
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     return (ret);
 }
 #endif
@@ -726,8 +720,7 @@ int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file)
  end:
     if (x != NULL)
         X509_free(x);
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     return (ret);
 }
 #endif
@@ -991,8 +984,7 @@ int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file)
     OPENSSL_free(header);
     OPENSSL_free(extension);
     OPENSSL_free(serverinfo);
-    if (bin != NULL)
-        BIO_free(bin);
+    BIO_free(bin);
     return ret;
 }
 # endif                         /* OPENSSL_NO_STDIO */
diff --git a/ssl/ssl_task.c b/ssl/ssl_task.c
index ab37cc6..d5ca89f 100644
--- a/ssl/ssl_task.c
+++ b/ssl/ssl_task.c
@@ -381,13 +381,9 @@ int doit(io_channel chan, SSL_CTX *s_ctx)
     s_ssl->rbio = NULL;
     s_ssl->wbio = NULL;
 
-    if (c_to_s != NULL)
-        BIO_free(c_to_s);
-    if (s_to_c != NULL)
-        BIO_free(s_to_c);
-    if (c_bio != NULL)
-        BIO_free(c_bio);
-    if (s_bio != NULL)
-        BIO_free(s_bio);
+    BIO_free(c_to_s);
+    BIO_free(s_to_c);
+    BIO_free(c_bio);
+    BIO_free(s_bio);
     return (0);
 }
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index d244ba3..508fedd 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -1798,8 +1798,7 @@ int main(int argc, char *argv[])
         SSL_CONF_CTX_free(c_cctx);
     sk_OPENSSL_STRING_free(conf_args);
 
-    if (bio_stdout != NULL)
-        BIO_free(bio_stdout);
+    BIO_free(bio_stdout);
 
 #ifndef OPENSSL_NO_RSA
     free_tmp_rsa();
@@ -1812,8 +1811,7 @@ int main(int argc, char *argv[])
     ERR_remove_thread_state(NULL);
     EVP_cleanup();
     CRYPTO_mem_leaks(bio_err);
-    if (bio_err != NULL)
-        BIO_free(bio_err);
+    BIO_free(bio_err);
     EXIT(ret);
 }
 
@@ -2173,18 +2171,12 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
  err:
     ERR_print_errors(bio_err);
 
-    if (server)
-        BIO_free(server);
-    if (server_io)
-        BIO_free(server_io);
-    if (client)
-        BIO_free(client);
-    if (client_io)
-        BIO_free(client_io);
-    if (s_ssl_bio)
-        BIO_free(s_ssl_bio);
-    if (c_ssl_bio)
-        BIO_free(c_ssl_bio);
+    BIO_free(server);
+    BIO_free(server_io);
+    BIO_free(client);
+    BIO_free(client_io);
+    BIO_free(s_ssl_bio);
+    BIO_free(c_ssl_bio);
 
     return ret;
 }
@@ -2468,14 +2460,10 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count)
         c_ssl->wbio = NULL;
     }
 
-    if (c_to_s != NULL)
-        BIO_free(c_to_s);
-    if (s_to_c != NULL)
-        BIO_free(s_to_c);
-    if (c_bio != NULL)
-        BIO_free_all(c_bio);
-    if (s_bio != NULL)
-        BIO_free_all(s_bio);
+    BIO_free(c_to_s);
+    BIO_free(s_to_c);
+    BIO_free_all(c_bio);
+    BIO_free_all(s_bio);
 
     if (cbuf)
         OPENSSL_free(cbuf);

From steve at openssl.org  Wed Mar 25 15:47:30 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Wed, 25 Mar 2015 15:47:30 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427298450.899158.2785.nullmailer@dev.openssl.org>

The branch master has been updated
       via  e20b57270dece66ce2c68aeb5d14dd6d9f3c5d68 (commit)
      from  ca3a82c3b364e1e584546f0f3bbb938b0b472580 (commit)


- Log -----------------------------------------------------------------
commit e20b57270dece66ce2c68aeb5d14dd6d9f3c5d68
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Mar 25 15:08:55 2015 +0000

    Remove X509_ATTRIBUTE hack.
    
    The X509_ATTRIBUTE structure includes a hack to tolerate malformed
    attributes that encode as the type instead of SET OF type. This form
    is never created by OpenSSL and shouldn't be needed any more.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/x509/x509_att.c | 20 +++++---------------
 crypto/x509/x509_lcl.h | 12 +-----------
 crypto/x509/x_attrib.c | 25 +++----------------------
 3 files changed, 9 insertions(+), 48 deletions(-)

diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c
index 212c422..292546b 100644
--- a/crypto/x509/x509_att.c
+++ b/crypto/x509/x509_att.c
@@ -317,9 +317,6 @@ int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype,
             goto err;
         atype = attrtype;
     }
-    if (!(attr->value.set = sk_ASN1_TYPE_new_null()))
-        goto err;
-    attr->single = 0;
     /*
      * This is a bit naughty because the attribute should really have at
      * least one value but some types use and zero length SET and require
@@ -334,7 +331,7 @@ int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype,
             goto err;
     } else
         ASN1_TYPE_set(ttmp, atype, stmp);
-    if (!sk_ASN1_TYPE_push(attr->value.set, ttmp))
+    if (!sk_ASN1_TYPE_push(attr->set, ttmp))
         goto err;
     return 1;
  err:
@@ -344,11 +341,9 @@ int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype,
 
 int X509_ATTRIBUTE_count(X509_ATTRIBUTE *attr)
 {
-    if (!attr->single)
-        return sk_ASN1_TYPE_num(attr->value.set);
-    if (attr->value.single)
-        return 1;
-    return 0;
+    if (attr == NULL)
+        return 0;
+    return sk_ASN1_TYPE_num(attr->set);
 }
 
 ASN1_OBJECT *X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr)
@@ -375,11 +370,6 @@ void *X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx,
 ASN1_TYPE *X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx)
 {
     if (attr == NULL)
-        return (NULL);
-    if (idx >= X509_ATTRIBUTE_count(attr))
         return NULL;
-    if (!attr->single)
-        return sk_ASN1_TYPE_value(attr->value.set, idx);
-    else
-        return attr->value.single;
+    return sk_ASN1_TYPE_value(attr->set, idx);
 }
diff --git a/crypto/x509/x509_lcl.h b/crypto/x509/x509_lcl.h
index 5e38f5f..427d8ca 100644
--- a/crypto/x509/x509_lcl.h
+++ b/crypto/x509/x509_lcl.h
@@ -74,17 +74,7 @@ int x509_check_cert_time(X509_STORE_CTX *ctx, X509 *x, int quiet);
 /* a sequence of these are used */
 struct x509_attributes_st {
     ASN1_OBJECT *object;
-    int single;                 /* 0 for a set, 1 for a single item (which is
-                                 * wrong) */
-    union {
-        char *ptr;
-        /*
-         * 0
-         */ STACK_OF(ASN1_TYPE) *set;
-        /*
-         * 1
-         */ ASN1_TYPE *single;
-    } value;
+    STACK_OF(ASN1_TYPE) *set;
 };
 
 struct X509_extension_st {
diff --git a/crypto/x509/x_attrib.c b/crypto/x509/x_attrib.c
index 335a85b..a07a5da 100644
--- a/crypto/x509/x_attrib.c
+++ b/crypto/x509/x_attrib.c
@@ -69,30 +69,14 @@
  * typedef struct x509_attributes_st
  *      {
  *      ASN1_OBJECT *object;
- *      int single;
- *      union   {
- *              char            *ptr;
- *              STACK_OF(ASN1_TYPE) *set;
- *              ASN1_TYPE       *single;
- *              } value;
+ *      STACK_OF(ASN1_TYPE) *set;
  *      } X509_ATTRIBUTE;
  *
- * this needs some extra thought because the CHOICE type is
- * merged with the main structure and because the value can
- * be anything at all we *must* try the SET OF first because
- * the ASN1_ANY type will swallow anything including the whole
- * SET OF structure.
  */
 
-ASN1_CHOICE(X509_ATTRIBUTE_SET) = {
-        ASN1_SET_OF(X509_ATTRIBUTE, value.set, ASN1_ANY),
-        ASN1_SIMPLE(X509_ATTRIBUTE, value.single, ASN1_ANY)
-} ASN1_CHOICE_END_selector(X509_ATTRIBUTE, X509_ATTRIBUTE_SET, single)
-
 ASN1_SEQUENCE(X509_ATTRIBUTE) = {
         ASN1_SIMPLE(X509_ATTRIBUTE, object, ASN1_OBJECT),
-        /* CHOICE type merged with parent */
-        ASN1_EX_COMBINE(0, 0, X509_ATTRIBUTE_SET)
+        ASN1_SET_OF(X509_ATTRIBUTE, set, ASN1_ANY)
 } ASN1_SEQUENCE_END(X509_ATTRIBUTE)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_ATTRIBUTE)
@@ -106,12 +90,9 @@ X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, void *value)
     if ((ret = X509_ATTRIBUTE_new()) == NULL)
         return (NULL);
     ret->object = OBJ_nid2obj(nid);
-    ret->single = 0;
-    if ((ret->value.set = sk_ASN1_TYPE_new_null()) == NULL)
-        goto err;
     if ((val = ASN1_TYPE_new()) == NULL)
         goto err;
-    if (!sk_ASN1_TYPE_push(ret->value.set, val))
+    if (!sk_ASN1_TYPE_push(ret->set, val))
         goto err;
 
     ASN1_TYPE_set(val, atrtype, value);

From steve at openssl.org  Wed Mar 25 16:11:51 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Wed, 25 Mar 2015 16:11:51 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427299911.382100.8075.nullmailer@dev.openssl.org>

The branch master has been updated
       via  cb14aec713ccab92d1c21d3d5b066570c4bca5ee (commit)
       via  c1ee50aac26c3b2261d04d61bb4154639e284b0d (commit)
      from  e20b57270dece66ce2c68aeb5d14dd6d9f3c5d68 (commit)


- Log -----------------------------------------------------------------
commit cb14aec713ccab92d1c21d3d5b066570c4bca5ee
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Mar 25 15:44:45 2015 +0000

    make update
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit c1ee50aac26c3b2261d04d61bb4154639e284b0d
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Mar 25 15:42:56 2015 +0000

    Move internal only ASN.1 functions to asn1_locl.h
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/asn1/Makefile    | 12 ++++++------
 crypto/asn1/asn1_locl.h | 23 +++++++++++++++++++++++
 crypto/asn1/asn1t.h     | 23 -----------------------
 crypto/asn1/tasn_dec.c  |  1 +
 crypto/asn1/tasn_enc.c  |  1 +
 crypto/asn1/tasn_fre.c  |  1 +
 crypto/asn1/tasn_new.c  |  1 +
 crypto/asn1/tasn_prn.c  |  1 +
 crypto/asn1/tasn_utl.c  |  1 +
 util/libeay.num         | 25 +++++++++++++------------
 10 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/crypto/asn1/Makefile b/crypto/asn1/Makefile
index 9f00de6..2a15f16 100644
--- a/crypto/asn1/Makefile
+++ b/crypto/asn1/Makefile
@@ -658,7 +658,7 @@ tasn_dec.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 tasn_dec.o: ../../include/openssl/opensslconf.h
 tasn_dec.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 tasn_dec.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-tasn_dec.o: ../../include/openssl/symhacks.h tasn_dec.c
+tasn_dec.o: ../../include/openssl/symhacks.h asn1_locl.h tasn_dec.c
 tasn_enc.o: ../../e_os.h ../../include/openssl/asn1.h
 tasn_enc.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 tasn_enc.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -668,14 +668,14 @@ tasn_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 tasn_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 tasn_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 tasn_enc.o: ../../include/openssl/symhacks.h ../cryptlib.h
-tasn_enc.o: ../include/internal/asn1_int.h tasn_enc.c
+tasn_enc.o: ../include/internal/asn1_int.h asn1_locl.h tasn_enc.c
 tasn_fre.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
 tasn_fre.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
 tasn_fre.o: ../../include/openssl/e_os2.h ../../include/openssl/obj_mac.h
 tasn_fre.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 tasn_fre.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 tasn_fre.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-tasn_fre.o: ../../include/openssl/symhacks.h tasn_fre.c
+tasn_fre.o: ../../include/openssl/symhacks.h asn1_locl.h tasn_fre.c
 tasn_new.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
 tasn_new.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
 tasn_new.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
@@ -683,7 +683,7 @@ tasn_new.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 tasn_new.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 tasn_new.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 tasn_new.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-tasn_new.o: ../../include/openssl/symhacks.h tasn_new.c
+tasn_new.o: ../../include/openssl/symhacks.h asn1_locl.h tasn_new.c
 tasn_prn.o: ../../e_os.h ../../include/openssl/asn1.h
 tasn_prn.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 tasn_prn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
@@ -698,7 +698,7 @@ tasn_prn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 tasn_prn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 tasn_prn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 tasn_prn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-tasn_prn.o: ../cryptlib.h ../include/internal/asn1_int.h tasn_prn.c
+tasn_prn.o: ../cryptlib.h ../include/internal/asn1_int.h asn1_locl.h tasn_prn.c
 tasn_scn.o: ../../e_os.h ../../include/openssl/asn1.h
 tasn_scn.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 tasn_scn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
@@ -727,7 +727,7 @@ tasn_utl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 tasn_utl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 tasn_utl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 tasn_utl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-tasn_utl.o: ../../include/openssl/symhacks.h tasn_utl.c
+tasn_utl.o: ../../include/openssl/symhacks.h asn1_locl.h tasn_utl.c
 x_algor.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
 x_algor.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 x_algor.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
diff --git a/crypto/asn1/asn1_locl.h b/crypto/asn1/asn1_locl.h
index ec4c0e8..79d76ec 100644
--- a/crypto/asn1/asn1_locl.h
+++ b/crypto/asn1/asn1_locl.h
@@ -104,3 +104,26 @@ struct x509_crl_method_st {
                        ASN1_INTEGER *ser, X509_NAME *issuer);
     int (*crl_verify) (X509_CRL *crl, EVP_PKEY *pk);
 };
+
+int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
+                const ASN1_ITEM *it);
+int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
+                int utype, char *free_cont, const ASN1_ITEM *it);
+
+int asn1_get_choice_selector(ASN1_VALUE **pval, const ASN1_ITEM *it);
+int asn1_set_choice_selector(ASN1_VALUE **pval, int value,
+                             const ASN1_ITEM *it);
+
+ASN1_VALUE **asn1_get_field_ptr(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
+
+const ASN1_TEMPLATE *asn1_do_adb(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt,
+                                 int nullerr);
+
+int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it);
+
+void asn1_enc_init(ASN1_VALUE **pval, const ASN1_ITEM *it);
+void asn1_enc_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
+int asn1_enc_restore(int *len, unsigned char **out, ASN1_VALUE **pval,
+                     const ASN1_ITEM *it);
+int asn1_enc_save(ASN1_VALUE **pval, const unsigned char *in, int inlen,
+                  const ASN1_ITEM *it);
diff --git a/crypto/asn1/asn1t.h b/crypto/asn1/asn1t.h
index 3dcca32..e6f6d79 100644
--- a/crypto/asn1/asn1t.h
+++ b/crypto/asn1/asn1t.h
@@ -910,29 +910,6 @@ int ASN1_template_i2d(ASN1_VALUE **pval, unsigned char **out,
                       const ASN1_TEMPLATE *tt);
 void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
 
-int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
-                const ASN1_ITEM *it);
-int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
-                int utype, char *free_cont, const ASN1_ITEM *it);
-
-int asn1_get_choice_selector(ASN1_VALUE **pval, const ASN1_ITEM *it);
-int asn1_set_choice_selector(ASN1_VALUE **pval, int value,
-                             const ASN1_ITEM *it);
-
-ASN1_VALUE **asn1_get_field_ptr(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
-
-const ASN1_TEMPLATE *asn1_do_adb(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt,
-                                 int nullerr);
-
-int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it);
-
-void asn1_enc_init(ASN1_VALUE **pval, const ASN1_ITEM *it);
-void asn1_enc_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
-int asn1_enc_restore(int *len, unsigned char **out, ASN1_VALUE **pval,
-                     const ASN1_ITEM *it);
-int asn1_enc_save(ASN1_VALUE **pval, const unsigned char *in, int inlen,
-                  const ASN1_ITEM *it);
-
 #ifdef  __cplusplus
 }
 #endif
diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index b96c1b5..5111c12 100644
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -64,6 +64,7 @@
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
 #include <openssl/err.h>
+#include "asn1_locl.h"
 
 static int asn1_check_eoc(const unsigned char **in, long len);
 static int asn1_find_end(const unsigned char **in, long len, char inf);
diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c
index 1d1f838..251a8f1 100644
--- a/crypto/asn1/tasn_enc.c
+++ b/crypto/asn1/tasn_enc.c
@@ -64,6 +64,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/objects.h>
 #include "internal/asn1_int.h"
+#include "asn1_locl.h"
 
 static int asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out,
                                  const ASN1_ITEM *it, int tag, int aclass);
diff --git a/crypto/asn1/tasn_fre.c b/crypto/asn1/tasn_fre.c
index bdc26f9..6f62fd4 100644
--- a/crypto/asn1/tasn_fre.c
+++ b/crypto/asn1/tasn_fre.c
@@ -61,6 +61,7 @@
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/objects.h>
+#include "asn1_locl.h"
 
 static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,
                                    int combine);
diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c
index 3884897..996a4d5 100644
--- a/crypto/asn1/tasn_new.c
+++ b/crypto/asn1/tasn_new.c
@@ -63,6 +63,7 @@
 #include <openssl/err.h>
 #include <openssl/asn1t.h>
 #include <string.h>
+#include "asn1_locl.h"
 
 static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
                                     int combine);
diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
index cb3d35b..d1e5ba5 100644
--- a/crypto/asn1/tasn_prn.c
+++ b/crypto/asn1/tasn_prn.c
@@ -66,6 +66,7 @@
 #include <openssl/err.h>
 #include <openssl/x509v3.h>
 #include "internal/asn1_int.h"
+#include "asn1_locl.h"
 
 /*
  * Print routines.
diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c
index 2e14c2f..da7b029 100644
--- a/crypto/asn1/tasn_utl.c
+++ b/crypto/asn1/tasn_utl.c
@@ -63,6 +63,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/objects.h>
 #include <openssl/err.h>
+#include "asn1_locl.h"
 
 /* Utility functions for manipulating fields and offsets */
 
diff --git a/util/libeay.num b/util/libeay.num
index 8930f2c..bfea39f 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1729,7 +1729,7 @@ BIO_number_written                      2202	EXIST::FUNCTION:
 BIO_number_read                         2203	EXIST::FUNCTION:
 X509_STORE_CTX_get1_chain               2204	EXIST::FUNCTION:
 ERR_load_RAND_strings                   2205	EXIST::FUNCTION:
-RAND_pseudo_bytes                       2206	EXIST::FUNCTION:
+RAND_pseudo_bytes                       2206	EXIST::FUNCTION:DEPRECATED
 X509_REQ_get_attr_by_NID                2207	EXIST::FUNCTION:
 X509_REQ_get_attr                       2208	EXIST::FUNCTION:
 X509_REQ_add1_attr_by_NID               2209	EXIST::FUNCTION:
@@ -2011,7 +2011,7 @@ OCSP_SINGLERESP_get_ext_count           2579	EXIST::FUNCTION:
 UI_ctrl                                 2580	EXIST::FUNCTION:
 _shadow_DES_rw_mode                     2581	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:DES
 _shadow_DES_rw_mode                     2581	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:DES
-asn1_do_adb                             2582	EXIST::FUNCTION:
+asn1_do_adb                             2582	NOEXIST::FUNCTION:
 ASN1_template_i2d                       2583	EXIST::FUNCTION:
 ENGINE_register_DH                      2584	EXIST::FUNCTION:ENGINE
 UI_construct_prompt                     2585	EXIST::FUNCTION:
@@ -2107,7 +2107,7 @@ ENGINE_set_load_privkey_fn              2659	EXIST:VMS:FUNCTION:ENGINE
 EVP_EncryptFinal_ex                     2660	EXIST::FUNCTION:
 ENGINE_set_default_digests              2661	EXIST::FUNCTION:ENGINE
 X509_get0_pubkey_bitstr                 2662	EXIST::FUNCTION:
-asn1_ex_i2c                             2663	EXIST::FUNCTION:
+asn1_ex_i2c                             2663	NOEXIST::FUNCTION:
 ENGINE_register_RSA                     2664	EXIST::FUNCTION:ENGINE
 ENGINE_unregister_DSA                   2665	EXIST::FUNCTION:ENGINE
 _ossl_old_des_key_sched                 2666	NOEXIST::FUNCTION:
@@ -2385,10 +2385,10 @@ OCSP_REQINFO_free                       2884	EXIST::FUNCTION:
 EC_GROUP_new_curve_GFp                  2885	EXIST::FUNCTION:EC
 OCSP_REQUEST_get1_ext_d2i               2886	EXIST::FUNCTION:
 PKCS12_item_pack_safebag                2887	EXIST::FUNCTION:
-asn1_ex_c2i                             2888	EXIST::FUNCTION:
+asn1_ex_c2i                             2888	NOEXIST::FUNCTION:
 ENGINE_register_digests                 2889	EXIST::FUNCTION:ENGINE
 i2d_OCSP_REVOKEDINFO                    2890	EXIST::FUNCTION:
-asn1_enc_restore                        2891	EXIST::FUNCTION:
+asn1_enc_restore                        2891	NOEXIST::FUNCTION:
 UI_free                                 2892	EXIST::FUNCTION:
 UI_new_method                           2893	EXIST::FUNCTION:
 EVP_EncryptInit_ex                      2894	EXIST::FUNCTION:
@@ -2504,7 +2504,7 @@ BN_swap                                 2990	EXIST::FUNCTION:
 POLICYINFO_it                           2991	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 POLICYINFO_it                           2991	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 ENGINE_set_destroy_function             2992	EXIST::FUNCTION:ENGINE
-asn1_enc_free                           2993	EXIST::FUNCTION:
+asn1_enc_free                           2993	NOEXIST::FUNCTION:
 OCSP_RESPID_it                          2994	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 OCSP_RESPID_it                          2994	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 EC_GROUP_new                            2995	EXIST::FUNCTION:EC
@@ -2564,7 +2564,7 @@ _ossl_old_des_ncbc_encrypt              3037	NOEXIST::FUNCTION:
 i2d_KRB5_TKTBODY                        3038	EXIST::FUNCTION:
 EC_POINT_clear_free                     3039	EXIST::FUNCTION:EC
 AES_decrypt                             3040	EXIST::FUNCTION:AES
-asn1_enc_init                           3041	EXIST::FUNCTION:
+asn1_enc_init                           3041	NOEXIST::FUNCTION:
 UI_get_result_maxsize                   3042	EXIST::FUNCTION:
 OCSP_CERTID_new                         3043	EXIST::FUNCTION:
 ENGINE_unregister_RAND                  3044	EXIST::FUNCTION:ENGINE
@@ -2577,13 +2577,13 @@ ASN1_item_d2i                           3050	EXIST::FUNCTION:
 ASN1_primitive_free                     3051	EXIST::FUNCTION:
 i2d_EXTENDED_KEY_USAGE                  3052	EXIST::FUNCTION:
 i2d_OCSP_SIGNATURE                      3053	EXIST::FUNCTION:
-asn1_enc_save                           3054	EXIST::FUNCTION:
+asn1_enc_save                           3054	NOEXIST::FUNCTION:
 ENGINE_load_nuron                       3055	EXIST::FUNCTION:ENGINE,STATIC_ENGINE
 _ossl_old_des_pcbc_encrypt              3056	NOEXIST::FUNCTION:
 PKCS12_MAC_DATA_it                      3057	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS12_MAC_DATA_it                      3057	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 OCSP_accept_responses_new               3058	EXIST::FUNCTION:
-asn1_do_lock                            3059	EXIST::FUNCTION:
+asn1_do_lock                            3059	NOEXIST::FUNCTION:
 PKCS7_ATTR_VERIFY_it                    3060	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS7_ATTR_VERIFY_it                    3060	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 KRB5_APREQBODY_it                       3061	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2598,7 +2598,7 @@ EVP_DecryptInit_ex                      3067	EXIST::FUNCTION:
 i2d_OCSP_CERTID                         3068	EXIST::FUNCTION:
 ASN1_item_d2i_bio                       3069	EXIST::FUNCTION:
 EC_POINT_dbl                            3070	EXIST::FUNCTION:EC
-asn1_get_choice_selector                3071	EXIST::FUNCTION:
+asn1_get_choice_selector                3071	NOEXIST::FUNCTION:
 i2d_KRB5_CHECKSUM                       3072	EXIST::FUNCTION:
 ENGINE_set_table_flags                  3073	EXIST::FUNCTION:ENGINE
 AES_options                             3074	EXIST::FUNCTION:AES
@@ -2660,10 +2660,10 @@ UI_dup_verify_string                    3119	EXIST::FUNCTION:
 BN_mod_lshift                           3120	EXIST::FUNCTION:
 KRB5_AUTHDATA_it                        3121	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 KRB5_AUTHDATA_it                        3121	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-asn1_set_choice_selector                3122	EXIST::FUNCTION:
+asn1_set_choice_selector                3122	NOEXIST::FUNCTION:
 OCSP_basic_add1_status                  3123	EXIST::FUNCTION:
 OCSP_RESPID_free                        3124	EXIST::FUNCTION:
-asn1_get_field_ptr                      3125	EXIST::FUNCTION:
+asn1_get_field_ptr                      3125	NOEXIST::FUNCTION:
 UI_add_input_string                     3126	EXIST::FUNCTION:
 OCSP_CRLID_it                           3127	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 OCSP_CRLID_it                           3127	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -4552,3 +4552,4 @@ EVP_camellia_192_ctr                    4910	EXIST::FUNCTION:CAMELLIA
 OCSP_resp_get0_signature                4911	EXIST::FUNCTION:
 OBJ_length                              4912	EXIST::FUNCTION:
 OBJ_get0_data                           4913	EXIST::FUNCTION:
+X509_NAME_ENTRY_set                     4914	EXIST::FUNCTION:

From matt at openssl.org  Wed Mar 25 18:54:23 2015
From: matt at openssl.org (Matt Caswell)
Date: Wed, 25 Mar 2015 18:54:23 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427309663.860088.8780.nullmailer@dev.openssl.org>

The branch master has been updated
       via  17dd65e6e1f888b4561d559b4d44fbbe0a0aa3e7 (commit)
      from  cb14aec713ccab92d1c21d3d5b066570c4bca5ee (commit)


- Log -----------------------------------------------------------------
commit 17dd65e6e1f888b4561d559b4d44fbbe0a0aa3e7
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 24 15:10:15 2015 +0000

    Resolve swallowed returns codes
    
    The recent updates to libssl to enforce stricter return code checking, left
    a small number of instances behind where return codes were being swallowed
    (typically because the function they were being called from was declared as
    void). This commit fixes those instances to handle the return codes more
    appropriately.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 doc/ssl/ssl.pod |  8 +++++++-
 ssl/bio_ssl.c   |  3 ++-
 ssl/d1_pkt.c    |  3 +--
 ssl/ssl.h       |  2 +-
 ssl/ssl_lib.c   | 13 +++++++------
 ssl/ssl_locl.h  |  4 ++--
 ssl/t1_lib.c    | 13 ++++++-------
 7 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/doc/ssl/ssl.pod b/doc/ssl/ssl.pod
index 3634fa9..5af0fc6 100644
--- a/doc/ssl/ssl.pod
+++ b/doc/ssl/ssl.pod
@@ -453,7 +453,10 @@ connection defined in the B<SSL> structure.
 
 =item int B<SSL_connect>(SSL *ssl);
 
-=item void B<SSL_copy_session_id>(SSL *t, const SSL *f);
+=item int B<SSL_copy_session_id>(SSL *t, const SSL *f);
+
+Sets the session details for B<t> to be the same as in B<f>. Returns 1 on
+success or 0 on failure.
 
 =item long B<SSL_ctrl>(SSL *ssl, int cmd, long larg, char *parg);
 
@@ -756,5 +759,8 @@ The L<ssl(3)|ssl(3)> document appeared in OpenSSL 0.9.2
 B<SSLv2_client_method>, B<SSLv2_server_method> and B<SSLv2_method> where removed
 in OpenSSL 1.1.0.
 
+The return type of B<SSL_copy_session_id> was changed from void to int in
+OpenSSL 1.1.0.
+
 =cut
 
diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index 11a2aad..0344b7e 100644
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c
@@ -556,7 +556,8 @@ int BIO_ssl_copy_session_id(BIO *t, BIO *f)
     if ((((BIO_SSL *)t->ptr)->ssl == NULL) ||
         (((BIO_SSL *)f->ptr)->ssl == NULL))
         return (0);
-    SSL_copy_session_id(((BIO_SSL *)t->ptr)->ssl, ((BIO_SSL *)f->ptr)->ssl);
+    if(!SSL_copy_session_id(((BIO_SSL *)t->ptr)->ssl, ((BIO_SSL *)f->ptr)->ssl))
+        return 0;
     return (1);
 }
 
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index 5463acf..19e60b7 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -1249,8 +1249,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             if (dtls1_check_timeout_num(s) < 0)
                 return -1;
 
-            /* Ignore retransmit failures - swallow return code */
-            if(dtls1_retransmit_buffered_messages(s));
+            dtls1_retransmit_buffered_messages(s);
             rr->length = 0;
             goto start;
         }
diff --git a/ssl/ssl.h b/ssl/ssl.h
index c0a368b..55aa6a6 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1467,7 +1467,7 @@ __owur int SSL_SESSION_has_ticket(const SSL_SESSION *s);
 __owur unsigned long SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s);
 void SSL_SESSION_get0_ticket(const SSL_SESSION *s, unsigned char **tick,
                             size_t *len);
-void SSL_copy_session_id(SSL *to, const SSL *from);
+__owur int SSL_copy_session_id(SSL *to, const SSL *from);
 __owur X509 *SSL_SESSION_get0_peer(SSL_SESSION *s);
 __owur int SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned char *sid_ctx,
                                 unsigned int sid_ctx_len);
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 1e9ad91..0b2d8de 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -880,12 +880,11 @@ STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *s)
  * Now in theory, since the calling process own 't' it should be safe to
  * modify.  We need to be able to read f without being hassled
  */
-void SSL_copy_session_id(SSL *t, const SSL *f)
+int SSL_copy_session_id(SSL *t, const SSL *f)
 {
     /* Do we need to to SSL locking? */
     if(!SSL_set_session(t, SSL_get_session(f))) {
-        /* How do we handle this!! void function */
-        return;
+        return 0;
     }
 
     /*
@@ -901,9 +900,10 @@ void SSL_copy_session_id(SSL *t, const SSL *f)
     ssl_cert_free(t->cert);
     t->cert = f->cert;
     if(!SSL_set_session_id_context(t, f->sid_ctx, f->sid_ctx_length)) {
-        /* Really should do something about this..but void function - ignore */
-        ;
+        return 0;
     }
+
+    return 1;
 }
 
 /* Fix this so it checks all the valid key/cert options */
@@ -2757,7 +2757,8 @@ SSL *SSL_dup(SSL *s)
 
     if (s->session != NULL) {
         /* This copies session-id, SSL_METHOD, sid_ctx, and 'cert' */
-        SSL_copy_session_id(ret, s);
+        if(!SSL_copy_session_id(ret, s))
+            goto err;
     } else {
         /*
          * No session has been established yet, so we have to expect that
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 3b3f298..40c42a8 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -2215,7 +2215,7 @@ __owur int dtls1_buffer_message(SSL *s, int ccs);
 __owur int dtls1_retransmit_message(SSL *s, unsigned short seq,
                              unsigned long frag_off, int *found);
 __owur int dtls1_get_queue_priority(unsigned short seq, int is_ccs);
-__owur int dtls1_retransmit_buffered_messages(SSL *s);
+int dtls1_retransmit_buffered_messages(SSL *s);
 void dtls1_clear_record_buffer(SSL *s);
 void dtls1_get_message_header(unsigned char *data,
                               struct hm_header_st *msg_hdr);
@@ -2369,7 +2369,7 @@ void ssl_set_sig_mask(unsigned long *pmask_a, SSL *s, int op);
 
 __owur int tls1_set_sigalgs_list(CERT *c, const char *str, int client);
 __owur int tls1_set_sigalgs(CERT *c, const int *salg, size_t salglen, int client);
-__owur int tls1_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain,
+int tls1_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain,
                      int idx);
 void tls1_set_cert_validity(SSL *s);
 
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index b5eb4bf..40d6490 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -4157,13 +4157,12 @@ int tls1_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain,
 /* Set validity of certificates in an SSL structure */
 void tls1_set_cert_validity(SSL *s)
 {
-    /* Deliberately ignore all return values */
-    if(tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_RSA_ENC)
-       || tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_RSA_SIGN)
-       || tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_DSA_SIGN)
-       || tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_DH_RSA)
-       || tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_DH_DSA)
-       || tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_ECC));
+    tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_RSA_ENC);
+    tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_RSA_SIGN);
+    tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_DSA_SIGN);
+    tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_DH_RSA);
+    tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_DH_DSA);
+    tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_ECC);
 }
 
 /* User level utiity function to check a chain is suitable */

From rsalz at openssl.org  Wed Mar 25 22:35:52 2015
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 25 Mar 2015 22:35:52 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427322952.806694.21104.nullmailer@dev.openssl.org>

The branch master has been updated
       via  8fdc3734c063146b038608c2412a0f2c9b21b6d6 (commit)
      from  17dd65e6e1f888b4561d559b4d44fbbe0a0aa3e7 (commit)


- Log -----------------------------------------------------------------
commit 8fdc3734c063146b038608c2412a0f2c9b21b6d6
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Mar 25 18:35:24 2015 -0400

    free NULL cleanup.
    
    This gets EC_GROUP_clear_free EC_GROUP_free, EC_KEY_free,
    EC_POINT_clear_free, EC_POINT_free
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

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

Summary of changes:
 apps/ec.c                   |  3 +--
 apps/ecparam.c              |  3 +--
 apps/speed.c                |  9 +++------
 crypto/ec/ec2_mult.c        |  6 ++----
 crypto/ec/ec_ameth.c        | 12 ++++--------
 crypto/ec/ec_asn1.c         | 21 +++++++++-----------
 crypto/ec/ec_check.c        |  3 +--
 crypto/ec/ec_curve.c        |  3 +--
 crypto/ec/ec_key.c          | 26 +++++++++---------------
 crypto/ec/ec_lib.c          | 21 ++++++++------------
 crypto/ec/ec_mult.c         |  9 +++------
 crypto/ec/ec_pmeth.c        | 11 ++++-------
 crypto/ec/ec_print.c        |  2 +-
 crypto/ec/ecp_nistp224.c    |  6 ++----
 crypto/ec/ecp_nistp256.c    |  6 ++----
 crypto/ec/ecp_nistp521.c    |  6 ++----
 crypto/ec/ecp_nistz256.c    |  6 ++----
 crypto/ec/ectest.c          | 48 +++++++++++++++------------------------------
 crypto/ecdh/ecdhtest.c      | 18 ++++++-----------
 crypto/ecdh/ech_ossl.c      |  3 +--
 crypto/ecdsa/ecdsatest.c    | 12 ++++--------
 crypto/ecdsa/ecs_ossl.c     |  6 ++----
 doc/crypto/EC_GROUP_new.pod |  2 ++
 doc/crypto/EC_KEY_new.pod   |  1 +
 doc/crypto/EC_POINT_new.pod |  2 ++
 engines/ccgost/gost_ameth.c |  4 +---
 ssl/s3_clnt.c               | 15 +++++---------
 ssl/s3_lib.c                | 16 +++++----------
 ssl/s3_srvr.c               |  3 +--
 ssl/ssl_cert.c              |  6 ++----
 30 files changed, 103 insertions(+), 186 deletions(-)

diff --git a/apps/ec.c b/apps/ec.c
index 2064723..aca2854 100644
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -345,8 +345,7 @@ int MAIN(int argc, char **argv)
  end:
     BIO_free(in);
     BIO_free_all(out);
-    if (eckey)
-        EC_KEY_free(eckey);
+    EC_KEY_free(eckey);
     if (passin)
         OPENSSL_free(passin);
     if (passout)
diff --git a/apps/ecparam.c b/apps/ecparam.c
index d417747..c6a1751 100644
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -623,8 +623,7 @@ int MAIN(int argc, char **argv)
         OPENSSL_free(buffer);
     BIO_free(in);
     BIO_free_all(out);
-    if (group != NULL)
-        EC_GROUP_free(group);
+    EC_GROUP_free(group);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
diff --git a/apps/speed.c b/apps/speed.c
index d2034a4..df972a3 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -2457,13 +2457,10 @@ int MAIN(int argc, char **argv)
 
 #ifndef OPENSSL_NO_EC
     for (i = 0; i < EC_NUM; i++)
-        if (ecdsa[i] != NULL)
-            EC_KEY_free(ecdsa[i]);
+        EC_KEY_free(ecdsa[i]);
     for (i = 0; i < EC_NUM; i++) {
-        if (ecdh_a[i] != NULL)
-            EC_KEY_free(ecdh_a[i]);
-        if (ecdh_b[i] != NULL)
-            EC_KEY_free(ecdh_b[i]);
+        EC_KEY_free(ecdh_a[i]);
+        EC_KEY_free(ecdh_b[i]);
     }
 #endif
 
diff --git a/crypto/ec/ec2_mult.c b/crypto/ec/ec2_mult.c
index 1fa0a53..635c0a5 100644
--- a/crypto/ec/ec2_mult.c
+++ b/crypto/ec/ec2_mult.c
@@ -437,10 +437,8 @@ int ec_GF2m_simple_mul(const EC_GROUP *group, EC_POINT *r,
     ret = 1;
 
  err:
-    if (p)
-        EC_POINT_free(p);
-    if (acc)
-        EC_POINT_free(acc);
+    EC_POINT_free(p);
+    EC_POINT_free(acc);
     if (new_ctx != NULL)
         BN_CTX_free(new_ctx);
     return ret;
diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index de56c89..4be85a9 100644
--- a/crypto/ec/ec_ameth.c
+++ b/crypto/ec/ec_ameth.c
@@ -176,8 +176,7 @@ static EC_KEY *eckey_type2param(int ptype, void *pval)
     return eckey;
 
  ecerr:
-    if (eckey)
-        EC_KEY_free(eckey);
+    EC_KEY_free(eckey);
     return NULL;
 }
 
@@ -210,8 +209,7 @@ static int eckey_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
     return 1;
 
  ecerr:
-    if (eckey)
-        EC_KEY_free(eckey);
+    EC_KEY_free(eckey);
     return 0;
 }
 
@@ -292,8 +290,7 @@ static int eckey_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
  ecliberr:
     ECerr(EC_F_ECKEY_PRIV_DECODE, ERR_R_EC_LIB);
  ecerr:
-    if (eckey)
-        EC_KEY_free(eckey);
+    EC_KEY_free(eckey);
     return 0;
 }
 
@@ -706,8 +703,7 @@ static int ecdh_cms_set_peerkey(EVP_PKEY_CTX *pctx,
     if (EVP_PKEY_derive_set_peer(pctx, pkpeer) > 0)
         rv = 1;
  err:
-    if (ecpeer)
-        EC_KEY_free(ecpeer);
+    EC_KEY_free(ecpeer);
     if (pkpeer)
         EVP_PKEY_free(pkpeer);
     return rv;
diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index 90de23b..9bba26e 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -910,9 +910,9 @@ static EC_GROUP *ec_asn1_parameters2group(const ECPARAMETERS *params)
 
     ok = 1;
 
- err:if (!ok) {
-        if (ret)
-            EC_GROUP_clear_free(ret);
+ err:
+    if (!ok) {
+        EC_GROUP_clear_free(ret);
         ret = NULL;
     }
 
@@ -922,8 +922,7 @@ static EC_GROUP *ec_asn1_parameters2group(const ECPARAMETERS *params)
         BN_free(a);
     if (b)
         BN_free(b);
-    if (point)
-        EC_POINT_free(point);
+    EC_POINT_free(point);
     return (ret);
 }
 
@@ -982,10 +981,10 @@ EC_GROUP *d2i_ECPKParameters(EC_GROUP **a, const unsigned char **in, long len)
         return NULL;
     }
 
-    if (a && *a)
+    if (a) {
         EC_GROUP_clear_free(*a);
-    if (a)
         *a = group;
+    }
 
     ECPKPARAMETERS_free(params);
     return (group);
@@ -1030,8 +1029,7 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
         ret = *a;
 
     if (priv_key->parameters) {
-        if (ret->group)
-            EC_GROUP_clear_free(ret->group);
+        EC_GROUP_clear_free(ret->group);
         ret->group = ec_asn1_pkparameters2group(priv_key->parameters);
     }
 
@@ -1055,8 +1053,7 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
         goto err;
     }
 
-    if (ret->pub_key)
-        EC_POINT_clear_free(ret->pub_key);
+    EC_POINT_clear_free(ret->pub_key);
     ret->pub_key = EC_POINT_new(ret->group);
     if (ret->pub_key == NULL) {
         ECerr(EC_F_D2I_ECPRIVATEKEY, ERR_R_EC_LIB);
@@ -1098,7 +1095,7 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
     ok = 1;
  err:
     if (!ok) {
-        if (ret && (a == NULL || *a != ret))
+        if (a == NULL || *a != ret)
             EC_KEY_free(ret);
         ret = NULL;
     }
diff --git a/crypto/ec/ec_check.c b/crypto/ec/ec_check.c
index d3f5349..422ca87 100644
--- a/crypto/ec/ec_check.c
+++ b/crypto/ec/ec_check.c
@@ -114,7 +114,6 @@ int EC_GROUP_check(const EC_GROUP *group, BN_CTX *ctx)
         BN_CTX_end(ctx);
     if (new_ctx != NULL)
         BN_CTX_free(new_ctx);
-    if (point)
-        EC_POINT_free(point);
+    EC_POINT_free(point);
     return ret;
 }
diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c
index 6199e25..d79637d 100644
--- a/crypto/ec/ec_curve.c
+++ b/crypto/ec/ec_curve.c
@@ -3114,8 +3114,7 @@ static EC_GROUP *ec_group_new_from_data(const ec_list_element curve)
         EC_GROUP_free(group);
         group = NULL;
     }
-    if (P)
-        EC_POINT_free(P);
+    EC_POINT_free(P);
     if (ctx)
         BN_CTX_free(ctx);
     if (p)
diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index 96d4897..a74ccf7 100644
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -120,10 +120,8 @@ void EC_KEY_free(EC_KEY *r)
     }
 #endif
 
-    if (r->group != NULL)
-        EC_GROUP_free(r->group);
-    if (r->pub_key != NULL)
-        EC_POINT_free(r->pub_key);
+    EC_GROUP_free(r->group);
+    EC_POINT_free(r->pub_key);
     if (r->priv_key != NULL)
         BN_clear_free(r->priv_key);
 
@@ -146,8 +144,7 @@ EC_KEY *EC_KEY_copy(EC_KEY *dest, const EC_KEY *src)
     if (src->group) {
         const EC_METHOD *meth = EC_GROUP_method_of(src->group);
         /* clear the old group */
-        if (dest->group)
-            EC_GROUP_free(dest->group);
+        EC_GROUP_free(dest->group);
         dest->group = EC_GROUP_new(meth);
         if (dest->group == NULL)
             return NULL;
@@ -156,8 +153,7 @@ EC_KEY *EC_KEY_copy(EC_KEY *dest, const EC_KEY *src)
     }
     /*  copy the public key */
     if (src->pub_key && src->group) {
-        if (dest->pub_key)
-            EC_POINT_free(dest->pub_key);
+        EC_POINT_free(dest->pub_key);
         dest->pub_key = EC_POINT_new(src->group);
         if (dest->pub_key == NULL)
             return NULL;
@@ -274,7 +270,7 @@ int EC_KEY_generate_key(EC_KEY *eckey)
  err:
     if (order)
         BN_free(order);
-    if (pub_key != NULL && eckey->pub_key == NULL)
+    if (eckey->pub_key == NULL)
         EC_POINT_free(pub_key);
     if (priv_key != NULL && eckey->priv_key == NULL)
         BN_free(priv_key);
@@ -347,8 +343,7 @@ int EC_KEY_check_key(const EC_KEY *eckey)
  err:
     if (ctx != NULL)
         BN_CTX_free(ctx);
-    if (point != NULL)
-        EC_POINT_free(point);
+    EC_POINT_free(point);
     return (ok);
 }
 
@@ -422,8 +417,7 @@ int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x,
  err:
     if (ctx)
         BN_CTX_free(ctx);
-    if (point)
-        EC_POINT_free(point);
+    EC_POINT_free(point);
     return ok;
 
 }
@@ -435,8 +429,7 @@ const EC_GROUP *EC_KEY_get0_group(const EC_KEY *key)
 
 int EC_KEY_set_group(EC_KEY *key, const EC_GROUP *group)
 {
-    if (key->group != NULL)
-        EC_GROUP_free(key->group);
+    EC_GROUP_free(key->group);
     key->group = EC_GROUP_dup(group);
     return (key->group == NULL) ? 0 : 1;
 }
@@ -461,8 +454,7 @@ const EC_POINT *EC_KEY_get0_public_key(const EC_KEY *key)
 
 int EC_KEY_set_public_key(EC_KEY *key, const EC_POINT *pub_key)
 {
-    if (key->pub_key != NULL)
-        EC_POINT_free(key->pub_key);
+    EC_POINT_free(key->pub_key);
     key->pub_key = EC_POINT_dup(pub_key, key->group);
     return (key->pub_key == NULL) ? 0 : 1;
 }
diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c
index 2dcdb40..0e850d6 100644
--- a/crypto/ec/ec_lib.c
+++ b/crypto/ec/ec_lib.c
@@ -138,8 +138,7 @@ void EC_GROUP_free(EC_GROUP *group)
     if (group->mont_data)
         BN_MONT_CTX_free(group->mont_data);
 
-    if (group->generator != NULL)
-        EC_POINT_free(group->generator);
+    EC_POINT_free(group->generator);
     BN_free(group->order);
     BN_free(group->cofactor);
 
@@ -164,8 +163,7 @@ void EC_GROUP_clear_free(EC_GROUP *group)
     if (group->mont_data)
         BN_MONT_CTX_free(group->mont_data);
 
-    if (group->generator != NULL)
-        EC_POINT_clear_free(group->generator);
+    EC_POINT_clear_free(group->generator);
     BN_clear_free(group->order);
     BN_clear_free(group->cofactor);
 
@@ -232,10 +230,8 @@ int EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src)
             return 0;
     } else {
         /* src->generator == NULL */
-        if (dest->generator != NULL) {
-            EC_POINT_clear_free(dest->generator);
-            dest->generator = NULL;
-        }
+        EC_POINT_clear_free(dest->generator);
+        dest->generator = NULL;
     }
 
     if (!BN_copy(dest->order, src->order))
@@ -283,10 +279,9 @@ EC_GROUP *EC_GROUP_dup(const EC_GROUP *a)
 
  err:
     if (!ok) {
-        if (t)
-            EC_GROUP_free(t);
+        EC_GROUP_free(t);
         return NULL;
-    } else
+    }
         return t;
 }
 
@@ -790,8 +785,8 @@ EC_POINT *EC_POINT_dup(const EC_POINT *a, const EC_GROUP *group)
     if (!r) {
         EC_POINT_free(t);
         return NULL;
-    } else
-        return t;
+    }
+    return t;
 }
 
 const EC_METHOD *EC_POINT_method_of(const EC_POINT *point)
diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
index 16b37db..243b539 100644
--- a/crypto/ec/ec_mult.c
+++ b/crypto/ec/ec_mult.c
@@ -556,8 +556,7 @@ int ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
  err:
     if (new_ctx != NULL)
         BN_CTX_free(new_ctx);
-    if (tmp != NULL)
-        EC_POINT_free(tmp);
+    EC_POINT_free(tmp);
     if (wsize != NULL)
         OPENSSL_free(wsize);
     if (wNAF_len != NULL)
@@ -759,10 +758,8 @@ int ec_wNAF_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
             EC_POINT_free(*p);
         OPENSSL_free(points);
     }
-    if (tmp_point)
-        EC_POINT_free(tmp_point);
-    if (base)
-        EC_POINT_free(base);
+    EC_POINT_free(tmp_point);
+    EC_POINT_free(base);
     return ret;
 }
 
diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c
index 4eda2ef..37f8fa1 100644
--- a/crypto/ec/ec_pmeth.c
+++ b/crypto/ec/ec_pmeth.c
@@ -146,10 +146,8 @@ static void pkey_ec_cleanup(EVP_PKEY_CTX *ctx)
 {
     EC_PKEY_CTX *dctx = ctx->data;
     if (dctx) {
-        if (dctx->gen_group)
-            EC_GROUP_free(dctx->gen_group);
-        if (dctx->co_key)
-            EC_KEY_free(dctx->co_key);
+        EC_GROUP_free(dctx->gen_group);
+        EC_KEY_free(dctx->co_key);
         if (dctx->kdf_ukm)
             OPENSSL_free(dctx->kdf_ukm);
         OPENSSL_free(dctx);
@@ -289,8 +287,7 @@ static int pkey_ec_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
             ECerr(EC_F_PKEY_EC_CTRL, EC_R_INVALID_CURVE);
             return 0;
         }
-        if (dctx->gen_group)
-            EC_GROUP_free(dctx->gen_group);
+        EC_GROUP_free(dctx->gen_group);
         dctx->gen_group = group;
         return 1;
 
@@ -331,7 +328,7 @@ static int pkey_ec_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
                 EC_KEY_set_flags(dctx->co_key, EC_FLAG_COFACTOR_ECDH);
             else
                 EC_KEY_clear_flags(dctx->co_key, EC_FLAG_COFACTOR_ECDH);
-        } else if (dctx->co_key) {
+        } else {
             EC_KEY_free(dctx->co_key);
             dctx->co_key = NULL;
         }
diff --git a/crypto/ec/ec_print.c b/crypto/ec/ec_print.c
index 96b294d..7c34694 100644
--- a/crypto/ec/ec_print.c
+++ b/crypto/ec/ec_print.c
@@ -110,7 +110,7 @@ EC_POINT *EC_POINT_bn2point(const EC_GROUP *group,
         ret = point;
 
     if (!EC_POINT_oct2point(group, ret, buf, buf_len, ctx)) {
-        if (point == NULL)
+        if (ret != point)
             EC_POINT_clear_free(ret);
         OPENSSL_free(buf);
         return NULL;
diff --git a/crypto/ec/ecp_nistp224.c b/crypto/ec/ecp_nistp224.c
index a0c7bec..2f1213f 100644
--- a/crypto/ec/ecp_nistp224.c
+++ b/crypto/ec/ecp_nistp224.c
@@ -1602,8 +1602,7 @@ int ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
 
  err:
     BN_CTX_end(ctx);
-    if (generator != NULL)
-        EC_POINT_free(generator);
+    EC_POINT_free(generator);
     if (new_ctx != NULL)
         BN_CTX_free(new_ctx);
     if (secrets != NULL)
@@ -1739,8 +1738,7 @@ int ec_GFp_nistp224_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
     pre = NULL;
  err:
     BN_CTX_end(ctx);
-    if (generator != NULL)
-        EC_POINT_free(generator);
+    EC_POINT_free(generator);
     if (new_ctx != NULL)
         BN_CTX_free(new_ctx);
     if (pre)
diff --git a/crypto/ec/ecp_nistp256.c b/crypto/ec/ecp_nistp256.c
index d485a97..9ec0346 100644
--- a/crypto/ec/ecp_nistp256.c
+++ b/crypto/ec/ecp_nistp256.c
@@ -2193,8 +2193,7 @@ int ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
 
  err:
     BN_CTX_end(ctx);
-    if (generator != NULL)
-        EC_POINT_free(generator);
+    EC_POINT_free(generator);
     if (new_ctx != NULL)
         BN_CTX_free(new_ctx);
     if (secrets != NULL)
@@ -2340,8 +2339,7 @@ int ec_GFp_nistp256_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
     pre = NULL;
  err:
     BN_CTX_end(ctx);
-    if (generator != NULL)
-        EC_POINT_free(generator);
+    EC_POINT_free(generator);
     if (new_ctx != NULL)
         BN_CTX_free(new_ctx);
     if (pre)
diff --git a/crypto/ec/ecp_nistp521.c b/crypto/ec/ecp_nistp521.c
index 360b9a3..c8f9d1e 100644
--- a/crypto/ec/ecp_nistp521.c
+++ b/crypto/ec/ecp_nistp521.c
@@ -2006,8 +2006,7 @@ int ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
 
  err:
     BN_CTX_end(ctx);
-    if (generator != NULL)
-        EC_POINT_free(generator);
+    EC_POINT_free(generator);
     if (new_ctx != NULL)
         BN_CTX_free(new_ctx);
     if (secrets != NULL)
@@ -2123,8 +2122,7 @@ int ec_GFp_nistp521_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
     pre = NULL;
  err:
     BN_CTX_end(ctx);
-    if (generator != NULL)
-        EC_POINT_free(generator);
+    EC_POINT_free(generator);
     if (new_ctx != NULL)
         BN_CTX_free(new_ctx);
     if (pre)
diff --git a/crypto/ec/ecp_nistz256.c b/crypto/ec/ecp_nistz256.c
index 0370ae6..ea692b8 100644
--- a/crypto/ec/ecp_nistz256.c
+++ b/crypto/ec/ecp_nistz256.c
@@ -874,10 +874,8 @@ static int ecp_nistz256_mult_precompute(EC_GROUP *group, BN_CTX *ctx)
         ecp_nistz256_pre_comp_free(pre_comp);
     if (precomp_storage)
         OPENSSL_free(precomp_storage);
-    if (P)
-        EC_POINT_free(P);
-    if (T)
-        EC_POINT_free(T);
+    EC_POINT_free(P);
+    EC_POINT_free(T);
     return ret;
 }
 
diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c
index 2290c8e..79ec21f 100644
--- a/crypto/ec/ectest.c
+++ b/crypto/ec/ectest.c
@@ -864,18 +864,12 @@ static void prime_field_tests(void)
     BN_free(y);
     BN_free(z);
 
-    if (P_160)
-        EC_GROUP_free(P_160);
-    if (P_192)
-        EC_GROUP_free(P_192);
-    if (P_224)
-        EC_GROUP_free(P_224);
-    if (P_256)
-        EC_GROUP_free(P_256);
-    if (P_384)
-        EC_GROUP_free(P_384);
-    if (P_521)
-        EC_GROUP_free(P_521);
+    EC_GROUP_free(P_160);
+    EC_GROUP_free(P_192);
+    EC_GROUP_free(P_224);
+    EC_GROUP_free(P_256);
+    EC_GROUP_free(P_384);
+    EC_GROUP_free(P_521);
 
 }
 
@@ -1346,26 +1340,16 @@ static void char2_field_tests(void)
     BN_free(z);
     BN_free(cof);
 
-    if (C2_K163)
-        EC_GROUP_free(C2_K163);
-    if (C2_B163)
-        EC_GROUP_free(C2_B163);
-    if (C2_K233)
-        EC_GROUP_free(C2_K233);
-    if (C2_B233)
-        EC_GROUP_free(C2_B233);
-    if (C2_K283)
-        EC_GROUP_free(C2_K283);
-    if (C2_B283)
-        EC_GROUP_free(C2_B283);
-    if (C2_K409)
-        EC_GROUP_free(C2_K409);
-    if (C2_B409)
-        EC_GROUP_free(C2_B409);
-    if (C2_K571)
-        EC_GROUP_free(C2_K571);
-    if (C2_B571)
-        EC_GROUP_free(C2_B571);
+    EC_GROUP_free(C2_K163);
+    EC_GROUP_free(C2_B163);
+    EC_GROUP_free(C2_K233);
+    EC_GROUP_free(C2_B233);
+    EC_GROUP_free(C2_K283);
+    EC_GROUP_free(C2_B283);
+    EC_GROUP_free(C2_K409);
+    EC_GROUP_free(C2_B409);
+    EC_GROUP_free(C2_K571);
+    EC_GROUP_free(C2_B571);
 
 }
 # endif
diff --git a/crypto/ecdh/ecdhtest.c b/crypto/ecdh/ecdhtest.c
index 578de31..a89177e 100644
--- a/crypto/ecdh/ecdhtest.c
+++ b/crypto/ecdh/ecdhtest.c
@@ -290,10 +290,8 @@ static int test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
         BN_free(x_b);
     if (y_b)
         BN_free(y_b);
-    if (b)
-        EC_KEY_free(b);
-    if (a)
-        EC_KEY_free(a);
+    EC_KEY_free(b);
+    EC_KEY_free(a);
     return (ret);
 }
 
@@ -394,12 +392,10 @@ static EC_KEY *mk_eckey(int nid, const unsigned char *p, size_t plen)
  err:
     if (priv)
         BN_clear_free(priv);
-    if (pub)
-        EC_POINT_free(pub);
+    EC_POINT_free(pub);
     if (ok)
         return k;
-    else if (k)
-        EC_KEY_free(k);
+    EC_KEY_free(k);
     return NULL;
 }
 
@@ -440,10 +436,8 @@ static int ecdh_kat(BIO *out, const char *cname, int nid,
         goto err;
     rv = 1;
  err:
-    if (key1)
-        EC_KEY_free(key1);
-    if (key2)
-        EC_KEY_free(key2);
+    EC_KEY_free(key1);
+    EC_KEY_free(key2);
     if (Ztmp)
         OPENSSL_free(Ztmp);
     if (rv)
diff --git a/crypto/ecdh/ech_ossl.c b/crypto/ecdh/ech_ossl.c
index 278c41b..b8ccf5a 100644
--- a/crypto/ecdh/ech_ossl.c
+++ b/crypto/ecdh/ech_ossl.c
@@ -202,8 +202,7 @@ static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
     }
 
  err:
-    if (tmp)
-        EC_POINT_free(tmp);
+    EC_POINT_free(tmp);
     if (ctx)
         BN_CTX_end(ctx);
     if (ctx)
diff --git a/crypto/ecdsa/ecdsatest.c b/crypto/ecdsa/ecdsatest.c
index 346ccd0..3a455b4 100644
--- a/crypto/ecdsa/ecdsatest.c
+++ b/crypto/ecdsa/ecdsatest.c
@@ -240,8 +240,7 @@ int x9_62_test_internal(BIO *out, int nid, const char *r_in, const char *s_in)
  x962_int_err:
     if (!ret)
         BIO_printf(out, " failed\n");
-    if (key)
-        EC_KEY_free(key);
+    EC_KEY_free(key);
     if (signature)
         ECDSA_SIG_free(signature);
     if (r)
@@ -354,9 +353,8 @@ int test_builtin(BIO *out)
             goto builtin_err;
         EC_GROUP_free(group);
         degree = EC_GROUP_get_degree(EC_KEY_get0_group(eckey));
-        if (degree < 160)
+        if (degree < 160) {
             /* drop the curve */
-        {
             EC_KEY_free(eckey);
             eckey = NULL;
             continue;
@@ -506,10 +504,8 @@ int test_builtin(BIO *out)
 
     ret = 1;
  builtin_err:
-    if (eckey)
-        EC_KEY_free(eckey);
-    if (wrong_eckey)
-        EC_KEY_free(wrong_eckey);
+    EC_KEY_free(eckey);
+    EC_KEY_free(wrong_eckey);
     if (ecdsa_sig)
         ECDSA_SIG_free(ecdsa_sig);
     if (signature)
diff --git a/crypto/ecdsa/ecs_ossl.c b/crypto/ecdsa/ecs_ossl.c
index 1343850..ce2973d 100644
--- a/crypto/ecdsa/ecs_ossl.c
+++ b/crypto/ecdsa/ecs_ossl.c
@@ -242,8 +242,7 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in,
         BN_CTX_free(ctx);
     if (order != NULL)
         BN_free(order);
-    if (tmp_point != NULL)
-        EC_POINT_free(tmp_point);
+    EC_POINT_free(tmp_point);
     if (X)
         BN_clear_free(X);
     return (ret);
@@ -475,7 +474,6 @@ static int ecdsa_do_verify(const unsigned char *dgst, int dgst_len,
  err:
     BN_CTX_end(ctx);
     BN_CTX_free(ctx);
-    if (point)
-        EC_POINT_free(point);
+    EC_POINT_free(point);
     return ret;
 }
diff --git a/doc/crypto/EC_GROUP_new.pod b/doc/crypto/EC_GROUP_new.pod
index ff55bf3..44599e2 100644
--- a/doc/crypto/EC_GROUP_new.pod
+++ b/doc/crypto/EC_GROUP_new.pod
@@ -75,8 +75,10 @@ In order to construct a builtin curve use the function EC_GROUP_new_by_curve_nam
 be constructed.
 
 EC_GROUP_free frees the memory associated with the EC_GROUP.
+If B<group> is NULL nothing is done.
 
 EC_GROUP_clear_free destroys any sensitive data held within the EC_GROUP and then frees its memory.
+If B<group> is NULL nothing is done.
 
 =head1 RETURN VALUES
 
diff --git a/doc/crypto/EC_KEY_new.pod b/doc/crypto/EC_KEY_new.pod
index e859689..c737058 100644
--- a/doc/crypto/EC_KEY_new.pod
+++ b/doc/crypto/EC_KEY_new.pod
@@ -47,6 +47,7 @@ EC_GROUP_new_by_curve_name.
 
 Calling EC_KEY_free decrements the reference count for the EC_KEY object, and if it has dropped to zero then frees the memory associated
 with it.
+If B<key> is NULL nothing is done.
 
 EC_KEY_copy copies the contents of the EC_KEY in B<src> into B<dest>.
 
diff --git a/doc/crypto/EC_POINT_new.pod b/doc/crypto/EC_POINT_new.pod
index 858baf4..0a20fce 100644
--- a/doc/crypto/EC_POINT_new.pod
+++ b/doc/crypto/EC_POINT_new.pod
@@ -53,8 +53,10 @@ An EC_POINT represents a point on a curve. A new point is constructed by calling
 object that the point relates to.
 
 EC_POINT_free frees the memory associated with the EC_POINT.
+if B<point> is NULL nothing is done.
 
 EC_POINT_clear_free destroys any sensitive data held within the EC_POINT and then frees its memory.
+if B<point> is NULL nothing is done.
 
 EC_POINT_copy copies the point B<src> into B<dst>. Both B<src> and B<dst> must use the same EC_METHOD.
 
diff --git a/engines/ccgost/gost_ameth.c b/engines/ccgost/gost_ameth.c
index bc45325..c5ca44f 100644
--- a/engines/ccgost/gost_ameth.c
+++ b/engines/ccgost/gost_ameth.c
@@ -284,9 +284,7 @@ static void pkey_free_gost94(EVP_PKEY *key)
 
 static void pkey_free_gost01(EVP_PKEY *key)
 {
-    if (key->pkey.ec) {
-        EC_KEY_free(key->pkey.ec);
-    }
+    EC_KEY_free(key->pkey.ec);
 }
 
 /* ------------------ private key functions  -----------------------------*/
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index bab95f3..6da1258 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1388,10 +1388,8 @@ int ssl3_get_key_exchange(SSL *s)
         s->session->sess_cert->peer_dh_tmp = NULL;
 #endif
 #ifndef OPENSSL_NO_EC
-        if (s->session->sess_cert->peer_ecdh_tmp) {
-            EC_KEY_free(s->session->sess_cert->peer_ecdh_tmp);
-            s->session->sess_cert->peer_ecdh_tmp = NULL;
-        }
+        EC_KEY_free(s->session->sess_cert->peer_ecdh_tmp);
+        s->session->sess_cert->peer_ecdh_tmp = NULL;
 #endif
     } else {
         s->session->sess_cert = ssl_sess_cert_new();
@@ -1959,8 +1957,7 @@ int ssl3_get_key_exchange(SSL *s)
 #ifndef OPENSSL_NO_EC
     BN_CTX_free(bn_ctx);
     EC_POINT_free(srvr_ecpoint);
-    if (ecdh != NULL)
-        EC_KEY_free(ecdh);
+    EC_KEY_free(ecdh);
 #endif
     EVP_MD_CTX_cleanup(&md_ctx);
     return (-1);
@@ -2760,8 +2757,7 @@ int ssl3_send_client_key_exchange(SSL *s)
             BN_CTX_free(bn_ctx);
             if (encodedPoint != NULL)
                 OPENSSL_free(encodedPoint);
-            if (clnt_ecdh != NULL)
-                EC_KEY_free(clnt_ecdh);
+            EC_KEY_free(clnt_ecdh);
             EVP_PKEY_free(srvr_pub_pkey);
         }
 #endif                          /* !OPENSSL_NO_EC */
@@ -3069,8 +3065,7 @@ int ssl3_send_client_key_exchange(SSL *s)
     BN_CTX_free(bn_ctx);
     if (encodedPoint != NULL)
         OPENSSL_free(encodedPoint);
-    if (clnt_ecdh != NULL)
-        EC_KEY_free(clnt_ecdh);
+    EC_KEY_free(clnt_ecdh);
     EVP_PKEY_free(srvr_pub_pkey);
 #endif
     return (-1);
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index bed4a4e..69f3d5d 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3141,8 +3141,7 @@ void ssl3_free(SSL *s)
     DH_free(s->s3->tmp.dh);
 #endif
 #ifndef OPENSSL_NO_EC
-    if (s->s3->tmp.ecdh != NULL)
-        EC_KEY_free(s->s3->tmp.ecdh);
+    EC_KEY_free(s->s3->tmp.ecdh);
 #endif
 
     if (s->s3->tmp.ca_names != NULL)
@@ -3182,10 +3181,8 @@ void ssl3_clear(SSL *s)
     s->s3->tmp.dh = NULL;
 #endif
 #ifndef OPENSSL_NO_EC
-    if (s->s3->tmp.ecdh != NULL) {
-        EC_KEY_free(s->s3->tmp.ecdh);
-        s->s3->tmp.ecdh = NULL;
-    }
+    EC_KEY_free(s->s3->tmp.ecdh);
+    s->s3->tmp.ecdh = NULL;
 #endif
 #ifndef OPENSSL_NO_TLSEXT
 # ifndef OPENSSL_NO_EC
@@ -3356,8 +3353,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
                     return (ret);
                 }
             }
-            if (s->cert->ecdh_tmp != NULL)
-                EC_KEY_free(s->cert->ecdh_tmp);
+            EC_KEY_free(s->cert->ecdh_tmp);
             s->cert->ecdh_tmp = ecdh;
             ret = 1;
         }
@@ -3829,9 +3825,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
                 }
             }
 
-            if (cert->ecdh_tmp != NULL) {
-                EC_KEY_free(cert->ecdh_tmp);
-            }
+            EC_KEY_free(cert->ecdh_tmp);
             cert->ecdh_tmp = ecdh;
             return 1;
         }
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 05dc439..68a8c81 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -2886,8 +2886,7 @@ int ssl3_get_client_key_exchange(SSL *s)
 #ifndef OPENSSL_NO_EC
     EVP_PKEY_free(clnt_pub_pkey);
     EC_POINT_free(clnt_ecpoint);
-    if (srvr_ecdh != NULL)
-        EC_KEY_free(srvr_ecdh);
+    EC_KEY_free(srvr_ecdh);
     BN_CTX_free(bn_ctx);
 #endif
     return (-1);
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index 367f7a9..f05a60a 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -449,8 +449,7 @@ void ssl_cert_free(CERT *c)
     DH_free(c->dh_tmp);
 #endif
 #ifndef OPENSSL_NO_EC
-    if (c->ecdh_tmp)
-        EC_KEY_free(c->ecdh_tmp);
+    EC_KEY_free(c->ecdh_tmp);
 #endif
 
     ssl_cert_clear_certs(c);
@@ -655,8 +654,7 @@ void ssl_sess_cert_free(SESS_CERT *sc)
     DH_free(sc->peer_dh_tmp);
 #endif
 #ifndef OPENSSL_NO_EC
-    if (sc->peer_ecdh_tmp != NULL)
-        EC_KEY_free(sc->peer_ecdh_tmp);
+    EC_KEY_free(sc->peer_ecdh_tmp);
 #endif
 
     OPENSSL_free(sc);

From steve at openssl.org  Thu Mar 26 00:44:37 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Thu, 26 Mar 2015 00:44:37 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427330677.966883.21872.nullmailer@dev.openssl.org>

The branch master has been updated
       via  8e3f0c988fabf60b65f7109b7f47daec0fde9c39 (commit)
       via  c315a547e62fc8f1bdc3e9d57138871117dca6f7 (commit)
      from  8fdc3734c063146b038608c2412a0f2c9b21b6d6 (commit)


- Log -----------------------------------------------------------------
commit 8e3f0c988fabf60b65f7109b7f47daec0fde9c39
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Mar 25 22:21:39 2015 +0000

    update ordinals
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit c315a547e62fc8f1bdc3e9d57138871117dca6f7
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Mar 25 22:02:42 2015 +0000

    Move more internal only functions to asn1_locl.h
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/asn1/a_bitstr.c  |  1 +
 crypto/asn1/a_int.c     |  1 +
 crypto/asn1/a_object.c  |  1 +
 crypto/asn1/a_type.c    |  3 ++-
 crypto/asn1/asn1.h      |  8 --------
 crypto/asn1/asn1_locl.h | 12 ++++++++++++
 crypto/asn1/asn1t.h     |  8 --------
 crypto/asn1/tasn_dec.c  | 21 ++++++---------------
 crypto/asn1/tasn_enc.c  |  6 ------
 crypto/asn1/tasn_fre.c  | 16 ++++++++--------
 crypto/asn1/tasn_new.c  | 14 ++++++++------
 util/libeay.num         | 22 +++++++++++-----------
 12 files changed, 50 insertions(+), 63 deletions(-)

diff --git a/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c
index 4078be4..24cdb0f 100644
--- a/crypto/asn1/a_bitstr.c
+++ b/crypto/asn1/a_bitstr.c
@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/asn1.h>
+#include "asn1_locl.h"
 
 int ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len)
 {
diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c
index 65fac75..f7f90ff 100644
--- a/crypto/asn1/a_int.c
+++ b/crypto/asn1/a_int.c
@@ -60,6 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/asn1.h>
 #include <openssl/bn.h>
+#include "asn1_locl.h"
 
 ASN1_INTEGER *ASN1_INTEGER_dup(const ASN1_INTEGER *x)
 {
diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c
index ddc3aaf..845413c 100644
--- a/crypto/asn1/a_object.c
+++ b/crypto/asn1/a_object.c
@@ -64,6 +64,7 @@
 #include <openssl/objects.h>
 #include <openssl/bn.h>
 #include "internal/asn1_int.h"
+#include "asn1_locl.h"
 
 int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp)
 {
diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c
index e7ec49d..d52ed46 100644
--- a/crypto/asn1/a_type.c
+++ b/crypto/asn1/a_type.c
@@ -60,6 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/asn1t.h>
 #include <openssl/objects.h>
+#include "asn1_locl.h"
 
 int ASN1_TYPE_get(ASN1_TYPE *a)
 {
@@ -73,7 +74,7 @@ void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value)
 {
     if (a->value.ptr != NULL) {
         ASN1_TYPE **tmp_a = &a;
-        ASN1_primitive_free((ASN1_VALUE **)tmp_a, NULL);
+        asn1_primitive_free((ASN1_VALUE **)tmp_a, NULL);
     }
     a->type = type;
     if (type == V_ASN1_BOOLEAN)
diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index a00c08a..0cf5c46 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -595,8 +595,6 @@ int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b);
 ASN1_OBJECT *ASN1_OBJECT_new(void);
 void ASN1_OBJECT_free(ASN1_OBJECT *a);
 int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp);
-ASN1_OBJECT *c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
-                             long length);
 ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
                              long length);
 
@@ -623,9 +621,6 @@ int ASN1_STRING_type(ASN1_STRING *x);
 unsigned char *ASN1_STRING_data(ASN1_STRING *x);
 
 DECLARE_ASN1_FUNCTIONS(ASN1_BIT_STRING)
-int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp);
-ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
-                                     const unsigned char **pp, long length);
 int ASN1_BIT_STRING_set(ASN1_BIT_STRING *a, unsigned char *d, int length);
 int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value);
 int ASN1_BIT_STRING_get_bit(const ASN1_BIT_STRING *a, int n);
@@ -639,9 +634,6 @@ int ASN1_BIT_STRING_set_asc(ASN1_BIT_STRING *bs, char *name, int value,
                             BIT_STRING_BITNAME *tbl);
 
 DECLARE_ASN1_FUNCTIONS(ASN1_INTEGER)
-int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp);
-ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,
-                               long length);
 ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
                                 long length);
 ASN1_INTEGER *ASN1_INTEGER_dup(const ASN1_INTEGER *x);
diff --git a/crypto/asn1/asn1_locl.h b/crypto/asn1/asn1_locl.h
index 79d76ec..aa10bea 100644
--- a/crypto/asn1/asn1_locl.h
+++ b/crypto/asn1/asn1_locl.h
@@ -127,3 +127,15 @@ int asn1_enc_restore(int *len, unsigned char **out, ASN1_VALUE **pval,
                      const ASN1_ITEM *it);
 int asn1_enc_save(ASN1_VALUE **pval, const unsigned char *in, int inlen,
                   const ASN1_ITEM *it);
+
+void asn1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
+void asn1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
+
+ASN1_OBJECT *c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
+                             long length);
+int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp);
+ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
+                                     const unsigned char **pp, long length);
+int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp);
+ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,
+                               long length);
diff --git a/crypto/asn1/asn1t.h b/crypto/asn1/asn1t.h
index e6f6d79..c54d3d4 100644
--- a/crypto/asn1/asn1t.h
+++ b/crypto/asn1/asn1t.h
@@ -894,21 +894,13 @@ DECLARE_STACK_OF(ASN1_VALUE)
 
 int ASN1_item_ex_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
 void ASN1_item_ex_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
-int ASN1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
-int ASN1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
 
-void ASN1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
-int ASN1_template_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
-                      const ASN1_TEMPLATE *tt);
 int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
                      const ASN1_ITEM *it, int tag, int aclass, char opt,
                      ASN1_TLC *ctx);
 
 int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                      const ASN1_ITEM *it, int tag, int aclass);
-int ASN1_template_i2d(ASN1_VALUE **pval, unsigned char **out,
-                      const ASN1_TEMPLATE *tt);
-void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
 
 #ifdef  __cplusplus
 }
diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index 5111c12..531fad9 100644
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -149,15 +149,6 @@ ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **pval,
     return NULL;
 }
 
-int ASN1_template_d2i(ASN1_VALUE **pval,
-                      const unsigned char **in, long len,
-                      const ASN1_TEMPLATE *tt)
-{
-    ASN1_TLC c;
-    asn1_tlc_clear_nc(&c);
-    return asn1_template_ex_d2i(pval, in, len, tt, 0, &c);
-}
-
 /*
  * Decode an item, taking care of IMPLICIT tagging, if any. If 'opt' set and
  * tag mismatch return -1 to handle OPTIONAL
@@ -248,7 +239,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
             if ((i >= 0) && (i < it->tcount)) {
                 tt = it->templates + i;
                 pchptr = asn1_get_field_ptr(pval, tt);
-                ASN1_template_free(pchptr, tt);
+                asn1_template_free(pchptr, tt);
                 asn1_set_choice_selector(pval, -1, it);
             }
         } else if (!ASN1_item_ex_new(pval, it)) {
@@ -338,7 +329,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
                 ASN1_VALUE **pseqval;
                 seqtt = asn1_do_adb(pval, tt, 1);
                 pseqval = asn1_get_field_ptr(pval, seqtt);
-                ASN1_template_free(pseqval, seqtt);
+                asn1_template_free(pseqval, seqtt);
             }
         }
 
@@ -386,7 +377,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
                 /*
                  * OPTIONAL component absent. Free and zero the field.
                  */
-                ASN1_template_free(pseqval, seqtt);
+                asn1_template_free(pseqval, seqtt);
                 continue;
             }
             /* Update length */
@@ -417,7 +408,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
             if (seqtt->flags & ASN1_TFLG_OPTIONAL) {
                 ASN1_VALUE **pseqval;
                 pseqval = asn1_get_field_ptr(pval, seqtt);
-                ASN1_template_free(pseqval, seqtt);
+                asn1_template_free(pseqval, seqtt);
             } else {
                 errtt = seqtt;
                 ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ASN1_R_FIELD_MISSING);
@@ -520,7 +511,7 @@ static int asn1_template_ex_d2i(ASN1_VALUE **val,
     return 1;
 
  err:
-    ASN1_template_free(val, tt);
+    asn1_template_free(val, tt);
     return 0;
 }
 
@@ -639,7 +630,7 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val,
     return 1;
 
  err:
-    ASN1_template_free(val, tt);
+    asn1_template_free(val, tt);
     return 0;
 }
 
diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c
index 251a8f1..d758861 100644
--- a/crypto/asn1/tasn_enc.c
+++ b/crypto/asn1/tasn_enc.c
@@ -238,12 +238,6 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
     return 0;
 }
 
-int ASN1_template_i2d(ASN1_VALUE **pval, unsigned char **out,
-                      const ASN1_TEMPLATE *tt)
-{
-    return asn1_template_ex_i2d(pval, out, tt, -1, 0);
-}
-
 static int asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                                 const ASN1_TEMPLATE *tt, int tag, int iclass)
 {
diff --git a/crypto/asn1/tasn_fre.c b/crypto/asn1/tasn_fre.c
index 6f62fd4..fd9f046 100644
--- a/crypto/asn1/tasn_fre.c
+++ b/crypto/asn1/tasn_fre.c
@@ -100,13 +100,13 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,
 
     case ASN1_ITYPE_PRIMITIVE:
         if (it->templates)
-            ASN1_template_free(pval, it->templates);
+            asn1_template_free(pval, it->templates);
         else
-            ASN1_primitive_free(pval, it);
+            asn1_primitive_free(pval, it);
         break;
 
     case ASN1_ITYPE_MSTRING:
-        ASN1_primitive_free(pval, it);
+        asn1_primitive_free(pval, it);
         break;
 
     case ASN1_ITYPE_CHOICE:
@@ -121,7 +121,7 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,
 
             tt = it->templates + i;
             pchval = asn1_get_field_ptr(pval, tt);
-            ASN1_template_free(pchval, tt);
+            asn1_template_free(pchval, tt);
         }
         if (asn1_cb)
             asn1_cb(ASN1_OP_FREE_POST, pval, it, NULL);
@@ -159,7 +159,7 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,
             if (!seqtt)
                 continue;
             pseqval = asn1_get_field_ptr(pval, seqtt);
-            ASN1_template_free(pseqval, seqtt);
+            asn1_template_free(pseqval, seqtt);
         }
         if (asn1_cb)
             asn1_cb(ASN1_OP_FREE_POST, pval, it, NULL);
@@ -171,7 +171,7 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,
     }
 }
 
-void ASN1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
+void asn1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
 {
     if (tt->flags & ASN1_TFLG_SK_MASK) {
         STACK_OF(ASN1_VALUE) *sk = (STACK_OF(ASN1_VALUE) *)*pval;
@@ -190,7 +190,7 @@ void ASN1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
     }
 }
 
-void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
+void asn1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
     int utype;
 
@@ -238,7 +238,7 @@ void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
         break;
 
     case V_ASN1_ANY:
-        ASN1_primitive_free(pval, NULL);
+        asn1_primitive_free(pval, NULL);
         OPENSSL_free(*pval);
         break;
 
diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c
index 996a4d5..b1f4da2 100644
--- a/crypto/asn1/tasn_new.c
+++ b/crypto/asn1/tasn_new.c
@@ -67,7 +67,9 @@
 
 static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
                                     int combine);
+static int asn1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
 static void asn1_item_clear(ASN1_VALUE **pval, const ASN1_ITEM *it);
+static int asn1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
 static void asn1_template_clear(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
 static void asn1_primitive_clear(ASN1_VALUE **pval, const ASN1_ITEM *it);
 
@@ -120,14 +122,14 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
 
     case ASN1_ITYPE_PRIMITIVE:
         if (it->templates) {
-            if (!ASN1_template_new(pval, it->templates))
+            if (!asn1_template_new(pval, it->templates))
                 goto memerr;
-        } else if (!ASN1_primitive_new(pval, it))
+        } else if (!asn1_primitive_new(pval, it))
             goto memerr;
         break;
 
     case ASN1_ITYPE_MSTRING:
-        if (!ASN1_primitive_new(pval, it))
+        if (!asn1_primitive_new(pval, it))
             goto memerr;
         break;
 
@@ -179,7 +181,7 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
         }
         for (i = 0, tt = it->templates; i < it->tcount; tt++, i++) {
             pseqval = asn1_get_field_ptr(pval, tt);
-            if (!ASN1_template_new(pseqval, tt))
+            if (!asn1_template_new(pseqval, tt))
                 goto memerr;
         }
         if (asn1_cb && !asn1_cb(ASN1_OP_NEW_POST, pval, it, NULL))
@@ -244,7 +246,7 @@ static void asn1_item_clear(ASN1_VALUE **pval, const ASN1_ITEM *it)
     }
 }
 
-int ASN1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
+static int asn1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
 {
     const ASN1_ITEM *it = ASN1_ITEM_ptr(tt->item);
     int ret;
@@ -299,7 +301,7 @@ static void asn1_template_clear(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
  * all the old functions.
  */
 
-int ASN1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
+static int asn1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
     ASN1_TYPE *typ;
     ASN1_STRING *str;
diff --git a/util/libeay.num b/util/libeay.num
index bfea39f..b848411 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1837,14 +1837,14 @@ CRYPTO_get_dynlock_destroy_cb           2418	EXIST:VMS:FUNCTION:
 CRYPTO_get_dynlock_value                2419	EXIST::FUNCTION:
 CRYPTO_get_dynlock_create_callback      2420	EXIST:!VMS:FUNCTION:
 CRYPTO_get_dynlock_create_cb            2420	EXIST:VMS:FUNCTION:
-c2i_ASN1_BIT_STRING                     2421	EXIST::FUNCTION:
-i2c_ASN1_BIT_STRING                     2422	EXIST::FUNCTION:
+c2i_ASN1_BIT_STRING                     2421	NOEXIST::FUNCTION:
+i2c_ASN1_BIT_STRING                     2422	NOEXIST::FUNCTION:
 RAND_poll                               2423	EXIST::FUNCTION:
-c2i_ASN1_INTEGER                        2424	EXIST::FUNCTION:
-i2c_ASN1_INTEGER                        2425	EXIST::FUNCTION:
+c2i_ASN1_INTEGER                        2424	NOEXIST::FUNCTION:
+i2c_ASN1_INTEGER                        2425	NOEXIST::FUNCTION:
 BIO_dump_indent                         2426	EXIST::FUNCTION:
 ASN1_parse_dump                         2427	EXIST::FUNCTION:
-c2i_ASN1_OBJECT                         2428	EXIST::FUNCTION:
+c2i_ASN1_OBJECT                         2428	NOEXIST::FUNCTION:
 X509_NAME_print_ex_fp                   2429	EXIST::FUNCTION:STDIO
 ASN1_STRING_print_ex_fp                 2430	EXIST::FUNCTION:STDIO
 X509_NAME_print_ex                      2431	EXIST::FUNCTION:
@@ -2012,7 +2012,7 @@ UI_ctrl                                 2580	EXIST::FUNCTION:
 _shadow_DES_rw_mode                     2581	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:DES
 _shadow_DES_rw_mode                     2581	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:DES
 asn1_do_adb                             2582	NOEXIST::FUNCTION:
-ASN1_template_i2d                       2583	EXIST::FUNCTION:
+ASN1_template_i2d                       2583	NOEXIST::FUNCTION:
 ENGINE_register_DH                      2584	EXIST::FUNCTION:ENGINE
 UI_construct_prompt                     2585	EXIST::FUNCTION:
 X509_STORE_set_trust                    2586	EXIST::FUNCTION:
@@ -2349,7 +2349,7 @@ ENGINE_get_ex_data                      2856	EXIST::FUNCTION:ENGINE
 UI_destroy_method                       2857	EXIST::FUNCTION:
 ASN1_item_i2d_bio                       2858	EXIST::FUNCTION:
 OCSP_ONEREQ_get_ext_by_OBJ              2859	EXIST::FUNCTION:
-ASN1_primitive_new                      2860	EXIST::FUNCTION:
+ASN1_primitive_new                      2860	NOEXIST::FUNCTION:
 ASN1_PRINTABLE_it                       2861	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_PRINTABLE_it                       2861	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 EVP_aes_192_ecb                         2862	EXIST::FUNCTION:AES
@@ -2482,7 +2482,7 @@ OCSP_check_validity                     2971	EXIST::FUNCTION:
 PKCS12_BAGS_it                          2972	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS12_BAGS_it                          2972	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 OCSP_url_svcloc_new                     2973	EXIST::FUNCTION:
-ASN1_template_free                      2974	EXIST::FUNCTION:
+ASN1_template_free                      2974	NOEXIST::FUNCTION:
 OCSP_SINGLERESP_add_ext                 2975	EXIST::FUNCTION:
 KRB5_AUTHENTBODY_it                     2976	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 KRB5_AUTHENTBODY_it                     2976	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2497,7 +2497,7 @@ KRB5_TICKET_new                         2983	EXIST::FUNCTION:
 KRB5_APREQ_new                          2984	EXIST::FUNCTION:
 EC_GROUP_get_curve_GFp                  2985	EXIST::FUNCTION:EC
 KRB5_ENCKEY_new                         2986	EXIST::FUNCTION:
-ASN1_template_d2i                       2987	EXIST::FUNCTION:
+ASN1_template_d2i                       2987	NOEXIST::FUNCTION:
 _ossl_old_des_quad_cksum                2988	NOEXIST::FUNCTION:
 OCSP_single_get0_status                 2989	EXIST::FUNCTION:
 BN_swap                                 2990	EXIST::FUNCTION:
@@ -2574,7 +2574,7 @@ OCSP_request_onereq_count               3047	EXIST::FUNCTION:
 OCSP_basic_verify                       3048	EXIST::FUNCTION:
 KRB5_AUTHENTBODY_free                   3049	EXIST::FUNCTION:
 ASN1_item_d2i                           3050	EXIST::FUNCTION:
-ASN1_primitive_free                     3051	EXIST::FUNCTION:
+ASN1_primitive_free                     3051	NOEXIST::FUNCTION:
 i2d_EXTENDED_KEY_USAGE                  3052	EXIST::FUNCTION:
 i2d_OCSP_SIGNATURE                      3053	EXIST::FUNCTION:
 asn1_enc_save                           3054	NOEXIST::FUNCTION:
@@ -2623,7 +2623,7 @@ ASN1_OCTET_STRING_it                    3090	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 ASN1_OCTET_STRING_it                    3090	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 ERR_load_UI_strings                     3091	EXIST::FUNCTION:
 i2d_KRB5_ENCKEY                         3092	EXIST::FUNCTION:
-ASN1_template_new                       3093	EXIST::FUNCTION:
+ASN1_template_new                       3093	NOEXIST::FUNCTION:
 OCSP_SIGNATURE_free                     3094	EXIST::FUNCTION:
 ASN1_item_i2d_fp                        3095	EXIST::FUNCTION:STDIO
 KRB5_PRINCNAME_free                     3096	EXIST::FUNCTION:

From matt at openssl.org  Thu Mar 26 19:55:45 2015
From: matt at openssl.org (Matt Caswell)
Date: Thu, 26 Mar 2015 19:55:45 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427399745.957492.4245.nullmailer@dev.openssl.org>

The branch master has been updated
       via  ee3ef9cbe9b355c460ebb06c3eee0e503fe1fb1a (commit)
       via  6f7ae319df8e7cb4578815f9944b3b912c0df308 (commit)
       via  d2200cafd4870c20ef170834e072fae1d8c412d5 (commit)
       via  e5bf62f716f71e4df6995a07d1fbc4cad82a2637 (commit)
       via  3497ac5d333af98947d0356146a0898e2398d321 (commit)
       via  1711f8de45cdee01fdf21e55db5522d23b450867 (commit)
       via  9e7ba3b2a2ffc049b4b5c664cf33473b475ce323 (commit)
       via  c99c4c11a202ed71d4c232075668a876f352d71a (commit)
       via  44cc35d38278da82d8be7ec3799d2f6565c2dfe5 (commit)
       via  cca52a844f7e62b312f9699a1494807295858064 (commit)
       via  3bb8f87d2d9aa1ab51703a725759d440785685e3 (commit)
       via  14daae5a625b38b43229eed0cf750f44d5881c0b (commit)
       via  24a1e2f2ec1553c2cc26574bdb48b5d8c1b913f7 (commit)
       via  c661ac16891460eaf443db3303a7b1358b14526d (commit)
       via  5fb6f80cdfa418d9429f39f348d7bab8b5f9578a (commit)
       via  cb2ce7abfd3e2e641851e0ed9dff1a883b38037e (commit)
       via  91f93f69ef59bbe9ad8d191eed5a88b2125fba26 (commit)
       via  78a39fe735ef253bbf1d028a3e7934bda76f8276 (commit)
       via  40f37188a63c988c66bfece95280b67158998e64 (commit)
       via  bb4203d97e7b3350fe501d90485526a6e5dc1e3e (commit)
       via  de07f311ce5569d698c86c7498f98345a9f472d6 (commit)
       via  f8caa3c813bcf9c621f8576eeba8a0df67596dac (commit)
       via  4aa7389e6c5509416d1672c7adddd1476dc1af09 (commit)
       via  e2228d318c51c2238ad8667b27574ae06afea191 (commit)
       via  295c3f41113f4ff537fb95e29f7f709ba03c6a21 (commit)
       via  7a7048aff053929feaadee4895749fe0a661d353 (commit)
       via  24a90afd858634d3fc4aabae6aa7e30020dc87ff (commit)
       via  88c23039484522457abdf83db2c64e3af6d0d8ca (commit)
       via  2c60ed0452919ea9a67886685e2fa5c8b9330620 (commit)
       via  bd2e3a9512523ff888982cd91e830fc49f1a9595 (commit)
       via  75d40c9332e271a03a3cad09502ea4f8363590dc (commit)
       via  d5a25ae0deeabc9baaacef64f4c23fbd0c2d67e9 (commit)
       via  c036e210f3339fc30fa88da4bd78753c6e643eaa (commit)
       via  bbcd6d7fe263361f18060c40cac676d6a6193ead (commit)
       via  f161995e0e1a77415354b1690fb92ae3f1480547 (commit)
       via  af9752e5faff5dd3c82fc2d02d1e7ad457ccb84a (commit)
       via  a0682a5e26dc7ac1466b218cc87d322094651518 (commit)
       via  999005e49355d738a017fa300630864f832b6273 (commit)
       via  c103c7e266145dc922115a2c3079776bb8216939 (commit)
       via  02a36fdae8cb503e2f88eac52eb3053431089397 (commit)
       via  fe589e6175f350a3e83b39ea07a08b0c824ea6fb (commit)
       via  7604202070b3d3767fe75bc8c5a268ee8aedfb52 (commit)
       via  4e08d4a84c5935667ae266008174565b3ba39b58 (commit)
       via  92ffa83d8b5bb9ba9d56a8e321d5924956a0bbe4 (commit)
       via  cd986e55865987c95bb89bd48b0ea1b0d7422860 (commit)
       via  258f8721a5d2c3ec5fd433e89112885139be1db3 (commit)
       via  ab97b2cd4301074fd88fd2f13b8c79342593dae4 (commit)
       via  db9a32e7193ef5841e5a021061237b8b24f68126 (commit)
       via  33d23b87a0d06bc497a13b1998737a1ce469a785 (commit)
       via  28d59af8740680c89e22ac19304457f2163e4371 (commit)
       via  52e1d7b152a92d4fc2c3704a0129ec0ee0ce5e21 (commit)
      from  8e3f0c988fabf60b65f7109b7f47daec0fde9c39 (commit)


- Log -----------------------------------------------------------------
commit ee3ef9cbe9b355c460ebb06c3eee0e503fe1fb1a
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 26 13:51:32 2015 +0000

    Add Record Layer documentation
    
    Add some design documentation on how the record layer works to aid future
    maintenance.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 6f7ae319df8e7cb4578815f9944b3b912c0df308
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 26 15:14:42 2015 +0000

    Fix formatting oddities
    
    Fix some formatting oddities in rec_layer_d1.c.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit d2200cafd4870c20ef170834e072fae1d8c412d5
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 26 13:17:38 2015 +0000

    Fix record.h formatting
    
    Fix some strange formatting in record.h. This was probably originally
    introduced as part of the reformat work.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit e5bf62f716f71e4df6995a07d1fbc4cad82a2637
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 26 13:12:24 2015 +0000

    Define SEQ_NUM_SIZE
    
    Replace the hard coded value 8 (the size of the sequence number) with a
    constant defined in a macro.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 3497ac5d333af98947d0356146a0898e2398d321
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Feb 4 16:29:38 2015 +0000

    Fix compilation on windows for record layer
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 1711f8de45cdee01fdf21e55db5522d23b450867
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Feb 4 16:02:37 2015 +0000

    Rename record layer source files
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 9e7ba3b2a2ffc049b4b5c664cf33473b475ce323
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Feb 4 15:52:15 2015 +0000

    Remove some unneccessary macros
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit c99c4c11a202ed71d4c232075668a876f352d71a
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Feb 4 15:52:05 2015 +0000

    Renamed record layer header files
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 44cc35d38278da82d8be7ec3799d2f6565c2dfe5
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Feb 4 15:44:12 2015 +0000

    Reorganise header files
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit cca52a844f7e62b312f9699a1494807295858064
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Feb 4 14:30:20 2015 +0000

    Remove last trace of non-record layer code reading and writing sequence
    numbers directly
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 3bb8f87d2d9aa1ab51703a725759d440785685e3
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Feb 4 11:57:34 2015 +0000

    Move last_write_sequence from s->d1 to s->rlayer.d.
    Also push some usage of last_write_sequence out of dtls1_retransmit_message
    and into the record layer.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 14daae5a625b38b43229eed0cf750f44d5881c0b
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Feb 4 11:24:24 2015 +0000

    Move ssl3_record_sequence_update into record layer
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 24a1e2f2ec1553c2cc26574bdb48b5d8c1b913f7
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Feb 4 10:27:43 2015 +0000

    Move buffered_app_data from s->d1 to s->rlayer.d
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit c661ac16891460eaf443db3303a7b1358b14526d
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Feb 4 10:14:36 2015 +0000

    Move handshake_fragment, handshake_fragment_len, alert_fragment and
    alert_fragment_len from s->d1 to s->rlayer.d
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 5fb6f80cdfa418d9429f39f348d7bab8b5f9578a
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 3 16:11:49 2015 +0000

    Fix seg fault in dtls1_new
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit cb2ce7abfd3e2e641851e0ed9dff1a883b38037e
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 3 16:05:28 2015 +0000

    Moved processed_rcds and unprocessed_rcds from s->d1 to s->rlayer.d
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 91f93f69ef59bbe9ad8d191eed5a88b2125fba26
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 3 15:39:06 2015 +0000

    Move bitmap and next_bitmap from s->d1 to s->rlayer.d.
    Create dtls_bitmap.h and dtls_bitmap.c
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 78a39fe735ef253bbf1d028a3e7934bda76f8276
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 3 15:14:24 2015 +0000

    Move r_epoch and w_epoch from s->d1 to s->rlayer.d
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 40f37188a63c988c66bfece95280b67158998e64
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 3 14:54:13 2015 +0000

    Introduce a DTLS_RECORD_LAYER type for DTLS record layer state
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit bb4203d97e7b3350fe501d90485526a6e5dc1e3e
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 3 14:32:15 2015 +0000

    Move DTLS1_RECORD_DATA into rec_layer.h
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit de07f311ce5569d698c86c7498f98345a9f472d6
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 3 14:26:50 2015 +0000

    Move read_sequence and write_sequence from s->s3 to s->rlayer
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit f8caa3c813bcf9c621f8576eeba8a0df67596dac
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 3 13:22:12 2015 +0000

    Move s->s3->wpend_* to s->rlayer
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 4aa7389e6c5509416d1672c7adddd1476dc1af09
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 3 13:12:22 2015 +0000

    Move handshake_fragment, handshake_fragment_len, alert_fragment and
    alert_fragment_len from s->s3 into s->rlayer
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit e2228d318c51c2238ad8667b27574ae06afea191
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 3 11:16:30 2015 +0000

    Move s->s3->wnum to s->rlayer.wnum
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 295c3f41113f4ff537fb95e29f7f709ba03c6a21
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 3 10:48:28 2015 +0000

    Move s->rstate to s->rlayer.rstate
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 7a7048aff053929feaadee4895749fe0a661d353
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Feb 2 20:55:15 2015 +0000

    Move s->packet and s->packet_length into s->rlayer
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 24a90afd858634d3fc4aabae6aa7e30020dc87ff
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Feb 2 16:14:03 2015 +0000

    Remove unneccessary use of accessor function now code is moved into record
    layer
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 88c23039484522457abdf83db2c64e3af6d0d8ca
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Feb 2 16:02:55 2015 +0000

    Make rrec, wrec, rbuf and wbuf fully private to the record layer. Also, clean
    up some access to them. Now that various functions have been moved into the
    record layer they no longer need to use the accessor macros.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 2c60ed0452919ea9a67886685e2fa5c8b9330620
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Feb 2 15:47:39 2015 +0000

    Removed dependency on rrec from heartbeat processing
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit bd2e3a9512523ff888982cd91e830fc49f1a9595
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Feb 2 14:52:32 2015 +0000

    Introduce macro RECORD_LAYER_setup_comp_buffer
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 75d40c9332e271a03a3cad09502ea4f8363590dc
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Feb 2 14:08:34 2015 +0000

    Fix bug where rrec was being released...should have been removed by one of
    the earlier record layer commits
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit d5a25ae0deeabc9baaacef64f4c23fbd0c2d67e9
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Feb 2 14:03:50 2015 +0000

    Move ssl3_pending into the record layer
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit c036e210f3339fc30fa88da4bd78753c6e643eaa
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Feb 2 13:57:12 2015 +0000

    Remove RECORD_LAYER_set_ssl and introduce RECORD_LAYER_init
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit bbcd6d7fe263361f18060c40cac676d6a6193ead
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Feb 2 13:43:38 2015 +0000

    Provide RECORD_LAYER_set_data function
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit f161995e0e1a77415354b1690fb92ae3f1480547
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Feb 2 12:18:03 2015 +0000

    Introduce the functions RECORD_LAYER_release, RECORD_LAYER_read_pending, and
    RECORD_LAYER_write_pending.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit af9752e5faff5dd3c82fc2d02d1e7ad457ccb84a
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Feb 2 11:53:20 2015 +0000

    Create RECORD_LAYER_clear function.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit a0682a5e26dc7ac1466b218cc87d322094651518
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Feb 2 11:41:29 2015 +0000

    Tidy up rec_layer.h. Add some comments regarding which functions should be
    being used for what purpose.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 999005e49355d738a017fa300630864f832b6273
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Feb 2 10:38:12 2015 +0000

    Moved s3_pkt.c, s23_pkt.c and d1_pkt.c into the record layer.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit c103c7e266145dc922115a2c3079776bb8216939
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Feb 2 10:05:09 2015 +0000

    Split out non record layer functions out of s3_pkt.c and d1_pkt.c into
    the new files s3_msg.c and s1_msg.c respectively.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 02a36fdae8cb503e2f88eac52eb3053431089397
Author: Matt Caswell <matt at openssl.org>
Date:   Sun Feb 1 17:14:43 2015 +0000

    Move more SSL3_RECORD oriented functions into ssl3_record.c
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit fe589e6175f350a3e83b39ea07a08b0c824ea6fb
Author: Matt Caswell <matt at openssl.org>
Date:   Sun Feb 1 16:47:15 2015 +0000

    Move SSL3_RECORD oriented functions into ssl3_record.c
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 7604202070b3d3767fe75bc8c5a268ee8aedfb52
Author: Matt Caswell <matt at openssl.org>
Date:   Sun Feb 1 16:03:18 2015 +0000

    Move SSL3_BUFFER set up and release code into ssl3_buffer.c
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 4e08d4a84c5935667ae266008174565b3ba39b58
Author: Matt Caswell <matt at openssl.org>
Date:   Sun Feb 1 15:41:06 2015 +0000

    Move s->s3->wrec to s>rlayer>wrec
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 92ffa83d8b5bb9ba9d56a8e321d5924956a0bbe4
Author: Matt Caswell <matt at openssl.org>
Date:   Sun Feb 1 15:30:37 2015 +0000

    Encapsulate s->s3->wrec
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit cd986e55865987c95bb89bd48b0ea1b0d7422860
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jan 30 23:27:17 2015 +0000

    Move s->s3->rrec to s->rlayer->rrec
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 258f8721a5d2c3ec5fd433e89112885139be1db3
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jan 30 17:29:41 2015 +0000

    Encapsulate s->s3->rrec
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit ab97b2cd4301074fd88fd2f13b8c79342593dae4
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jan 30 16:17:25 2015 +0000

    Move s->s3->wbuf to s->rlayer->wbuf
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit db9a32e7193ef5841e5a021061237b8b24f68126
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jan 30 16:05:47 2015 +0000

    Encapsulate access to s->s3->wbuf
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 33d23b87a0d06bc497a13b1998737a1ce469a785
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jan 30 15:38:10 2015 +0000

    Move s->s3->rrec into s->rlayer
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 28d59af8740680c89e22ac19304457f2163e4371
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jan 30 14:57:54 2015 +0000

    Encapsulate SSL3_BUFFER and all access to s->s3->rbuf.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 52e1d7b152a92d4fc2c3704a0129ec0ee0ce5e21
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jan 30 13:46:43 2015 +0000

    Create a RECORD_LAYER structure and move read_ahead into it.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 ssl/Makefile                                      |   22 +-
 ssl/d1_both.c                                     |   43 +-
 ssl/d1_lib.c                                      |   63 +-
 crypto/rand/rand_nw.c => ssl/d1_msg.c             |  241 ++--
 ssl/d1_srvr.c                                     |    3 +-
 ssl/heartbeat_test.c                              |   15 +-
 ssl/record/README                                 |   78 ++
 apps/app_rand.c => ssl/record/dtls1_bitmap.c      |  290 ++--
 ssl/{d1_pkt.c => record/rec_layer_d1.c}           |  847 +++--------
 ssl/{s23_pkt.c => record/rec_layer_s23.c}         |   19 +-
 ssl/{s3_pkt.c => record/rec_layer_s3.c}           |  777 ++++------
 ssl/record/record.h                               |  345 +++++
 crypto/rand/rand_nw.c => ssl/record/record_locl.h |  127 +-
 apps/app_rand.c => ssl/record/ssl3_buffer.c       |  200 +--
 ssl/record/ssl3_record.c                          | 1558 +++++++++++++++++++++
 ssl/s23_clnt.c                                    |   15 +-
 ssl/s23_srvr.c                                    |   54 +-
 ssl/s3_both.c                                     |  105 +-
 ssl/s3_cbc.c                                      |  220 ---
 ssl/s3_enc.c                                      |  189 +--
 ssl/s3_lib.c                                      |   40 +-
 apps/app_rand.c => ssl/s3_msg.c                   |  194 +--
 ssl/ssl.h                                         |    4 +-
 ssl/ssl_lib.c                                     |   23 +-
 ssl/ssl_locl.h                                    |  184 +--
 ssl/ssl_stat.c                                    |   41 -
 ssl/t1_enc.c                                      |  300 +---
 ssl/t1_lib.c                                      |   10 +-
 28 files changed, 3124 insertions(+), 2883 deletions(-)
 copy crypto/rand/rand_nw.c => ssl/d1_msg.c (68%)
 create mode 100644 ssl/record/README
 copy apps/app_rand.c => ssl/record/dtls1_bitmap.c (66%)
 rename ssl/{d1_pkt.c => record/rec_layer_d1.c} (62%)
 rename ssl/{s23_pkt.c => record/rec_layer_s23.c} (90%)
 rename ssl/{s3_pkt.c => record/rec_layer_s3.c} (68%)
 create mode 100644 ssl/record/record.h
 copy crypto/rand/rand_nw.c => ssl/record/record_locl.h (59%)
 copy apps/app_rand.c => ssl/record/ssl3_buffer.c (65%)
 create mode 100644 ssl/record/ssl3_record.c
 copy apps/app_rand.c => ssl/s3_msg.c (62%)

diff --git a/ssl/Makefile b/ssl/Makefile
index 90b6ac5..d876d91 100644
--- a/ssl/Makefile
+++ b/ssl/Makefile
@@ -21,30 +21,34 @@ APPS=
 LIB=$(TOP)/libssl.a
 SHARED_LIB= libssl$(SHLIB_EXT)
 LIBSRC=	\
-	s3_meth.c   s3_srvr.c s3_clnt.c  s3_lib.c  s3_enc.c s3_pkt.c s3_both.c s3_cbc.c \
-	s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c          s23_pkt.c \
+	s3_meth.c   s3_srvr.c s3_clnt.c  s3_lib.c  s3_enc.c record/rec_layer_s3.c \
+	s3_both.c s3_cbc.c s3_msg.c \
+	s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c record/rec_layer_s23.c \
 	t1_meth.c   t1_srvr.c t1_clnt.c  t1_lib.c  t1_enc.c t1_ext.c \
-	d1_meth.c   d1_srvr.c d1_clnt.c  d1_lib.c  d1_pkt.c \
+	d1_meth.c   d1_srvr.c d1_clnt.c  d1_lib.c  record/rec_layer_d1.c d1_msg.c \
 	d1_both.c d1_srtp.c \
 	ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \
 	ssl_ciph.c ssl_stat.c ssl_rsa.c \
 	ssl_asn1.c ssl_txt.c ssl_algs.c ssl_conf.c \
-	bio_ssl.c ssl_err.c kssl.c t1_reneg.c tls_srp.c t1_trce.c ssl_utst.c
+	bio_ssl.c ssl_err.c kssl.c t1_reneg.c tls_srp.c t1_trce.c ssl_utst.c \
+	record/ssl3_buffer.c record/ssl3_record.c record/dtls1_bitmap.c
 LIBOBJ= \
-	s3_meth.o  s3_srvr.o  s3_clnt.o  s3_lib.o  s3_enc.o s3_pkt.o s3_both.o s3_cbc.o \
-	s23_meth.o s23_srvr.o s23_clnt.o s23_lib.o          s23_pkt.o \
+	s3_meth.o  s3_srvr.o  s3_clnt.o  s3_lib.o  s3_enc.o record/rec_layer_s3.o \
+	s3_both.o s3_cbc.o s3_msg.o \
+	s23_meth.o s23_srvr.o s23_clnt.o s23_lib.o record/rec_layer_s23.o \
 	t1_meth.o   t1_srvr.o t1_clnt.o  t1_lib.o  t1_enc.o t1_ext.o \
-	d1_meth.o   d1_srvr.o d1_clnt.o  d1_lib.o  d1_pkt.o \
+	d1_meth.o   d1_srvr.o d1_clnt.o  d1_lib.o  record/rec_layer_d1.o d1_msg.o \
 	d1_both.o d1_srtp.o\
 	ssl_lib.o ssl_err2.o ssl_cert.o ssl_sess.o \
 	ssl_ciph.o ssl_stat.o ssl_rsa.o \
 	ssl_asn1.o ssl_txt.o ssl_algs.o ssl_conf.o \
-	bio_ssl.o ssl_err.o kssl.o t1_reneg.o tls_srp.o t1_trce.o ssl_utst.o
+	bio_ssl.o ssl_err.o kssl.o t1_reneg.o tls_srp.o t1_trce.o ssl_utst.o \
+	record/ssl3_buffer.o record/ssl3_record.o record/dtls1_bitmap.o
 
 SRC= $(LIBSRC)
 
 EXHEADER= ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h kssl.h srtp.h
-HEADER=	$(EXHEADER) ssl_locl.h kssl_lcl.h
+HEADER=	$(EXHEADER) ssl_locl.h kssl_lcl.h  record/record_locl.h record/record.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index 8d15f70..094b337 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -961,7 +961,7 @@ dtls1_get_message_fragment(SSL *s, int st1, int stn, long max, int *ok)
 /*-
  * for these 2 messages, we need to
  * ssl->enc_read_ctx                    re-init
- * ssl->s3->read_sequence               zero
+ * ssl->rlayer.read_sequence            zero
  * ssl->s3->read_mac_secret             re-init
  * ssl->session->read_sym_enc           assign
  * ssl->session->read_compression       assign
@@ -1110,7 +1110,8 @@ int dtls1_buffer_message(SSL *s, int is_ccs)
     frag->msg_header.saved_retransmit_state.write_hash = s->write_hash;
     frag->msg_header.saved_retransmit_state.compress = s->compress;
     frag->msg_header.saved_retransmit_state.session = s->session;
-    frag->msg_header.saved_retransmit_state.epoch = s->d1->w_epoch;
+    frag->msg_header.saved_retransmit_state.epoch =
+        DTLS_RECORD_LAYER_get_w_epoch(&s->rlayer);
 
     memset(seq64be, 0, sizeof(seq64be));
     seq64be[6] =
@@ -1143,7 +1144,6 @@ dtls1_retransmit_message(SSL *s, unsigned short seq, unsigned long frag_off,
     unsigned long header_length;
     unsigned char seq64be[8];
     struct dtls1_retransmit_state saved_state;
-    unsigned char save_write_sequence[8];
 
     /*-
       OPENSSL_assert(s->init_num == 0);
@@ -1184,8 +1184,7 @@ dtls1_retransmit_message(SSL *s, unsigned short seq, unsigned long frag_off,
     saved_state.write_hash = s->write_hash;
     saved_state.compress = s->compress;
     saved_state.session = s->session;
-    saved_state.epoch = s->d1->w_epoch;
-    saved_state.epoch = s->d1->w_epoch;
+    saved_state.epoch = DTLS_RECORD_LAYER_get_w_epoch(&s->rlayer);
 
     s->d1->retransmitting = 1;
 
@@ -1194,15 +1193,8 @@ dtls1_retransmit_message(SSL *s, unsigned short seq, unsigned long frag_off,
     s->write_hash = frag->msg_header.saved_retransmit_state.write_hash;
     s->compress = frag->msg_header.saved_retransmit_state.compress;
     s->session = frag->msg_header.saved_retransmit_state.session;
-    s->d1->w_epoch = frag->msg_header.saved_retransmit_state.epoch;
-
-    if (frag->msg_header.saved_retransmit_state.epoch ==
-        saved_state.epoch - 1) {
-        memcpy(save_write_sequence, s->s3->write_sequence,
-               sizeof(s->s3->write_sequence));
-        memcpy(s->s3->write_sequence, s->d1->last_write_sequence,
-               sizeof(s->s3->write_sequence));
-    }
+    DTLS_RECORD_LAYER_set_saved_w_epoch(&s->rlayer,
+        frag->msg_header.saved_retransmit_state.epoch);
 
     ret = dtls1_do_write(s, frag->msg_header.is_ccs ?
                          SSL3_RT_CHANGE_CIPHER_SPEC : SSL3_RT_HANDSHAKE);
@@ -1212,15 +1204,7 @@ dtls1_retransmit_message(SSL *s, unsigned short seq, unsigned long frag_off,
     s->write_hash = saved_state.write_hash;
     s->compress = saved_state.compress;
     s->session = saved_state.session;
-    s->d1->w_epoch = saved_state.epoch;
-
-    if (frag->msg_header.saved_retransmit_state.epoch ==
-        saved_state.epoch - 1) {
-        memcpy(s->d1->last_write_sequence, s->s3->write_sequence,
-               sizeof(s->s3->write_sequence));
-        memcpy(s->s3->write_sequence, save_write_sequence,
-               sizeof(s->s3->write_sequence));
-    }
+    DTLS_RECORD_LAYER_set_saved_w_epoch(&s->rlayer, saved_state.epoch);
 
     s->d1->retransmitting = 0;
 
@@ -1347,27 +1331,26 @@ int dtls1_shutdown(SSL *s)
 }
 
 #ifndef OPENSSL_NO_HEARTBEATS
-int dtls1_process_heartbeat(SSL *s)
+int dtls1_process_heartbeat(SSL *s, unsigned char *p, unsigned int length)
 {
-    unsigned char *p = &s->s3->rrec.data[0], *pl;
+    unsigned char *pl;
     unsigned short hbtype;
     unsigned int payload;
     unsigned int padding = 16;  /* Use minimum padding */
 
     if (s->msg_callback)
         s->msg_callback(0, s->version, TLS1_RT_HEARTBEAT,
-                        &s->s3->rrec.data[0], s->s3->rrec.length,
-                        s, s->msg_callback_arg);
+                        p, length, s, s->msg_callback_arg);
 
     /* Read type and payload length first */
-    if (1 + 2 + 16 > s->s3->rrec.length)
+    if (1 + 2 + 16 > length)
         return 0;               /* silently discard */
-    if (s->s3->rrec.length > SSL3_RT_MAX_PLAIN_LENGTH)
+    if (length > SSL3_RT_MAX_PLAIN_LENGTH)
         return 0;               /* silently discard per RFC 6520 sec. 4 */
 
     hbtype = *p++;
     n2s(p, payload);
-    if (1 + 2 + payload + 16 > s->s3->rrec.length)
+    if (1 + 2 + payload + 16 > length)
         return 0;               /* silently discard per RFC 6520 sec. 4 */
     pl = p;
 
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index ad6561c..eac271d 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -124,6 +124,10 @@ int dtls1_new(SSL *s)
 {
     DTLS1_STATE *d1;
 
+    if(!DTLS_RECORD_LAYER_new(&s->rlayer)) {
+        return 0;
+    }
+    
     if (!ssl3_new(s))
         return (0);
     if ((d1 = OPENSSL_malloc(sizeof *d1)) == NULL) {
@@ -132,13 +136,8 @@ int dtls1_new(SSL *s)
     }
     memset(d1, 0, sizeof *d1);
 
-    /* d1->handshake_epoch=0; */
-
-    d1->unprocessed_rcds.q = pqueue_new();
-    d1->processed_rcds.q = pqueue_new();
     d1->buffered_messages = pqueue_new();
     d1->sent_messages = pqueue_new();
-    d1->buffered_app_data.q = pqueue_new();
 
     if (s->server) {
         d1->cookie_len = sizeof(s->d1->cookie);
@@ -147,19 +146,11 @@ int dtls1_new(SSL *s)
     d1->link_mtu = 0;
     d1->mtu = 0;
 
-    if (!d1->unprocessed_rcds.q || !d1->processed_rcds.q
-        || !d1->buffered_messages || !d1->sent_messages
-        || !d1->buffered_app_data.q) {
-        if (d1->unprocessed_rcds.q)
-            pqueue_free(d1->unprocessed_rcds.q);
-        if (d1->processed_rcds.q)
-            pqueue_free(d1->processed_rcds.q);
+    if (!d1->buffered_messages || !d1->sent_messages) {
         if (d1->buffered_messages)
             pqueue_free(d1->buffered_messages);
         if (d1->sent_messages)
             pqueue_free(d1->sent_messages);
-        if (d1->buffered_app_data.q)
-            pqueue_free(d1->buffered_app_data.q);
         OPENSSL_free(d1);
         ssl3_free(s);
         return (0);
@@ -174,25 +165,6 @@ static void dtls1_clear_queues(SSL *s)
 {
     pitem *item = NULL;
     hm_fragment *frag = NULL;
-    DTLS1_RECORD_DATA *rdata;
-
-    while ((item = pqueue_pop(s->d1->unprocessed_rcds.q)) != NULL) {
-        rdata = (DTLS1_RECORD_DATA *)item->data;
-        if (rdata->rbuf.buf) {
-            OPENSSL_free(rdata->rbuf.buf);
-        }
-        OPENSSL_free(item->data);
-        pitem_free(item);
-    }
-
-    while ((item = pqueue_pop(s->d1->processed_rcds.q)) != NULL) {
-        rdata = (DTLS1_RECORD_DATA *)item->data;
-        if (rdata->rbuf.buf) {
-            OPENSSL_free(rdata->rbuf.buf);
-        }
-        OPENSSL_free(item->data);
-        pitem_free(item);
-    }
 
     while ((item = pqueue_pop(s->d1->buffered_messages)) != NULL) {
         frag = (hm_fragment *)item->data;
@@ -205,28 +177,18 @@ static void dtls1_clear_queues(SSL *s)
         dtls1_hm_fragment_free(frag);
         pitem_free(item);
     }
-
-    while ((item = pqueue_pop(s->d1->buffered_app_data.q)) != NULL) {
-        rdata = (DTLS1_RECORD_DATA *)item->data;
-        if (rdata->rbuf.buf) {
-            OPENSSL_free(rdata->rbuf.buf);
-        }
-        OPENSSL_free(item->data);
-        pitem_free(item);
-    }
 }
 
 void dtls1_free(SSL *s)
 {
+    DTLS_RECORD_LAYER_free(&s->rlayer);
+
     ssl3_free(s);
 
     dtls1_clear_queues(s);
 
-    pqueue_free(s->d1->unprocessed_rcds.q);
-    pqueue_free(s->d1->processed_rcds.q);
     pqueue_free(s->d1->buffered_messages);
     pqueue_free(s->d1->sent_messages);
-    pqueue_free(s->d1->buffered_app_data.q);
 
     OPENSSL_free(s->d1);
     s->d1 = NULL;
@@ -234,20 +196,16 @@ void dtls1_free(SSL *s)
 
 void dtls1_clear(SSL *s)
 {
-    pqueue unprocessed_rcds;
-    pqueue processed_rcds;
     pqueue buffered_messages;
     pqueue sent_messages;
-    pqueue buffered_app_data;
     unsigned int mtu;
     unsigned int link_mtu;
 
+    DTLS_RECORD_LAYER_clear(&s->rlayer);
+
     if (s->d1) {
-        unprocessed_rcds = s->d1->unprocessed_rcds.q;
-        processed_rcds = s->d1->processed_rcds.q;
         buffered_messages = s->d1->buffered_messages;
         sent_messages = s->d1->sent_messages;
-        buffered_app_data = s->d1->buffered_app_data.q;
         mtu = s->d1->mtu;
         link_mtu = s->d1->link_mtu;
 
@@ -264,11 +222,8 @@ void dtls1_clear(SSL *s)
             s->d1->link_mtu = link_mtu;
         }
 
-        s->d1->unprocessed_rcds.q = unprocessed_rcds;
-        s->d1->processed_rcds.q = processed_rcds;
         s->d1->buffered_messages = buffered_messages;
         s->d1->sent_messages = sent_messages;
-        s->d1->buffered_app_data.q = buffered_app_data;
     }
 
     ssl3_clear(s);
diff --git a/crypto/rand/rand_nw.c b/ssl/d1_msg.c
similarity index 68%
copy from crypto/rand/rand_nw.c
copy to ssl/d1_msg.c
index 76ef70c..f71b1cc 100644
--- a/crypto/rand/rand_nw.c
+++ b/ssl/d1_msg.c
@@ -1,4 +1,61 @@
-/* crypto/rand/rand_nw.c */
+/* ssl/d1_msg.c */
+/*
+ * DTLS implementation written by Nagendra Modadugu
+ * (nagendra at cs.stanford.edu) for the OpenSSL project 2005.
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2015 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core at openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
 /* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
  * All rights reserved.
  *
@@ -55,125 +112,91 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core at openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay at cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh at cryptsoft.com).
- *
- */
-
-#include "cryptlib.h"
-#include <openssl/rand.h>
-#include "rand_lcl.h"
-
-#if defined (OPENSSL_SYS_NETWARE)
-
-# if defined(NETWARE_LIBC)
-#  include <nks/thread.h>
-# else
-#  include <nwthread.h>
-# endif
 
-extern int GetProcessSwitchCount(void);
-# if !defined(NETWARE_LIBC) || (CURRENT_NDK_THRESHOLD < 509220000)
-extern void *RunningProcess;    /* declare here same as found in newer NDKs */
-extern unsigned long GetSuperHighResolutionTimer(void);
-# endif
-
-   /*
-    * the FAQ indicates we need to provide at least 20 bytes (160 bits) of
-    * seed
-    */
-int RAND_poll(void)
+#define USE_SOCKETS
+#include "ssl_locl.h"
+    
+int dtls1_write_app_data_bytes(SSL *s, int type, const void *buf_, int len)
 {
-    unsigned long l;
-    unsigned long tsc;
     int i;
 
+#ifndef OPENSSL_NO_SCTP
     /*
-     * There are several options to gather miscellaneous data but for now we
-     * will loop checking the time stamp counter (rdtsc) and the
-     * SuperHighResolutionTimer.  Each iteration will collect 8 bytes of data
-     * but it is treated as only 1 byte of entropy.  The call to
-     * ThreadSwitchWithDelay() will introduce additional variability into the
-     * data returned by rdtsc. Applications can argument the seed material
-     * by adding additional stuff with RAND_add() and should probably do so.
+     * Check if we have to continue an interrupted handshake for reading
+     * belated app data with SCTP.
      */
-    l = GetProcessSwitchCount();
-    RAND_add(&l, sizeof(l), 1);
+    if ((SSL_in_init(s) && !s->in_handshake) ||
+        (BIO_dgram_is_sctp(SSL_get_wbio(s)) &&
+         (s->state == DTLS1_SCTP_ST_SR_READ_SOCK
+          || s->state == DTLS1_SCTP_ST_CR_READ_SOCK)))
+#else
+    if (SSL_in_init(s) && !s->in_handshake)
+#endif
+    {
+        i = s->handshake_func(s);
+        if (i < 0)
+            return (i);
+        if (i == 0) {
+            SSLerr(SSL_F_DTLS1_WRITE_APP_DATA_BYTES,
+                   SSL_R_SSL_HANDSHAKE_FAILURE);
+            return -1;
+        }
+    }
 
-    /* need to cast the void* to unsigned long here */
-    l = (unsigned long)RunningProcess;
-    RAND_add(&l, sizeof(l), 1);
+    if (len > SSL3_RT_MAX_PLAIN_LENGTH) {
+        SSLerr(SSL_F_DTLS1_WRITE_APP_DATA_BYTES, SSL_R_DTLS_MESSAGE_TOO_BIG);
+        return -1;
+    }
 
-    for (i = 2; i < ENTROPY_NEEDED; i++) {
-# ifdef __MWERKS__
-        asm {
-        rdtsc mov tsc, eax}
-# elif defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-        asm volatile ("rdtsc":"=a" (tsc)::"edx");
-# endif
+    i = dtls1_write_bytes(s, type, buf_, len);
+    return i;
+}
 
-        RAND_add(&tsc, sizeof(tsc), 1);
+int dtls1_dispatch_alert(SSL *s)
+{
+    int i, j;
+    void (*cb) (const SSL *ssl, int type, int val) = NULL;
+    unsigned char buf[DTLS1_AL_HEADER_LENGTH];
+    unsigned char *ptr = &buf[0];
 
-        l = GetSuperHighResolutionTimer();
-        RAND_add(&l, sizeof(l), 0);
+    s->s3->alert_dispatch = 0;
 
-# if defined(NETWARE_LIBC)
-        NXThreadYield();
-# else                          /* NETWARE_CLIB */
-        ThreadSwitchWithDelay();
-# endif
-    }
+    memset(buf, 0x00, sizeof(buf));
+    *ptr++ = s->s3->send_alert[0];
+    *ptr++ = s->s3->send_alert[1];
 
-    return 1;
-}
+#ifdef DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
+    if (s->s3->send_alert[1] == DTLS1_AD_MISSING_HANDSHAKE_MESSAGE) {
+        s2n(s->d1->handshake_read_seq, ptr);
+        l2n3(s->d1->r_msg_hdr.frag_off, ptr);
+    }
+#endif
 
+    i = do_dtls1_write(s, SSL3_RT_ALERT, &buf[0], sizeof(buf), 0);
+    if (i <= 0) {
+        s->s3->alert_dispatch = 1;
+        /* fprintf( stderr, "not done with alert\n" ); */
+    } else {
+        if (s->s3->send_alert[0] == SSL3_AL_FATAL
+#ifdef DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
+            || s->s3->send_alert[1] == DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
 #endif
+            )
+            (void)BIO_flush(s->wbio);
+
+        if (s->msg_callback)
+            s->msg_callback(1, s->version, SSL3_RT_ALERT, s->s3->send_alert,
+                            2, s, s->msg_callback_arg);
+
+        if (s->info_callback != NULL)
+            cb = s->info_callback;
+        else if (s->ctx->info_callback != NULL)
+            cb = s->ctx->info_callback;
+
+        if (cb != NULL) {
+            j = (s->s3->send_alert[0] << 8) | s->s3->send_alert[1];
+            cb(s, SSL_CB_WRITE_ALERT, j);
+        }
+    }
+    return (i);
+}
diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c
index b55af35..5ddfeac 100644
--- a/ssl/d1_srvr.c
+++ b/ssl/d1_srvr.c
@@ -330,8 +330,7 @@ int dtls1_accept(SSL *s)
              * listening
              */
             if (listen) {
-                memcpy(s->s3->write_sequence, s->s3->read_sequence,
-                       sizeof(s->s3->write_sequence));
+                DTLS_RECORD_LAYER_resync_write(&s->rlayer);
             }
 
             /* If we're just listening, stop here */
diff --git a/ssl/heartbeat_test.c b/ssl/heartbeat_test.c
index d6b7cfc..491bbed 100644
--- a/ssl/heartbeat_test.c
+++ b/ssl/heartbeat_test.c
@@ -60,7 +60,7 @@ typedef struct heartbeat_test_fixture {
     SSL_CTX *ctx;
     SSL *s;
     const char *test_case_name;
-    int (*process_heartbeat) (SSL *s);
+    int (*process_heartbeat) (SSL *s, unsigned char *p, unsigned int length);
     unsigned char *payload;
     int sent_payload_len;
     int expected_return_value;
@@ -112,7 +112,7 @@ static HEARTBEAT_TEST_FIXTURE set_up(const char *const test_case_name,
      * zeroed in opt mode and will cause spurious test failures that will
      * change with each execution.
      */
-    memset(fixture.s->s3->wbuf.buf, 0, fixture.s->s3->wbuf.len);
+    memset(fixture.s->rlayer.wbuf.buf, 0, fixture.s->rlayer.wbuf.len);
 
  fail:
     if (!setup_ok) {
@@ -202,8 +202,8 @@ static int execute_heartbeat(HEARTBEAT_TEST_FIXTURE fixture)
     unsigned const char *p;
     int actual_payload_len;
 
-    s->s3->rrec.data = payload;
-    s->s3->rrec.length = strlen((const char *)payload);
+    s->rlayer.rrec.data = payload;
+    s->rlayer.rrec.length = strlen((const char *)payload);
     *payload++ = TLS1_HB_REQUEST;
     s2n(fixture.sent_payload_len, payload);
 
@@ -213,7 +213,8 @@ static int execute_heartbeat(HEARTBEAT_TEST_FIXTURE fixture)
      */
     memcpy((char *)sent_buf, (const char *)payload, sizeof(sent_buf));
 
-    return_value = fixture.process_heartbeat(s);
+    return_value = fixture.process_heartbeat(s, s->rlayer.rrec.data,
+        s->rlayer.rrec.length);
 
     if (return_value != fixture.expected_return_value) {
         printf("%s failed: expected return value %d, received %d\n",
@@ -225,8 +226,8 @@ static int execute_heartbeat(HEARTBEAT_TEST_FIXTURE fixture)
     /*
      * If there is any byte alignment, it will be stored in wbuf.offset.
      */
-    p = &(s->s3->
-          wbuf.buf[fixture.return_payload_offset + s->s3->wbuf.offset]);
+    p = &(s->rlayer.
+          wbuf.buf[fixture.return_payload_offset + s->rlayer.wbuf.offset]);
     actual_payload_len = 0;
     n2s(p, actual_payload_len);
 
diff --git a/ssl/record/README b/ssl/record/README
new file mode 100644
index 0000000..6870b53
--- /dev/null
+++ b/ssl/record/README
@@ -0,0 +1,78 @@
+Record Layer Design
+===================
+
+This file provides some guidance on the thinking behind the design of the
+record layer code to aid future maintenance.
+
+The record layer is divided into a number of components. At the time of writing
+there are four: SSL3_RECORD, SSL3_BUFFER, DLTS1_BITMAP and RECORD_LAYER. Each
+of these components is defined by:
+1) A struct definition of the same name as the component
+2) A set of source files that define the functions for that component
+3) A set of accessor macros
+
+All struct definitions are in record.h. The functions and macros are either
+defined in record.h or record_locl.h dependent on whether they are intended to
+be private to the record layer, or whether they form part of the API to the rest
+of libssl.
+
+The source files map to components as follows:
+
+dtls1_bitmap.c                                   -> DTLS1_BITMAP component
+ssl3_buffer.c                                    -> SSL3_BUFFER component
+ssl3_record.c                                    -> SSL3_RECORD component
+rec_layer_s23.c, rec_layer_s3.c, rec_layer_d1.c  -> RECORD_LAYER component
+
+The RECORD_LAYER component is a facade pattern, i.e. it provides a simplified
+interface to the record layer for the rest of libssl. The other 3 components are
+entirely private to the record layer and therefore should never be accessed
+directly by libssl.
+
+Any component can directly access its own members - they are private to that
+component, e.g. ssl3_buffer.c can access members of the SSL3_BUFFER struct
+without using a macro. No component can directly access the members of another
+component, e.g. ssl3_buffer cannot reach inside the RECORD_LAYER component to
+directly access its members. Instead components use accessor macros, so if code
+in ssl3_buffer.c wants to access the members of the RECORD_LAYER it uses the
+RECORD_LAYER_* macros.
+
+Conceptually it looks like this:
+
+                        libssl
+                           |
+---------------------------|-----record.h--------------------------------------
+                           |
+                    _______V______________
+                   |                      |
+                   |    RECORD_LAYER      |
+                   |                      |
+                   |    rec_layer_s23.c   |
+                   |          ^           |
+                   |          |           |
+                   |    rec_layer_s3.c    |
+                   |          ^           |
+                   | _________|__________ |
+                   ||                    ||
+                   || DTLS1_RECORD_LAYER ||
+                   ||                    ||
+                   || rec_layer_d1.c     ||
+                   ||____________________||
+                   |______________________|
+        record_locl.h     ^   ^   ^
+         _________________|   |   |_________________
+        |                     |                     |
+   _____V_________      ______V________      _______V________
+  |               |    |               |    |                |
+  | SSL3_BUFFER   |    | SSL3_RECORD   |    | DTLS1_BITMAP   |
+  |               |--->|               |    |                |
+  | ssl3_buffer.c |    | ssl3_record.c |    | dtls1_bitmap.c |
+  |_______________|    |_______________|    |________________|
+
+
+The three RECORD_LAYER source files build progressively on each other, i.e.
+the simplest is rec_layer_s23.c. This provides the most basic functions used
+for version negotiation. Next rec_layer_s3.c adds the SSL/TLS layer. Finally
+rec_layer_d1.c builds off of the SSL/TLS code to provide DTLS specific
+capabilities. It uses some DTLS specific RECORD_LAYER component members which
+should only be accessed from rec_layer_d1.c. These are held in the
+DTLS1_RECORD_LAYER struct.
diff --git a/apps/app_rand.c b/ssl/record/dtls1_bitmap.c
similarity index 66%
copy from apps/app_rand.c
copy to ssl/record/dtls1_bitmap.c
index 595fc78..9d2d681 100644
--- a/apps/app_rand.c
+++ b/ssl/record/dtls1_bitmap.c
@@ -1,4 +1,61 @@
-/* apps/app_rand.c */
+/* ssl/record/dtls1_bitmap.c */
+/*
+ * DTLS implementation written by Nagendra Modadugu
+ * (nagendra at cs.stanford.edu) for the OpenSSL project 2005.
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2015 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core at openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
 /* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
  * All rights reserved.
  *
@@ -55,166 +112,107 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core at openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay at cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh at cryptsoft.com).
- *
- */
-
-#define NON_MAIN
-#include "apps.h"
-#undef NON_MAIN
-#include <openssl/bio.h>
-#include <openssl/rand.h>
 
-static int seeded = 0;
-static int egdsocket = 0;
+#include "../ssl_locl.h"
+#include "record_locl.h"
 
-int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
+/* mod 128 saturating subtract of two 64-bit values in big-endian order */
+static int satsub64be(const unsigned char *v1, const unsigned char *v2)
 {
-    int consider_randfile = (file == NULL);
-    char buffer[200];
-
-#ifdef OPENSSL_SYS_WINDOWS
-    BIO_printf(bio_e, "Loading 'screen' into random state -");
-    BIO_flush(bio_e);
-    RAND_screen();
-    BIO_printf(bio_e, " done\n");
-#endif
+    int ret, sat, brw, i;
 
-    if (file == NULL)
-        file = RAND_file_name(buffer, sizeof buffer);
-    else if (RAND_egd(file) > 0) {
-        /*
-         * we try if the given filename is an EGD socket. if it is, we don't
-         * write anything back to the file.
-         */
-        egdsocket = 1;
-        return 1;
-    }
-    if (file == NULL || !RAND_load_file(file, -1)) {
-        if (RAND_status() == 0) {
-            if (!dont_warn) {
-                BIO_printf(bio_e, "unable to load 'random state'\n");
-                BIO_printf(bio_e,
-                           "This means that the random number generator has not been seeded\n");
-                BIO_printf(bio_e, "with much random data.\n");
-                if (consider_randfile) { /* explanation does not apply when a
-                                          * file is explicitly named */
-                    BIO_printf(bio_e,
-                               "Consider setting the RANDFILE environment variable to point at a file that\n");
-                    BIO_printf(bio_e,
-                               "'random' data can be kept in (the file will be overwritten).\n");
-                }
-            }
-            return 0;
-        }
-    }
-    seeded = 1;
-    return 1;
-}
+    if (sizeof(long) == 8)
+        do {
+            const union {
+                long one;
+                char little;
+            } is_endian = {
+                1
+            };
+            long l;
 
-long app_RAND_load_files(char *name)
-{
-    char *p, *n;
-    int last;
-    long tot = 0;
-    int egd;
+            if (is_endian.little)
+                break;
+            /* not reached on little-endians */
+            /*
+             * following test is redundant, because input is always aligned,
+             * but I take no chances...
+             */
+            if (((size_t)v1 | (size_t)v2) & 0x7)
+                break;
 
-    for (;;) {
-        last = 0;
-        for (p = name; ((*p != '\0') && (*p != LIST_SEPARATOR_CHAR)); p++) ;
-        if (*p == '\0')
-            last = 1;
-        *p = '\0';
-        n = name;
-        name = p + 1;
-        if (*n == '\0')
-            break;
+            l = *((long *)v1);
+            l -= *((long *)v2);
+            if (l > 128)
+                return 128;
+            else if (l < -128)
+                return -128;
+            else
+                return (int)l;
+        } while (0);
 
-        egd = RAND_egd(n);
-        if (egd > 0)
-            tot += egd;
-        else
-            tot += RAND_load_file(n, -1);
-        if (last)
-            break;
+    ret = (int)v1[7] - (int)v2[7];
+    sat = 0;
+    brw = ret >> 8;             /* brw is either 0 or -1 */
+    if (ret & 0x80) {
+        for (i = 6; i >= 0; i--) {
+            brw += (int)v1[i] - (int)v2[i];
+            sat |= ~brw;
+            brw >>= 8;
+        }
+    } else {
+        for (i = 6; i >= 0; i--) {
+            brw += (int)v1[i] - (int)v2[i];
+            sat |= brw;
+            brw >>= 8;
+        }
     }
-    if (tot > 512)
-        app_RAND_allow_write_file();
-    return (tot);
+    brw <<= 8;                  /* brw is either 0 or -256 */
+
+    if (sat & 0xff)
+        return brw | 0x80;
+    else
+        return brw + (ret & 0xFF);
 }
 
-int app_RAND_write_file(const char *file, BIO *bio_e)
+int dtls1_record_replay_check(SSL *s, DTLS1_BITMAP *bitmap)
 {
-    char buffer[200];
+    int cmp;
+    unsigned int shift;
+    const unsigned char *seq = s->rlayer.read_sequence;
 
-    if (egdsocket || !seeded)
-        /*
-         * If we did not manage to read the seed file, we should not write a
-         * low-entropy seed file back -- it would suppress a crucial warning
-         * the next time we want to use it.
-         */
-        return 0;
-
-    if (file == NULL)
-        file = RAND_file_name(buffer, sizeof buffer);
-    if (file == NULL || !RAND_write_file(file)) {
-        BIO_printf(bio_e, "unable to write 'random state'\n");
-        return 0;
+    cmp = satsub64be(seq, bitmap->max_seq_num);
+    if (cmp > 0) {
+        SSL3_RECORD_set_seq_num(RECORD_LAYER_get_rrec(&s->rlayer), seq);
+        return 1;               /* this record in new */
     }
+    shift = -cmp;
+    if (shift >= sizeof(bitmap->map) * 8)
+        return 0;               /* stale, outside the window */
+    else if (bitmap->map & (1UL << shift))
+        return 0;               /* record previously received */
+
+    SSL3_RECORD_set_seq_num(RECORD_LAYER_get_rrec(&s->rlayer), seq);
     return 1;
 }
 
-void app_RAND_allow_write_file(void)
+void dtls1_record_bitmap_update(SSL *s, DTLS1_BITMAP *bitmap)
 {
-    seeded = 1;
+    int cmp;
+    unsigned int shift;
+    const unsigned char *seq = RECORD_LAYER_get_read_sequence(&s->rlayer);
+
+    cmp = satsub64be(seq, bitmap->max_seq_num);
+    if (cmp > 0) {
+        shift = cmp;
+        if (shift < sizeof(bitmap->map) * 8)
+            bitmap->map <<= shift, bitmap->map |= 1UL;
+        else
+            bitmap->map = 1UL;
+        memcpy(bitmap->max_seq_num, seq, SEQ_NUM_SIZE);
+    } else {
+        shift = -cmp;
+        if (shift < sizeof(bitmap->map) * 8)
+            bitmap->map |= 1UL << shift;
+    }
 }
diff --git a/ssl/d1_pkt.c b/ssl/record/rec_layer_d1.c
similarity index 62%
rename from ssl/d1_pkt.c
rename to ssl/record/rec_layer_d1.c
index 19e60b7..80f10be 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/record/rec_layer_d1.c
@@ -1,4 +1,4 @@
-/* ssl/d1_pkt.c */
+/* ssl/record/rec_layer_d1.c */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra at cs.stanford.edu) for the OpenSSL project 2005.
@@ -116,80 +116,128 @@
 #include <stdio.h>
 #include <errno.h>
 #define USE_SOCKETS
-#include "ssl_locl.h"
+#include "../ssl_locl.h"
 #include <openssl/evp.h>
 #include <openssl/buffer.h>
 #include <openssl/pqueue.h>
 #include <openssl/rand.h>
+#include "record_locl.h"
 
-/* mod 128 saturating subtract of two 64-bit values in big-endian order */
-static int satsub64be(const unsigned char *v1, const unsigned char *v2)
+int DTLS_RECORD_LAYER_new(RECORD_LAYER *rl)
 {
-    int ret, sat, brw, i;
-
-    if (sizeof(long) == 8)
-        do {
-            const union {
-                long one;
-                char little;
-            } is_endian = {
-                1
-            };
-            long l;
-
-            if (is_endian.little)
-                break;
-            /* not reached on little-endians */
-            /*
-             * following test is redundant, because input is always aligned,
-             * but I take no chances...
-             */
-            if (((size_t)v1 | (size_t)v2) & 0x7)
-                break;
-
-            l = *((long *)v1);
-            l -= *((long *)v2);
-            if (l > 128)
-                return 128;
-            else if (l < -128)
-                return -128;
-            else
-                return (int)l;
-        } while (0);
-
-    ret = (int)v1[7] - (int)v2[7];
-    sat = 0;
-    brw = ret >> 8;             /* brw is either 0 or -1 */
-    if (ret & 0x80) {
-        for (i = 6; i >= 0; i--) {
-            brw += (int)v1[i] - (int)v2[i];
-            sat |= ~brw;
-            brw >>= 8;
+    DTLS_RECORD_LAYER *d;
+    
+    if ((d = OPENSSL_malloc(sizeof *d)) == NULL) {
+        return (0);
+    }
+
+
+    rl->d = d;
+
+    d->unprocessed_rcds.q = pqueue_new();
+    d->processed_rcds.q = pqueue_new();
+    d->buffered_app_data.q = pqueue_new();
+
+    if (!d->unprocessed_rcds.q || !d->processed_rcds.q
+        || !d->buffered_app_data.q) {
+        if (d->unprocessed_rcds.q)
+            pqueue_free(d->unprocessed_rcds.q);
+        if (d->processed_rcds.q)
+            pqueue_free(d->processed_rcds.q);
+        if (d->buffered_app_data.q)
+            pqueue_free(d->buffered_app_data.q);
+        OPENSSL_free(d);
+        rl->d = NULL;
+        return (0);
+    }
+
+    return 1;
+}
+
+void DTLS_RECORD_LAYER_free(RECORD_LAYER *rl)
+{
+    DTLS_RECORD_LAYER_clear(rl);
+    pqueue_free(rl->d->unprocessed_rcds.q);
+    pqueue_free(rl->d->processed_rcds.q);
+    pqueue_free(rl->d->buffered_app_data.q);
+    OPENSSL_free(rl->d);
+    rl->d = NULL;
+}
+
+void DTLS_RECORD_LAYER_clear(RECORD_LAYER *rl)
+{
+    DTLS_RECORD_LAYER *d;
+    pitem *item = NULL;
+    DTLS1_RECORD_DATA *rdata;
+    pqueue unprocessed_rcds;
+    pqueue processed_rcds;
+    pqueue buffered_app_data;
+
+    d = rl->d;
+    
+    while ((item = pqueue_pop(d->unprocessed_rcds.q)) != NULL) {
+        rdata = (DTLS1_RECORD_DATA *)item->data;
+        if (rdata->rbuf.buf) {
+            OPENSSL_free(rdata->rbuf.buf);
         }
-    } else {
-        for (i = 6; i >= 0; i--) {
-            brw += (int)v1[i] - (int)v2[i];
-            sat |= brw;
-            brw >>= 8;
+        OPENSSL_free(item->data);
+        pitem_free(item);
+    }
+
+    while ((item = pqueue_pop(d->processed_rcds.q)) != NULL) {
+        rdata = (DTLS1_RECORD_DATA *)item->data;
+        if (rdata->rbuf.buf) {
+            OPENSSL_free(rdata->rbuf.buf);
         }
+        OPENSSL_free(item->data);
+        pitem_free(item);
     }
-    brw <<= 8;                  /* brw is either 0 or -256 */
 
-    if (sat & 0xff)
-        return brw | 0x80;
-    else
-        return brw + (ret & 0xFF);
+    while ((item = pqueue_pop(d->buffered_app_data.q)) != NULL) {
+        rdata = (DTLS1_RECORD_DATA *)item->data;
+        if (rdata->rbuf.buf) {
+            OPENSSL_free(rdata->rbuf.buf);
+        }
+        OPENSSL_free(item->data);
+        pitem_free(item);
+    }
+
+    unprocessed_rcds = d->unprocessed_rcds.q;
+    processed_rcds = d->processed_rcds.q;
+    buffered_app_data = d->buffered_app_data.q;
+    memset(d, 0, sizeof *d);
+    d->unprocessed_rcds.q = unprocessed_rcds;
+    d->processed_rcds.q = processed_rcds;
+    d->buffered_app_data.q = buffered_app_data;
+}
+
+void DTLS_RECORD_LAYER_set_saved_w_epoch(RECORD_LAYER *rl, unsigned short e)
+{
+    if (e == rl->d->w_epoch - 1) {
+        memcpy(rl->d->curr_write_sequence,
+               rl->write_sequence,
+               sizeof(rl->write_sequence));
+        memcpy(rl->write_sequence,
+               rl->d->last_write_sequence,
+               sizeof(rl->write_sequence));
+    } else if (e == rl->d->w_epoch + 1) {
+        memcpy(rl->d->last_write_sequence,
+               rl->write_sequence,
+               sizeof(unsigned char[8]));
+        memcpy(rl->write_sequence,
+               rl->d->curr_write_sequence,
+               sizeof(rl->write_sequence));
+    }
+    rl->d->w_epoch = e;
+}
+
+void DTLS_RECORD_LAYER_resync_write(RECORD_LAYER *rl)
+{
+    memcpy(rl->write_sequence, rl->read_sequence, sizeof(rl->write_sequence));
 }
 
 static int have_handshake_fragment(SSL *s, int type, unsigned char *buf,
                                    int len, int peek);
-static int dtls1_record_replay_check(SSL *s, DTLS1_BITMAP *bitmap);
-static void dtls1_record_bitmap_update(SSL *s, DTLS1_BITMAP *bitmap);
-static DTLS1_BITMAP *dtls1_get_bitmap(SSL *s, SSL3_RECORD *rr,
-                                      unsigned int *is_next_epoch);
-static int dtls1_buffer_record(SSL *s, record_pqueue *q,
-                               unsigned char *priority);
-static int dtls1_process_record(SSL *s);
 
 /* copy buffered record into SSL structure */
 static int dtls1_copy_record(SSL *s, pitem *item)
@@ -198,22 +246,20 @@ static int dtls1_copy_record(SSL *s, pitem *item)
 
     rdata = (DTLS1_RECORD_DATA *)item->data;
 
-    if (s->s3->rbuf.buf != NULL)
-        OPENSSL_free(s->s3->rbuf.buf);
+    SSL3_BUFFER_release(&s->rlayer.rbuf);
 
-    s->packet = rdata->packet;
-    s->packet_length = rdata->packet_length;
-    memcpy(&(s->s3->rbuf), &(rdata->rbuf), sizeof(SSL3_BUFFER));
-    memcpy(&(s->s3->rrec), &(rdata->rrec), sizeof(SSL3_RECORD));
+    s->rlayer.packet = rdata->packet;
+    s->rlayer.packet_length = rdata->packet_length;
+    memcpy(&s->rlayer.rbuf, &(rdata->rbuf), sizeof(SSL3_BUFFER));
+    memcpy(&s->rlayer.rrec, &(rdata->rrec), sizeof(SSL3_RECORD));
 
     /* Set proper sequence number for mac calculation */
-    memcpy(&(s->s3->read_sequence[2]), &(rdata->packet[5]), 6);
+    memcpy(&(s->rlayer.read_sequence[2]), &(rdata->packet[5]), 6);
 
     return (1);
 }
 
-static int
-dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority)
+int dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority)
 {
     DTLS1_RECORD_DATA *rdata;
     pitem *item;
@@ -234,10 +280,10 @@ dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority)
         return -1;
     }
 
-    rdata->packet = s->packet;
-    rdata->packet_length = s->packet_length;
-    memcpy(&(rdata->rbuf), &(s->s3->rbuf), sizeof(SSL3_BUFFER));
-    memcpy(&(rdata->rrec), &(s->s3->rrec), sizeof(SSL3_RECORD));
+    rdata->packet = s->rlayer.packet;
+    rdata->packet_length = s->rlayer.packet_length;
+    memcpy(&(rdata->rbuf), &s->rlayer.rbuf, sizeof(SSL3_BUFFER));
+    memcpy(&(rdata->rrec), &s->rlayer.rrec, sizeof(SSL3_RECORD));
 
     item->data = rdata;
 
@@ -251,10 +297,10 @@ dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority)
     }
 #endif
 
-    s->packet = NULL;
-    s->packet_length = 0;
-    memset(&(s->s3->rbuf), 0, sizeof(SSL3_BUFFER));
-    memset(&(s->s3->rrec), 0, sizeof(SSL3_RECORD));
+    s->rlayer.packet = NULL;
+    s->rlayer.packet_length = 0;
+    memset(&s->rlayer.rbuf, 0, sizeof(SSL3_BUFFER));
+    memset(&s->rlayer.rrec, 0, sizeof(SSL3_RECORD));
 
     if (!ssl3_setup_buffers(s)) {
         SSLerr(SSL_F_DTLS1_BUFFER_RECORD, ERR_R_INTERNAL_ERROR);
@@ -278,7 +324,7 @@ dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority)
     return (1);
 }
 
-static int dtls1_retrieve_buffered_record(SSL *s, record_pqueue *queue)
+int dtls1_retrieve_buffered_record(SSL *s, record_pqueue *queue)
 {
     pitem *item;
 
@@ -301,33 +347,26 @@ static int dtls1_retrieve_buffered_record(SSL *s, record_pqueue *queue)
  */
 #define dtls1_get_unprocessed_record(s) \
                    dtls1_retrieve_buffered_record((s), \
-                   &((s)->d1->unprocessed_rcds))
+                   &((s)->rlayer.d->unprocessed_rcds))
 
-/*
- * retrieve a buffered record that belongs to the current epoch, ie,
- * processed
- */
-#define dtls1_get_processed_record(s) \
-                   dtls1_retrieve_buffered_record((s), \
-                   &((s)->d1->processed_rcds))
 
-static int dtls1_process_buffered_records(SSL *s)
+int dtls1_process_buffered_records(SSL *s)
 {
     pitem *item;
 
-    item = pqueue_peek(s->d1->unprocessed_rcds.q);
+    item = pqueue_peek(s->rlayer.d->unprocessed_rcds.q);
     if (item) {
         /* Check if epoch is current. */
-        if (s->d1->unprocessed_rcds.epoch != s->d1->r_epoch)
+        if (s->rlayer.d->unprocessed_rcds.epoch != s->rlayer.d->r_epoch)
             return (1);         /* Nothing to do. */
 
         /* Process all the records. */
-        while (pqueue_peek(s->d1->unprocessed_rcds.q)) {
+        while (pqueue_peek(s->rlayer.d->unprocessed_rcds.q)) {
             dtls1_get_unprocessed_record(s);
             if (!dtls1_process_record(s))
                 return (0);
-            if (dtls1_buffer_record(s, &(s->d1->processed_rcds),
-                                    s->s3->rrec.seq_num) < 0)
+            if (dtls1_buffer_record(s, &(s->rlayer.d->processed_rcds),
+                SSL3_RECORD_get_seq_num(&s->rlayer.rrec)) < 0)
                 return -1;
         }
     }
@@ -336,356 +375,12 @@ static int dtls1_process_buffered_records(SSL *s)
      * sync epoch numbers once all the unprocessed records have been
      * processed
      */
-    s->d1->processed_rcds.epoch = s->d1->r_epoch;
-    s->d1->unprocessed_rcds.epoch = s->d1->r_epoch + 1;
+    s->rlayer.d->processed_rcds.epoch = s->rlayer.d->r_epoch;
+    s->rlayer.d->unprocessed_rcds.epoch = s->rlayer.d->r_epoch + 1;
 
     return (1);
 }
 
-static int dtls1_process_record(SSL *s)
-{
-    int i, al;
-    int enc_err;
-    SSL_SESSION *sess;
-    SSL3_RECORD *rr;
-    unsigned int mac_size;
-    unsigned char md[EVP_MAX_MD_SIZE];
-
-    rr = &(s->s3->rrec);
-    sess = s->session;
-
-    /*
-     * At this point, s->packet_length == SSL3_RT_HEADER_LNGTH + rr->length,
-     * and we have that many bytes in s->packet
-     */
-    rr->input = &(s->packet[DTLS1_RT_HEADER_LENGTH]);
-
-    /*
-     * ok, we can now read from 's->packet' data into 'rr' rr->input points
-     * at rr->length bytes, which need to be copied into rr->data by either
-     * the decryption or by the decompression When the data is 'copied' into
-     * the rr->data buffer, rr->input will be pointed at the new buffer
-     */
-
-    /*
-     * We now have - encrypted [ MAC [ compressed [ plain ] ] ] rr->length
-     * bytes of encrypted compressed stuff.
-     */
-
-    /* check is not needed I believe */
-    if (rr->length > SSL3_RT_MAX_ENCRYPTED_LENGTH) {
-        al = SSL_AD_RECORD_OVERFLOW;
-        SSLerr(SSL_F_DTLS1_PROCESS_RECORD, SSL_R_ENCRYPTED_LENGTH_TOO_LONG);
-        goto f_err;
-    }
-
-    /* decrypt in place in 'rr->input' */
-    rr->data = rr->input;
-    rr->orig_len = rr->length;
-
-    enc_err = s->method->ssl3_enc->enc(s, 0);
-    /*-
-     * enc_err is:
-     *    0: (in non-constant time) if the record is publically invalid.
-     *    1: if the padding is valid
-     *   -1: if the padding is invalid
-     */
-    if (enc_err == 0) {
-        /* For DTLS we simply ignore bad packets. */
-        rr->length = 0;
-        s->packet_length = 0;
-        goto err;
-    }
-#ifdef TLS_DEBUG
-    printf("dec %d\n", rr->length);
-    {
-        unsigned int z;
-        for (z = 0; z < rr->length; z++)
-            printf("%02X%c", rr->data[z], ((z + 1) % 16) ? ' ' : '\n');
-    }
-    printf("\n");
-#endif
-
-    /* r->length is now the compressed data plus mac */
-    if ((sess != NULL) &&
-        (s->enc_read_ctx != NULL) && (EVP_MD_CTX_md(s->read_hash) != NULL)) {
-        /* s->read_hash != NULL => mac_size != -1 */
-        unsigned char *mac = NULL;
-        unsigned char mac_tmp[EVP_MAX_MD_SIZE];
-        mac_size = EVP_MD_CTX_size(s->read_hash);
-        OPENSSL_assert(mac_size <= EVP_MAX_MD_SIZE);
-
-        /*
-         * orig_len is the length of the record before any padding was
-         * removed. This is public information, as is the MAC in use,
-         * therefore we can safely process the record in a different amount
-         * of time if it's too short to possibly contain a MAC.
-         */
-        if (rr->orig_len < mac_size ||
-            /* CBC records must have a padding length byte too. */
-            (EVP_CIPHER_CTX_mode(s->enc_read_ctx) == EVP_CIPH_CBC_MODE &&
-             rr->orig_len < mac_size + 1)) {
-            al = SSL_AD_DECODE_ERROR;
-            SSLerr(SSL_F_DTLS1_PROCESS_RECORD, SSL_R_LENGTH_TOO_SHORT);
-            goto f_err;
-        }
-
-        if (EVP_CIPHER_CTX_mode(s->enc_read_ctx) == EVP_CIPH_CBC_MODE) {
-            /*
-             * We update the length so that the TLS header bytes can be
-             * constructed correctly but we need to extract the MAC in
-             * constant time from within the record, without leaking the
-             * contents of the padding bytes.
-             */
-            mac = mac_tmp;
-            ssl3_cbc_copy_mac(mac_tmp, rr, mac_size);
-            rr->length -= mac_size;
-        } else {
-            /*
-             * In this case there's no padding, so |rec->orig_len| equals
-             * |rec->length| and we checked that there's enough bytes for
-             * |mac_size| above.
-             */
-            rr->length -= mac_size;
-            mac = &rr->data[rr->length];
-        }
-
-        i = s->method->ssl3_enc->mac(s, md, 0 /* not send */ );
-        if (i < 0 || mac == NULL
-            || CRYPTO_memcmp(md, mac, (size_t)mac_size) != 0)
-            enc_err = -1;
-        if (rr->length > SSL3_RT_MAX_COMPRESSED_LENGTH + mac_size)
-            enc_err = -1;
-    }
-
-    if (enc_err < 0) {
-        /* decryption failed, silently discard message */
-        rr->length = 0;
-        s->packet_length = 0;
-        goto err;
-    }
-
-    /* r->length is now just compressed */
-    if (s->expand != NULL) {
-        if (rr->length > SSL3_RT_MAX_COMPRESSED_LENGTH) {
-            al = SSL_AD_RECORD_OVERFLOW;
-            SSLerr(SSL_F_DTLS1_PROCESS_RECORD,
-                   SSL_R_COMPRESSED_LENGTH_TOO_LONG);
-            goto f_err;
-        }
-        if (!ssl3_do_uncompress(s)) {
-            al = SSL_AD_DECOMPRESSION_FAILURE;
-            SSLerr(SSL_F_DTLS1_PROCESS_RECORD, SSL_R_BAD_DECOMPRESSION);
-            goto f_err;
-        }
-    }
-
-    if (rr->length > SSL3_RT_MAX_PLAIN_LENGTH) {
-        al = SSL_AD_RECORD_OVERFLOW;
-        SSLerr(SSL_F_DTLS1_PROCESS_RECORD, SSL_R_DATA_LENGTH_TOO_LONG);
-        goto f_err;
-    }
-
-    rr->off = 0;
-    /*-
-     * So at this point the following is true
-     * ssl->s3->rrec.type   is the type of record
-     * ssl->s3->rrec.length == number of bytes in record
-     * ssl->s3->rrec.off    == offset to first valid byte
-     * ssl->s3->rrec.data   == where to take bytes from, increment
-     *                         after use :-).
-     */
-
-    /* we have pulled in a full packet so zero things */
-    s->packet_length = 0;
-    return (1);
-
- f_err:
-    ssl3_send_alert(s, SSL3_AL_FATAL, al);
- err:
-    return (0);
-}
-
-/*-
- * Call this to get a new input record.
- * It will return <= 0 if more data is needed, normally due to an error
- * or non-blocking IO.
- * When it finishes, one packet has been decoded and can be found in
- * ssl->s3->rrec.type    - is the type of record
- * ssl->s3->rrec.data,   - data
- * ssl->s3->rrec.length, - number of bytes
- */
-/* used only by dtls1_read_bytes */
-int dtls1_get_record(SSL *s)
-{
-    int ssl_major, ssl_minor;
-    int i, n;
-    SSL3_RECORD *rr;
-    unsigned char *p = NULL;
-    unsigned short version;
-    DTLS1_BITMAP *bitmap;
-    unsigned int is_next_epoch;
-
-    rr = &(s->s3->rrec);
-
-    /*
-     * The epoch may have changed.  If so, process all the pending records.
-     * This is a non-blocking operation.
-     */
-    if (dtls1_process_buffered_records(s) < 0)
-        return -1;
-
-    /* if we're renegotiating, then there may be buffered records */
-    if (dtls1_get_processed_record(s))
-        return 1;
-
-    /* get something from the wire */
- again:
-    /* check if we have the header */
-    if ((s->rstate != SSL_ST_READ_BODY) ||
-        (s->packet_length < DTLS1_RT_HEADER_LENGTH)) {
-        n = ssl3_read_n(s, DTLS1_RT_HEADER_LENGTH, s->s3->rbuf.len, 0);
-        /* read timeout is handled by dtls1_read_bytes */
-        if (n <= 0)
-            return (n);         /* error or non-blocking */
-
-        /* this packet contained a partial record, dump it */
-        if (s->packet_length != DTLS1_RT_HEADER_LENGTH) {
-            s->packet_length = 0;
-            goto again;
-        }
-
-        s->rstate = SSL_ST_READ_BODY;
-
-        p = s->packet;
-
-        if (s->msg_callback)
-            s->msg_callback(0, 0, SSL3_RT_HEADER, p, DTLS1_RT_HEADER_LENGTH,
-                            s, s->msg_callback_arg);
-
-        /* Pull apart the header into the DTLS1_RECORD */
-        rr->type = *(p++);
-        ssl_major = *(p++);
-        ssl_minor = *(p++);
-        version = (ssl_major << 8) | ssl_minor;
-
-        /* sequence number is 64 bits, with top 2 bytes = epoch */
-        n2s(p, rr->epoch);
-
-        memcpy(&(s->s3->read_sequence[2]), p, 6);
-        p += 6;
-
-        n2s(p, rr->length);
-
-        /* Lets check version */
-        if (!s->first_packet) {
-            if (version != s->version) {
-                /* unexpected version, silently discard */
-                rr->length = 0;
-                s->packet_length = 0;
-                goto again;
-            }
-        }
-
-        if ((version & 0xff00) != (s->version & 0xff00)) {
-            /* wrong version, silently discard record */
-            rr->length = 0;
-            s->packet_length = 0;
-            goto again;
-        }
-
-        if (rr->length > SSL3_RT_MAX_ENCRYPTED_LENGTH) {
-            /* record too long, silently discard it */
-            rr->length = 0;
-            s->packet_length = 0;
-            goto again;
-        }
-
-        /* now s->rstate == SSL_ST_READ_BODY */
-    }
-
-    /* s->rstate == SSL_ST_READ_BODY, get and decode the data */
-
-    if (rr->length > s->packet_length - DTLS1_RT_HEADER_LENGTH) {
-        /* now s->packet_length == DTLS1_RT_HEADER_LENGTH */
-        i = rr->length;
-        n = ssl3_read_n(s, i, i, 1);
-        /* this packet contained a partial record, dump it */
-        if (n != i) {
-            rr->length = 0;
-            s->packet_length = 0;
-            goto again;
-        }
-
-        /*
-         * now n == rr->length, and s->packet_length ==
-         * DTLS1_RT_HEADER_LENGTH + rr->length
-         */
-    }
-    s->rstate = SSL_ST_READ_HEADER; /* set state for later operations */
-
-    /* match epochs.  NULL means the packet is dropped on the floor */
-    bitmap = dtls1_get_bitmap(s, rr, &is_next_epoch);
-    if (bitmap == NULL) {
-        rr->length = 0;
-        s->packet_length = 0;   /* dump this record */
-        goto again;             /* get another record */
-    }
-#ifndef OPENSSL_NO_SCTP
-    /* Only do replay check if no SCTP bio */
-    if (!BIO_dgram_is_sctp(SSL_get_rbio(s))) {
-#endif
-        /*
-         * Check whether this is a repeat, or aged record. Don't check if
-         * we're listening and this message is a ClientHello. They can look
-         * as if they're replayed, since they arrive from different
-         * connections and would be dropped unnecessarily.
-         */
-        if (!(s->d1->listen && rr->type == SSL3_RT_HANDSHAKE &&
-              s->packet_length > DTLS1_RT_HEADER_LENGTH &&
-              s->packet[DTLS1_RT_HEADER_LENGTH] == SSL3_MT_CLIENT_HELLO) &&
-            !dtls1_record_replay_check(s, bitmap)) {
-            rr->length = 0;
-            s->packet_length = 0; /* dump this record */
-            goto again;         /* get another record */
-        }
-#ifndef OPENSSL_NO_SCTP
-    }
-#endif
-
-    /* just read a 0 length packet */
-    if (rr->length == 0)
-        goto again;
-
-    /*
-     * If this record is from the next epoch (either HM or ALERT), and a
-     * handshake is currently in progress, buffer it since it cannot be
-     * processed at this time. However, do not buffer anything while
-     * listening.
-     */
-    if (is_next_epoch) {
-        if ((SSL_in_init(s) || s->in_handshake) && !s->d1->listen) {
-            if (dtls1_buffer_record
-                (s, &(s->d1->unprocessed_rcds), rr->seq_num) < 0)
-                return -1;
-            /* Mark receipt of record. */
-            dtls1_record_bitmap_update(s, bitmap);
-        }
-        rr->length = 0;
-        s->packet_length = 0;
-        goto again;
-    }
-
-    if (!dtls1_process_record(s)) {
-        rr->length = 0;
-        s->packet_length = 0;   /* dump this record */
-        goto again;             /* get another record */
-    }
-    dtls1_record_bitmap_update(s, bitmap); /* Mark receipt of record. */
-
-    return (1);
-
-}
 
 /*-
  * Return up to 'len' payload bytes received in 'type' records.
@@ -722,9 +417,11 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
     SSL3_RECORD *rr;
     void (*cb) (const SSL *ssl, int type2, int val) = NULL;
 
-    if (s->s3->rbuf.buf == NULL) /* Not initialized yet */
+    if (!SSL3_BUFFER_is_initialised(&s->rlayer.rbuf)) {
+        /* Not initialized yet */
         if (!ssl3_setup_buffers(s))
             return (-1);
+    }
 
     if ((type && (type != SSL3_RT_APPLICATION_DATA) &&
          (type != SSL3_RT_HANDSHAKE)) ||
@@ -740,7 +437,8 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         return ret;
 
     /*
-     * Now s->d1->handshake_fragment_len == 0 if type == SSL3_RT_HANDSHAKE.
+     * Now s->rlayer.d->handshake_fragment_len == 0 if
+     * type == SSL3_RT_HANDSHAKE.
      */
 
 #ifndef OPENSSL_NO_SCTP
@@ -776,7 +474,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
      * s->s3->rrec.off,     - offset into 'data' for next read
      * s->s3->rrec.length,  - number of bytes.
      */
-    rr = &(s->s3->rrec);
+    rr = &s->rlayer.rrec;
 
     /*
      * We are not handshaking and have no data yet, so process data buffered
@@ -784,7 +482,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
      */
     if (s->state == SSL_ST_OK && rr->length == 0) {
         pitem *item;
-        item = pqueue_pop(s->d1->buffered_app_data.q);
+        item = pqueue_pop(s->rlayer.d->buffered_app_data.q);
         if (item) {
 #ifndef OPENSSL_NO_SCTP
             /* Restore bio_dgram_sctp_rcvinfo struct */
@@ -807,7 +505,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         goto start;
 
     /* get new packet if necessary */
-    if ((rr->length == 0) || (s->rstate == SSL_ST_READ_BODY)) {
+    if ((rr->length == 0) || (s->rlayer.rstate == SSL_ST_READ_BODY)) {
         ret = dtls1_get_record(s);
         if (ret <= 0) {
             ret = dtls1_read_failed(s, ret);
@@ -834,8 +532,8 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
          * the packets were reordered on their way, so buffer the application
          * data for later processing rather than dropping the connection.
          */
-        if (dtls1_buffer_record(s, &(s->d1->buffered_app_data), rr->seq_num) <
-            0) {
+        if (dtls1_buffer_record(s, &(s->rlayer.d->buffered_app_data),
+            rr->seq_num) < 0) {
             SSLerr(SSL_F_DTLS1_READ_BYTES, ERR_R_INTERNAL_ERROR);
             return -1;
         }
@@ -879,7 +577,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             rr->length -= n;
             rr->off += n;
             if (rr->length == 0) {
-                s->rstate = SSL_ST_READ_HEADER;
+                s->rlayer.rstate = SSL_ST_READ_HEADER;
                 rr->off = 0;
             }
         }
@@ -927,21 +625,21 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         unsigned int *dest_len = NULL;
 
         if (rr->type == SSL3_RT_HANDSHAKE) {
-            dest_maxlen = sizeof s->d1->handshake_fragment;
-            dest = s->d1->handshake_fragment;
-            dest_len = &s->d1->handshake_fragment_len;
+            dest_maxlen = sizeof s->rlayer.d->handshake_fragment;
+            dest = s->rlayer.d->handshake_fragment;
+            dest_len = &s->rlayer.d->handshake_fragment_len;
         } else if (rr->type == SSL3_RT_ALERT) {
-            dest_maxlen = sizeof(s->d1->alert_fragment);
-            dest = s->d1->alert_fragment;
-            dest_len = &s->d1->alert_fragment_len;
+            dest_maxlen = sizeof(s->rlayer.d->alert_fragment);
+            dest = s->rlayer.d->alert_fragment;
+            dest_len = &s->rlayer.d->alert_fragment_len;
         }
 #ifndef OPENSSL_NO_HEARTBEATS
         else if (rr->type == TLS1_RT_HEARTBEAT) {
             /* We allow a 0 return */
-            if(dtls1_process_heartbeat(s) < 0) {
+            if(dtls1_process_heartbeat(s, SSL3_RECORD_get_data(&s->rlayer.rrec),
+                    SSL3_RECORD_get_length(&s->rlayer.rrec)) < 0) {
                 return -1;
             }
-
             /* Exit and notify application to read again */
             rr->length = 0;
             s->rwstate = SSL_READING;
@@ -986,7 +684,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
                  */
                 FIX ME
 #endif
-                 s->rstate = SSL_ST_READ_HEADER;
+                 s->rlayer.rstate = SSL_ST_READ_HEADER;
                 rr->length = 0;
                 goto start;
             }
@@ -1001,21 +699,21 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
     }
 
     /*-
-     * s->d1->handshake_fragment_len == 12  iff  rr->type == SSL3_RT_HANDSHAKE;
-     * s->d1->alert_fragment_len == 7      iff  rr->type == SSL3_RT_ALERT.
+     * s->rlayer.d->handshake_fragment_len == 12  iff  rr->type == SSL3_RT_HANDSHAKE;
+     * s->rlayer.d->alert_fragment_len == 7      iff  rr->type == SSL3_RT_ALERT.
      * (Possibly rr is 'empty' now, i.e. rr->length may be 0.)
      */
 
     /* If we are a client, check for an incoming 'Hello Request': */
     if ((!s->server) &&
-        (s->d1->handshake_fragment_len >= DTLS1_HM_HEADER_LENGTH) &&
-        (s->d1->handshake_fragment[0] == SSL3_MT_HELLO_REQUEST) &&
+        (s->rlayer.d->handshake_fragment_len >= DTLS1_HM_HEADER_LENGTH) &&
+        (s->rlayer.d->handshake_fragment[0] == SSL3_MT_HELLO_REQUEST) &&
         (s->session != NULL) && (s->session->cipher != NULL)) {
-        s->d1->handshake_fragment_len = 0;
+        s->rlayer.d->handshake_fragment_len = 0;
 
-        if ((s->d1->handshake_fragment[1] != 0) ||
-            (s->d1->handshake_fragment[2] != 0) ||
-            (s->d1->handshake_fragment[3] != 0)) {
+        if ((s->rlayer.d->handshake_fragment[1] != 0) ||
+            (s->rlayer.d->handshake_fragment[2] != 0) ||
+            (s->rlayer.d->handshake_fragment[3] != 0)) {
             al = SSL_AD_DECODE_ERROR;
             SSLerr(SSL_F_DTLS1_READ_BYTES, SSL_R_BAD_HELLO_REQUEST);
             goto err;
@@ -1027,7 +725,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
 
         if (s->msg_callback)
             s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE,
-                            s->d1->handshake_fragment, 4, s,
+                            s->rlayer.d->handshake_fragment, 4, s,
                             s->msg_callback_arg);
 
         if (SSL_is_init_finished(s) &&
@@ -1047,7 +745,8 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
                 }
 
                 if (!(s->mode & SSL_MODE_AUTO_RETRY)) {
-                    if (s->s3->rbuf.left == 0) { /* no read-ahead left? */
+                    if (SSL3_BUFFER_get_left(&s->rlayer.rbuf) == 0) {
+                        /* no read-ahead left? */
                         BIO *bio;
                         /*
                          * In the case where we try to read application data,
@@ -1071,15 +770,16 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         goto start;
     }
 
-    if (s->d1->alert_fragment_len >= DTLS1_AL_HEADER_LENGTH) {
-        int alert_level = s->d1->alert_fragment[0];
-        int alert_descr = s->d1->alert_fragment[1];
+    if (s->rlayer.d->alert_fragment_len >= DTLS1_AL_HEADER_LENGTH) {
+        int alert_level = s->rlayer.d->alert_fragment[0];
+        int alert_descr = s->rlayer.d->alert_fragment[1];
 
-        s->d1->alert_fragment_len = 0;
+        s->rlayer.d->alert_fragment_len = 0;
 
         if (s->msg_callback)
             s->msg_callback(0, s->version, SSL3_RT_ALERT,
-                            s->d1->alert_fragment, 2, s, s->msg_callback_arg);
+                            s->rlayer.d->alert_fragment, 2, s,
+                            s->msg_callback_arg);
 
         if (s->info_callback != NULL)
             cb = s->info_callback;
@@ -1118,7 +818,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             if (alert_descr == DTLS1_AD_MISSING_HANDSHAKE_MESSAGE) {
                 unsigned short seq;
                 unsigned int frag_off;
-                unsigned char *p = &(s->d1->alert_fragment[2]);
+                unsigned char *p = &(s->rlayer.d->alert_fragment[2]);
 
                 n2s(p, seq);
                 n2l3(p, frag_off);
@@ -1230,13 +930,13 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
     /*
      * Unexpected handshake message (Client Hello, or protocol violation)
      */
-    if ((s->d1->handshake_fragment_len >= DTLS1_HM_HEADER_LENGTH) &&
+    if ((s->rlayer.d->handshake_fragment_len >= DTLS1_HM_HEADER_LENGTH) &&
         !s->in_handshake) {
         struct hm_header_st msg_hdr;
 
         /* this may just be a stale retransmit */
         dtls1_get_message_header(rr->data, &msg_hdr);
-        if (rr->epoch != s->d1->r_epoch) {
+        if (rr->epoch != s->rlayer.d->r_epoch) {
             rr->length = 0;
             goto start;
         }
@@ -1269,7 +969,8 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         }
 
         if (!(s->mode & SSL_MODE_AUTO_RETRY)) {
-            if (s->s3->rbuf.left == 0) { /* no read-ahead left? */
+            if (SSL3_BUFFER_get_left(&s->rlayer.rbuf) == 0) {
+                /* no read-ahead left? */
                 BIO *bio;
                 /*
                  * In the case where we try to read application data, but we
@@ -1342,69 +1043,34 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
     return (-1);
 }
 
-int dtls1_write_app_data_bytes(SSL *s, int type, const void *buf_, int len)
-{
-    int i;
-
-#ifndef OPENSSL_NO_SCTP
-    /*
-     * Check if we have to continue an interrupted handshake for reading
-     * belated app data with SCTP.
-     */
-    if ((SSL_in_init(s) && !s->in_handshake) ||
-        (BIO_dgram_is_sctp(SSL_get_wbio(s)) &&
-         (s->state == DTLS1_SCTP_ST_SR_READ_SOCK
-          || s->state == DTLS1_SCTP_ST_CR_READ_SOCK)))
-#else
-    if (SSL_in_init(s) && !s->in_handshake)
-#endif
-    {
-        i = s->handshake_func(s);
-        if (i < 0)
-            return (i);
-        if (i == 0) {
-            SSLerr(SSL_F_DTLS1_WRITE_APP_DATA_BYTES,
-                   SSL_R_SSL_HANDSHAKE_FAILURE);
-            return -1;
-        }
-    }
-
-    if (len > SSL3_RT_MAX_PLAIN_LENGTH) {
-        SSLerr(SSL_F_DTLS1_WRITE_APP_DATA_BYTES, SSL_R_DTLS_MESSAGE_TOO_BIG);
-        return -1;
-    }
-
-    i = dtls1_write_bytes(s, type, buf_, len);
-    return i;
-}
 
         /*
          * this only happens when a client hello is received and a handshake
          * is started.
          */
-static int
-have_handshake_fragment(SSL *s, int type, unsigned char *buf,
-                        int len, int peek)
+static int have_handshake_fragment(SSL *s, int type, unsigned char *buf,
+                                   int len, int peek)
 {
 
-    if ((type == SSL3_RT_HANDSHAKE) && (s->d1->handshake_fragment_len > 0))
+    if ((type == SSL3_RT_HANDSHAKE)
+            && (s->rlayer.d->handshake_fragment_len > 0))
         /* (partially) satisfy request from storage */
     {
-        unsigned char *src = s->d1->handshake_fragment;
+        unsigned char *src = s->rlayer.d->handshake_fragment;
         unsigned char *dst = buf;
         unsigned int k, n;
 
         /* peek == 0 */
         n = 0;
-        while ((len > 0) && (s->d1->handshake_fragment_len > 0)) {
+        while ((len > 0) && (s->rlayer.d->handshake_fragment_len > 0)) {
             *dst++ = *src++;
             len--;
-            s->d1->handshake_fragment_len--;
+            s->rlayer.d->handshake_fragment_len--;
             n++;
         }
         /* move any remaining fragment bytes: */
-        for (k = 0; k < s->d1->handshake_fragment_len; k++)
-            s->d1->handshake_fragment[k] = *src++;
+        for (k = 0; k < s->rlayer.d->handshake_fragment_len; k++)
+            s->rlayer.d->handshake_fragment[k] = *src++;
         return n;
     }
 
@@ -1436,11 +1102,13 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
     SSL3_BUFFER *wb;
     SSL_SESSION *sess;
 
+    wb = &s->rlayer.wbuf;
+
     /*
      * first check if there is a SSL3_BUFFER still being written out.  This
      * will happen with non blocking IO
      */
-    if (s->s3->wbuf.left != 0) {
+    if (SSL3_BUFFER_get_left(wb) != 0) {
         OPENSSL_assert(0);      /* XDTLS: want to see if we ever get here */
         return (ssl3_write_pending(s, type, buf, len));
     }
@@ -1456,8 +1124,7 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
     if (len == 0 && !create_empty_fragment)
         return 0;
 
-    wr = &(s->s3->wrec);
-    wb = &(s->s3->wbuf);
+    wr = &s->rlayer.wrec;
     sess = s->session;
 
     if ((sess == NULL) ||
@@ -1561,14 +1228,14 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
 
     /* there's only one epoch between handshake and app data */
 
-    s2n(s->d1->w_epoch, pseq);
+    s2n(s->rlayer.d->w_epoch, pseq);
 
     /* XDTLS: ?? */
     /*
      * else s2n(s->d1->handshake_epoch, pseq);
      */
 
-    memcpy(pseq, &(s->s3->write_sequence[2]), 6);
+    memcpy(pseq, &(s->rlayer.write_sequence[2]), 6);
     pseq += 6;
     s2n(wr->length, pseq);
 
@@ -1583,7 +1250,7 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
     wr->type = type;            /* not needed but helps for debugging */
     wr->length += DTLS1_RT_HEADER_LENGTH;
 
-    ssl3_record_sequence_update(&(s->s3->write_sequence[0]));
+    ssl3_record_sequence_update(&(s->rlayer.write_sequence[0]));
 
     if (create_empty_fragment) {
         /*
@@ -1601,10 +1268,10 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
      * memorize arguments so that ssl3_write_pending can detect bad write
      * retries later
      */
-    s->s3->wpend_tot = len;
-    s->s3->wpend_buf = buf;
-    s->s3->wpend_type = type;
-    s->s3->wpend_ret = len;
+    s->rlayer.wpend_tot = len;
+    s->rlayer.wpend_buf = buf;
+    s->rlayer.wpend_type = type;
+    s->rlayer.wpend_ret = len;
 
     /* we now just need to write the buffer */
     return ssl3_write_pending(s, type, buf, len);
@@ -1612,112 +1279,21 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
     return -1;
 }
 
-static int dtls1_record_replay_check(SSL *s, DTLS1_BITMAP *bitmap)
-{
-    int cmp;
-    unsigned int shift;
-    const unsigned char *seq = s->s3->read_sequence;
-
-    cmp = satsub64be(seq, bitmap->max_seq_num);
-    if (cmp > 0) {
-        memcpy(s->s3->rrec.seq_num, seq, 8);
-        return 1;               /* this record in new */
-    }
-    shift = -cmp;
-    if (shift >= sizeof(bitmap->map) * 8)
-        return 0;               /* stale, outside the window */
-    else if (bitmap->map & (1UL << shift))
-        return 0;               /* record previously received */
-
-    memcpy(s->s3->rrec.seq_num, seq, 8);
-    return 1;
-}
-
-static void dtls1_record_bitmap_update(SSL *s, DTLS1_BITMAP *bitmap)
-{
-    int cmp;
-    unsigned int shift;
-    const unsigned char *seq = s->s3->read_sequence;
-
-    cmp = satsub64be(seq, bitmap->max_seq_num);
-    if (cmp > 0) {
-        shift = cmp;
-        if (shift < sizeof(bitmap->map) * 8)
-            bitmap->map <<= shift, bitmap->map |= 1UL;
-        else
-            bitmap->map = 1UL;
-        memcpy(bitmap->max_seq_num, seq, 8);
-    } else {
-        shift = -cmp;
-        if (shift < sizeof(bitmap->map) * 8)
-            bitmap->map |= 1UL << shift;
-    }
-}
-
-int dtls1_dispatch_alert(SSL *s)
-{
-    int i, j;
-    void (*cb) (const SSL *ssl, int type, int val) = NULL;
-    unsigned char buf[DTLS1_AL_HEADER_LENGTH];
-    unsigned char *ptr = &buf[0];
-
-    s->s3->alert_dispatch = 0;
-
-    memset(buf, 0x00, sizeof(buf));
-    *ptr++ = s->s3->send_alert[0];
-    *ptr++ = s->s3->send_alert[1];
-
-#ifdef DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
-    if (s->s3->send_alert[1] == DTLS1_AD_MISSING_HANDSHAKE_MESSAGE) {
-        s2n(s->d1->handshake_read_seq, ptr);
-        l2n3(s->d1->r_msg_hdr.frag_off, ptr);
-    }
-#endif
-
-    i = do_dtls1_write(s, SSL3_RT_ALERT, &buf[0], sizeof(buf), 0);
-    if (i <= 0) {
-        s->s3->alert_dispatch = 1;
-        /* fprintf( stderr, "not done with alert\n" ); */
-    } else {
-        if (s->s3->send_alert[0] == SSL3_AL_FATAL
-#ifdef DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
-            || s->s3->send_alert[1] == DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
-#endif
-            )
-            (void)BIO_flush(s->wbio);
-
-        if (s->msg_callback)
-            s->msg_callback(1, s->version, SSL3_RT_ALERT, s->s3->send_alert,
-                            2, s, s->msg_callback_arg);
-
-        if (s->info_callback != NULL)
-            cb = s->info_callback;
-        else if (s->ctx->info_callback != NULL)
-            cb = s->ctx->info_callback;
-
-        if (cb != NULL) {
-            j = (s->s3->send_alert[0] << 8) | s->s3->send_alert[1];
-            cb(s, SSL_CB_WRITE_ALERT, j);
-        }
-    }
-    return (i);
-}
-
-static DTLS1_BITMAP *dtls1_get_bitmap(SSL *s, SSL3_RECORD *rr,
+DTLS1_BITMAP *dtls1_get_bitmap(SSL *s, SSL3_RECORD *rr,
                                       unsigned int *is_next_epoch)
 {
 
     *is_next_epoch = 0;
 
     /* In current epoch, accept HM, CCS, DATA, & ALERT */
-    if (rr->epoch == s->d1->r_epoch)
-        return &s->d1->bitmap;
+    if (rr->epoch == s->rlayer.d->r_epoch)
+        return &s->rlayer.d->bitmap;
 
     /* Only HM and ALERT messages can be from the next epoch */
-    else if (rr->epoch == (unsigned long)(s->d1->r_epoch + 1) &&
-             (rr->type == SSL3_RT_HANDSHAKE || rr->type == SSL3_RT_ALERT)) {
+    else if (rr->epoch == (unsigned long)(s->rlayer.d->r_epoch + 1) &&
+            (rr->type == SSL3_RT_HANDSHAKE || rr->type == SSL3_RT_ALERT)) {
         *is_next_epoch = 1;
-        return &s->d1->next_bitmap;
+        return &s->rlayer.d->next_bitmap;
     }
 
     return NULL;
@@ -1726,18 +1302,19 @@ static DTLS1_BITMAP *dtls1_get_bitmap(SSL *s, SSL3_RECORD *rr,
 void dtls1_reset_seq_numbers(SSL *s, int rw)
 {
     unsigned char *seq;
-    unsigned int seq_bytes = sizeof(s->s3->read_sequence);
+    unsigned int seq_bytes = sizeof(s->rlayer.read_sequence);
 
     if (rw & SSL3_CC_READ) {
-        seq = s->s3->read_sequence;
-        s->d1->r_epoch++;
-        memcpy(&(s->d1->bitmap), &(s->d1->next_bitmap), sizeof(DTLS1_BITMAP));
-        memset(&(s->d1->next_bitmap), 0x00, sizeof(DTLS1_BITMAP));
+        seq = s->rlayer.read_sequence;
+        s->rlayer.d->r_epoch++;
+        memcpy(&(s->rlayer.d->bitmap), &(s->rlayer.d->next_bitmap),
+            sizeof(DTLS1_BITMAP));
+        memset(&(s->rlayer.d->next_bitmap), 0x00, sizeof(DTLS1_BITMAP));
     } else {
-        seq = s->s3->write_sequence;
-        memcpy(s->d1->last_write_sequence, seq,
-               sizeof(s->s3->write_sequence));
-        s->d1->w_epoch++;
+        seq = s->rlayer.write_sequence;
+        memcpy(s->rlayer.d->last_write_sequence, seq,
+               sizeof(s->rlayer.write_sequence));
+        s->rlayer.d->w_epoch++;
     }
 
     memset(seq, 0x00, seq_bytes);
diff --git a/ssl/s23_pkt.c b/ssl/record/rec_layer_s23.c
similarity index 90%
rename from ssl/s23_pkt.c
rename to ssl/record/rec_layer_s23.c
index efc8647..eb09be1 100644
--- a/ssl/s23_pkt.c
+++ b/ssl/record/rec_layer_s23.c
@@ -1,4 +1,4 @@
-/* ssl/s23_pkt.c */
+/* ssl/record/rec_layer_s23.c */
 /* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
  * All rights reserved.
  *
@@ -59,7 +59,7 @@
 #include <stdio.h>
 #include <errno.h>
 #define USE_SOCKETS
-#include "ssl_locl.h"
+#include "../ssl_locl.h"
 #include <openssl/evp.h>
 #include <openssl/buffer.h>
 
@@ -94,19 +94,20 @@ int ssl23_read_bytes(SSL *s, int n)
     unsigned char *p;
     int j;
 
-    if (s->packet_length < (unsigned int)n) {
-        p = s->packet;
+    if (s->rlayer.packet_length < (unsigned int)n) {
+        p = s->rlayer.packet;
 
         for (;;) {
             s->rwstate = SSL_READING;
-            j = BIO_read(s->rbio, (char *)&(p[s->packet_length]),
-                         n - s->packet_length);
+            j = BIO_read(s->rbio,
+                (char *)&(p[s->rlayer.packet_length]),
+                n - s->rlayer.packet_length);
             if (j <= 0)
                 return (j);
             s->rwstate = SSL_NOTHING;
-            s->packet_length += j;
-            if (s->packet_length >= (unsigned int)n)
-                return (s->packet_length);
+            s->rlayer.packet_length += j;
+            if (s->rlayer.packet_length >= (unsigned int)n)
+                return (s->rlayer.packet_length);
         }
     }
     return (n);
diff --git a/ssl/s3_pkt.c b/ssl/record/rec_layer_s3.c
similarity index 68%
rename from ssl/s3_pkt.c
rename to ssl/record/rec_layer_s3.c
index 4f81f1a..dc89be8 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/record/rec_layer_s3.c
@@ -1,4 +1,4 @@
-/* ssl/s3_pkt.c */
+/* ssl/record/rec_layer_s3.c */
 /* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
  * All rights reserved.
  *
@@ -113,10 +113,11 @@
 #include <limits.h>
 #include <errno.h>
 #define USE_SOCKETS
-#include "ssl_locl.h"
+#include "../ssl_locl.h"
 #include <openssl/evp.h>
 #include <openssl/buffer.h>
 #include <openssl/rand.h>
+#include "record_locl.h"
 
 #ifndef  EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK
 # define EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0
@@ -132,9 +133,156 @@
 # define EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0
 #endif
 
-static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
-                         unsigned int len, int create_empty_fragment);
-static int ssl3_get_record(SSL *s);
+void RECORD_LAYER_init(RECORD_LAYER *rl, SSL *s)
+{
+    rl->s = s;
+    SSL3_RECORD_clear(&rl->rrec);
+    SSL3_RECORD_clear(&rl->wrec);
+}
+
+void RECORD_LAYER_clear(RECORD_LAYER *rl)
+{
+    unsigned char *rp, *wp;
+    size_t rlen, wlen;
+    int read_ahead;
+    SSL *s;
+    DTLS_RECORD_LAYER *d;
+
+    s = rl->s;
+    d = rl->d;
+    read_ahead = rl->read_ahead;
+    rp = SSL3_BUFFER_get_buf(&rl->rbuf);
+    rlen = SSL3_BUFFER_get_len(&rl->rbuf);
+    wp = SSL3_BUFFER_get_buf(&rl->wbuf);
+    wlen = SSL3_BUFFER_get_len(&rl->wbuf);
+    memset(rl, 0, sizeof (RECORD_LAYER));
+    SSL3_BUFFER_set_buf(&rl->rbuf, rp);
+    SSL3_BUFFER_set_len(&rl->rbuf, rlen);
+    SSL3_BUFFER_set_buf(&rl->wbuf, wp);
+    SSL3_BUFFER_set_len(&rl->wbuf, wlen);
+
+    /* Do I need to do this? As far as I can tell read_ahead did not
+     * previously get reset by SSL_clear...so I'll keep it that way..but is
+     * that right?
+     */
+    rl->read_ahead = read_ahead;
+    rl->rstate = SSL_ST_READ_HEADER;
+    rl->s = s;
+    rl->d = d;
+    
+    if(d)
+        DTLS_RECORD_LAYER_clear(rl);
+}
+
+void RECORD_LAYER_release(RECORD_LAYER *rl)
+{
+    if (SSL3_BUFFER_is_initialised(&rl->rbuf))
+        ssl3_release_read_buffer(rl->s);
+    if (SSL3_BUFFER_is_initialised(&rl->wbuf))
+        ssl3_release_write_buffer(rl->s);
+    SSL3_RECORD_release(&rl->rrec);
+}
+
+int RECORD_LAYER_read_pending(RECORD_LAYER *rl)
+{
+    return SSL3_BUFFER_get_left(&rl->rbuf) != 0;
+}
+
+int RECORD_LAYER_write_pending(RECORD_LAYER *rl)
+{
+    return SSL3_BUFFER_get_left(&rl->wbuf) != 0;
+}
+
+int RECORD_LAYER_set_data(RECORD_LAYER *rl, const unsigned char *buf, int len)
+{
+    rl->packet_length = len;
+    if(len != 0) {
+        rl->rstate = SSL_ST_READ_HEADER;
+        if (!SSL3_BUFFER_is_initialised(&rl->rbuf))
+            if (!ssl3_setup_read_buffer(rl->s))
+                return 0;
+    }
+
+    rl->packet = SSL3_BUFFER_get_buf(&rl->rbuf);
+    SSL3_BUFFER_set_data(&rl->rbuf, buf, len);
+
+    return 1;
+}
+
+void RECORD_LAYER_dup(RECORD_LAYER *dst, RECORD_LAYER *src)
+{
+    /*
+     * Currently only called from SSL_dup...which only seems to expect the
+     * rstate to be duplicated and nothing else from the RECORD_LAYER???
+     */
+    dst->rstate = src->rstate;
+}
+
+void RECORD_LAYER_reset_read_sequence(RECORD_LAYER *rl)
+{
+    memset(rl->read_sequence, 0, 8);
+}
+
+void RECORD_LAYER_reset_write_sequence(RECORD_LAYER *rl)
+{
+    memset(rl->write_sequence, 0, 8);
+}
+
+int RECORD_LAYER_setup_comp_buffer(RECORD_LAYER *rl)
+{
+    return SSL3_RECORD_setup(&(rl)->rrec);
+}
+
+int ssl3_pending(const SSL *s)
+{
+    if (s->rlayer.rstate == SSL_ST_READ_BODY)
+        return 0;
+
+    return (SSL3_RECORD_get_type(&s->rlayer.rrec) == SSL3_RT_APPLICATION_DATA)
+           ? SSL3_RECORD_get_length(&s->rlayer.rrec) : 0;
+}
+
+const char *SSL_rstate_string_long(const SSL *s)
+{
+    const char *str;
+
+    switch (s->rlayer.rstate) {
+    case SSL_ST_READ_HEADER:
+        str = "read header";
+        break;
+    case SSL_ST_READ_BODY:
+        str = "read body";
+        break;
+    case SSL_ST_READ_DONE:
+        str = "read done";
+        break;
+    default:
+        str = "unknown";
+        break;
+    }
+    return (str);
+}
+
+const char *SSL_rstate_string(const SSL *s)
+{
+    const char *str;
+
+    switch (s->rlayer.rstate) {
+    case SSL_ST_READ_HEADER:
+        str = "RH";
+        break;
+    case SSL_ST_READ_BODY:
+        str = "RB";
+        break;
+    case SSL_ST_READ_DONE:
+        str = "RD";
+        break;
+    default:
+        str = "unknown";
+        break;
+    }
+    return (str);
+}
 
 int ssl3_read_n(SSL *s, int n, int max, int extend)
 {
@@ -142,7 +290,7 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
      * If extend == 0, obtain new n-byte packet; if extend == 1, increase
      * packet by another n bytes. The packet will be in the sub-array of
      * s->s3->rbuf.buf specified by s->packet and s->packet_length. (If
-     * s->read_ahead is set, 'max' bytes may be stored in rbuf [plus
+     * s->rlayer.read_ahead is set, 'max' bytes may be stored in rbuf [plus
      * s->packet_length bytes if extend == 1].)
      */
     int i, len, left;
@@ -153,7 +301,7 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
     if (n <= 0)
         return n;
 
-    rb = &(s->s3->rbuf);
+    rb = &s->rlayer.rbuf;
     if (rb->buf == NULL)
         if (!ssl3_setup_read_buffer(s))
             return -1;
@@ -187,8 +335,8 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
                 rb->offset = align;
             }
         }
-        s->packet = rb->buf + rb->offset;
-        s->packet_length = 0;
+        s->rlayer.packet = rb->buf + rb->offset;
+        s->rlayer.packet_length = 0;
         /* ... now we can act as if 'extend' was set */
     }
 
@@ -206,7 +354,7 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
 
     /* if there is enough in the buffer from a previous read, take some */
     if (left >= n) {
-        s->packet_length += n;
+        s->rlayer.packet_length += n;
         rb->left = left - n;
         rb->offset += n;
         return (n);
@@ -214,15 +362,15 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
 
     /* else we need to read more data */
 
-    len = s->packet_length;
+    len = s->rlayer.packet_length;
     pkt = rb->buf + align;
     /*
      * Move any available bytes to front of buffer: 'len' bytes already
      * pointed to by 'packet', 'left' extra ones at the end
      */
-    if (s->packet != pkt) {     /* len > 0 */
-        memmove(pkt, s->packet, len + left);
-        s->packet = pkt;
+    if (s->rlayer.packet != pkt) {     /* len > 0 */
+        memmove(pkt, s->rlayer.packet, len + left);
+        s->rlayer.packet = pkt;
         rb->offset = len + align;
     }
 
@@ -232,7 +380,7 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
     }
 
     /* We always act like read_ahead is set for DTLS */
-    if (!s->read_ahead && !SSL_IS_DTLS(s))
+    if (&s->rlayer.read_ahead && !SSL_IS_DTLS(s))
         /* ignore max parameter */
         max = n;
     else {
@@ -280,355 +428,11 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
     /* done reading, now the book-keeping */
     rb->offset += n;
     rb->left = left - n;
-    s->packet_length += n;
+    s->rlayer.packet_length += n;
     s->rwstate = SSL_NOTHING;
     return (n);
 }
 
-/*
- * MAX_EMPTY_RECORDS defines the number of consecutive, empty records that
- * will be processed per call to ssl3_get_record. Without this limit an
- * attacker could send empty records at a faster rate than we can process and
- * cause ssl3_get_record to loop forever.
- */
-#define MAX_EMPTY_RECORDS 32
-
-/*-
- * Call this to get a new input record.
- * It will return <= 0 if more data is needed, normally due to an error
- * or non-blocking IO.
- * When it finishes, one packet has been decoded and can be found in
- * ssl->s3->rrec.type    - is the type of record
- * ssl->s3->rrec.data,   - data
- * ssl->s3->rrec.length, - number of bytes
- */
-/* used only by ssl3_read_bytes */
-static int ssl3_get_record(SSL *s)
-{
-    int ssl_major, ssl_minor, al;
-    int enc_err, n, i, ret = -1;
-    SSL3_RECORD *rr;
-    SSL_SESSION *sess;
-    unsigned char *p;
-    unsigned char md[EVP_MAX_MD_SIZE];
-    short version;
-    unsigned mac_size;
-    size_t extra;
-    unsigned empty_record_count = 0;
-
-    rr = &(s->s3->rrec);
-    sess = s->session;
-
-    if (s->options & SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER)
-        extra = SSL3_RT_MAX_EXTRA;
-    else
-        extra = 0;
-    if (extra && !s->s3->init_extra) {
-        /*
-         * An application error: SLS_OP_MICROSOFT_BIG_SSLV3_BUFFER set after
-         * ssl3_setup_buffers() was done
-         */
-        SSLerr(SSL_F_SSL3_GET_RECORD, ERR_R_INTERNAL_ERROR);
-        return -1;
-    }
-
- again:
-    /* check if we have the header */
-    if ((s->rstate != SSL_ST_READ_BODY) ||
-        (s->packet_length < SSL3_RT_HEADER_LENGTH)) {
-        n = ssl3_read_n(s, SSL3_RT_HEADER_LENGTH, s->s3->rbuf.len, 0);
-        if (n <= 0)
-            return (n);         /* error or non-blocking */
-        s->rstate = SSL_ST_READ_BODY;
-
-        p = s->packet;
-        if (s->msg_callback)
-            s->msg_callback(0, 0, SSL3_RT_HEADER, p, 5, s,
-                            s->msg_callback_arg);
-
-        /* Pull apart the header into the SSL3_RECORD */
-        rr->type = *(p++);
-        ssl_major = *(p++);
-        ssl_minor = *(p++);
-        version = (ssl_major << 8) | ssl_minor;
-        n2s(p, rr->length);
-
-        /* Lets check version */
-        if (!s->first_packet) {
-            if (version != s->version) {
-                SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_WRONG_VERSION_NUMBER);
-                if ((s->version & 0xFF00) == (version & 0xFF00)
-                    && !s->enc_write_ctx && !s->write_hash)
-                    /*
-                     * Send back error using their minor version number :-)
-                     */
-                    s->version = (unsigned short)version;
-                al = SSL_AD_PROTOCOL_VERSION;
-                goto f_err;
-            }
-        }
-
-        if ((version >> 8) != SSL3_VERSION_MAJOR) {
-            SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_WRONG_VERSION_NUMBER);
-            goto err;
-        }
-
-        if (rr->length > s->s3->rbuf.len - SSL3_RT_HEADER_LENGTH) {
-            al = SSL_AD_RECORD_OVERFLOW;
-            SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_PACKET_LENGTH_TOO_LONG);
-            goto f_err;
-        }
-
-        /* now s->rstate == SSL_ST_READ_BODY */
-    }
-
-    /* s->rstate == SSL_ST_READ_BODY, get and decode the data */
-
-    if (rr->length > s->packet_length - SSL3_RT_HEADER_LENGTH) {
-        /* now s->packet_length == SSL3_RT_HEADER_LENGTH */
-        i = rr->length;
-        n = ssl3_read_n(s, i, i, 1);
-        if (n <= 0)
-            return (n);         /* error or non-blocking io */
-        /*
-         * now n == rr->length, and s->packet_length == SSL3_RT_HEADER_LENGTH
-         * + rr->length
-         */
-    }
-
-    s->rstate = SSL_ST_READ_HEADER; /* set state for later operations */
-
-    /*
-     * At this point, s->packet_length == SSL3_RT_HEADER_LNGTH + rr->length,
-     * and we have that many bytes in s->packet
-     */
-    rr->input = &(s->packet[SSL3_RT_HEADER_LENGTH]);
-
-    /*
-     * ok, we can now read from 's->packet' data into 'rr' rr->input points
-     * at rr->length bytes, which need to be copied into rr->data by either
-     * the decryption or by the decompression When the data is 'copied' into
-     * the rr->data buffer, rr->input will be pointed at the new buffer
-     */
-
-    /*
-     * We now have - encrypted [ MAC [ compressed [ plain ] ] ] rr->length
-     * bytes of encrypted compressed stuff.
-     */
-
-    /* check is not needed I believe */
-    if (rr->length > SSL3_RT_MAX_ENCRYPTED_LENGTH + extra) {
-        al = SSL_AD_RECORD_OVERFLOW;
-        SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_ENCRYPTED_LENGTH_TOO_LONG);
-        goto f_err;
-    }
-
-    /* decrypt in place in 'rr->input' */
-    rr->data = rr->input;
-    rr->orig_len = rr->length;
-    /*
-     * If in encrypt-then-mac mode calculate mac from encrypted record. All
-     * the details below are public so no timing details can leak.
-     */
-    if (SSL_USE_ETM(s) && s->read_hash) {
-        unsigned char *mac;
-        mac_size = EVP_MD_CTX_size(s->read_hash);
-        OPENSSL_assert(mac_size <= EVP_MAX_MD_SIZE);
-        if (rr->length < mac_size) {
-            al = SSL_AD_DECODE_ERROR;
-            SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_LENGTH_TOO_SHORT);
-            goto f_err;
-        }
-        rr->length -= mac_size;
-        mac = rr->data + rr->length;
-        i = s->method->ssl3_enc->mac(s, md, 0 /* not send */ );
-        if (i < 0 || CRYPTO_memcmp(md, mac, (size_t)mac_size) != 0) {
-            al = SSL_AD_BAD_RECORD_MAC;
-            SSLerr(SSL_F_SSL3_GET_RECORD,
-                   SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC);
-            goto f_err;
-        }
-    }
-
-    enc_err = s->method->ssl3_enc->enc(s, 0);
-    /*-
-     * enc_err is:
-     *    0: (in non-constant time) if the record is publically invalid.
-     *    1: if the padding is valid
-     *    -1: if the padding is invalid
-     */
-    if (enc_err == 0) {
-        al = SSL_AD_DECRYPTION_FAILED;
-        SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_BLOCK_CIPHER_PAD_IS_WRONG);
-        goto f_err;
-    }
-#ifdef TLS_DEBUG
-    printf("dec %d\n", rr->length);
-    {
-        unsigned int z;
-        for (z = 0; z < rr->length; z++)
-            printf("%02X%c", rr->data[z], ((z + 1) % 16) ? ' ' : '\n');
-    }
-    printf("\n");
-#endif
-
-    /* r->length is now the compressed data plus mac */
-    if ((sess != NULL) &&
-        (s->enc_read_ctx != NULL) &&
-        (EVP_MD_CTX_md(s->read_hash) != NULL) && !SSL_USE_ETM(s)) {
-        /* s->read_hash != NULL => mac_size != -1 */
-        unsigned char *mac = NULL;
-        unsigned char mac_tmp[EVP_MAX_MD_SIZE];
-        mac_size = EVP_MD_CTX_size(s->read_hash);
-        OPENSSL_assert(mac_size <= EVP_MAX_MD_SIZE);
-
-        /*
-         * orig_len is the length of the record before any padding was
-         * removed. This is public information, as is the MAC in use,
-         * therefore we can safely process the record in a different amount
-         * of time if it's too short to possibly contain a MAC.
-         */
-        if (rr->orig_len < mac_size ||
-            /* CBC records must have a padding length byte too. */
-            (EVP_CIPHER_CTX_mode(s->enc_read_ctx) == EVP_CIPH_CBC_MODE &&
-             rr->orig_len < mac_size + 1)) {
-            al = SSL_AD_DECODE_ERROR;
-            SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_LENGTH_TOO_SHORT);
-            goto f_err;
-        }
-
-        if (EVP_CIPHER_CTX_mode(s->enc_read_ctx) == EVP_CIPH_CBC_MODE) {
-            /*
-             * We update the length so that the TLS header bytes can be
-             * constructed correctly but we need to extract the MAC in
-             * constant time from within the record, without leaking the
-             * contents of the padding bytes.
-             */
-            mac = mac_tmp;
-            ssl3_cbc_copy_mac(mac_tmp, rr, mac_size);
-            rr->length -= mac_size;
-        } else {
-            /*
-             * In this case there's no padding, so |rec->orig_len| equals
-             * |rec->length| and we checked that there's enough bytes for
-             * |mac_size| above.
-             */
-            rr->length -= mac_size;
-            mac = &rr->data[rr->length];
-        }
-
-        i = s->method->ssl3_enc->mac(s, md, 0 /* not send */ );
-        if (i < 0 || mac == NULL
-            || CRYPTO_memcmp(md, mac, (size_t)mac_size) != 0)
-            enc_err = -1;
-        if (rr->length > SSL3_RT_MAX_COMPRESSED_LENGTH + extra + mac_size)
-            enc_err = -1;
-    }
-
-    if (enc_err < 0) {
-        /*
-         * A separate 'decryption_failed' alert was introduced with TLS 1.0,
-         * SSL 3.0 only has 'bad_record_mac'.  But unless a decryption
-         * failure is directly visible from the ciphertext anyway, we should
-         * not reveal which kind of error occurred -- this might become
-         * visible to an attacker (e.g. via a logfile)
-         */
-        al = SSL_AD_BAD_RECORD_MAC;
-        SSLerr(SSL_F_SSL3_GET_RECORD,
-               SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC);
-        goto f_err;
-    }
-
-    /* r->length is now just compressed */
-    if (s->expand != NULL) {
-        if (rr->length > SSL3_RT_MAX_COMPRESSED_LENGTH + extra) {
-            al = SSL_AD_RECORD_OVERFLOW;
-            SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_COMPRESSED_LENGTH_TOO_LONG);
-            goto f_err;
-        }
-        if (!ssl3_do_uncompress(s)) {
-            al = SSL_AD_DECOMPRESSION_FAILURE;
-            SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_BAD_DECOMPRESSION);
-            goto f_err;
-        }
-    }
-
-    if (rr->length > SSL3_RT_MAX_PLAIN_LENGTH + extra) {
-        al = SSL_AD_RECORD_OVERFLOW;
-        SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_DATA_LENGTH_TOO_LONG);
-        goto f_err;
-    }
-
-    rr->off = 0;
-    /*-
-     * So at this point the following is true
-     * ssl->s3->rrec.type   is the type of record
-     * ssl->s3->rrec.length == number of bytes in record
-     * ssl->s3->rrec.off    == offset to first valid byte
-     * ssl->s3->rrec.data   == where to take bytes from, increment
-     *                         after use :-).
-     */
-
-    /* we have pulled in a full packet so zero things */
-    s->packet_length = 0;
-
-    /* just read a 0 length packet */
-    if (rr->length == 0) {
-        empty_record_count++;
-        if (empty_record_count > MAX_EMPTY_RECORDS) {
-            al = SSL_AD_UNEXPECTED_MESSAGE;
-            SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_RECORD_TOO_SMALL);
-            goto f_err;
-        }
-        goto again;
-    }
-
-    return (1);
-
- f_err:
-    ssl3_send_alert(s, SSL3_AL_FATAL, al);
- err:
-    return (ret);
-}
-
-int ssl3_do_uncompress(SSL *ssl)
-{
-#ifndef OPENSSL_NO_COMP
-    int i;
-    SSL3_RECORD *rr;
-
-    rr = &(ssl->s3->rrec);
-    i = COMP_expand_block(ssl->expand, rr->comp,
-                          SSL3_RT_MAX_PLAIN_LENGTH, rr->data,
-                          (int)rr->length);
-    if (i < 0)
-        return (0);
-    else
-        rr->length = i;
-    rr->data = rr->comp;
-#endif
-    return (1);
-}
-
-int ssl3_do_compress(SSL *ssl)
-{
-#ifndef OPENSSL_NO_COMP
-    int i;
-    SSL3_RECORD *wr;
-
-    wr = &(ssl->s3->wrec);
-    i = COMP_compress_block(ssl->compress, wr->data,
-                            SSL3_RT_MAX_COMPRESSED_LENGTH,
-                            wr->input, (int)wr->length);
-    if (i < 0)
-        return (0);
-    else
-        wr->length = i;
-
-    wr->input = wr->data;
-#endif
-    return (1);
-}
 
 /*
  * Call this to write data in records of type 'type' It will return <= 0 if
@@ -642,7 +446,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
 #if !defined(OPENSSL_NO_MULTIBLOCK) && EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK
     unsigned int max_send_fragment;
 #endif
-    SSL3_BUFFER *wb = &(s->s3->wbuf);
+    SSL3_BUFFER *wb = &s->rlayer.wbuf;
     int i;
     unsigned int u_len = (unsigned int)len;
 
@@ -652,9 +456,9 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
     }
 
     s->rwstate = SSL_NOTHING;
-    OPENSSL_assert(s->s3->wnum <= INT_MAX);
-    tot = s->s3->wnum;
-    s->s3->wnum = 0;
+    OPENSSL_assert(s->rlayer.wnum <= INT_MAX);
+    tot = s->rlayer.wnum;
+    s->rlayer.wnum = 0;
 
     if (SSL_in_init(s) && !s->in_handshake) {
         i = s->handshake_func(s);
@@ -685,10 +489,10 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
      * will happen with non blocking IO
      */
     if (wb->left != 0) {
-        i = ssl3_write_pending(s, type, &buf[tot], s->s3->wpend_tot);
+        i = ssl3_write_pending(s, type, &buf[tot], s->rlayer.wpend_tot);
         if (i <= 0) {
             /* XXX should we ssl3_release_write_buffer if i<0? */
-            s->s3->wnum = tot;
+            s->rlayer.wnum = tot;
             return i;
         }
         tot += i;               /* this might be last fragment */
@@ -749,7 +553,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
             if (s->s3->alert_dispatch) {
                 i = s->method->ssl_dispatch_alert(s);
                 if (i <= 0) {
-                    s->s3->wnum = tot;
+                    s->rlayer.wnum = tot;
                     return i;
                 }
             }
@@ -759,7 +563,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
             else
                 nw = max_send_fragment * (mb_param.interleave = 4);
 
-            memcpy(aad, s->s3->write_sequence, 8);
+            memcpy(aad, s->rlayer.write_sequence, 8);
             aad[8] = type;
             aad[9] = (unsigned char)(s->version >> 8);
             aad[10] = (unsigned char)(s->version);
@@ -788,19 +592,19 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
                                     sizeof(mb_param), &mb_param) <= 0)
                 return -1;
 
-            s->s3->write_sequence[7] += mb_param.interleave;
-            if (s->s3->write_sequence[7] < mb_param.interleave) {
+            s->rlayer.write_sequence[7] += mb_param.interleave;
+            if (s->rlayer.write_sequence[7] < mb_param.interleave) {
                 int j = 6;
-                while (j >= 0 && (++s->s3->write_sequence[j--]) == 0) ;
+                while (j >= 0 && (++s->rlayer.write_sequence[j--]) == 0) ;
             }
 
             wb->offset = 0;
             wb->left = packlen;
 
-            s->s3->wpend_tot = nw;
-            s->s3->wpend_buf = &buf[tot];
-            s->s3->wpend_type = type;
-            s->s3->wpend_ret = nw;
+            s->rlayer.wpend_tot = nw;
+            s->rlayer.wpend_buf = &buf[tot];
+            s->rlayer.wpend_type = type;
+            s->rlayer.wpend_ret = nw;
 
             i = ssl3_write_pending(s, type, &buf[tot], nw);
             if (i <= 0) {
@@ -808,7 +612,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
                     OPENSSL_free(wb->buf);
                     wb->buf = NULL;
                 }
-                s->s3->wnum = tot;
+                s->rlayer.wnum = tot;
                 return i;
             }
             if (i == (int)n) {
@@ -838,7 +642,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
         i = do_ssl3_write(s, type, &(buf[tot]), nw, 0);
         if (i <= 0) {
             /* XXX should we ssl3_release_write_buffer if i<0? */
-            s->s3->wnum = tot;
+            s->rlayer.wnum = tot;
             return i;
         }
 
@@ -863,8 +667,8 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
     }
 }
 
-static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
-                         unsigned int len, int create_empty_fragment)
+int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
+                  unsigned int len, int create_empty_fragment)
 {
     unsigned char *p, *plen;
     int i, mac_size, clear = 0;
@@ -872,7 +676,7 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
     int eivlen;
     long align = 0;
     SSL3_RECORD *wr;
-    SSL3_BUFFER *wb = &(s->s3->wbuf);
+    SSL3_BUFFER *wb = &s->rlayer.wbuf;
     SSL_SESSION *sess;
 
     /*
@@ -897,7 +701,7 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
     if (len == 0 && !create_empty_fragment)
         return 0;
 
-    wr = &(s->s3->wrec);
+    wr = &s->rlayer.wrec;
     sess = s->session;
 
     if ((sess == NULL) ||
@@ -1081,10 +885,10 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
      * memorize arguments so that ssl3_write_pending can detect bad write
      * retries later
      */
-    s->s3->wpend_tot = len;
-    s->s3->wpend_buf = buf;
-    s->s3->wpend_type = type;
-    s->s3->wpend_ret = len;
+    s->rlayer.wpend_tot = len;
+    s->rlayer.wpend_buf = buf;
+    s->rlayer.wpend_type = type;
+    s->rlayer.wpend_ret = len;
 
     /* we now just need to write the buffer */
     return ssl3_write_pending(s, type, buf, len);
@@ -1097,13 +901,13 @@ int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
                        unsigned int len)
 {
     int i;
-    SSL3_BUFFER *wb = &(s->s3->wbuf);
+    SSL3_BUFFER *wb = &s->rlayer.wbuf;
 
 /* XXXX */
-    if ((s->s3->wpend_tot > (int)len)
-        || ((s->s3->wpend_buf != buf) &&
+    if ((s->rlayer.wpend_tot > (int)len)
+        || ((s->rlayer.wpend_buf != buf) &&
             !(s->mode & SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER))
-        || (s->s3->wpend_type != type)) {
+        || (s->rlayer.wpend_type != type)) {
         SSLerr(SSL_F_SSL3_WRITE_PENDING, SSL_R_BAD_WRITE_RETRY);
         return (-1);
     }
@@ -1123,7 +927,7 @@ int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
             wb->left = 0;
             wb->offset += i;
             s->rwstate = SSL_NOTHING;
-            return (s->s3->wpend_ret);
+            return (s->rlayer.wpend_ret);
         } else if (i <= 0) {
             if (s->version == DTLS1_VERSION || s->version == DTLS1_BAD_VER) {
                 /*
@@ -1174,9 +978,11 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
     SSL3_RECORD *rr;
     void (*cb) (const SSL *ssl, int type2, int val) = NULL;
 
-    if (s->s3->rbuf.buf == NULL) /* Not initialized yet */
+    if (!SSL3_BUFFER_is_initialised(&s->rlayer.rbuf)) {
+        /* Not initialized yet */
         if (!ssl3_setup_read_buffer(s))
             return (-1);
+    }
 
     if ((type && (type != SSL3_RT_APPLICATION_DATA)
          && (type != SSL3_RT_HANDSHAKE)) || (peek
@@ -1186,29 +992,29 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         return -1;
     }
 
-    if ((type == SSL3_RT_HANDSHAKE) && (s->s3->handshake_fragment_len > 0))
+    if ((type == SSL3_RT_HANDSHAKE) && (s->rlayer.handshake_fragment_len > 0))
         /* (partially) satisfy request from storage */
     {
-        unsigned char *src = s->s3->handshake_fragment;
+        unsigned char *src = s->rlayer.handshake_fragment;
         unsigned char *dst = buf;
         unsigned int k;
 
         /* peek == 0 */
         n = 0;
-        while ((len > 0) && (s->s3->handshake_fragment_len > 0)) {
+        while ((len > 0) && (s->rlayer.handshake_fragment_len > 0)) {
             *dst++ = *src++;
             len--;
-            s->s3->handshake_fragment_len--;
+            s->rlayer.handshake_fragment_len--;
             n++;
         }
         /* move any remaining fragment bytes: */
-        for (k = 0; k < s->s3->handshake_fragment_len; k++)
-            s->s3->handshake_fragment[k] = *src++;
+        for (k = 0; k < s->rlayer.handshake_fragment_len; k++)
+            s->rlayer.handshake_fragment[k] = *src++;
         return n;
     }
 
     /*
-     * Now s->s3->handshake_fragment_len == 0 if type == SSL3_RT_HANDSHAKE.
+     * Now s->rlayer.handshake_fragment_len == 0 if type == SSL3_RT_HANDSHAKE.
      */
 
     if (!s->in_handshake && SSL_in_init(s)) {
@@ -1230,10 +1036,10 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
      * s->s3->rrec.off,     - offset into 'data' for next read
      * s->s3->rrec.length,  - number of bytes.
      */
-    rr = &(s->s3->rrec);
+    rr = &s->rlayer.rrec;
 
     /* get new packet if necessary */
-    if ((rr->length == 0) || (s->rstate == SSL_ST_READ_BODY)) {
+    if ((rr->length == 0) || (s->rlayer.rstate == SSL_ST_READ_BODY)) {
         ret = ssl3_get_record(s);
         if (ret <= 0)
             return (ret);
@@ -1285,10 +1091,10 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             rr->length -= n;
             rr->off += n;
             if (rr->length == 0) {
-                s->rstate = SSL_ST_READ_HEADER;
+                s->rlayer.rstate = SSL_ST_READ_HEADER;
                 rr->off = 0;
                 if (s->mode & SSL_MODE_RELEASE_BUFFERS
-                    && s->s3->rbuf.left == 0)
+                    && SSL3_BUFFER_get_left(&s->rlayer.rbuf) == 0)
                     ssl3_release_read_buffer(s);
             }
         }
@@ -1310,18 +1116,19 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         unsigned int *dest_len = NULL;
 
         if (rr->type == SSL3_RT_HANDSHAKE) {
-            dest_maxlen = sizeof s->s3->handshake_fragment;
-            dest = s->s3->handshake_fragment;
-            dest_len = &s->s3->handshake_fragment_len;
+            dest_maxlen = sizeof s->rlayer.handshake_fragment;
+            dest = s->rlayer.handshake_fragment;
+            dest_len = &s->rlayer.handshake_fragment_len;
         } else if (rr->type == SSL3_RT_ALERT) {
-            dest_maxlen = sizeof s->s3->alert_fragment;
-            dest = s->s3->alert_fragment;
-            dest_len = &s->s3->alert_fragment_len;
+            dest_maxlen = sizeof s->rlayer.alert_fragment;
+            dest = s->rlayer.alert_fragment;
+            dest_len = &s->rlayer.alert_fragment_len;
         }
 #ifndef OPENSSL_NO_HEARTBEATS
         else if (rr->type == TLS1_RT_HEARTBEAT) {
             /* We can ignore 0 return values */
-            if(tls1_process_heartbeat(s) < 0) {
+            if(tls1_process_heartbeat(s, SSL3_RECORD_get_data(&s->rlayer.rrec),
+                    SSL3_RECORD_get_length(&s->rlayer.rrec)) < 0) {
                 return -1;
             }
 
@@ -1351,21 +1158,21 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
     }
 
     /*-
-     * s->s3->handshake_fragment_len == 4  iff  rr->type == SSL3_RT_HANDSHAKE;
-     * s->s3->alert_fragment_len == 2      iff  rr->type == SSL3_RT_ALERT.
+     * s->rlayer.handshake_fragment_len == 4  iff  rr->type == SSL3_RT_HANDSHAKE;
+     * s->rlayer.alert_fragment_len == 2      iff  rr->type == SSL3_RT_ALERT.
      * (Possibly rr is 'empty' now, i.e. rr->length may be 0.)
      */
 
     /* If we are a client, check for an incoming 'Hello Request': */
     if ((!s->server) &&
-        (s->s3->handshake_fragment_len >= 4) &&
-        (s->s3->handshake_fragment[0] == SSL3_MT_HELLO_REQUEST) &&
+        (s->rlayer.handshake_fragment_len >= 4) &&
+        (s->rlayer.handshake_fragment[0] == SSL3_MT_HELLO_REQUEST) &&
         (s->session != NULL) && (s->session->cipher != NULL)) {
-        s->s3->handshake_fragment_len = 0;
+        s->rlayer.handshake_fragment_len = 0;
 
-        if ((s->s3->handshake_fragment[1] != 0) ||
-            (s->s3->handshake_fragment[2] != 0) ||
-            (s->s3->handshake_fragment[3] != 0)) {
+        if ((s->rlayer.handshake_fragment[1] != 0) ||
+            (s->rlayer.handshake_fragment[2] != 0) ||
+            (s->rlayer.handshake_fragment[3] != 0)) {
             al = SSL_AD_DECODE_ERROR;
             SSLerr(SSL_F_SSL3_READ_BYTES, SSL_R_BAD_HELLO_REQUEST);
             goto f_err;
@@ -1373,7 +1180,7 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
 
         if (s->msg_callback)
             s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE,
-                            s->s3->handshake_fragment, 4, s,
+                            s->rlayer.handshake_fragment, 4, s,
                             s->msg_callback_arg);
 
         if (SSL_is_init_finished(s) &&
@@ -1391,7 +1198,8 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
                 }
 
                 if (!(s->mode & SSL_MODE_AUTO_RETRY)) {
-                    if (s->s3->rbuf.left == 0) { /* no read-ahead left? */
+                    if (SSL3_BUFFER_get_left(&s->rlayer.rbuf) == 0) {
+                        /* no read-ahead left? */
                         BIO *bio;
                         /*
                          * In the case where we try to read application data,
@@ -1423,26 +1231,24 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         SSL_is_init_finished(s) &&
         !s->s3->send_connection_binding &&
         (s->version > SSL3_VERSION) &&
-        (s->s3->handshake_fragment_len >= 4) &&
-        (s->s3->handshake_fragment[0] == SSL3_MT_CLIENT_HELLO) &&
+        (s->rlayer.handshake_fragment_len >= 4) &&
+        (s->rlayer.handshake_fragment[0] == SSL3_MT_CLIENT_HELLO) &&
         (s->session != NULL) && (s->session->cipher != NULL) &&
         !(s->ctx->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)) {
-        /*
-         * s->s3->handshake_fragment_len = 0;
-         */
         rr->length = 0;
         ssl3_send_alert(s, SSL3_AL_WARNING, SSL_AD_NO_RENEGOTIATION);
         goto start;
     }
-    if (s->s3->alert_fragment_len >= 2) {
-        int alert_level = s->s3->alert_fragment[0];
-        int alert_descr = s->s3->alert_fragment[1];
+    if (s->rlayer.alert_fragment_len >= 2) {
+        int alert_level = s->rlayer.alert_fragment[0];
+        int alert_descr = s->rlayer.alert_fragment[1];
 
-        s->s3->alert_fragment_len = 0;
+        s->rlayer.alert_fragment_len = 0;
 
         if (s->msg_callback)
             s->msg_callback(0, s->version, SSL3_RT_ALERT,
-                            s->s3->alert_fragment, 2, s, s->msg_callback_arg);
+                            s->rlayer.alert_fragment, 2, s,
+                            s->msg_callback_arg);
 
         if (s->info_callback != NULL)
             cb = s->info_callback;
@@ -1547,7 +1353,7 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
     /*
      * Unexpected handshake message (Client Hello, or protocol violation)
      */
-    if ((s->s3->handshake_fragment_len >= 4) && !s->in_handshake) {
+    if ((s->rlayer.handshake_fragment_len >= 4) && !s->in_handshake) {
         if (((s->state & SSL_ST_MASK) == SSL_ST_OK) &&
             !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)) {
             s->state = s->server ? SSL_ST_ACCEPT : SSL_ST_CONNECT;
@@ -1563,7 +1369,8 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         }
 
         if (!(s->mode & SSL_MODE_AUTO_RETRY)) {
-            if (s->s3->rbuf.left == 0) { /* no read-ahead left? */
+            if (SSL3_BUFFER_get_left(&s->rlayer.rbuf) == 0) {
+                /* no read-ahead left? */
                 BIO *bio;
                 /*
                  * In the case where we try to read application data, but we
@@ -1639,113 +1446,15 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
     return (-1);
 }
 
-int ssl3_do_change_cipher_spec(SSL *s)
+void ssl3_record_sequence_update(unsigned char *seq)
 {
     int i;
-    const char *sender;
-    int slen;
-
-    if (s->state & SSL_ST_ACCEPT)
-        i = SSL3_CHANGE_CIPHER_SERVER_READ;
-    else
-        i = SSL3_CHANGE_CIPHER_CLIENT_READ;
-
-    if (s->s3->tmp.key_block == NULL) {
-        if (s->session == NULL || s->session->master_key_length == 0) {
-            /* might happen if dtls1_read_bytes() calls this */
-            SSLerr(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC,
-                   SSL_R_CCS_RECEIVED_EARLY);
-            return (0);
-        }
-
-        s->session->cipher = s->s3->tmp.new_cipher;
-        if (!s->method->ssl3_enc->setup_key_block(s))
-            return (0);
-    }
-
-    if (!s->method->ssl3_enc->change_cipher_state(s, i))
-        return (0);
-
-    /*
-     * we have to record the message digest at this point so we can get it
-     * before we read the finished message
-     */
-    if (s->state & SSL_ST_CONNECT) {
-        sender = s->method->ssl3_enc->server_finished_label;
-        slen = s->method->ssl3_enc->server_finished_label_len;
-    } else {
-        sender = s->method->ssl3_enc->client_finished_label;
-        slen = s->method->ssl3_enc->client_finished_label_len;
-    }
 
-    i = s->method->ssl3_enc->final_finish_mac(s,
-                                              sender, slen,
-                                              s->s3->tmp.peer_finish_md);
-    if (i == 0) {
-        SSLerr(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC, ERR_R_INTERNAL_ERROR);
-        return 0;
+    for (i = 7; i >= 0; i--) {
+        ++seq[i];
+        if (seq[i] != 0)
+            break;
     }
-    s->s3->tmp.peer_finish_md_len = i;
-
-    return (1);
-}
-
-int ssl3_send_alert(SSL *s, int level, int desc)
-{
-    /* Map tls/ssl alert value to correct one */
-    desc = s->method->ssl3_enc->alert_value(desc);
-    if (s->version == SSL3_VERSION && desc == SSL_AD_PROTOCOL_VERSION)
-        desc = SSL_AD_HANDSHAKE_FAILURE; /* SSL 3.0 does not have
-                                          * protocol_version alerts */
-    if (desc < 0)
-        return -1;
-    /* If a fatal one, remove from cache */
-    if ((level == SSL3_AL_FATAL) && (s->session != NULL))
-        SSL_CTX_remove_session(s->ctx, s->session);
-
-    s->s3->alert_dispatch = 1;
-    s->s3->send_alert[0] = level;
-    s->s3->send_alert[1] = desc;
-    if (s->s3->wbuf.left == 0)  /* data still being written out? */
-        return s->method->ssl_dispatch_alert(s);
-    /*
-     * else data is still being written out, we will get written some time in
-     * the future
-     */
-    return -1;
 }
 
-int ssl3_dispatch_alert(SSL *s)
-{
-    int i, j;
-    void (*cb) (const SSL *ssl, int type, int val) = NULL;
-
-    s->s3->alert_dispatch = 0;
-    i = do_ssl3_write(s, SSL3_RT_ALERT, &s->s3->send_alert[0], 2, 0);
-    if (i <= 0) {
-        s->s3->alert_dispatch = 1;
-    } else {
-        /*
-         * Alert sent to BIO.  If it is important, flush it now. If the
-         * message does not get sent due to non-blocking IO, we will not
-         * worry too much.
-         */
-        if (s->s3->send_alert[0] == SSL3_AL_FATAL)
-            (void)BIO_flush(s->wbio);
-
-        if (s->msg_callback)
-            s->msg_callback(1, s->version, SSL3_RT_ALERT, s->s3->send_alert,
-                            2, s, s->msg_callback_arg);
-
-        if (s->info_callback != NULL)
-            cb = s->info_callback;
-        else if (s->ctx->info_callback != NULL)
-            cb = s->ctx->info_callback;
 
-        if (cb != NULL) {
-            j = (s->s3->send_alert[0] << 8) | s->s3->send_alert[1];
-            cb(s, SSL_CB_WRITE_ALERT, j);
-        }
-    }
-    return (i);
-}
diff --git a/ssl/record/record.h b/ssl/record/record.h
new file mode 100644
index 0000000..29c74d7
--- /dev/null
+++ b/ssl/record/record.h
@@ -0,0 +1,345 @@
+/* ssl/record/record.h */
+/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay at cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh at cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay at cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh at cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2015 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core at openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
+
+/*****************************************************************************
+ *                                                                           *
+ * These structures should be considered PRIVATE to the record layer. No     *
+ * non-record layer code should be using these structures in any way.        *
+ *                                                                           *
+ *****************************************************************************/
+
+typedef struct ssl3_buffer_st {
+    /* at least SSL3_RT_MAX_PACKET_SIZE bytes, see ssl3_setup_buffers() */
+    unsigned char *buf;
+    /* buffer size */
+    size_t len;
+    /* where to 'copy from' */
+    int offset;
+    /* how many bytes left */
+    int left;
+} SSL3_BUFFER;
+
+#define SEQ_NUM_SIZE                            8
+
+typedef struct ssl3_record_st {
+    /* type of record */
+    /* r */
+    int type;
+
+    /* How many bytes available */
+    /* rw */
+    unsigned int length;
+
+    /*
+     * How many bytes were available before padding was removed? This is used
+     * to implement the MAC check in constant time for CBC records.
+     */
+    /* rw */
+    unsigned int orig_len;
+
+    /* read/write offset into 'buf' */
+    /* r */
+    unsigned int off;
+
+    /* pointer to the record data */
+    /* rw */
+    unsigned char *data;
+
+    /* where the decode bytes are */
+    /* rw */
+    unsigned char *input;
+
+    /* only used with decompression - malloc()ed */
+    /* r */
+    unsigned char *comp;
+
+    /* epoch number, needed by DTLS1 */
+    /* r */
+    unsigned long epoch;
+
+    /* sequence number, needed by DTLS1 */
+    /* r */
+    unsigned char seq_num[SEQ_NUM_SIZE];
+} SSL3_RECORD;
+
+typedef struct dtls1_bitmap_st {
+    /* Track 32 packets on 32-bit systems and 64 - on 64-bit systems */
+    unsigned long map;
+
+    /* Max record number seen so far, 64-bit value in big-endian encoding */
+    unsigned char max_seq_num[SEQ_NUM_SIZE];
+} DTLS1_BITMAP;
+
+typedef struct record_pqueue_st {
+    unsigned short epoch;
+    pqueue q;
+} record_pqueue;
+
+typedef struct dtls1_record_data_st {
+    unsigned char *packet;
+    unsigned int packet_length;
+    SSL3_BUFFER rbuf;
+    SSL3_RECORD rrec;
+#  ifndef OPENSSL_NO_SCTP
+    struct bio_dgram_sctp_rcvinfo recordinfo;
+#  endif
+} DTLS1_RECORD_DATA;
+
+
+typedef struct dtls_record_layer_st {
+    /*
+     * The current data and handshake epoch.  This is initially
+     * undefined, and starts at zero once the initial handshake is
+     * completed
+     */
+    unsigned short r_epoch;
+    unsigned short w_epoch;
+
+    /* records being received in the current epoch */
+    DTLS1_BITMAP bitmap;
+    /* renegotiation starts a new set of sequence numbers */
+    DTLS1_BITMAP next_bitmap;
+
+    /* Received handshake records (processed and unprocessed) */
+    record_pqueue unprocessed_rcds;
+    record_pqueue processed_rcds;
+    /*
+     * Buffered application records. Only for records between CCS and
+     * Finished to prevent either protocol violation or unnecessary message
+     * loss.
+     */
+    record_pqueue buffered_app_data;
+    /*
+     * storage for Alert/Handshake protocol data received but not yet
+     * processed by ssl3_read_bytes:
+     */
+    unsigned char alert_fragment[DTLS1_AL_HEADER_LENGTH];
+    unsigned int alert_fragment_len;
+    unsigned char handshake_fragment[DTLS1_HM_HEADER_LENGTH];
+    unsigned int handshake_fragment_len;
+
+    /* save last and current sequence numbers for retransmissions */
+    unsigned char last_write_sequence[8];
+    unsigned char curr_write_sequence[8];
+} DTLS_RECORD_LAYER;
+
+/*****************************************************************************
+ *                                                                           *
+ * This structure should be considered "opaque" to anything outside of the   *
+ * record layer. No non-record layer code should be accessing the members of *
+ * this structure.                                                           *
+ *                                                                           *
+ *****************************************************************************/
+
+typedef struct record_layer_st {
+    /* The parent SSL structure */
+    SSL *s;
+    /*
+     * Read as many input bytes as possible (for
+     * non-blocking reads)
+     */
+    int read_ahead;
+    /* where we are when reading */
+    int rstate;
+    /* read IO goes into here */
+    SSL3_BUFFER rbuf;
+    /* write IO goes into here */
+    SSL3_BUFFER wbuf;
+    /* each decoded record goes in here */
+    SSL3_RECORD rrec;
+    /* goes out from here */
+    SSL3_RECORD wrec;
+
+    /* used internally to point at a raw packet */
+    unsigned char *packet;
+    unsigned int packet_length;
+
+    /* number of bytes sent so far */
+    unsigned int wnum;
+
+    /*
+     * storage for Alert/Handshake protocol data received but not yet
+     * processed by ssl3_read_bytes:
+     */
+    unsigned char alert_fragment[2];
+    unsigned int alert_fragment_len;
+    unsigned char handshake_fragment[4];
+    unsigned int handshake_fragment_len;
+
+    /* partial write - check the numbers match */
+    /* number bytes written */
+    int wpend_tot;
+    int wpend_type;
+    /* number of bytes submitted */
+    int wpend_ret;
+    const unsigned char *wpend_buf;
+
+    unsigned char read_sequence[8];
+    unsigned char write_sequence[8];
+    
+    DTLS_RECORD_LAYER *d;
+} RECORD_LAYER;
+
+
+/*****************************************************************************
+ *                                                                           *
+ * The following macros/functions represent the libssl internal API to the   *
+ * record layer. Any libssl code may call these functions/macros             *
+ *                                                                           *
+ *****************************************************************************/
+
+#define RECORD_LAYER_set_read_ahead(rl, ra)     ((rl)->read_ahead = (ra))
+#define RECORD_LAYER_get_read_ahead(rl)         ((rl)->read_ahead)
+#define RECORD_LAYER_get_packet(rl)             ((rl)->packet)
+#define RECORD_LAYER_get_packet_length(rl)      ((rl)->packet_length)
+#define RECORD_LAYER_add_packet_length(rl, inc) ((rl)->packet_length += (inc))
+#define DTLS_RECORD_LAYER_get_w_epoch(rl)       ((rl)->d->w_epoch)
+#define DTLS_RECORD_LAYER_get_processed_rcds(rl) \
+                                                ((rl)->d->processed_rcds)
+#define DTLS_RECORD_LAYER_get_unprocessed_rcds(rl) \
+                                                ((rl)->d->unprocessed_rcds)
+
+void RECORD_LAYER_init(RECORD_LAYER *rl, SSL *s);
+void RECORD_LAYER_clear(RECORD_LAYER *rl);
+void RECORD_LAYER_release(RECORD_LAYER *rl);
+int RECORD_LAYER_read_pending(RECORD_LAYER *rl);
+int RECORD_LAYER_write_pending(RECORD_LAYER *rl);
+int RECORD_LAYER_set_data(RECORD_LAYER *rl, const unsigned char *buf, int len);
+void RECORD_LAYER_dup(RECORD_LAYER *dst, RECORD_LAYER *src);
+void RECORD_LAYER_reset_read_sequence(RECORD_LAYER *rl);
+void RECORD_LAYER_reset_write_sequence(RECORD_LAYER *rl);
+int RECORD_LAYER_setup_comp_buffer(RECORD_LAYER *rl);
+__owur int ssl3_pending(const SSL *s);
+__owur int ssl23_read_bytes(SSL *s, int n);
+__owur int ssl23_write_bytes(SSL *s);
+__owur int ssl3_write_bytes(SSL *s, int type, const void *buf, int len);
+__owur int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
+                         unsigned int len, int create_empty_fragment);
+__owur int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek);
+__owur int ssl3_setup_buffers(SSL *s);
+__owur int ssl3_enc(SSL *s, int send_data);
+__owur int n_ssl3_mac(SSL *ssl, unsigned char *md, int send_data);
+__owur int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
+                       unsigned int len);
+__owur int tls1_enc(SSL *s, int snd);
+__owur int tls1_mac(SSL *ssl, unsigned char *md, int snd);
+int DTLS_RECORD_LAYER_new(RECORD_LAYER *rl);
+void DTLS_RECORD_LAYER_free(RECORD_LAYER *rl);
+void DTLS_RECORD_LAYER_clear(RECORD_LAYER *rl);
+void DTLS_RECORD_LAYER_set_saved_w_epoch(RECORD_LAYER *rl, unsigned short e);
+void DTLS_RECORD_LAYER_clear(RECORD_LAYER *rl);
+void DTLS_RECORD_LAYER_resync_write(RECORD_LAYER *rl);
+__owur int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek);
+__owur int dtls1_write_bytes(SSL *s, int type, const void *buf, int len);
+__owur int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
+                   unsigned int len, int create_empty_fragement);
+void dtls1_reset_seq_numbers(SSL *s, int rw);
+
diff --git a/crypto/rand/rand_nw.c b/ssl/record/record_locl.h
similarity index 59%
copy from crypto/rand/rand_nw.c
copy to ssl/record/record_locl.h
index 76ef70c..26b5a15 100644
--- a/crypto/rand/rand_nw.c
+++ b/ssl/record/record_locl.h
@@ -1,4 +1,4 @@
-/* crypto/rand/rand_nw.c */
+/* ssl/record/record_locl.h */
 /* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
  * All rights reserved.
  *
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 /* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2015 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -109,71 +109,82 @@
  *
  */
 
-#include "cryptlib.h"
-#include <openssl/rand.h>
-#include "rand_lcl.h"
 
-#if defined (OPENSSL_SYS_NETWARE)
+/*****************************************************************************
+ *                                                                           *
+ * The following macros/functions are PRIVATE to the record layer. They      *
+ * should NOT be used outside of the record layer.                           *
+ *                                                                           *
+ *****************************************************************************/
 
-# if defined(NETWARE_LIBC)
-#  include <nks/thread.h>
-# else
-#  include <nwthread.h>
-# endif
+/* Functions/macros provided by the RECORD_LAYER component */
 
-extern int GetProcessSwitchCount(void);
-# if !defined(NETWARE_LIBC) || (CURRENT_NDK_THRESHOLD < 509220000)
-extern void *RunningProcess;    /* declare here same as found in newer NDKs */
-extern unsigned long GetSuperHighResolutionTimer(void);
-# endif
+#define RECORD_LAYER_get_rbuf(rl)               (&(rl)->rbuf)
+#define RECORD_LAYER_get_wbuf(rl)               (&(rl)->wbuf)
+#define RECORD_LAYER_get_rrec(rl)               (&(rl)->rrec)
+#define RECORD_LAYER_get_wrec(rl)               (&(rl)->wrec)
+#define RECORD_LAYER_set_packet(rl, p)          ((rl)->packet = (p))
+#define RECORD_LAYER_reset_packet_length(rl)    ((rl)->packet_length = 0)
+#define RECORD_LAYER_get_rstate(rl)             ((rl)->rstate)
+#define RECORD_LAYER_set_rstate(rl, st)         ((rl)->rstate = (st))
+#define RECORD_LAYER_get_read_sequence(rl)      ((rl)->read_sequence)
+#define RECORD_LAYER_get_write_sequence(rl)     ((rl)->write_sequence)
+#define DTLS_RECORD_LAYER_get_r_epoch(rl)       ((rl)->d->r_epoch)
 
-   /*
-    * the FAQ indicates we need to provide at least 20 bytes (160 bits) of
-    * seed
-    */
-int RAND_poll(void)
-{
-    unsigned long l;
-    unsigned long tsc;
-    int i;
+__owur int ssl3_read_n(SSL *s, int n, int max, int extend);
 
-    /*
-     * There are several options to gather miscellaneous data but for now we
-     * will loop checking the time stamp counter (rdtsc) and the
-     * SuperHighResolutionTimer.  Each iteration will collect 8 bytes of data
-     * but it is treated as only 1 byte of entropy.  The call to
-     * ThreadSwitchWithDelay() will introduce additional variability into the
-     * data returned by rdtsc. Applications can argument the seed material
-     * by adding additional stuff with RAND_add() and should probably do so.
-     */
-    l = GetProcessSwitchCount();
-    RAND_add(&l, sizeof(l), 1);
+void RECORD_LAYER_set_write_sequence(RECORD_LAYER *rl, const unsigned char *ws);
+DTLS1_BITMAP *dtls1_get_bitmap(SSL *s, SSL3_RECORD *rr,
+                                      unsigned int *is_next_epoch);
+int dtls1_process_buffered_records(SSL *s);
+int dtls1_retrieve_buffered_record(SSL *s, record_pqueue *queue);
+int dtls1_buffer_record(SSL *s, record_pqueue *q,
+                               unsigned char *priority);
+void ssl3_record_sequence_update(unsigned char *seq);
 
-    /* need to cast the void* to unsigned long here */
-    l = (unsigned long)RunningProcess;
-    RAND_add(&l, sizeof(l), 1);
+/* Functions provided by the DTLS1_BITMAP component */
 
-    for (i = 2; i < ENTROPY_NEEDED; i++) {
-# ifdef __MWERKS__
-        asm {
-        rdtsc mov tsc, eax}
-# elif defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-        asm volatile ("rdtsc":"=a" (tsc)::"edx");
-# endif
+int dtls1_record_replay_check(SSL *s, DTLS1_BITMAP *bitmap);
+void dtls1_record_bitmap_update(SSL *s, DTLS1_BITMAP *bitmap);
 
-        RAND_add(&tsc, sizeof(tsc), 1);
 
-        l = GetSuperHighResolutionTimer();
-        RAND_add(&l, sizeof(l), 0);
+/* Macros/functions provided by the SSL3_BUFFER component */
 
-# if defined(NETWARE_LIBC)
-        NXThreadYield();
-# else                          /* NETWARE_CLIB */
-        ThreadSwitchWithDelay();
-# endif
-    }
+#define SSL3_BUFFER_get_buf(b)              ((b)->buf)
+#define SSL3_BUFFER_set_buf(b, n)           ((b)->buf = (n))
+#define SSL3_BUFFER_get_len(b)              ((b)->len)
+#define SSL3_BUFFER_set_len(b, l)           ((b)->len = (l))
+#define SSL3_BUFFER_get_left(b)             ((b)->left)
+#define SSL3_BUFFER_is_initialised(b)       ((b)->buf != NULL)
 
-    return 1;
-}
+void SSL3_BUFFER_set_data(SSL3_BUFFER *b, const unsigned char *d, int n);
+void SSL3_BUFFER_release(SSL3_BUFFER *b);
+__owur int ssl3_setup_read_buffer(SSL *s);
+__owur int ssl3_setup_write_buffer(SSL *s);
+int ssl3_release_read_buffer(SSL *s);
+int ssl3_release_write_buffer(SSL *s);
 
-#endif
+/* Macros/functions provided by the SSL3_RECORD component */
+
+#define SSL3_RECORD_get_type(r)                 ((r)->type)
+#define SSL3_RECORD_get_length(r)               ((r)->length)
+#define SSL3_RECORD_get_data(r)                 ((r)->data)
+#define SSL3_RECORD_get_seq_num(r)              ((r)->seq_num)
+
+void SSL3_RECORD_clear(SSL3_RECORD *r);
+void SSL3_RECORD_release(SSL3_RECORD *r);
+int SSL3_RECORD_setup(SSL3_RECORD *r);
+void SSL3_RECORD_set_seq_num(SSL3_RECORD *r, const unsigned char *seq_num);
+int ssl3_get_record(SSL *s);
+__owur int ssl3_do_compress(SSL *ssl);
+__owur int ssl3_do_uncompress(SSL *ssl);
+void ssl3_cbc_copy_mac(unsigned char *out,
+                       const SSL3_RECORD *rec, unsigned md_size);
+__owur int ssl3_cbc_remove_padding(const SSL *s,
+                            SSL3_RECORD *rec,
+                            unsigned block_size, unsigned mac_size);
+__owur int tls1_cbc_remove_padding(const SSL *s,
+                            SSL3_RECORD *rec,
+                            unsigned block_size, unsigned mac_size);
+int dtls1_process_record(SSL *s);
+__owur int dtls1_get_record(SSL *s);
diff --git a/apps/app_rand.c b/ssl/record/ssl3_buffer.c
similarity index 65%
copy from apps/app_rand.c
copy to ssl/record/ssl3_buffer.c
index 595fc78..79a7636 100644
--- a/apps/app_rand.c
+++ b/ssl/record/ssl3_buffer.c
@@ -1,4 +1,4 @@
-/* apps/app_rand.c */
+/* ssl/record/ssl3_buffer.c */
 /* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
  * All rights reserved.
  *
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 /* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -109,112 +109,136 @@
  *
  */
 
-#define NON_MAIN
-#include "apps.h"
-#undef NON_MAIN
-#include <openssl/bio.h>
-#include <openssl/rand.h>
+#include "../ssl_locl.h"
+#include "record_locl.h"
 
-static int seeded = 0;
-static int egdsocket = 0;
+void SSL3_BUFFER_set_data(SSL3_BUFFER *b, const unsigned char *d, int n)
+{
+    if(d != NULL)
+        memcpy(b->buf, d, n);
+    b->left = n;
+    b->offset = 0;
+}
+
+void SSL3_BUFFER_release(SSL3_BUFFER *b)
+{
+    if (b->buf != NULL)
+        OPENSSL_free(b->buf);
+    b->buf = NULL;
+}
 
-int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
+int ssl3_setup_read_buffer(SSL *s)
 {
-    int consider_randfile = (file == NULL);
-    char buffer[200];
-
-#ifdef OPENSSL_SYS_WINDOWS
-    BIO_printf(bio_e, "Loading 'screen' into random state -");
-    BIO_flush(bio_e);
-    RAND_screen();
-    BIO_printf(bio_e, " done\n");
+    unsigned char *p;
+    size_t len, align = 0, headerlen;
+    SSL3_BUFFER *b;
+    
+    b = RECORD_LAYER_get_rbuf(&s->rlayer);
+
+    if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
+        headerlen = DTLS1_RT_HEADER_LENGTH;
+    else
+        headerlen = SSL3_RT_HEADER_LENGTH;
+
+#if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0
+    align = (-SSL3_RT_HEADER_LENGTH) & (SSL3_ALIGN_PAYLOAD - 1);
 #endif
 
-    if (file == NULL)
-        file = RAND_file_name(buffer, sizeof buffer);
-    else if (RAND_egd(file) > 0) {
-        /*
-         * we try if the given filename is an EGD socket. if it is, we don't
-         * write anything back to the file.
-         */
-        egdsocket = 1;
-        return 1;
-    }
-    if (file == NULL || !RAND_load_file(file, -1)) {
-        if (RAND_status() == 0) {
-            if (!dont_warn) {
-                BIO_printf(bio_e, "unable to load 'random state'\n");
-                BIO_printf(bio_e,
-                           "This means that the random number generator has not been seeded\n");
-                BIO_printf(bio_e, "with much random data.\n");
-                if (consider_randfile) { /* explanation does not apply when a
-                                          * file is explicitly named */
-                    BIO_printf(bio_e,
-                               "Consider setting the RANDFILE environment variable to point at a file that\n");
-                    BIO_printf(bio_e,
-                               "'random' data can be kept in (the file will be overwritten).\n");
-                }
-            }
-            return 0;
+    if (b->buf == NULL) {
+        len = SSL3_RT_MAX_PLAIN_LENGTH
+            + SSL3_RT_MAX_ENCRYPTED_OVERHEAD + headerlen + align;
+        if (s->options & SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER) {
+            s->s3->init_extra = 1;
+            len += SSL3_RT_MAX_EXTRA;
         }
+#ifndef OPENSSL_NO_COMP
+        if (ssl_allow_compression(s))
+            len += SSL3_RT_MAX_COMPRESSED_OVERHEAD;
+#endif
+        if ((p = OPENSSL_malloc(len)) == NULL)
+            goto err;
+        b->buf = p;
+        b->len = len;
     }
-    seeded = 1;
+
+    RECORD_LAYER_set_packet(&s->rlayer, &(b->buf[0]));
     return 1;
+
+ err:
+    SSLerr(SSL_F_SSL3_SETUP_READ_BUFFER, ERR_R_MALLOC_FAILURE);
+    return 0;
 }
 
-long app_RAND_load_files(char *name)
+int ssl3_setup_write_buffer(SSL *s)
 {
-    char *p, *n;
-    int last;
-    long tot = 0;
-    int egd;
-
-    for (;;) {
-        last = 0;
-        for (p = name; ((*p != '\0') && (*p != LIST_SEPARATOR_CHAR)); p++) ;
-        if (*p == '\0')
-            last = 1;
-        *p = '\0';
-        n = name;
-        name = p + 1;
-        if (*n == '\0')
-            break;
-
-        egd = RAND_egd(n);
-        if (egd > 0)
-            tot += egd;
-        else
-            tot += RAND_load_file(n, -1);
-        if (last)
-            break;
+    unsigned char *p;
+    size_t len, align = 0, headerlen;
+    SSL3_BUFFER *wb;
+
+    wb = RECORD_LAYER_get_wbuf(&s->rlayer);
+
+    if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
+        headerlen = DTLS1_RT_HEADER_LENGTH + 1;
+    else
+        headerlen = SSL3_RT_HEADER_LENGTH;
+
+#if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0
+    align = (-SSL3_RT_HEADER_LENGTH) & (SSL3_ALIGN_PAYLOAD - 1);
+#endif
+
+    if (wb->buf == NULL) {
+        len = s->max_send_fragment
+            + SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD + headerlen + align;
+#ifndef OPENSSL_NO_COMP
+        if (ssl_allow_compression(s))
+            len += SSL3_RT_MAX_COMPRESSED_OVERHEAD;
+#endif
+        if (!(s->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS))
+            len += headerlen + align + SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD;
+
+        if ((p = OPENSSL_malloc(len)) == NULL)
+            goto err;
+        wb->buf = p;
+        wb->len = len;
     }
-    if (tot > 512)
-        app_RAND_allow_write_file();
-    return (tot);
+
+    return 1;
+
+ err:
+    SSLerr(SSL_F_SSL3_SETUP_WRITE_BUFFER, ERR_R_MALLOC_FAILURE);
+    return 0;
 }
 
-int app_RAND_write_file(const char *file, BIO *bio_e)
+int ssl3_setup_buffers(SSL *s)
 {
-    char buffer[200];
-
-    if (egdsocket || !seeded)
-        /*
-         * If we did not manage to read the seed file, we should not write a
-         * low-entropy seed file back -- it would suppress a crucial warning
-         * the next time we want to use it.
-         */
+    if (!ssl3_setup_read_buffer(s))
         return 0;
-
-    if (file == NULL)
-        file = RAND_file_name(buffer, sizeof buffer);
-    if (file == NULL || !RAND_write_file(file)) {
-        BIO_printf(bio_e, "unable to write 'random state'\n");
+    if (!ssl3_setup_write_buffer(s))
         return 0;
+    return 1;
+}
+
+int ssl3_release_write_buffer(SSL *s)
+{
+    SSL3_BUFFER *wb;
+
+    wb = RECORD_LAYER_get_wbuf(&s->rlayer);
+
+    if (wb->buf != NULL) {
+        OPENSSL_free(wb->buf);
+        wb->buf = NULL;
     }
     return 1;
 }
 
-void app_RAND_allow_write_file(void)
+int ssl3_release_read_buffer(SSL *s)
 {
-    seeded = 1;
+    SSL3_BUFFER *b;
+
+    b = RECORD_LAYER_get_rbuf(&s->rlayer);
+    if (b->buf != NULL) {
+        OPENSSL_free(b->buf);
+        b->buf = NULL;
+    }
+    return 1;
 }
diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c
new file mode 100644
index 0000000..cfd8290
--- /dev/null
+++ b/ssl/record/ssl3_record.c
@@ -0,0 +1,1558 @@
+/* ssl/record/ssl3_record.c */
+/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay at cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh at cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay at cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh at cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2015 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core at openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
+
+#include "../ssl_locl.h"
+#include "../../crypto/constant_time_locl.h"
+#include <openssl/rand.h>
+#include "record_locl.h"
+
+static const unsigned char ssl3_pad_1[48] = {
+    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
+    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
+    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
+    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
+    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
+    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36
+};
+
+static const unsigned char ssl3_pad_2[48] = {
+    0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c,
+    0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c,
+    0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c,
+    0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c,
+    0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c,
+    0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c
+};
+
+void SSL3_RECORD_clear(SSL3_RECORD *r)
+{
+    memset(r->seq_num, 0, sizeof(r->seq_num));
+}
+
+void SSL3_RECORD_release(SSL3_RECORD *r)
+{
+    if (r->comp != NULL)
+        OPENSSL_free(r->comp);
+    r->comp = NULL;
+}
+
+int SSL3_RECORD_setup(SSL3_RECORD *r)
+{
+    if (r->comp == NULL)
+        r->comp = (unsigned char *)
+            OPENSSL_malloc(SSL3_RT_MAX_ENCRYPTED_LENGTH);
+    if (r->comp == NULL)
+        return 0;
+    return 1;
+}
+
+void SSL3_RECORD_set_seq_num(SSL3_RECORD *r, const unsigned char *seq_num)
+{
+    memcpy(r->seq_num, seq_num, SEQ_NUM_SIZE);
+}
+
+/*
+ * MAX_EMPTY_RECORDS defines the number of consecutive, empty records that
+ * will be processed per call to ssl3_get_record. Without this limit an
+ * attacker could send empty records at a faster rate than we can process and
+ * cause ssl3_get_record to loop forever.
+ */
+#define MAX_EMPTY_RECORDS 32
+
+/*-
+ * Call this to get a new input record.
+ * It will return <= 0 if more data is needed, normally due to an error
+ * or non-blocking IO.
+ * When it finishes, one packet has been decoded and can be found in
+ * ssl->s3->rrec.type    - is the type of record
+ * ssl->s3->rrec.data,   - data
+ * ssl->s3->rrec.length, - number of bytes
+ */
+/* used only by ssl3_read_bytes */
+int ssl3_get_record(SSL *s)
+{
+    int ssl_major, ssl_minor, al;
+    int enc_err, n, i, ret = -1;
+    SSL3_RECORD *rr;
+    SSL_SESSION *sess;
+    unsigned char *p;
+    unsigned char md[EVP_MAX_MD_SIZE];
+    short version;
+    unsigned mac_size;
+    size_t extra;
+    unsigned empty_record_count = 0;
+
+    rr = RECORD_LAYER_get_rrec(&s->rlayer);
+    sess = s->session;
+
+    if (s->options & SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER)
+        extra = SSL3_RT_MAX_EXTRA;
+    else
+        extra = 0;
+    if (extra && !s->s3->init_extra) {
+        /*
+         * An application error: SLS_OP_MICROSOFT_BIG_SSLV3_BUFFER set after
+         * ssl3_setup_buffers() was done
+         */
+        SSLerr(SSL_F_SSL3_GET_RECORD, ERR_R_INTERNAL_ERROR);
+        return -1;
+    }
+
+ again:
+    /* check if we have the header */
+    if ((RECORD_LAYER_get_rstate(&s->rlayer) != SSL_ST_READ_BODY) ||
+        (RECORD_LAYER_get_packet_length(&s->rlayer) < SSL3_RT_HEADER_LENGTH)) {
+        n = ssl3_read_n(s, SSL3_RT_HEADER_LENGTH,
+            SSL3_BUFFER_get_len(&s->rlayer.rbuf), 0);
+        if (n <= 0)
+            return (n);         /* error or non-blocking */
+        RECORD_LAYER_set_rstate(&s->rlayer, SSL_ST_READ_BODY);
+
+        p = RECORD_LAYER_get_packet(&s->rlayer);
+        if (s->msg_callback)
+            s->msg_callback(0, 0, SSL3_RT_HEADER, p, 5, s,
+                            s->msg_callback_arg);
+
+        /* Pull apart the header into the SSL3_RECORD */
+        rr->type = *(p++);
+        ssl_major = *(p++);
+        ssl_minor = *(p++);
+        version = (ssl_major << 8) | ssl_minor;
+        n2s(p, rr->length);
+
+        /* Lets check version */
+        if (!s->first_packet) {
+            if (version != s->version) {
+                SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_WRONG_VERSION_NUMBER);
+                if ((s->version & 0xFF00) == (version & 0xFF00)
+                    && !s->enc_write_ctx && !s->write_hash)
+                    /*
+                     * Send back error using their minor version number :-)
+                     */
+                    s->version = (unsigned short)version;
+                al = SSL_AD_PROTOCOL_VERSION;
+                goto f_err;
+            }
+        }
+
+        if ((version >> 8) != SSL3_VERSION_MAJOR) {
+            SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_WRONG_VERSION_NUMBER);
+            goto err;
+        }
+
+        if (rr->length >
+                SSL3_BUFFER_get_len(&s->rlayer.rbuf)
+                - SSL3_RT_HEADER_LENGTH) {
+            al = SSL_AD_RECORD_OVERFLOW;
+            SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_PACKET_LENGTH_TOO_LONG);
+            goto f_err;
+        }
+
+        /* now s->rlayer.rstate == SSL_ST_READ_BODY */
+    }
+
+    /* s->rlayer.rstate == SSL_ST_READ_BODY, get and decode the data */
+
+    if (rr->length >
+        RECORD_LAYER_get_packet_length(&s->rlayer) - SSL3_RT_HEADER_LENGTH) {
+        /* now s->packet_length == SSL3_RT_HEADER_LENGTH */
+        i = rr->length;
+        n = ssl3_read_n(s, i, i, 1);
+        if (n <= 0)
+            return (n);         /* error or non-blocking io */
+        /*
+         * now n == rr->length, and s->packet_length == SSL3_RT_HEADER_LENGTH
+         * + rr->length
+         */
+    }
+
+    /* set state for later operations */
+    RECORD_LAYER_set_rstate(&s->rlayer, SSL_ST_READ_HEADER);
+
+    /*
+     * At this point, s->packet_length == SSL3_RT_HEADER_LNGTH + rr->length,
+     * and we have that many bytes in s->packet
+     */
+    rr->input = &(RECORD_LAYER_get_packet(&s->rlayer)[SSL3_RT_HEADER_LENGTH]);
+
+    /*
+     * ok, we can now read from 's->packet' data into 'rr' rr->input points
+     * at rr->length bytes, which need to be copied into rr->data by either
+     * the decryption or by the decompression When the data is 'copied' into
+     * the rr->data buffer, rr->input will be pointed at the new buffer
+     */
+
+    /*
+     * We now have - encrypted [ MAC [ compressed [ plain ] ] ] rr->length
+     * bytes of encrypted compressed stuff.
+     */
+
+    /* check is not needed I believe */
+    if (rr->length > SSL3_RT_MAX_ENCRYPTED_LENGTH + extra) {
+        al = SSL_AD_RECORD_OVERFLOW;
+        SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_ENCRYPTED_LENGTH_TOO_LONG);
+        goto f_err;
+    }
+
+    /* decrypt in place in 'rr->input' */
+    rr->data = rr->input;
+    rr->orig_len = rr->length;
+    /*
+     * If in encrypt-then-mac mode calculate mac from encrypted record. All
+     * the details below are public so no timing details can leak.
+     */
+    if (SSL_USE_ETM(s) && s->read_hash) {
+        unsigned char *mac;
+        mac_size = EVP_MD_CTX_size(s->read_hash);
+        OPENSSL_assert(mac_size <= EVP_MAX_MD_SIZE);
+        if (rr->length < mac_size) {
+            al = SSL_AD_DECODE_ERROR;
+            SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_LENGTH_TOO_SHORT);
+            goto f_err;
+        }
+        rr->length -= mac_size;
+        mac = rr->data + rr->length;
+        i = s->method->ssl3_enc->mac(s, md, 0 /* not send */ );
+        if (i < 0 || CRYPTO_memcmp(md, mac, (size_t)mac_size) != 0) {
+            al = SSL_AD_BAD_RECORD_MAC;
+            SSLerr(SSL_F_SSL3_GET_RECORD,
+                   SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC);
+            goto f_err;
+        }
+    }
+
+    enc_err = s->method->ssl3_enc->enc(s, 0);
+    /*-
+     * enc_err is:
+     *    0: (in non-constant time) if the record is publically invalid.
+     *    1: if the padding is valid
+     *    -1: if the padding is invalid
+     */
+    if (enc_err == 0) {
+        al = SSL_AD_DECRYPTION_FAILED;
+        SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_BLOCK_CIPHER_PAD_IS_WRONG);
+        goto f_err;
+    }
+#ifdef TLS_DEBUG
+    printf("dec %d\n", rr->length);
+    {
+        unsigned int z;
+        for (z = 0; z < rr->length; z++)
+            printf("%02X%c", rr->data[z], ((z + 1) % 16) ? ' ' : '\n');
+    }
+    printf("\n");
+#endif
+
+    /* r->length is now the compressed data plus mac */
+    if ((sess != NULL) &&
+        (s->enc_read_ctx != NULL) &&
+        (EVP_MD_CTX_md(s->read_hash) != NULL) && !SSL_USE_ETM(s)) {
+        /* s->read_hash != NULL => mac_size != -1 */
+        unsigned char *mac = NULL;
+        unsigned char mac_tmp[EVP_MAX_MD_SIZE];
+        mac_size = EVP_MD_CTX_size(s->read_hash);
+        OPENSSL_assert(mac_size <= EVP_MAX_MD_SIZE);
+
+        /*
+         * orig_len is the length of the record before any padding was
+         * removed. This is public information, as is the MAC in use,
+         * therefore we can safely process the record in a different amount
+         * of time if it's too short to possibly contain a MAC.
+         */
+        if (rr->orig_len < mac_size ||
+            /* CBC records must have a padding length byte too. */
+            (EVP_CIPHER_CTX_mode(s->enc_read_ctx) == EVP_CIPH_CBC_MODE &&
+             rr->orig_len < mac_size + 1)) {
+            al = SSL_AD_DECODE_ERROR;
+            SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_LENGTH_TOO_SHORT);
+            goto f_err;
+        }
+
+        if (EVP_CIPHER_CTX_mode(s->enc_read_ctx) == EVP_CIPH_CBC_MODE) {
+            /*
+             * We update the length so that the TLS header bytes can be
+             * constructed correctly but we need to extract the MAC in
+             * constant time from within the record, without leaking the
+             * contents of the padding bytes.
+             */
+            mac = mac_tmp;
+            ssl3_cbc_copy_mac(mac_tmp, rr, mac_size);
+            rr->length -= mac_size;
+        } else {
+            /*
+             * In this case there's no padding, so |rec->orig_len| equals
+             * |rec->length| and we checked that there's enough bytes for
+             * |mac_size| above.
+             */
+            rr->length -= mac_size;
+            mac = &rr->data[rr->length];
+        }
+
+        i = s->method->ssl3_enc->mac(s, md, 0 /* not send */ );
+        if (i < 0 || mac == NULL
+            || CRYPTO_memcmp(md, mac, (size_t)mac_size) != 0)
+            enc_err = -1;
+        if (rr->length > SSL3_RT_MAX_COMPRESSED_LENGTH + extra + mac_size)
+            enc_err = -1;
+    }
+
+    if (enc_err < 0) {
+        /*
+         * A separate 'decryption_failed' alert was introduced with TLS 1.0,
+         * SSL 3.0 only has 'bad_record_mac'.  But unless a decryption
+         * failure is directly visible from the ciphertext anyway, we should
+         * not reveal which kind of error occurred -- this might become
+         * visible to an attacker (e.g. via a logfile)
+         */
+        al = SSL_AD_BAD_RECORD_MAC;
+        SSLerr(SSL_F_SSL3_GET_RECORD,
+               SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC);
+        goto f_err;
+    }
+
+    /* r->length is now just compressed */
+    if (s->expand != NULL) {
+        if (rr->length > SSL3_RT_MAX_COMPRESSED_LENGTH + extra) {
+            al = SSL_AD_RECORD_OVERFLOW;
+            SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_COMPRESSED_LENGTH_TOO_LONG);
+            goto f_err;
+        }
+        if (!ssl3_do_uncompress(s)) {
+            al = SSL_AD_DECOMPRESSION_FAILURE;
+            SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_BAD_DECOMPRESSION);
+            goto f_err;
+        }
+    }
+
+    if (rr->length > SSL3_RT_MAX_PLAIN_LENGTH + extra) {
+        al = SSL_AD_RECORD_OVERFLOW;
+        SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_DATA_LENGTH_TOO_LONG);
+        goto f_err;
+    }
+
+    rr->off = 0;
+    /*-
+     * So at this point the following is true
+     * ssl->s3->rrec.type   is the type of record
+     * ssl->s3->rrec.length == number of bytes in record
+     * ssl->s3->rrec.off    == offset to first valid byte
+     * ssl->s3->rrec.data   == where to take bytes from, increment
+     *                         after use :-).
+     */
+
+    /* we have pulled in a full packet so zero things */
+    RECORD_LAYER_reset_packet_length(&s->rlayer);
+
+    /* just read a 0 length packet */
+    if (rr->length == 0) {
+        empty_record_count++;
+        if (empty_record_count > MAX_EMPTY_RECORDS) {
+            al = SSL_AD_UNEXPECTED_MESSAGE;
+            SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_RECORD_TOO_SMALL);
+            goto f_err;
+        }
+        goto again;
+    }
+
+    return (1);
+
+ f_err:
+    ssl3_send_alert(s, SSL3_AL_FATAL, al);
+ err:
+    return (ret);
+}
+
+int ssl3_do_uncompress(SSL *ssl)
+{
+#ifndef OPENSSL_NO_COMP
+    int i;
+    SSL3_RECORD *rr;
+
+    rr = RECORD_LAYER_get_rrec(&ssl->rlayer);
+    i = COMP_expand_block(ssl->expand, rr->comp,
+                          SSL3_RT_MAX_PLAIN_LENGTH, rr->data,
+                          (int)rr->length);
+    if (i < 0)
+        return (0);
+    else
+        rr->length = i;
+    rr->data = rr->comp;
+#endif
+    return (1);
+}
+
+int ssl3_do_compress(SSL *ssl)
+{
+#ifndef OPENSSL_NO_COMP
+    int i;
+    SSL3_RECORD *wr;
+
+    wr = RECORD_LAYER_get_wrec(&ssl->rlayer);
+    i = COMP_compress_block(ssl->compress, wr->data,
+                            SSL3_RT_MAX_COMPRESSED_LENGTH,
+                            wr->input, (int)wr->length);
+    if (i < 0)
+        return (0);
+    else
+        wr->length = i;
+
+    wr->input = wr->data;
+#endif
+    return (1);
+}
+
+/*-
+ * ssl3_enc encrypts/decrypts the record in |s->wrec| / |s->rrec|, respectively.
+ *
+ * Returns:
+ *   0: (in non-constant time) if the record is publically invalid (i.e. too
+ *       short etc).
+ *   1: if the record's padding is valid / the encryption was successful.
+ *   -1: if the record's padding is invalid or, if sending, an internal error
+ *       occurred.
+ */
+int ssl3_enc(SSL *s, int send)
+{
+    SSL3_RECORD *rec;
+    EVP_CIPHER_CTX *ds;
+    unsigned long l;
+    int bs, i, mac_size = 0;
+    const EVP_CIPHER *enc;
+
+    if (send) {
+        ds = s->enc_write_ctx;
+        rec = RECORD_LAYER_get_wrec(&s->rlayer);
+        if (s->enc_write_ctx == NULL)
+            enc = NULL;
+        else
+            enc = EVP_CIPHER_CTX_cipher(s->enc_write_ctx);
+    } else {
+        ds = s->enc_read_ctx;
+        rec = RECORD_LAYER_get_rrec(&s->rlayer);
+        if (s->enc_read_ctx == NULL)
+            enc = NULL;
+        else
+            enc = EVP_CIPHER_CTX_cipher(s->enc_read_ctx);
+    }
+
+    if ((s->session == NULL) || (ds == NULL) || (enc == NULL)) {
+        memmove(rec->data, rec->input, rec->length);
+        rec->input = rec->data;
+    } else {
+        l = rec->length;
+        bs = EVP_CIPHER_block_size(ds->cipher);
+
+        /* COMPRESS */
+
+        if ((bs != 1) && send) {
+            i = bs - ((int)l % bs);
+
+            /* we need to add 'i-1' padding bytes */
+            l += i;
+            /*
+             * the last of these zero bytes will be overwritten with the
+             * padding length.
+             */
+            memset(&rec->input[rec->length], 0, i);
+            rec->length += i;
+            rec->input[l - 1] = (i - 1);
+        }
+
+        if (!send) {
+            if (l == 0 || l % bs != 0)
+                return 0;
+            /* otherwise, rec->length >= bs */
+        }
+
+        if (EVP_Cipher(ds, rec->data, rec->input, l) < 1)
+            return -1;
+
+        if (EVP_MD_CTX_md(s->read_hash) != NULL)
+            mac_size = EVP_MD_CTX_size(s->read_hash);
+        if ((bs != 1) && !send)
+            return ssl3_cbc_remove_padding(s, rec, bs, mac_size);
+    }
+    return (1);
+}
+
+/*-
+ * tls1_enc encrypts/decrypts the record in |s->wrec| / |s->rrec|, respectively.
+ *
+ * Returns:
+ *   0: (in non-constant time) if the record is publically invalid (i.e. too
+ *       short etc).
+ *   1: if the record's padding is valid / the encryption was successful.
+ *   -1: if the record's padding/AEAD-authenticator is invalid or, if sending,
+ *       an internal error occurred.
+ */
+int tls1_enc(SSL *s, int send)
+{
+    SSL3_RECORD *rec;
+    EVP_CIPHER_CTX *ds;
+    unsigned long l;
+    int bs, i, j, k, pad = 0, ret, mac_size = 0;
+    const EVP_CIPHER *enc;
+
+    if (send) {
+        if (EVP_MD_CTX_md(s->write_hash)) {
+            int n = EVP_MD_CTX_size(s->write_hash);
+            OPENSSL_assert(n >= 0);
+        }
+        ds = s->enc_write_ctx;
+        rec = RECORD_LAYER_get_wrec(&s->rlayer);
+        if (s->enc_write_ctx == NULL)
+            enc = NULL;
+        else {
+            int ivlen;
+            enc = EVP_CIPHER_CTX_cipher(s->enc_write_ctx);
+            /* For TLSv1.1 and later explicit IV */
+            if (SSL_USE_EXPLICIT_IV(s)
+                && EVP_CIPHER_mode(enc) == EVP_CIPH_CBC_MODE)
+                ivlen = EVP_CIPHER_iv_length(enc);
+            else
+                ivlen = 0;
+            if (ivlen > 1) {
+                if (rec->data != rec->input)
+                    /*
+                     * we can't write into the input stream: Can this ever
+                     * happen?? (steve)
+                     */
+                    fprintf(stderr,
+                            "%s:%d: rec->data != rec->input\n",
+                            __FILE__, __LINE__);
+                else if (RAND_bytes(rec->input, ivlen) <= 0)
+                    return -1;
+            }
+        }
+    } else {
+        if (EVP_MD_CTX_md(s->read_hash)) {
+            int n = EVP_MD_CTX_size(s->read_hash);
+            OPENSSL_assert(n >= 0);
+        }
+        ds = s->enc_read_ctx;
+        rec = RECORD_LAYER_get_rrec(&s->rlayer);
+        if (s->enc_read_ctx == NULL)
+            enc = NULL;
+        else
+            enc = EVP_CIPHER_CTX_cipher(s->enc_read_ctx);
+    }
+
+#ifdef KSSL_DEBUG
+    fprintf(stderr, "tls1_enc(%d)\n", send);
+#endif                          /* KSSL_DEBUG */
+
+    if ((s->session == NULL) || (ds == NULL) || (enc == NULL)) {
+        memmove(rec->data, rec->input, rec->length);
+        rec->input = rec->data;
+        ret = 1;
+    } else {
+        l = rec->length;
+        bs = EVP_CIPHER_block_size(ds->cipher);
+
+        if (EVP_CIPHER_flags(ds->cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) {
+            unsigned char buf[13], *seq;
+
+            seq = send ? RECORD_LAYER_get_write_sequence(&s->rlayer)
+                : RECORD_LAYER_get_read_sequence(&s->rlayer);
+
+            if (SSL_IS_DTLS(s)) {
+                unsigned char dtlsseq[9], *p = dtlsseq;
+
+                s2n(send ? DTLS_RECORD_LAYER_get_w_epoch(&s->rlayer) :
+                    DTLS_RECORD_LAYER_get_r_epoch(&s->rlayer), p);
+                memcpy(p, &seq[2], 6);
+                memcpy(buf, dtlsseq, 8);
+            } else {
+                memcpy(buf, seq, 8);
+                for (i = 7; i >= 0; i--) { /* increment */
+                    ++seq[i];
+                    if (seq[i] != 0)
+                        break;
+                }
+            }
+
+            buf[8] = rec->type;
+            buf[9] = (unsigned char)(s->version >> 8);
+            buf[10] = (unsigned char)(s->version);
+            buf[11] = rec->length >> 8;
+            buf[12] = rec->length & 0xff;
+            pad = EVP_CIPHER_CTX_ctrl(ds, EVP_CTRL_AEAD_TLS1_AAD, 13, buf);
+            if (send) {
+                l += pad;
+                rec->length += pad;
+            }
+        } else if ((bs != 1) && send) {
+            i = bs - ((int)l % bs);
+
+            /* Add weird padding of upto 256 bytes */
+
+            /* we need to add 'i' padding bytes of value j */
+            j = i - 1;
+            if (s->options & SSL_OP_TLS_BLOCK_PADDING_BUG) {
+                if (s->s3->flags & TLS1_FLAGS_TLS_PADDING_BUG)
+                    j++;
+            }
+            for (k = (int)l; k < (int)(l + i); k++)
+                rec->input[k] = j;
+            l += i;
+            rec->length += i;
+        }
+#ifdef KSSL_DEBUG
+        {
+            unsigned long ui;
+            fprintf(stderr,
+                    "EVP_Cipher(ds=%p,rec->data=%p,rec->input=%p,l=%ld) ==>\n",
+                    ds, rec->data, rec->input, l);
+            fprintf(stderr,
+                    "\tEVP_CIPHER_CTX: %d buf_len, %d key_len [%lu %lu], %d iv_len\n",
+                    ds->buf_len, ds->cipher->key_len, DES_KEY_SZ,
+                    DES_SCHEDULE_SZ, ds->cipher->iv_len);
+            fprintf(stderr, "\t\tIV: ");
+            for (i = 0; i < ds->cipher->iv_len; i++)
+                fprintf(stderr, "%02X", ds->iv[i]);
+            fprintf(stderr, "\n");
+            fprintf(stderr, "\trec->input=");
+            for (ui = 0; ui < l; ui++)
+                fprintf(stderr, " %02x", rec->input[ui]);
+            fprintf(stderr, "\n");
+        }
+#endif                          /* KSSL_DEBUG */
+
+        if (!send) {
+            if (l == 0 || l % bs != 0)
+                return 0;
+        }
+
+        i = EVP_Cipher(ds, rec->data, rec->input, l);
+        if ((EVP_CIPHER_flags(ds->cipher) & EVP_CIPH_FLAG_CUSTOM_CIPHER)
+            ? (i < 0)
+            : (i == 0))
+            return -1;          /* AEAD can fail to verify MAC */
+        if (EVP_CIPHER_mode(enc) == EVP_CIPH_GCM_MODE && !send) {
+            rec->data += EVP_GCM_TLS_EXPLICIT_IV_LEN;
+            rec->input += EVP_GCM_TLS_EXPLICIT_IV_LEN;
+            rec->length -= EVP_GCM_TLS_EXPLICIT_IV_LEN;
+        }
+#ifdef KSSL_DEBUG
+        {
+            unsigned long i;
+            fprintf(stderr, "\trec->data=");
+            for (i = 0; i < l; i++)
+                fprintf(stderr, " %02x", rec->data[i]);
+            fprintf(stderr, "\n");
+        }
+#endif                          /* KSSL_DEBUG */
+
+        ret = 1;
+        if (!SSL_USE_ETM(s) && EVP_MD_CTX_md(s->read_hash) != NULL)
+            mac_size = EVP_MD_CTX_size(s->read_hash);
+        if ((bs != 1) && !send)
+            ret = tls1_cbc_remove_padding(s, rec, bs, mac_size);
+        if (pad && !send)
+            rec->length -= pad;
+    }
+    return ret;
+}
+
+int n_ssl3_mac(SSL *ssl, unsigned char *md, int send)
+{
+    SSL3_RECORD *rec;
+    unsigned char *mac_sec, *seq;
+    EVP_MD_CTX md_ctx;
+    const EVP_MD_CTX *hash;
+    unsigned char *p, rec_char;
+    size_t md_size;
+    int npad;
+    int t;
+
+    if (send) {
+        rec = RECORD_LAYER_get_wrec(&ssl->rlayer);
+        mac_sec = &(ssl->s3->write_mac_secret[0]);
+        seq = RECORD_LAYER_get_write_sequence(&ssl->rlayer);
+        hash = ssl->write_hash;
+    } else {
+        rec = RECORD_LAYER_get_rrec(&ssl->rlayer);
+        mac_sec = &(ssl->s3->read_mac_secret[0]);
+        seq = RECORD_LAYER_get_read_sequence(&ssl->rlayer);
+        hash = ssl->read_hash;
+    }
+
+    t = EVP_MD_CTX_size(hash);
+    if (t < 0)
+        return -1;
+    md_size = t;
+    npad = (48 / md_size) * md_size;
+
+    if (!send &&
+        EVP_CIPHER_CTX_mode(ssl->enc_read_ctx) == EVP_CIPH_CBC_MODE &&
+        ssl3_cbc_record_digest_supported(hash)) {
+        /*
+         * This is a CBC-encrypted record. We must avoid leaking any
+         * timing-side channel information about how many blocks of data we
+         * are hashing because that gives an attacker a timing-oracle.
+         */
+
+        /*-
+         * npad is, at most, 48 bytes and that's with MD5:
+         *   16 + 48 + 8 (sequence bytes) + 1 + 2 = 75.
+         *
+         * With SHA-1 (the largest hash speced for SSLv3) the hash size
+         * goes up 4, but npad goes down by 8, resulting in a smaller
+         * total size.
+         */
+        unsigned char header[75];
+        unsigned j = 0;
+        memcpy(header + j, mac_sec, md_size);
+        j += md_size;
+        memcpy(header + j, ssl3_pad_1, npad);
+        j += npad;
+        memcpy(header + j, seq, 8);
+        j += 8;
+        header[j++] = rec->type;
+        header[j++] = rec->length >> 8;
+        header[j++] = rec->length & 0xff;
+
+        /* Final param == is SSLv3 */
+        ssl3_cbc_digest_record(hash,
+                               md, &md_size,
+                               header, rec->input,
+                               rec->length + md_size, rec->orig_len,
+                               mac_sec, md_size, 1);
+    } else {
+        unsigned int md_size_u;
+        /* Chop the digest off the end :-) */
+        EVP_MD_CTX_init(&md_ctx);
+
+        EVP_MD_CTX_copy_ex(&md_ctx, hash);
+        EVP_DigestUpdate(&md_ctx, mac_sec, md_size);
+        EVP_DigestUpdate(&md_ctx, ssl3_pad_1, npad);
+        EVP_DigestUpdate(&md_ctx, seq, 8);
+        rec_char = rec->type;
+        EVP_DigestUpdate(&md_ctx, &rec_char, 1);
+        p = md;
+        s2n(rec->length, p);
+        EVP_DigestUpdate(&md_ctx, md, 2);
+        EVP_DigestUpdate(&md_ctx, rec->input, rec->length);
+        EVP_DigestFinal_ex(&md_ctx, md, NULL);
+
+        EVP_MD_CTX_copy_ex(&md_ctx, hash);
+        EVP_DigestUpdate(&md_ctx, mac_sec, md_size);
+        EVP_DigestUpdate(&md_ctx, ssl3_pad_2, npad);
+        EVP_DigestUpdate(&md_ctx, md, md_size);
+        EVP_DigestFinal_ex(&md_ctx, md, &md_size_u);
+        md_size = md_size_u;
+
+        EVP_MD_CTX_cleanup(&md_ctx);
+    }
+
+    ssl3_record_sequence_update(seq);
+    return (md_size);
+}
+
+int tls1_mac(SSL *ssl, unsigned char *md, int send)
+{
+    SSL3_RECORD *rec;
+    unsigned char *seq;
+    EVP_MD_CTX *hash;
+    size_t md_size;
+    int i;
+    EVP_MD_CTX hmac, *mac_ctx;
+    unsigned char header[13];
+    int stream_mac = (send ? (ssl->mac_flags & SSL_MAC_FLAG_WRITE_MAC_STREAM)
+                      : (ssl->mac_flags & SSL_MAC_FLAG_READ_MAC_STREAM));
+    int t;
+
+    if (send) {
+        rec = RECORD_LAYER_get_wrec(&ssl->rlayer);
+        seq = RECORD_LAYER_get_write_sequence(&ssl->rlayer);
+        hash = ssl->write_hash;
+    } else {
+        rec = RECORD_LAYER_get_rrec(&ssl->rlayer);
+        seq = RECORD_LAYER_get_read_sequence(&ssl->rlayer);
+        hash = ssl->read_hash;
+    }
+
+    t = EVP_MD_CTX_size(hash);
+    OPENSSL_assert(t >= 0);
+    md_size = t;
+
+    /* I should fix this up TLS TLS TLS TLS TLS XXXXXXXX */
+    if (stream_mac) {
+        mac_ctx = hash;
+    } else {
+        if (!EVP_MD_CTX_copy(&hmac, hash))
+            return -1;
+        mac_ctx = &hmac;
+    }
+
+    if (SSL_IS_DTLS(ssl)) {
+        unsigned char dtlsseq[8], *p = dtlsseq;
+
+        s2n(send ? DTLS_RECORD_LAYER_get_w_epoch(&ssl->rlayer) :
+            DTLS_RECORD_LAYER_get_r_epoch(&ssl->rlayer), p);
+        memcpy(p, &seq[2], 6);
+
+        memcpy(header, dtlsseq, 8);
+    } else
+        memcpy(header, seq, 8);
+
+    header[8] = rec->type;
+    header[9] = (unsigned char)(ssl->version >> 8);
+    header[10] = (unsigned char)(ssl->version);
+    header[11] = (rec->length) >> 8;
+    header[12] = (rec->length) & 0xff;
+
+    if (!send && !SSL_USE_ETM(ssl) &&
+        EVP_CIPHER_CTX_mode(ssl->enc_read_ctx) == EVP_CIPH_CBC_MODE &&
+        ssl3_cbc_record_digest_supported(mac_ctx)) {
+        /*
+         * This is a CBC-encrypted record. We must avoid leaking any
+         * timing-side channel information about how many blocks of data we
+         * are hashing because that gives an attacker a timing-oracle.
+         */
+        /* Final param == not SSLv3 */
+        ssl3_cbc_digest_record(mac_ctx,
+                               md, &md_size,
+                               header, rec->input,
+                               rec->length + md_size, rec->orig_len,
+                               ssl->s3->read_mac_secret,
+                               ssl->s3->read_mac_secret_size, 0);
+    } else {
+        EVP_DigestSignUpdate(mac_ctx, header, sizeof(header));
+        EVP_DigestSignUpdate(mac_ctx, rec->input, rec->length);
+        t = EVP_DigestSignFinal(mac_ctx, md, &md_size);
+        OPENSSL_assert(t > 0);
+        if (!send && !SSL_USE_ETM(ssl) && FIPS_mode())
+            tls_fips_digest_extra(ssl->enc_read_ctx,
+                                  mac_ctx, rec->input,
+                                  rec->length, rec->orig_len);
+    }
+
+    if (!stream_mac)
+        EVP_MD_CTX_cleanup(&hmac);
+#ifdef TLS_DEBUG
+    fprintf(stderr, "seq=");
+    {
+        int z;
+        for (z = 0; z < 8; z++)
+            fprintf(stderr, "%02X ", seq[z]);
+        fprintf(stderr, "\n");
+    }
+    fprintf(stderr, "rec=");
+    {
+        unsigned int z;
+        for (z = 0; z < rec->length; z++)
+            fprintf(stderr, "%02X ", rec->data[z]);
+        fprintf(stderr, "\n");
+    }
+#endif
+
+    if (!SSL_IS_DTLS(ssl)) {
+        for (i = 7; i >= 0; i--) {
+            ++seq[i];
+            if (seq[i] != 0)
+                break;
+        }
+    }
+#ifdef TLS_DEBUG
+    {
+        unsigned int z;
+        for (z = 0; z < md_size; z++)
+            fprintf(stderr, "%02X ", md[z]);
+        fprintf(stderr, "\n");
+    }
+#endif
+    return (md_size);
+}
+
+/*-
+ * ssl3_cbc_remove_padding removes padding from the decrypted, SSLv3, CBC
+ * record in |rec| by updating |rec->length| in constant time.
+ *
+ * block_size: the block size of the cipher used to encrypt the record.
+ * returns:
+ *   0: (in non-constant time) if the record is publicly invalid.
+ *   1: if the padding was valid
+ *  -1: otherwise.
+ */
+int ssl3_cbc_remove_padding(const SSL *s,
+                            SSL3_RECORD *rec,
+                            unsigned block_size, unsigned mac_size)
+{
+    unsigned padding_length, good;
+    const unsigned overhead = 1 /* padding length byte */  + mac_size;
+
+    /*
+     * These lengths are all public so we can test them in non-constant time.
+     */
+    if (overhead > rec->length)
+        return 0;
+
+    padding_length = rec->data[rec->length - 1];
+    good = constant_time_ge(rec->length, padding_length + overhead);
+    /* SSLv3 requires that the padding is minimal. */
+    good &= constant_time_ge(block_size, padding_length + 1);
+    rec->length -= good & (padding_length + 1);
+    return constant_time_select_int(good, 1, -1);
+}
+
+/*-
+ * tls1_cbc_remove_padding removes the CBC padding from the decrypted, TLS, CBC
+ * record in |rec| in constant time and returns 1 if the padding is valid and
+ * -1 otherwise. It also removes any explicit IV from the start of the record
+ * without leaking any timing about whether there was enough space after the
+ * padding was removed.
+ *
+ * block_size: the block size of the cipher used to encrypt the record.
+ * returns:
+ *   0: (in non-constant time) if the record is publicly invalid.
+ *   1: if the padding was valid
+ *  -1: otherwise.
+ */
+int tls1_cbc_remove_padding(const SSL *s,
+                            SSL3_RECORD *rec,
+                            unsigned block_size, unsigned mac_size)
+{
+    unsigned padding_length, good, to_check, i;
+    const unsigned overhead = 1 /* padding length byte */  + mac_size;
+    /* Check if version requires explicit IV */
+    if (SSL_USE_EXPLICIT_IV(s)) {
+        /*
+         * These lengths are all public so we can test them in non-constant
+         * time.
+         */
+        if (overhead + block_size > rec->length)
+            return 0;
+        /* We can now safely skip explicit IV */
+        rec->data += block_size;
+        rec->input += block_size;
+        rec->length -= block_size;
+        rec->orig_len -= block_size;
+    } else if (overhead > rec->length)
+        return 0;
+
+    padding_length = rec->data[rec->length - 1];
+
+    /*
+     * NB: if compression is in operation the first packet may not be of even
+     * length so the padding bug check cannot be performed. This bug
+     * workaround has been around since SSLeay so hopefully it is either
+     * fixed now or no buggy implementation supports compression [steve]
+     */
+    if ((s->options & SSL_OP_TLS_BLOCK_PADDING_BUG) && !s->expand) {
+        /* First packet is even in size, so check */
+        if ((memcmp(RECORD_LAYER_get_read_sequence(&s->rlayer),
+                "\0\0\0\0\0\0\0\0", 8) == 0) &&
+            !(padding_length & 1)) {
+            s->s3->flags |= TLS1_FLAGS_TLS_PADDING_BUG;
+        }
+        if ((s->s3->flags & TLS1_FLAGS_TLS_PADDING_BUG) && padding_length > 0) {
+            padding_length--;
+        }
+    }
+
+    if (EVP_CIPHER_flags(s->enc_read_ctx->cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) {
+        /* padding is already verified */
+        rec->length -= padding_length + 1;
+        return 1;
+    }
+
+    good = constant_time_ge(rec->length, overhead + padding_length);
+    /*
+     * The padding consists of a length byte at the end of the record and
+     * then that many bytes of padding, all with the same value as the length
+     * byte. Thus, with the length byte included, there are i+1 bytes of
+     * padding. We can't check just |padding_length+1| bytes because that
+     * leaks decrypted information. Therefore we always have to check the
+     * maximum amount of padding possible. (Again, the length of the record
+     * is public information so we can use it.)
+     */
+    to_check = 255;             /* maximum amount of padding. */
+    if (to_check > rec->length - 1)
+        to_check = rec->length - 1;
+
+    for (i = 0; i < to_check; i++) {
+        unsigned char mask = constant_time_ge_8(padding_length, i);
+        unsigned char b = rec->data[rec->length - 1 - i];
+        /*
+         * The final |padding_length+1| bytes should all have the value
+         * |padding_length|. Therefore the XOR should be zero.
+         */
+        good &= ~(mask & (padding_length ^ b));
+    }
+
+    /*
+     * If any of the final |padding_length+1| bytes had the wrong value, one
+     * or more of the lower eight bits of |good| will be cleared.
+     */
+    good = constant_time_eq(0xff, good & 0xff);
+    rec->length -= good & (padding_length + 1);
+
+    return constant_time_select_int(good, 1, -1);
+}
+
+/*-
+ * ssl3_cbc_copy_mac copies |md_size| bytes from the end of |rec| to |out| in
+ * constant time (independent of the concrete value of rec->length, which may
+ * vary within a 256-byte window).
+ *
+ * ssl3_cbc_remove_padding or tls1_cbc_remove_padding must be called prior to
+ * this function.
+ *
+ * On entry:
+ *   rec->orig_len >= md_size
+ *   md_size <= EVP_MAX_MD_SIZE
+ *
+ * If CBC_MAC_ROTATE_IN_PLACE is defined then the rotation is performed with
+ * variable accesses in a 64-byte-aligned buffer. Assuming that this fits into
+ * a single or pair of cache-lines, then the variable memory accesses don't
+ * actually affect the timing. CPUs with smaller cache-lines [if any] are
+ * not multi-core and are not considered vulnerable to cache-timing attacks.
+ */
+#define CBC_MAC_ROTATE_IN_PLACE
+
+void ssl3_cbc_copy_mac(unsigned char *out,
+                       const SSL3_RECORD *rec, unsigned md_size)
+{
+#if defined(CBC_MAC_ROTATE_IN_PLACE)
+    unsigned char rotated_mac_buf[64 + EVP_MAX_MD_SIZE];
+    unsigned char *rotated_mac;
+#else
+    unsigned char rotated_mac[EVP_MAX_MD_SIZE];
+#endif
+
+    /*
+     * mac_end is the index of |rec->data| just after the end of the MAC.
+     */
+    unsigned mac_end = rec->length;
+    unsigned mac_start = mac_end - md_size;
+    /*
+     * scan_start contains the number of bytes that we can ignore because the
+     * MAC's position can only vary by 255 bytes.
+     */
+    unsigned scan_start = 0;
+    unsigned i, j;
+    unsigned div_spoiler;
+    unsigned rotate_offset;
+
+    OPENSSL_assert(rec->orig_len >= md_size);
+    OPENSSL_assert(md_size <= EVP_MAX_MD_SIZE);
+
+#if defined(CBC_MAC_ROTATE_IN_PLACE)
+    rotated_mac = rotated_mac_buf + ((0 - (size_t)rotated_mac_buf) & 63);
+#endif
+
+    /* This information is public so it's safe to branch based on it. */
+    if (rec->orig_len > md_size + 255 + 1)
+        scan_start = rec->orig_len - (md_size + 255 + 1);
+    /*
+     * div_spoiler contains a multiple of md_size that is used to cause the
+     * modulo operation to be constant time. Without this, the time varies
+     * based on the amount of padding when running on Intel chips at least.
+     * The aim of right-shifting md_size is so that the compiler doesn't
+     * figure out that it can remove div_spoiler as that would require it to
+     * prove that md_size is always even, which I hope is beyond it.
+     */
+    div_spoiler = md_size >> 1;
+    div_spoiler <<= (sizeof(div_spoiler) - 1) * 8;
+    rotate_offset = (div_spoiler + mac_start - scan_start) % md_size;
+
+    memset(rotated_mac, 0, md_size);
+    for (i = scan_start, j = 0; i < rec->orig_len; i++) {
+        unsigned char mac_started = constant_time_ge_8(i, mac_start);
+        unsigned char mac_ended = constant_time_ge_8(i, mac_end);
+        unsigned char b = rec->data[i];
+        rotated_mac[j++] |= b & mac_started & ~mac_ended;
+        j &= constant_time_lt(j, md_size);
+    }
+
+    /* Now rotate the MAC */
+#if defined(CBC_MAC_ROTATE_IN_PLACE)
+    j = 0;
+    for (i = 0; i < md_size; i++) {
+        /* in case cache-line is 32 bytes, touch second line */
+        ((volatile unsigned char *)rotated_mac)[rotate_offset ^ 32];
+        out[j++] = rotated_mac[rotate_offset++];
+        rotate_offset &= constant_time_lt(rotate_offset, md_size);
+    }
+#else
+    memset(out, 0, md_size);
+    rotate_offset = md_size - rotate_offset;
+    rotate_offset &= constant_time_lt(rotate_offset, md_size);
+    for (i = 0; i < md_size; i++) {
+        for (j = 0; j < md_size; j++)
+            out[j] |= rotated_mac[i] & constant_time_eq_8(j, rotate_offset);
+        rotate_offset++;
+        rotate_offset &= constant_time_lt(rotate_offset, md_size);
+    }
+#endif
+}
+
+int dtls1_process_record(SSL *s)
+{
+    int i, al;
+    int enc_err;
+    SSL_SESSION *sess;
+    SSL3_RECORD *rr;
+    unsigned int mac_size;
+    unsigned char md[EVP_MAX_MD_SIZE];
+
+    rr = RECORD_LAYER_get_rrec(&s->rlayer);
+    sess = s->session;
+
+    /*
+     * At this point, s->packet_length == SSL3_RT_HEADER_LNGTH + rr->length,
+     * and we have that many bytes in s->packet
+     */
+    rr->input = &(RECORD_LAYER_get_packet(&s->rlayer)[DTLS1_RT_HEADER_LENGTH]);
+
+    /*
+     * ok, we can now read from 's->packet' data into 'rr' rr->input points
+     * at rr->length bytes, which need to be copied into rr->data by either
+     * the decryption or by the decompression When the data is 'copied' into
+     * the rr->data buffer, rr->input will be pointed at the new buffer
+     */
+
+    /*
+     * We now have - encrypted [ MAC [ compressed [ plain ] ] ] rr->length
+     * bytes of encrypted compressed stuff.
+     */
+
+    /* check is not needed I believe */
+    if (rr->length > SSL3_RT_MAX_ENCRYPTED_LENGTH) {
+        al = SSL_AD_RECORD_OVERFLOW;
+        SSLerr(SSL_F_DTLS1_PROCESS_RECORD, SSL_R_ENCRYPTED_LENGTH_TOO_LONG);
+        goto f_err;
+    }
+
+    /* decrypt in place in 'rr->input' */
+    rr->data = rr->input;
+    rr->orig_len = rr->length;
+
+    enc_err = s->method->ssl3_enc->enc(s, 0);
+    /*-
+     * enc_err is:
+     *    0: (in non-constant time) if the record is publically invalid.
+     *    1: if the padding is valid
+     *   -1: if the padding is invalid
+     */
+    if (enc_err == 0) {
+        /* For DTLS we simply ignore bad packets. */
+        rr->length = 0;
+        RECORD_LAYER_reset_packet_length(&s->rlayer);
+        goto err;
+    }
+#ifdef TLS_DEBUG
+    printf("dec %d\n", rr->length);
+    {
+        unsigned int z;
+        for (z = 0; z < rr->length; z++)
+            printf("%02X%c", rr->data[z], ((z + 1) % 16) ? ' ' : '\n');
+    }
+    printf("\n");
+#endif
+
+    /* r->length is now the compressed data plus mac */
+    if ((sess != NULL) &&
+        (s->enc_read_ctx != NULL) && (EVP_MD_CTX_md(s->read_hash) != NULL)) {
+        /* s->read_hash != NULL => mac_size != -1 */
+        unsigned char *mac = NULL;
+        unsigned char mac_tmp[EVP_MAX_MD_SIZE];
+        mac_size = EVP_MD_CTX_size(s->read_hash);
+        OPENSSL_assert(mac_size <= EVP_MAX_MD_SIZE);
+
+        /*
+         * orig_len is the length of the record before any padding was
+         * removed. This is public information, as is the MAC in use,
+         * therefore we can safely process the record in a different amount
+         * of time if it's too short to possibly contain a MAC.
+         */
+        if (rr->orig_len < mac_size ||
+            /* CBC records must have a padding length byte too. */
+            (EVP_CIPHER_CTX_mode(s->enc_read_ctx) == EVP_CIPH_CBC_MODE &&
+             rr->orig_len < mac_size + 1)) {
+            al = SSL_AD_DECODE_ERROR;
+            SSLerr(SSL_F_DTLS1_PROCESS_RECORD, SSL_R_LENGTH_TOO_SHORT);
+            goto f_err;
+        }
+
+        if (EVP_CIPHER_CTX_mode(s->enc_read_ctx) == EVP_CIPH_CBC_MODE) {
+            /*
+             * We update the length so that the TLS header bytes can be
+             * constructed correctly but we need to extract the MAC in
+             * constant time from within the record, without leaking the
+             * contents of the padding bytes.
+             */
+            mac = mac_tmp;
+            ssl3_cbc_copy_mac(mac_tmp, rr, mac_size);
+            rr->length -= mac_size;
+        } else {
+            /*
+             * In this case there's no padding, so |rec->orig_len| equals
+             * |rec->length| and we checked that there's enough bytes for
+             * |mac_size| above.
+             */
+            rr->length -= mac_size;
+            mac = &rr->data[rr->length];
+        }
+
+        i = s->method->ssl3_enc->mac(s, md, 0 /* not send */ );
+        if (i < 0 || mac == NULL
+            || CRYPTO_memcmp(md, mac, (size_t)mac_size) != 0)
+            enc_err = -1;
+        if (rr->length > SSL3_RT_MAX_COMPRESSED_LENGTH + mac_size)
+            enc_err = -1;
+    }
+
+    if (enc_err < 0) {
+        /* decryption failed, silently discard message */
+        rr->length = 0;
+        RECORD_LAYER_reset_packet_length(&s->rlayer);
+        goto err;
+    }
+
+    /* r->length is now just compressed */
+    if (s->expand != NULL) {
+        if (rr->length > SSL3_RT_MAX_COMPRESSED_LENGTH) {
+            al = SSL_AD_RECORD_OVERFLOW;
+            SSLerr(SSL_F_DTLS1_PROCESS_RECORD,
+                   SSL_R_COMPRESSED_LENGTH_TOO_LONG);
+            goto f_err;
+        }
+        if (!ssl3_do_uncompress(s)) {
+            al = SSL_AD_DECOMPRESSION_FAILURE;
+            SSLerr(SSL_F_DTLS1_PROCESS_RECORD, SSL_R_BAD_DECOMPRESSION);
+            goto f_err;
+        }
+    }
+
+    if (rr->length > SSL3_RT_MAX_PLAIN_LENGTH) {
+        al = SSL_AD_RECORD_OVERFLOW;
+        SSLerr(SSL_F_DTLS1_PROCESS_RECORD, SSL_R_DATA_LENGTH_TOO_LONG);
+        goto f_err;
+    }
+
+    rr->off = 0;
+    /*-
+     * So at this point the following is true
+     * ssl->s3->rrec.type   is the type of record
+     * ssl->s3->rrec.length == number of bytes in record
+     * ssl->s3->rrec.off    == offset to first valid byte
+     * ssl->s3->rrec.data   == where to take bytes from, increment
+     *                         after use :-).
+     */
+
+    /* we have pulled in a full packet so zero things */
+    RECORD_LAYER_reset_packet_length(&s->rlayer);
+    return (1);
+
+ f_err:
+    ssl3_send_alert(s, SSL3_AL_FATAL, al);
+ err:
+    return (0);
+}
+
+
+/*
+ * retrieve a buffered record that belongs to the current epoch, ie,
+ * processed
+ */
+#define dtls1_get_processed_record(s) \
+                   dtls1_retrieve_buffered_record((s), \
+                   &(DTLS_RECORD_LAYER_get_processed_rcds(&s->rlayer)))
+
+/*-
+ * Call this to get a new input record.
+ * It will return <= 0 if more data is needed, normally due to an error
+ * or non-blocking IO.
+ * When it finishes, one packet has been decoded and can be found in
+ * ssl->s3->rrec.type    - is the type of record
+ * ssl->s3->rrec.data,   - data
+ * ssl->s3->rrec.length, - number of bytes
+ */
+/* used only by dtls1_read_bytes */
+int dtls1_get_record(SSL *s)
+{
+    int ssl_major, ssl_minor;
+    int i, n;
+    SSL3_RECORD *rr;
+    unsigned char *p = NULL;
+    unsigned short version;
+    DTLS1_BITMAP *bitmap;
+    unsigned int is_next_epoch;
+
+    rr = RECORD_LAYER_get_rrec(&s->rlayer);
+
+    /*
+     * The epoch may have changed.  If so, process all the pending records.
+     * This is a non-blocking operation.
+     */
+    if (dtls1_process_buffered_records(s) < 0)
+        return -1;
+
+    /* if we're renegotiating, then there may be buffered records */
+    if (dtls1_get_processed_record(s))
+        return 1;
+
+    /* get something from the wire */
+ again:
+    /* check if we have the header */
+    if ((RECORD_LAYER_get_rstate(&s->rlayer) != SSL_ST_READ_BODY) ||
+        (RECORD_LAYER_get_packet_length(&s->rlayer) < DTLS1_RT_HEADER_LENGTH)) {
+        n = ssl3_read_n(s, DTLS1_RT_HEADER_LENGTH,
+            SSL3_BUFFER_get_len(&s->rlayer.rbuf), 0);
+        /* read timeout is handled by dtls1_read_bytes */
+        if (n <= 0)
+            return (n);         /* error or non-blocking */
+
+        /* this packet contained a partial record, dump it */
+        if (RECORD_LAYER_get_packet_length(&s->rlayer) != DTLS1_RT_HEADER_LENGTH) {
+            RECORD_LAYER_reset_packet_length(&s->rlayer);
+            goto again;
+        }
+
+        RECORD_LAYER_set_rstate(&s->rlayer, SSL_ST_READ_BODY);
+
+        p = RECORD_LAYER_get_packet(&s->rlayer);
+
+        if (s->msg_callback)
+            s->msg_callback(0, 0, SSL3_RT_HEADER, p, DTLS1_RT_HEADER_LENGTH,
+                            s, s->msg_callback_arg);
+
+        /* Pull apart the header into the DTLS1_RECORD */
+        rr->type = *(p++);
+        ssl_major = *(p++);
+        ssl_minor = *(p++);
+        version = (ssl_major << 8) | ssl_minor;
+
+        /* sequence number is 64 bits, with top 2 bytes = epoch */
+        n2s(p, rr->epoch);
+
+        memcpy(&(RECORD_LAYER_get_read_sequence(&s->rlayer)[2]), p, 6);
+        p += 6;
+
+        n2s(p, rr->length);
+
+        /* Lets check version */
+        if (!s->first_packet) {
+            if (version != s->version) {
+                /* unexpected version, silently discard */
+                rr->length = 0;
+                RECORD_LAYER_reset_packet_length(&s->rlayer);
+                goto again;
+            }
+        }
+
+        if ((version & 0xff00) != (s->version & 0xff00)) {
+            /* wrong version, silently discard record */
+            rr->length = 0;
+            RECORD_LAYER_reset_packet_length(&s->rlayer);
+            goto again;
+        }
+
+        if (rr->length > SSL3_RT_MAX_ENCRYPTED_LENGTH) {
+            /* record too long, silently discard it */
+            rr->length = 0;
+            RECORD_LAYER_reset_packet_length(&s->rlayer);
+            goto again;
+        }
+
+        /* now s->rlayer.rstate == SSL_ST_READ_BODY */
+    }
+
+    /* s->rlayer.rstate == SSL_ST_READ_BODY, get and decode the data */
+
+    if (rr->length >
+        RECORD_LAYER_get_packet_length(&s->rlayer) - DTLS1_RT_HEADER_LENGTH) {
+        /* now s->packet_length == DTLS1_RT_HEADER_LENGTH */
+        i = rr->length;
+        n = ssl3_read_n(s, i, i, 1);
+        /* this packet contained a partial record, dump it */
+        if (n != i) {
+            rr->length = 0;
+            RECORD_LAYER_reset_packet_length(&s->rlayer);
+            goto again;
+        }
+
+        /*
+         * now n == rr->length, and s->packet_length ==
+         * DTLS1_RT_HEADER_LENGTH + rr->length
+         */
+    }
+    /* set state for later operations */
+    RECORD_LAYER_set_rstate(&s->rlayer, SSL_ST_READ_HEADER);
+
+    /* match epochs.  NULL means the packet is dropped on the floor */
+    bitmap = dtls1_get_bitmap(s, rr, &is_next_epoch);
+    if (bitmap == NULL) {
+        rr->length = 0;
+        RECORD_LAYER_reset_packet_length(&s->rlayer);   /* dump this record */
+        goto again;             /* get another record */
+    }
+#ifndef OPENSSL_NO_SCTP
+    /* Only do replay check if no SCTP bio */
+    if (!BIO_dgram_is_sctp(SSL_get_rbio(s))) {
+#endif
+        /*
+         * Check whether this is a repeat, or aged record. Don't check if
+         * we're listening and this message is a ClientHello. They can look
+         * as if they're replayed, since they arrive from different
+         * connections and would be dropped unnecessarily.
+         */
+        if (!(s->d1->listen && rr->type == SSL3_RT_HANDSHAKE &&
+              RECORD_LAYER_get_packet_length(&s->rlayer)
+                  > DTLS1_RT_HEADER_LENGTH &&
+              RECORD_LAYER_get_packet(&s->rlayer)[DTLS1_RT_HEADER_LENGTH]
+                  == SSL3_MT_CLIENT_HELLO) &&
+            !dtls1_record_replay_check(s, bitmap)) {
+            rr->length = 0;
+            RECORD_LAYER_reset_packet_length(&s->rlayer); /* dump this record */
+            goto again;         /* get another record */
+        }
+#ifndef OPENSSL_NO_SCTP
+    }
+#endif
+
+    /* just read a 0 length packet */
+    if (rr->length == 0)
+        goto again;
+
+    /*
+     * If this record is from the next epoch (either HM or ALERT), and a
+     * handshake is currently in progress, buffer it since it cannot be
+     * processed at this time. However, do not buffer anything while
+     * listening.
+     */
+    if (is_next_epoch) {
+        if ((SSL_in_init(s) || s->in_handshake) && !s->d1->listen) {
+            if (dtls1_buffer_record
+                (s, &(DTLS_RECORD_LAYER_get_unprocessed_rcds(&s->rlayer)),
+                rr->seq_num) < 0)
+                return -1;
+            /* Mark receipt of record. */
+            dtls1_record_bitmap_update(s, bitmap);
+        }
+        rr->length = 0;
+        RECORD_LAYER_reset_packet_length(&s->rlayer);
+        goto again;
+    }
+
+    if (!dtls1_process_record(s)) {
+        rr->length = 0;
+        RECORD_LAYER_reset_packet_length(&s->rlayer);   /* dump this record */
+        goto again;             /* get another record */
+    }
+    dtls1_record_bitmap_update(s, bitmap); /* Mark receipt of record. */
+
+    return (1);
+
+}
+
diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c
index 3451b7c..76ad876 100644
--- a/ssl/s23_clnt.c
+++ b/ssl/s23_clnt.c
@@ -481,7 +481,7 @@ static int ssl23_client_hello(SSL *s)
 
 static int ssl23_get_server_hello(SSL *s)
 {
-    char buf[8];
+    unsigned char buf[8];
     unsigned char *p;
     int i;
     int n;
@@ -490,7 +490,7 @@ static int ssl23_get_server_hello(SSL *s)
 
     if (n != 7)
         return (n);
-    p = s->packet;
+    p = RECORD_LAYER_get_packet(&s->rlayer);
 
     memcpy(buf, p, n);
 
@@ -573,15 +573,8 @@ static int ssl23_get_server_hello(SSL *s)
         /*
          * put the 7 bytes we have read into the input buffer for SSLv3
          */
-        s->rstate = SSL_ST_READ_HEADER;
-        s->packet_length = n;
-        if (s->s3->rbuf.buf == NULL)
-            if (!ssl3_setup_read_buffer(s))
-                goto err;
-        s->packet = &(s->s3->rbuf.buf[0]);
-        memcpy(s->packet, buf, n);
-        s->s3->rbuf.left = n;
-        s->s3->rbuf.offset = 0;
+        if(!RECORD_LAYER_set_data(&s->rlayer, buf, n))
+            goto err;
 
         s->handshake_func = s->method->ssl_connect;
     } else {
diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c
index 255d278..7287022 100644
--- a/ssl/s23_srvr.c
+++ b/ssl/s23_srvr.c
@@ -244,8 +244,8 @@ int ssl23_get_client_hello(SSL *s)
      *  6-8   length           > Client Hello message
      *  9/10  client_version  /
      */
-    char buf_space[11];
-    char *buf = &(buf_space[0]);
+    unsigned char buf_space[11];
+    unsigned char *buf = &(buf_space[0]);
     unsigned char *p, *d, *d_len, *dd;
     unsigned int i;
     unsigned int csl, sil, cl;
@@ -264,7 +264,7 @@ int ssl23_get_client_hello(SSL *s)
         if (n != sizeof buf_space)
             return (n);         /* n == -1 || n == 0 */
 
-        p = s->packet;
+        p = RECORD_LAYER_get_packet(&s->rlayer);
 
         memcpy(buf, p, n);
 
@@ -415,7 +415,7 @@ int ssl23_get_client_hello(SSL *s)
          */
 
         type = 2;
-        p = s->packet;
+        p = RECORD_LAYER_get_packet(&s->rlayer);
         v[0] = p[3];            /* == SSL3_VERSION_MAJOR */
         v[1] = p[4];
 
@@ -451,27 +451,32 @@ int ssl23_get_client_hello(SSL *s)
         if (j <= 0)
             return (j);
 
-        ssl3_finish_mac(s, s->packet + 2, s->packet_length - 2);
+        ssl3_finish_mac(s, RECORD_LAYER_get_packet(&s->rlayer) + 2,
+                        RECORD_LAYER_get_packet_length(&s->rlayer) - 2);
 
         /* CLIENT-HELLO */
         if (s->msg_callback)
-            s->msg_callback(0, SSL2_VERSION, 0, s->packet + 2,
-                            s->packet_length - 2, s, s->msg_callback_arg);
+            s->msg_callback(0, SSL2_VERSION, 0,
+                            RECORD_LAYER_get_packet(&s->rlayer) + 2,
+                            RECORD_LAYER_get_packet_length(&s->rlayer) - 2, s,
+                            s->msg_callback_arg);
 
-        p = s->packet;
+        p = RECORD_LAYER_get_packet(&s->rlayer);
         p += 5;
         n2s(p, csl);
         n2s(p, sil);
         n2s(p, cl);
         d = (unsigned char *)s->init_buf->data;
-        if ((csl + sil + cl + 11) != s->packet_length) { /* We can't have TLS
-                                                          * extensions in SSL
-                                                          * 2.0 format *
-                                                          * Client Hello, can
-                                                          * we? Error
-                                                          * condition should
-                                                          * be * '>'
-                                                          * otherweise */
+        if ((csl + sil + cl + 11)
+                != RECORD_LAYER_get_packet_length(&s->rlayer)) {
+            /* We can't have TLS
+             * extensions in SSL
+             * 2.0 format *
+             * Client Hello, can
+             * we? Error
+             * condition should
+             * be * '>'
+             * otherweise */
             SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,
                    SSL_R_RECORD_LENGTH_MISMATCH);
             goto err;
@@ -556,20 +561,11 @@ int ssl23_get_client_hello(SSL *s)
             /*
              * put the 'n' bytes we have read into the input buffer for SSLv3
              */
-            s->rstate = SSL_ST_READ_HEADER;
-            s->packet_length = n;
-            if (s->s3->rbuf.buf == NULL)
-                if (!ssl3_setup_read_buffer(s))
-                    goto err;
-
-            s->packet = &(s->s3->rbuf.buf[0]);
-            memcpy(s->packet, buf, n);
-            s->s3->rbuf.left = n;
-            s->s3->rbuf.offset = 0;
+            if(!RECORD_LAYER_set_data(&s->rlayer, buf, n))
+                goto err;
         } else {
-            s->packet_length = 0;
-            s->s3->rbuf.left = 0;
-            s->s3->rbuf.offset = 0;
+            if(!RECORD_LAYER_set_data(&s->rlayer, NULL, 0))
+                goto err;
         }
         s->handshake_func = s->method->ssl_accept;
     } else {
diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index 2bc4e6a..ed6ae12 100644
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -292,7 +292,7 @@ int ssl3_get_finished(SSL *s, int a, int b)
 /*-
  * for these 2 messages, we need to
  * ssl->enc_read_ctx                    re-init
- * ssl->s3->read_sequence               zero
+ * ssl->rlayer.read_sequence            zero
  * ssl->s3->read_mac_secret             re-init
  * ssl->session->read_sym_enc           assign
  * ssl->session->read_compression       assign
@@ -573,109 +573,6 @@ int ssl_verify_alarm_type(long type)
     return (al);
 }
 
-int ssl3_setup_read_buffer(SSL *s)
-{
-    unsigned char *p;
-    size_t len, align = 0, headerlen;
-
-    if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
-        headerlen = DTLS1_RT_HEADER_LENGTH;
-    else
-        headerlen = SSL3_RT_HEADER_LENGTH;
-
-#if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0
-    align = (-SSL3_RT_HEADER_LENGTH) & (SSL3_ALIGN_PAYLOAD - 1);
-#endif
-
-    if (s->s3->rbuf.buf == NULL) {
-        len = SSL3_RT_MAX_PLAIN_LENGTH
-            + SSL3_RT_MAX_ENCRYPTED_OVERHEAD + headerlen + align;
-        if (s->options & SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER) {
-            s->s3->init_extra = 1;
-            len += SSL3_RT_MAX_EXTRA;
-        }
-#ifndef OPENSSL_NO_COMP
-        if (ssl_allow_compression(s))
-            len += SSL3_RT_MAX_COMPRESSED_OVERHEAD;
-#endif
-        if ((p = OPENSSL_malloc(len)) == NULL)
-            goto err;
-        s->s3->rbuf.buf = p;
-        s->s3->rbuf.len = len;
-    }
-
-    s->packet = &(s->s3->rbuf.buf[0]);
-    return 1;
-
- err:
-    SSLerr(SSL_F_SSL3_SETUP_READ_BUFFER, ERR_R_MALLOC_FAILURE);
-    return 0;
-}
-
-int ssl3_setup_write_buffer(SSL *s)
-{
-    unsigned char *p;
-    size_t len, align = 0, headerlen;
-
-    if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
-        headerlen = DTLS1_RT_HEADER_LENGTH + 1;
-    else
-        headerlen = SSL3_RT_HEADER_LENGTH;
-
-#if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0
-    align = (-SSL3_RT_HEADER_LENGTH) & (SSL3_ALIGN_PAYLOAD - 1);
-#endif
-
-    if (s->s3->wbuf.buf == NULL) {
-        len = s->max_send_fragment
-            + SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD + headerlen + align;
-#ifndef OPENSSL_NO_COMP
-        if (ssl_allow_compression(s))
-            len += SSL3_RT_MAX_COMPRESSED_OVERHEAD;
-#endif
-        if (!(s->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS))
-            len += headerlen + align + SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD;
-
-        if ((p = OPENSSL_malloc(len)) == NULL)
-            goto err;
-        s->s3->wbuf.buf = p;
-        s->s3->wbuf.len = len;
-    }
-
-    return 1;
-
- err:
-    SSLerr(SSL_F_SSL3_SETUP_WRITE_BUFFER, ERR_R_MALLOC_FAILURE);
-    return 0;
-}
-
-int ssl3_setup_buffers(SSL *s)
-{
-    if (!ssl3_setup_read_buffer(s))
-        return 0;
-    if (!ssl3_setup_write_buffer(s))
-        return 0;
-    return 1;
-}
-
-int ssl3_release_write_buffer(SSL *s)
-{
-    if (s->s3->wbuf.buf != NULL) {
-        OPENSSL_free(s->s3->wbuf.buf);
-        s->s3->wbuf.buf = NULL;
-    }
-    return 1;
-}
-
-int ssl3_release_read_buffer(SSL *s)
-{
-    if (s->s3->rbuf.buf != NULL) {
-        OPENSSL_free(s->s3->rbuf.buf);
-        s->s3->rbuf.buf = NULL;
-    }
-    return 1;
-}
-
 int ssl_allow_compression(SSL *s)
 {
     if (s->options & SSL_OP_NO_COMPRESSION)
diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c
index 53e3c87..b20c564 100644
--- a/ssl/s3_cbc.c
+++ b/ssl/s3_cbc.c
@@ -72,227 +72,7 @@
  */
 #define MAX_HASH_BLOCK_SIZE 128
 
-/*-
- * ssl3_cbc_remove_padding removes padding from the decrypted, SSLv3, CBC
- * record in |rec| by updating |rec->length| in constant time.
- *
- * block_size: the block size of the cipher used to encrypt the record.
- * returns:
- *   0: (in non-constant time) if the record is publicly invalid.
- *   1: if the padding was valid
- *  -1: otherwise.
- */
-int ssl3_cbc_remove_padding(const SSL *s,
-                            SSL3_RECORD *rec,
-                            unsigned block_size, unsigned mac_size)
-{
-    unsigned padding_length, good;
-    const unsigned overhead = 1 /* padding length byte */  + mac_size;
-
-    /*
-     * These lengths are all public so we can test them in non-constant time.
-     */
-    if (overhead > rec->length)
-        return 0;
-
-    padding_length = rec->data[rec->length - 1];
-    good = constant_time_ge(rec->length, padding_length + overhead);
-    /* SSLv3 requires that the padding is minimal. */
-    good &= constant_time_ge(block_size, padding_length + 1);
-    rec->length -= good & (padding_length + 1);
-    return constant_time_select_int(good, 1, -1);
-}
-
-/*-
- * tls1_cbc_remove_padding removes the CBC padding from the decrypted, TLS, CBC
- * record in |rec| in constant time and returns 1 if the padding is valid and
- * -1 otherwise. It also removes any explicit IV from the start of the record
- * without leaking any timing about whether there was enough space after the
- * padding was removed.
- *
- * block_size: the block size of the cipher used to encrypt the record.
- * returns:
- *   0: (in non-constant time) if the record is publicly invalid.
- *   1: if the padding was valid
- *  -1: otherwise.
- */
-int tls1_cbc_remove_padding(const SSL *s,
-                            SSL3_RECORD *rec,
-                            unsigned block_size, unsigned mac_size)
-{
-    unsigned padding_length, good, to_check, i;
-    const unsigned overhead = 1 /* padding length byte */  + mac_size;
-    /* Check if version requires explicit IV */
-    if (SSL_USE_EXPLICIT_IV(s)) {
-        /*
-         * These lengths are all public so we can test them in non-constant
-         * time.
-         */
-        if (overhead + block_size > rec->length)
-            return 0;
-        /* We can now safely skip explicit IV */
-        rec->data += block_size;
-        rec->input += block_size;
-        rec->length -= block_size;
-        rec->orig_len -= block_size;
-    } else if (overhead > rec->length)
-        return 0;
-
-    padding_length = rec->data[rec->length - 1];
-
-    /*
-     * NB: if compression is in operation the first packet may not be of even
-     * length so the padding bug check cannot be performed. This bug
-     * workaround has been around since SSLeay so hopefully it is either
-     * fixed now or no buggy implementation supports compression [steve]
-     */
-    if ((s->options & SSL_OP_TLS_BLOCK_PADDING_BUG) && !s->expand) {
-        /* First packet is even in size, so check */
-        if ((memcmp(s->s3->read_sequence, "\0\0\0\0\0\0\0\0", 8) == 0) &&
-            !(padding_length & 1)) {
-            s->s3->flags |= TLS1_FLAGS_TLS_PADDING_BUG;
-        }
-        if ((s->s3->flags & TLS1_FLAGS_TLS_PADDING_BUG) && padding_length > 0) {
-            padding_length--;
-        }
-    }
-
-    if (EVP_CIPHER_flags(s->enc_read_ctx->cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) {
-        /* padding is already verified */
-        rec->length -= padding_length + 1;
-        return 1;
-    }
-
-    good = constant_time_ge(rec->length, overhead + padding_length);
-    /*
-     * The padding consists of a length byte at the end of the record and
-     * then that many bytes of padding, all with the same value as the length
-     * byte. Thus, with the length byte included, there are i+1 bytes of
-     * padding. We can't check just |padding_length+1| bytes because that
-     * leaks decrypted information. Therefore we always have to check the
-     * maximum amount of padding possible. (Again, the length of the record
-     * is public information so we can use it.)
-     */
-    to_check = 255;             /* maximum amount of padding. */
-    if (to_check > rec->length - 1)
-        to_check = rec->length - 1;
-
-    for (i = 0; i < to_check; i++) {
-        unsigned char mask = constant_time_ge_8(padding_length, i);
-        unsigned char b = rec->data[rec->length - 1 - i];
-        /*
-         * The final |padding_length+1| bytes should all have the value
-         * |padding_length|. Therefore the XOR should be zero.
-         */
-        good &= ~(mask & (padding_length ^ b));
-    }
-
-    /*
-     * If any of the final |padding_length+1| bytes had the wrong value, one
-     * or more of the lower eight bits of |good| will be cleared.
-     */
-    good = constant_time_eq(0xff, good & 0xff);
-    rec->length -= good & (padding_length + 1);
-
-    return constant_time_select_int(good, 1, -1);
-}
-
-/*-
- * ssl3_cbc_copy_mac copies |md_size| bytes from the end of |rec| to |out| in
- * constant time (independent of the concrete value of rec->length, which may
- * vary within a 256-byte window).
- *
- * ssl3_cbc_remove_padding or tls1_cbc_remove_padding must be called prior to
- * this function.
- *
- * On entry:
- *   rec->orig_len >= md_size
- *   md_size <= EVP_MAX_MD_SIZE
- *
- * If CBC_MAC_ROTATE_IN_PLACE is defined then the rotation is performed with
- * variable accesses in a 64-byte-aligned buffer. Assuming that this fits into
- * a single or pair of cache-lines, then the variable memory accesses don't
- * actually affect the timing. CPUs with smaller cache-lines [if any] are
- * not multi-core and are not considered vulnerable to cache-timing attacks.
- */
-#define CBC_MAC_ROTATE_IN_PLACE
-
-void ssl3_cbc_copy_mac(unsigned char *out,
-                       const SSL3_RECORD *rec, unsigned md_size)
-{
-#if defined(CBC_MAC_ROTATE_IN_PLACE)
-    unsigned char rotated_mac_buf[64 + EVP_MAX_MD_SIZE];
-    unsigned char *rotated_mac;
-#else
-    unsigned char rotated_mac[EVP_MAX_MD_SIZE];
-#endif
 
-    /*
-     * mac_end is the index of |rec->data| just after the end of the MAC.
-     */
-    unsigned mac_end = rec->length;
-    unsigned mac_start = mac_end - md_size;
-    /*
-     * scan_start contains the number of bytes that we can ignore because the
-     * MAC's position can only vary by 255 bytes.
-     */
-    unsigned scan_start = 0;
-    unsigned i, j;
-    unsigned div_spoiler;
-    unsigned rotate_offset;
-
-    OPENSSL_assert(rec->orig_len >= md_size);
-    OPENSSL_assert(md_size <= EVP_MAX_MD_SIZE);
-
-#if defined(CBC_MAC_ROTATE_IN_PLACE)
-    rotated_mac = rotated_mac_buf + ((0 - (size_t)rotated_mac_buf) & 63);
-#endif
-
-    /* This information is public so it's safe to branch based on it. */
-    if (rec->orig_len > md_size + 255 + 1)
-        scan_start = rec->orig_len - (md_size + 255 + 1);
-    /*
-     * div_spoiler contains a multiple of md_size that is used to cause the
-     * modulo operation to be constant time. Without this, the time varies
-     * based on the amount of padding when running on Intel chips at least.
-     * The aim of right-shifting md_size is so that the compiler doesn't
-     * figure out that it can remove div_spoiler as that would require it to
-     * prove that md_size is always even, which I hope is beyond it.
-     */
-    div_spoiler = md_size >> 1;
-    div_spoiler <<= (sizeof(div_spoiler) - 1) * 8;
-    rotate_offset = (div_spoiler + mac_start - scan_start) % md_size;
-
-    memset(rotated_mac, 0, md_size);
-    for (i = scan_start, j = 0; i < rec->orig_len; i++) {
-        unsigned char mac_started = constant_time_ge_8(i, mac_start);
-        unsigned char mac_ended = constant_time_ge_8(i, mac_end);
-        unsigned char b = rec->data[i];
-        rotated_mac[j++] |= b & mac_started & ~mac_ended;
-        j &= constant_time_lt(j, md_size);
-    }
-
-    /* Now rotate the MAC */
-#if defined(CBC_MAC_ROTATE_IN_PLACE)
-    j = 0;
-    for (i = 0; i < md_size; i++) {
-        /* in case cache-line is 32 bytes, touch second line */
-        ((volatile unsigned char *)rotated_mac)[rotate_offset ^ 32];
-        out[j++] = rotated_mac[rotate_offset++];
-        rotate_offset &= constant_time_lt(rotate_offset, md_size);
-    }
-#else
-    memset(out, 0, md_size);
-    rotate_offset = md_size - rotate_offset;
-    rotate_offset &= constant_time_lt(rotate_offset, md_size);
-    for (i = 0; i < md_size; i++) {
-        for (j = 0; j < md_size; j++)
-            out[j] |= rotated_mac[i] & constant_time_eq_8(j, rotate_offset);
-        rotate_offset++;
-        rotate_offset &= constant_time_lt(rotate_offset, md_size);
-    }
-#endif
-}
 
 /*
  * u32toLE serialises an unsigned, 32-bit number (n) as four bytes at (p) in
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index 94f6dd0..1db2f77 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -270,14 +270,11 @@ int ssl3_change_cipher_state(SSL *s, int which)
                        SSL_R_COMPRESSION_LIBRARY_ERROR);
                 goto err2;
             }
-            if (s->s3->rrec.comp == NULL)
-                s->s3->rrec.comp = (unsigned char *)
-                    OPENSSL_malloc(SSL3_RT_MAX_PLAIN_LENGTH);
-            if (s->s3->rrec.comp == NULL)
+            if(!RECORD_LAYER_setup_comp_buffer(&s->rlayer))
                 goto err;
         }
 #endif
-        memset(&(s->s3->read_sequence[0]), 0, 8);
+        RECORD_LAYER_reset_read_sequence(&s->rlayer);
         mac_secret = &(s->s3->read_mac_secret[0]);
     } else {
         if (s->enc_write_ctx != NULL)
@@ -310,7 +307,7 @@ int ssl3_change_cipher_state(SSL *s, int which)
             }
         }
 #endif
-        memset(&(s->s3->write_sequence[0]), 0, 8);
+        RECORD_LAYER_reset_write_sequence(&s->rlayer);
         mac_secret = &(s->s3->write_mac_secret[0]);
     }
 
@@ -482,80 +479,6 @@ void ssl3_cleanup_key_block(SSL *s)
     s->s3->tmp.key_block_length = 0;
 }
 
-/*-
- * ssl3_enc encrypts/decrypts the record in |s->wrec| / |s->rrec|, respectively.
- *
- * Returns:
- *   0: (in non-constant time) if the record is publically invalid (i.e. too
- *       short etc).
- *   1: if the record's padding is valid / the encryption was successful.
- *   -1: if the record's padding is invalid or, if sending, an internal error
- *       occurred.
- */
-int ssl3_enc(SSL *s, int send)
-{
-    SSL3_RECORD *rec;
-    EVP_CIPHER_CTX *ds;
-    unsigned long l;
-    int bs, i, mac_size = 0;
-    const EVP_CIPHER *enc;
-
-    if (send) {
-        ds = s->enc_write_ctx;
-        rec = &(s->s3->wrec);
-        if (s->enc_write_ctx == NULL)
-            enc = NULL;
-        else
-            enc = EVP_CIPHER_CTX_cipher(s->enc_write_ctx);
-    } else {
-        ds = s->enc_read_ctx;
-        rec = &(s->s3->rrec);
-        if (s->enc_read_ctx == NULL)
-            enc = NULL;
-        else
-            enc = EVP_CIPHER_CTX_cipher(s->enc_read_ctx);
-    }
-
-    if ((s->session == NULL) || (ds == NULL) || (enc == NULL)) {
-        memmove(rec->data, rec->input, rec->length);
-        rec->input = rec->data;
-    } else {
-        l = rec->length;
-        bs = EVP_CIPHER_block_size(ds->cipher);
-
-        /* COMPRESS */
-
-        if ((bs != 1) && send) {
-            i = bs - ((int)l % bs);
-
-            /* we need to add 'i-1' padding bytes */
-            l += i;
-            /*
-             * the last of these zero bytes will be overwritten with the
-             * padding length.
-             */
-            memset(&rec->input[rec->length], 0, i);
-            rec->length += i;
-            rec->input[l - 1] = (i - 1);
-        }
-
-        if (!send) {
-            if (l == 0 || l % bs != 0)
-                return 0;
-            /* otherwise, rec->length >= bs */
-        }
-
-        if (EVP_Cipher(ds, rec->data, rec->input, l) < 1)
-            return -1;
-
-        if (EVP_MD_CTX_md(s->read_hash) != NULL)
-            mac_size = EVP_MD_CTX_size(s->read_hash);
-        if ((bs != 1) && !send)
-            return ssl3_cbc_remove_padding(s, rec, bs, mac_size);
-    }
-    return (1);
-}
-
 void ssl3_init_finished_mac(SSL *s)
 {
     BIO_free(s->s3->handshake_buffer);
@@ -715,112 +638,6 @@ static int ssl3_handshake_mac(SSL *s, int md_nid,
     return ((int)ret);
 }
 
-int n_ssl3_mac(SSL *ssl, unsigned char *md, int send)
-{
-    SSL3_RECORD *rec;
-    unsigned char *mac_sec, *seq;
-    EVP_MD_CTX md_ctx;
-    const EVP_MD_CTX *hash;
-    unsigned char *p, rec_char;
-    size_t md_size;
-    int npad;
-    int t;
-
-    if (send) {
-        rec = &(ssl->s3->wrec);
-        mac_sec = &(ssl->s3->write_mac_secret[0]);
-        seq = &(ssl->s3->write_sequence[0]);
-        hash = ssl->write_hash;
-    } else {
-        rec = &(ssl->s3->rrec);
-        mac_sec = &(ssl->s3->read_mac_secret[0]);
-        seq = &(ssl->s3->read_sequence[0]);
-        hash = ssl->read_hash;
-    }
-
-    t = EVP_MD_CTX_size(hash);
-    if (t < 0)
-        return -1;
-    md_size = t;
-    npad = (48 / md_size) * md_size;
-
-    if (!send &&
-        EVP_CIPHER_CTX_mode(ssl->enc_read_ctx) == EVP_CIPH_CBC_MODE &&
-        ssl3_cbc_record_digest_supported(hash)) {
-        /*
-         * This is a CBC-encrypted record. We must avoid leaking any
-         * timing-side channel information about how many blocks of data we
-         * are hashing because that gives an attacker a timing-oracle.
-         */
-
-        /*-
-         * npad is, at most, 48 bytes and that's with MD5:
-         *   16 + 48 + 8 (sequence bytes) + 1 + 2 = 75.
-         *
-         * With SHA-1 (the largest hash speced for SSLv3) the hash size
-         * goes up 4, but npad goes down by 8, resulting in a smaller
-         * total size.
-         */
-        unsigned char header[75];
-        unsigned j = 0;
-        memcpy(header + j, mac_sec, md_size);
-        j += md_size;
-        memcpy(header + j, ssl3_pad_1, npad);
-        j += npad;
-        memcpy(header + j, seq, 8);
-        j += 8;
-        header[j++] = rec->type;
-        header[j++] = rec->length >> 8;
-        header[j++] = rec->length & 0xff;
-
-        /* Final param == is SSLv3 */
-        ssl3_cbc_digest_record(hash,
-                               md, &md_size,
-                               header, rec->input,
-                               rec->length + md_size, rec->orig_len,
-                               mac_sec, md_size, 1);
-    } else {
-        unsigned int md_size_u;
-        /* Chop the digest off the end :-) */
-        EVP_MD_CTX_init(&md_ctx);
-
-        EVP_MD_CTX_copy_ex(&md_ctx, hash);
-        EVP_DigestUpdate(&md_ctx, mac_sec, md_size);
-        EVP_DigestUpdate(&md_ctx, ssl3_pad_1, npad);
-        EVP_DigestUpdate(&md_ctx, seq, 8);
-        rec_char = rec->type;
-        EVP_DigestUpdate(&md_ctx, &rec_char, 1);
-        p = md;
-        s2n(rec->length, p);
-        EVP_DigestUpdate(&md_ctx, md, 2);
-        EVP_DigestUpdate(&md_ctx, rec->input, rec->length);
-        EVP_DigestFinal_ex(&md_ctx, md, NULL);
-
-        EVP_MD_CTX_copy_ex(&md_ctx, hash);
-        EVP_DigestUpdate(&md_ctx, mac_sec, md_size);
-        EVP_DigestUpdate(&md_ctx, ssl3_pad_2, npad);
-        EVP_DigestUpdate(&md_ctx, md, md_size);
-        EVP_DigestFinal_ex(&md_ctx, md, &md_size_u);
-        md_size = md_size_u;
-
-        EVP_MD_CTX_cleanup(&md_ctx);
-    }
-
-    ssl3_record_sequence_update(seq);
-    return (md_size);
-}
-
-void ssl3_record_sequence_update(unsigned char *seq)
-{
-    int i;
-
-    for (i = 7; i >= 0; i--) {
-        ++seq[i];
-        if (seq[i] != 0)
-            break;
-    }
-}
-
 int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
                                 int len)
 {
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 69f3d5d..a7dbbf6 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3078,15 +3078,6 @@ const SSL_CIPHER *ssl3_get_cipher(unsigned int u)
         return (NULL);
 }
 
-int ssl3_pending(const SSL *s)
-{
-    if (s->rstate == SSL_ST_READ_BODY)
-        return 0;
-
-    return (s->s3->rrec.type ==
-            SSL3_RT_APPLICATION_DATA) ? s->s3->rrec.length : 0;
-}
-
 int ssl3_set_handshake_header(SSL *s, int htype, unsigned long len)
 {
     unsigned char *p = (unsigned char *)s->init_buf->data;
@@ -3110,11 +3101,8 @@ int ssl3_new(SSL *s)
     if ((s3 = OPENSSL_malloc(sizeof *s3)) == NULL)
         goto err;
     memset(s3, 0, sizeof *s3);
-    memset(s3->rrec.seq_num, 0, sizeof(s3->rrec.seq_num));
-    memset(s3->wrec.seq_num, 0, sizeof(s3->wrec.seq_num));
-
     s->s3 = s3;
-
+    
 #ifndef OPENSSL_NO_SRP
     if(!SSL_SRP_CTX_init(s))
           goto err;
@@ -3131,12 +3119,6 @@ void ssl3_free(SSL *s)
         return;
 
     ssl3_cleanup_key_block(s);
-    if (s->s3->rbuf.buf != NULL)
-        ssl3_release_read_buffer(s);
-    if (s->s3->wbuf.buf != NULL)
-        ssl3_release_write_buffer(s);
-    if (s->s3->rrec.comp != NULL)
-        OPENSSL_free(s->s3->rrec.comp);
 #ifndef OPENSSL_NO_DH
     DH_free(s->s3->tmp.dh);
 #endif
@@ -3164,18 +3146,12 @@ void ssl3_free(SSL *s)
 
 void ssl3_clear(SSL *s)
 {
-    unsigned char *rp, *wp;
-    size_t rlen, wlen;
     int init_extra;
 
     ssl3_cleanup_key_block(s);
     if (s->s3->tmp.ca_names != NULL)
         sk_X509_NAME_pop_free(s->s3->tmp.ca_names, X509_NAME_free);
 
-    if (s->s3->rrec.comp != NULL) {
-        OPENSSL_free(s->s3->rrec.comp);
-        s->s3->rrec.comp = NULL;
-    }
 #ifndef OPENSSL_NO_DH
     DH_free(s->s3->tmp.dh);
     s->s3->tmp.dh = NULL;
@@ -3190,10 +3166,6 @@ void ssl3_clear(SSL *s)
 # endif                         /* !OPENSSL_NO_EC */
 #endif                          /* !OPENSSL_NO_TLSEXT */
 
-    rp = s->s3->rbuf.buf;
-    wp = s->s3->wbuf.buf;
-    rlen = s->s3->rbuf.len;
-    wlen = s->s3->wbuf.len;
     init_extra = s->s3->init_extra;
     BIO_free(s->s3->handshake_buffer);
     s->s3->handshake_buffer = NULL;
@@ -3207,15 +3179,10 @@ void ssl3_clear(SSL *s)
     }
 #endif
     memset(s->s3, 0, sizeof *s->s3);
-    s->s3->rbuf.buf = rp;
-    s->s3->wbuf.buf = wp;
-    s->s3->rbuf.len = rlen;
-    s->s3->wbuf.len = wlen;
     s->s3->init_extra = init_extra;
 
     ssl_free_wbio_buffer(s);
 
-    s->packet_length = 0;
     s->s3->renegotiate = 0;
     s->s3->total_renegotiations = 0;
     s->s3->num_renegotiations = 0;
@@ -4494,8 +4461,9 @@ int ssl3_renegotiate_check(SSL *s)
     int ret = 0;
 
     if (s->s3->renegotiate) {
-        if ((s->s3->rbuf.left == 0) &&
-            (s->s3->wbuf.left == 0) && !SSL_in_init(s)) {
+        if (!RECORD_LAYER_read_pending(&s->rlayer)
+            && !RECORD_LAYER_write_pending(&s->rlayer)
+            && !SSL_in_init(s)) {
             /*
              * if we are the server, and we have sent a 'RENEGOTIATE'
              * message, we need to go to SSL_ST_ACCEPT.
diff --git a/apps/app_rand.c b/ssl/s3_msg.c
similarity index 62%
copy from apps/app_rand.c
copy to ssl/s3_msg.c
index 595fc78..fcf4744 100644
--- a/apps/app_rand.c
+++ b/ssl/s3_msg.c
@@ -1,4 +1,4 @@
-/* apps/app_rand.c */
+/* ssl/s3_msg.c */
 /* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
  * All rights reserved.
  *
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 /* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2015 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -109,112 +109,118 @@
  *
  */
 
-#define NON_MAIN
-#include "apps.h"
-#undef NON_MAIN
-#include <openssl/bio.h>
-#include <openssl/rand.h>
+#define USE_SOCKETS
+#include "ssl_locl.h"
 
-static int seeded = 0;
-static int egdsocket = 0;
-
-int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
+int ssl3_do_change_cipher_spec(SSL *s)
 {
-    int consider_randfile = (file == NULL);
-    char buffer[200];
-
-#ifdef OPENSSL_SYS_WINDOWS
-    BIO_printf(bio_e, "Loading 'screen' into random state -");
-    BIO_flush(bio_e);
-    RAND_screen();
-    BIO_printf(bio_e, " done\n");
-#endif
-
-    if (file == NULL)
-        file = RAND_file_name(buffer, sizeof buffer);
-    else if (RAND_egd(file) > 0) {
-        /*
-         * we try if the given filename is an EGD socket. if it is, we don't
-         * write anything back to the file.
-         */
-        egdsocket = 1;
-        return 1;
-    }
-    if (file == NULL || !RAND_load_file(file, -1)) {
-        if (RAND_status() == 0) {
-            if (!dont_warn) {
-                BIO_printf(bio_e, "unable to load 'random state'\n");
-                BIO_printf(bio_e,
-                           "This means that the random number generator has not been seeded\n");
-                BIO_printf(bio_e, "with much random data.\n");
-                if (consider_randfile) { /* explanation does not apply when a
-                                          * file is explicitly named */
-                    BIO_printf(bio_e,
-                               "Consider setting the RANDFILE environment variable to point at a file that\n");
-                    BIO_printf(bio_e,
-                               "'random' data can be kept in (the file will be overwritten).\n");
-                }
-            }
-            return 0;
+    int i;
+    const char *sender;
+    int slen;
+
+    if (s->state & SSL_ST_ACCEPT)
+        i = SSL3_CHANGE_CIPHER_SERVER_READ;
+    else
+        i = SSL3_CHANGE_CIPHER_CLIENT_READ;
+
+    if (s->s3->tmp.key_block == NULL) {
+        if (s->session == NULL || s->session->master_key_length == 0) {
+            /* might happen if dtls1_read_bytes() calls this */
+            SSLerr(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC,
+                   SSL_R_CCS_RECEIVED_EARLY);
+            return (0);
         }
+
+        s->session->cipher = s->s3->tmp.new_cipher;
+        if (!s->method->ssl3_enc->setup_key_block(s))
+            return (0);
+    }
+
+    if (!s->method->ssl3_enc->change_cipher_state(s, i))
+        return (0);
+
+    /*
+     * we have to record the message digest at this point so we can get it
+     * before we read the finished message
+     */
+    if (s->state & SSL_ST_CONNECT) {
+        sender = s->method->ssl3_enc->server_finished_label;
+        slen = s->method->ssl3_enc->server_finished_label_len;
+    } else {
+        sender = s->method->ssl3_enc->client_finished_label;
+        slen = s->method->ssl3_enc->client_finished_label_len;
     }
-    seeded = 1;
-    return 1;
+
+    i = s->method->ssl3_enc->final_finish_mac(s,
+                                              sender, slen,
+                                              s->s3->tmp.peer_finish_md);
+    if (i == 0) {
+        SSLerr(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC, ERR_R_INTERNAL_ERROR);
+        return 0;
+    }
+    s->s3->tmp.peer_finish_md_len = i;
+
+    return (1);
 }
 
-long app_RAND_load_files(char *name)
+int ssl3_send_alert(SSL *s, int level, int desc)
 {
-    char *p, *n;
-    int last;
-    long tot = 0;
-    int egd;
-
-    for (;;) {
-        last = 0;
-        for (p = name; ((*p != '\0') && (*p != LIST_SEPARATOR_CHAR)); p++) ;
-        if (*p == '\0')
-            last = 1;
-        *p = '\0';
-        n = name;
-        name = p + 1;
-        if (*n == '\0')
-            break;
-
-        egd = RAND_egd(n);
-        if (egd > 0)
-            tot += egd;
-        else
-            tot += RAND_load_file(n, -1);
-        if (last)
-            break;
+    /* Map tls/ssl alert value to correct one */
+    desc = s->method->ssl3_enc->alert_value(desc);
+    if (s->version == SSL3_VERSION && desc == SSL_AD_PROTOCOL_VERSION)
+        desc = SSL_AD_HANDSHAKE_FAILURE; /* SSL 3.0 does not have
+                                          * protocol_version alerts */
+    if (desc < 0)
+        return -1;
+    /* If a fatal one, remove from cache */
+    if ((level == SSL3_AL_FATAL) && (s->session != NULL))
+        SSL_CTX_remove_session(s->ctx, s->session);
+
+    s->s3->alert_dispatch = 1;
+    s->s3->send_alert[0] = level;
+    s->s3->send_alert[1] = desc;
+    if (!RECORD_LAYER_write_pending(&s->rlayer)) {
+        /* data still being written out? */
+        return s->method->ssl_dispatch_alert(s);
     }
-    if (tot > 512)
-        app_RAND_allow_write_file();
-    return (tot);
+    /*
+     * else data is still being written out, we will get written some time in
+     * the future
+     */
+    return -1;
 }
 
-int app_RAND_write_file(const char *file, BIO *bio_e)
+int ssl3_dispatch_alert(SSL *s)
 {
-    char buffer[200];
+    int i, j;
+    void (*cb) (const SSL *ssl, int type, int val) = NULL;
 
-    if (egdsocket || !seeded)
+    s->s3->alert_dispatch = 0;
+    i = do_ssl3_write(s, SSL3_RT_ALERT, &s->s3->send_alert[0], 2, 0);
+    if (i <= 0) {
+        s->s3->alert_dispatch = 1;
+    } else {
         /*
-         * If we did not manage to read the seed file, we should not write a
-         * low-entropy seed file back -- it would suppress a crucial warning
-         * the next time we want to use it.
+         * Alert sent to BIO.  If it is important, flush it now. If the
+         * message does not get sent due to non-blocking IO, we will not
+         * worry too much.
          */
-        return 0;
+        if (s->s3->send_alert[0] == SSL3_AL_FATAL)
+            (void)BIO_flush(s->wbio);
 
-    if (file == NULL)
-        file = RAND_file_name(buffer, sizeof buffer);
-    if (file == NULL || !RAND_write_file(file)) {
-        BIO_printf(bio_e, "unable to write 'random state'\n");
-        return 0;
-    }
-    return 1;
-}
+        if (s->msg_callback)
+            s->msg_callback(1, s->version, SSL3_RT_ALERT, s->s3->send_alert,
+                            2, s, s->msg_callback_arg);
 
-void app_RAND_allow_write_file(void)
-{
-    seeded = 1;
+        if (s->info_callback != NULL)
+            cb = s->info_callback;
+        else if (s->ctx->info_callback != NULL)
+            cb = s->ctx->info_callback;
+
+        if (cb != NULL) {
+            j = (s->s3->send_alert[0] << 8) | s->s3->send_alert[1];
+            cb(s, SSL_CB_WRITE_ALERT, j);
+        }
+    }
+    return (i);
 }
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 55aa6a6..50a79a8 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -999,8 +999,8 @@ extern "C" {
 # define SSL_in_accept_init(a)           (SSL_state(a)&SSL_ST_ACCEPT)
 
 /*
- * The following 2 states are kept in ssl->rstate when reads fail, you should
- * not need these
+ * The following 3 states are kept in ssl->rlayer.rstate when reads fail, you
+ * should not need these
  */
 # define SSL_ST_READ_HEADER                      0xF0
 # define SSL_ST_READ_BODY                        0xF1
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 0b2d8de..abb3fd3 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -189,7 +189,6 @@ SSL3_ENC_METHOD ssl3_undef_enc_method = {
 
 int SSL_clear(SSL *s)
 {
-
     if (s->method == NULL) {
         SSLerr(SSL_F_SSL_CLEAR, SSL_R_NO_METHOD_SPECIFIED);
         return (0);
@@ -216,7 +215,6 @@ int SSL_clear(SSL *s)
     s->version = s->method->version;
     s->client_version = s->version;
     s->rwstate = SSL_NOTHING;
-    s->rstate = SSL_ST_READ_HEADER;
 
     if (s->init_buf != NULL) {
         BUF_MEM_free(s->init_buf);
@@ -241,6 +239,9 @@ int SSL_clear(SSL *s)
             return (0);
     } else
         s->method->ssl_clear(s);
+
+    RECORD_LAYER_clear(&s->rlayer);
+
     return (1);
 }
 
@@ -280,6 +281,8 @@ SSL *SSL_new(SSL_CTX *ctx)
         goto err;
     memset(s, 0, sizeof(SSL));
 
+    RECORD_LAYER_init(&s->rlayer, s);
+
 #ifndef OPENSSL_NO_KRB5
     s->kssl_ctx = kssl_ctx_new();
 #endif                          /* OPENSSL_NO_KRB5 */
@@ -301,7 +304,7 @@ SSL *SSL_new(SSL_CTX *ctx)
     if (s->cert == NULL)
         goto err;
 
-    s->read_ahead = ctx->read_ahead;
+    RECORD_LAYER_set_read_ahead(&s->rlayer, ctx->read_ahead);
     s->msg_callback = ctx->msg_callback;
     s->msg_callback_arg = ctx->msg_callback_arg;
     s->verify_mode = ctx->verify_mode;
@@ -597,6 +600,8 @@ void SSL_free(SSL *s)
     if (s->method != NULL)
         s->method->ssl_free(s);
 
+    RECORD_LAYER_release(&s->rlayer);
+
     if (s->ctx)
         SSL_CTX_free(s->ctx);
 
@@ -821,12 +826,12 @@ void SSL_set_verify_depth(SSL *s, int depth)
 
 void SSL_set_read_ahead(SSL *s, int yes)
 {
-    s->read_ahead = yes;
+    RECORD_LAYER_set_read_ahead(&s->rlayer, yes);
 }
 
 int SSL_get_read_ahead(const SSL *s)
 {
-    return (s->read_ahead);
+    return RECORD_LAYER_get_read_ahead(&s->rlayer);
 }
 
 int SSL_pending(const SSL *s)
@@ -1063,10 +1068,10 @@ long SSL_ctrl(SSL *s, int cmd, long larg, void *parg)
 
     switch (cmd) {
     case SSL_CTRL_GET_READ_AHEAD:
-        return (s->read_ahead);
+        return (RECORD_LAYER_get_read_ahead(&s->rlayer));
     case SSL_CTRL_SET_READ_AHEAD:
-        l = s->read_ahead;
-        s->read_ahead = larg;
+        l = RECORD_LAYER_get_read_ahead(&s->rlayer);
+        RECORD_LAYER_set_read_ahead(&s->rlayer, larg);
         return (l);
 
     case SSL_CTRL_SET_MSG_CALLBACK_ARG:
@@ -2824,7 +2829,7 @@ SSL *SSL_dup(SSL *s)
     ret->shutdown = s->shutdown;
     ret->state = s->state;      /* SSL_dup does not really work at any state,
                                  * though */
-    ret->rstate = s->rstate;
+    RECORD_LAYER_dup(&ret->rlayer, &s->rlayer);
     ret->init_num = 0;          /* would have to copy ret->init_buf,
                                  * ret->init_msg, ret->init_num,
                                  * ret->init_off */
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 40c42a8..8b4c615 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -165,6 +165,8 @@
 # include <openssl/ssl.h>
 # include <openssl/symhacks.h>
 
+#include "record/record.h"
+
 # ifdef OPENSSL_BUILD_SHLIBSSL
 #  undef OPENSSL_EXTERN
 #  define OPENSSL_EXTERN OPENSSL_EXPORT
@@ -1018,20 +1020,15 @@ struct ssl_st {
     int shutdown;
     /* where we are */
     int state;
-    /* where we are when reading */
-    int rstate;
     BUF_MEM *init_buf;          /* buffer used during init */
     void *init_msg;             /* pointer to handshake message body, set by
                                  * ssl3_get_message() */
     int init_num;               /* amount read/written */
     int init_off;               /* amount read/written */
-    /* used internally to point at a raw packet */
-    unsigned char *packet;
-    unsigned int packet_length;
+
     struct ssl3_state_st *s3;   /* SSLv3 variables */
     struct dtls1_state_st *d1;  /* DTLSv1 variables */
-    int read_ahead;             /* Read as many input bytes as possible (for
-                                 * non-blocking reads) */
+
     /* callback that allows applications to peek at protocol messages */
     void (*msg_callback) (int write_p, int version, int content_type,
                           const void *buf, size_t len, SSL *ssl, void *arg);
@@ -1217,68 +1214,16 @@ struct ssl_st {
      * basis, depending on the chosen cipher.
      */
     int (*not_resumable_session_cb) (SSL *ssl, int is_forward_secure);
+    
+    RECORD_LAYER rlayer;
 };
 
-typedef struct ssl3_record_st {
-    /* type of record */
-    /*
-     * r
-     */ int type;
-    /* How many bytes available */
-    /*
-     * rw
-     */ unsigned int length;
-    /*
-     * How many bytes were available before padding was removed? This is used
-     * to implement the MAC check in constant time for CBC records.
-     */
-    /*
-     * rw
-     */ unsigned int orig_len;
-    /* read/write offset into 'buf' */
-    /*
-     * r
-     */ unsigned int off;
-    /* pointer to the record data */
-    /*
-     * rw
-     */ unsigned char *data;
-    /* where the decode bytes are */
-    /*
-     * rw
-     */ unsigned char *input;
-    /* only used with decompression - malloc()ed */
-    /*
-     * r
-     */ unsigned char *comp;
-    /* epoch number, needed by DTLS1 */
-    /*
-     * r
-     */ unsigned long epoch;
-    /* sequence number, needed by DTLS1 */
-    /*
-     * r
-     */ unsigned char seq_num[8];
-} SSL3_RECORD;
-
-typedef struct ssl3_buffer_st {
-    /* at least SSL3_RT_MAX_PACKET_SIZE bytes, see ssl3_setup_buffers() */
-    unsigned char *buf;
-    /* buffer size */
-    size_t len;
-    /* where to 'copy from' */
-    int offset;
-    /* how many bytes left */
-    int left;
-} SSL3_BUFFER;
 
 typedef struct ssl3_state_st {
     long flags;
     int delay_buf_pop_ret;
-    unsigned char read_sequence[8];
     int read_mac_secret_size;
     unsigned char read_mac_secret[EVP_MAX_MD_SIZE];
-    unsigned char write_sequence[8];
     int write_mac_secret_size;
     unsigned char write_mac_secret[EVP_MAX_MD_SIZE];
     unsigned char server_random[SSL3_RANDOM_SIZE];
@@ -1288,24 +1233,6 @@ typedef struct ssl3_state_st {
     int empty_fragment_done;
     /* The value of 'extra' when the buffers were initialized */
     int init_extra;
-    SSL3_BUFFER rbuf;           /* read IO goes into here */
-    SSL3_BUFFER wbuf;           /* write IO goes into here */
-    SSL3_RECORD rrec;           /* each decoded record goes in here */
-    SSL3_RECORD wrec;           /* goes out from here */
-    /*
-     * storage for Alert/Handshake protocol data received but not yet
-     * processed by ssl3_read_bytes:
-     */
-    unsigned char alert_fragment[2];
-    unsigned int alert_fragment_len;
-    unsigned char handshake_fragment[4];
-    unsigned int handshake_fragment_len;
-    /* partial write - check the numbers match */
-    unsigned int wnum;          /* number of bytes sent so far */
-    int wpend_tot;              /* number bytes written */
-    int wpend_type;
-    int wpend_ret;              /* number of bytes submitted */
-    const unsigned char *wpend_buf;
     /* used during startup, digest all incoming/outgoing packets */
     BIO *handshake_buffer;
     /*
@@ -1427,13 +1354,6 @@ typedef struct ssl3_state_st {
 /* Max MTU overhead we know about so far is 40 for IPv6 + 8 for UDP */
 #  define DTLS1_MAX_MTU_OVERHEAD                   48
 
-typedef struct dtls1_bitmap_st {
-    unsigned long map;          /* track 32 packets on 32-bit systems and 64
-                                 * - on 64-bit systems */
-    unsigned char max_seq_num[8]; /* max record number seen so far, 64-bit
-                                   * value in big-endian encoding */
-} DTLS1_BITMAP;
-
 struct dtls1_retransmit_state {
     EVP_CIPHER_CTX *enc_write_ctx; /* cryptographic state */
     EVP_MD_CTX *write_hash;     /* used for mac generation */
@@ -1470,11 +1390,6 @@ struct dtls1_timeout_st {
     unsigned int num_alerts;
 };
 
-typedef struct record_pqueue_st {
-    unsigned short epoch;
-    pqueue q;
-} record_pqueue;
-
 typedef struct hm_fragment_st {
     struct hm_header_st msg_header;
     unsigned char *fragment;
@@ -1486,36 +1401,17 @@ typedef struct dtls1_state_st {
     unsigned char cookie[DTLS1_COOKIE_LENGTH];
     unsigned char rcvd_cookie[DTLS1_COOKIE_LENGTH];
     unsigned int cookie_len;
-    /*
-     * The current data and handshake epoch.  This is initially
-     * undefined, and starts at zero once the initial handshake is
-     * completed
-     */
-    unsigned short r_epoch;
-    unsigned short w_epoch;
-    /* records being received in the current epoch */
-    DTLS1_BITMAP bitmap;
-    /* renegotiation starts a new set of sequence numbers */
-    DTLS1_BITMAP next_bitmap;
+
     /* handshake message numbers */
     unsigned short handshake_write_seq;
     unsigned short next_handshake_write_seq;
     unsigned short handshake_read_seq;
-    /* save last sequence number for retransmissions */
-    unsigned char last_write_sequence[8];
-    /* Received handshake records (processed and unprocessed) */
-    record_pqueue unprocessed_rcds;
-    record_pqueue processed_rcds;
+
     /* Buffered handshake messages */
     pqueue buffered_messages;
     /* Buffered (sent) handshake records */
     pqueue sent_messages;
-    /*
-     * Buffered application records. Only for records between CCS and
-     * Finished to prevent either protocol violation or unnecessary message
-     * loss.
-     */
-    record_pqueue buffered_app_data;
+
     /* Is set when listening for new connections with dtls1_listen() */
     unsigned int listen;
     unsigned int link_mtu;      /* max on-the-wire DTLS packet size */
@@ -1529,14 +1425,7 @@ typedef struct dtls1_state_st {
     struct timeval next_timeout;
     /* Timeout duration */
     unsigned short timeout_duration;
-    /*
-     * storage for Alert/Handshake protocol data received but not yet
-     * processed by ssl3_read_bytes:
-     */
-    unsigned char alert_fragment[DTLS1_AL_HEADER_LENGTH];
-    unsigned int alert_fragment_len;
-    unsigned char handshake_fragment[DTLS1_HM_HEADER_LENGTH];
-    unsigned int handshake_fragment_len;
+
     unsigned int retransmitting;
     /*
      * Set when the handshake is ready to process peer's ChangeCipherSpec message.
@@ -1550,15 +1439,6 @@ typedef struct dtls1_state_st {
 #  endif
 } DTLS1_STATE;
 
-typedef struct dtls1_record_data_st {
-    unsigned char *packet;
-    unsigned int packet_length;
-    SSL3_BUFFER rbuf;
-    SSL3_RECORD rrec;
-#  ifndef OPENSSL_NO_SCTP
-    struct bio_dgram_sctp_rcvinfo recordinfo;
-#  endif
-} DTLS1_RECORD_DATA;
 
 
 # ifndef OPENSSL_NO_EC
@@ -2042,8 +1922,10 @@ const SSL_METHOD *func_name(void)  \
 struct openssl_ssl_test_functions {
     int (*p_ssl_init_wbio_buffer) (SSL *s, int push);
     int (*p_ssl3_setup_buffers) (SSL *s);
-    int (*p_tls1_process_heartbeat) (SSL *s);
-    int (*p_dtls1_process_heartbeat) (SSL *s);
+    int (*p_tls1_process_heartbeat) (SSL *s,
+        unsigned char *p, unsigned int length);
+    int (*p_dtls1_process_heartbeat) (SSL *s,
+        unsigned char *p, unsigned int length);
 };
 
 # ifndef OPENSSL_UNIT_TEST
@@ -2140,23 +2022,14 @@ __owur const SSL_CIPHER *ssl3_get_cipher(unsigned int u);
 int ssl3_renegotiate(SSL *ssl);
 int ssl3_renegotiate_check(SSL *ssl);
 __owur int ssl3_dispatch_alert(SSL *s);
-__owur int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek);
-__owur int ssl3_write_bytes(SSL *s, int type, const void *buf, int len);
 __owur int ssl3_final_finish_mac(SSL *s, const char *sender, int slen,
                           unsigned char *p);
 __owur int ssl3_cert_verify_mac(SSL *s, int md_nid, unsigned char *p);
 void ssl3_finish_mac(SSL *s, const unsigned char *buf, int len);
-__owur int ssl3_enc(SSL *s, int send_data);
-__owur int n_ssl3_mac(SSL *ssl, unsigned char *md, int send_data);
 void ssl3_free_digest_list(SSL *s);
 __owur unsigned long ssl3_output_cert_chain(SSL *s, CERT_PKEY *cpk);
 __owur SSL_CIPHER *ssl3_choose_cipher(SSL *ssl, STACK_OF(SSL_CIPHER) *clnt,
                                STACK_OF(SSL_CIPHER) *srvr);
-__owur int ssl3_setup_buffers(SSL *s);
-__owur int ssl3_setup_read_buffer(SSL *s);
-__owur int ssl3_setup_write_buffer(SSL *s);
-int ssl3_release_read_buffer(SSL *s);
-int ssl3_release_write_buffer(SSL *s);
 __owur int ssl3_digest_cached_records(SSL *s);
 __owur int ssl3_new(SSL *s);
 void ssl3_free(SSL *s);
@@ -2171,9 +2044,7 @@ __owur long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg);
 __owur long ssl3_ctx_ctrl(SSL_CTX *s, int cmd, long larg, void *parg);
 __owur long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp) (void));
 __owur long ssl3_ctx_callback_ctrl(SSL_CTX *s, int cmd, void (*fp) (void));
-__owur int ssl3_pending(const SSL *s);
 
-void ssl3_record_sequence_update(unsigned char *seq);
 __owur int ssl3_do_change_cipher_spec(SSL *ssl);
 __owur long ssl3_default_timeout(void);
 
@@ -2193,12 +2064,6 @@ __owur int ssl_allow_compression(SSL *s);
 
 __owur long tls1_default_timeout(void);
 __owur int dtls1_do_write(SSL *s, int type);
-__owur int ssl3_read_n(SSL *s, int n, int max, int extend);
-__owur int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek);
-__owur int ssl3_do_compress(SSL *ssl);
-__owur int ssl3_do_uncompress(SSL *ssl);
-__owur int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
-                       unsigned int len);
 void dtls1_set_message_header(SSL *s,
                               unsigned char *p, unsigned char mt,
                               unsigned long len,
@@ -2206,7 +2071,6 @@ void dtls1_set_message_header(SSL *s,
                               unsigned long frag_len);
 
 __owur int dtls1_write_app_data_bytes(SSL *s, int type, const void *buf, int len);
-__owur int dtls1_write_bytes(SSL *s, int type, const void *buf, int len);
 
 __owur int dtls1_send_change_cipher_spec(SSL *s, int a, int b);
 __owur int dtls1_send_finished(SSL *s, int a, int b, const char *sender, int slen);
@@ -2220,7 +2084,6 @@ void dtls1_clear_record_buffer(SSL *s);
 void dtls1_get_message_header(unsigned char *data,
                               struct hm_header_st *msg_hdr);
 void dtls1_get_ccs_header(unsigned char *data, struct ccs_header_st *ccs_hdr);
-void dtls1_reset_seq_numbers(SSL *s, int rw);
 __owur long dtls1_default_timeout(void);
 __owur struct timeval *dtls1_get_timeout(SSL *s, struct timeval *timeleft);
 __owur int dtls1_check_timeout_num(SSL *s);
@@ -2273,8 +2136,6 @@ __owur int ssl3_get_next_proto(SSL *s);
 
 __owur int ssl23_accept(SSL *s);
 __owur int ssl23_connect(SSL *s);
-__owur int ssl23_read_bytes(SSL *s, int n);
-__owur int ssl23_write_bytes(SSL *s);
 
 __owur int tls1_new(SSL *s);
 void tls1_free(SSL *s);
@@ -2291,9 +2152,6 @@ long dtls1_ctrl(SSL *s, int cmd, long larg, void *parg);
 __owur int dtls1_shutdown(SSL *s);
 
 __owur long dtls1_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok);
-__owur int dtls1_get_record(SSL *s);
-__owur int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
-                   unsigned int len, int create_empty_fragement);
 __owur int dtls1_dispatch_alert(SSL *s);
 
 __owur int ssl_init_wbio_buffer(SSL *s, int push);
@@ -2301,11 +2159,9 @@ void ssl_free_wbio_buffer(SSL *s);
 
 __owur int tls1_change_cipher_state(SSL *s, int which);
 __owur int tls1_setup_key_block(SSL *s);
-__owur int tls1_enc(SSL *s, int snd);
 __owur int tls1_final_finish_mac(SSL *s,
                           const char *str, int slen, unsigned char *p);
 __owur int tls1_cert_verify_mac(SSL *s, int md_nid, unsigned char *p);
-__owur int tls1_mac(SSL *ssl, unsigned char *md, int snd);
 __owur int tls1_generate_master_secret(SSL *s, unsigned char *out,
                                 unsigned char *p, int len);
 __owur int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
@@ -2354,8 +2210,8 @@ __owur int ssl_prepare_serverhello_tlsext(SSL *s);
 #   ifndef OPENSSL_NO_HEARTBEATS
 __owur int tls1_heartbeat(SSL *s);
 __owur int dtls1_heartbeat(SSL *s);
-__owur int tls1_process_heartbeat(SSL *s);
-__owur int dtls1_process_heartbeat(SSL *s);
+__owur int tls1_process_heartbeat(SSL *s, unsigned char *p, unsigned int length);
+__owur int dtls1_process_heartbeat(SSL *s, unsigned char *p, unsigned int length);
 #   endif
 
 __owur int tls1_process_ticket(SSL *s, unsigned char *session_id, int len,
@@ -2414,14 +2270,6 @@ __owur int ssl_parse_serverhello_use_srtp_ext(SSL *s, unsigned char *d, int len,
 __owur int ssl_handshake_hash(SSL *s, unsigned char *out, int outlen);
 
 /* s3_cbc.c */
-void ssl3_cbc_copy_mac(unsigned char *out,
-                       const SSL3_RECORD *rec, unsigned md_size);
-__owur int ssl3_cbc_remove_padding(const SSL *s,
-                            SSL3_RECORD *rec,
-                            unsigned block_size, unsigned mac_size);
-__owur int tls1_cbc_remove_padding(const SSL *s,
-                            SSL3_RECORD *rec,
-                            unsigned block_size, unsigned mac_size);
 __owur char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx);
 void ssl3_cbc_digest_record(const EVP_MD_CTX *ctx,
                             unsigned char *md_out,
diff --git a/ssl/ssl_stat.c b/ssl/ssl_stat.c
index 4e39a9b..258c4eb 100644
--- a/ssl/ssl_stat.c
+++ b/ssl/ssl_stat.c
@@ -342,26 +342,6 @@ const char *SSL_state_string_long(const SSL *s)
     return (str);
 }
 
-const char *SSL_rstate_string_long(const SSL *s)
-{
-    const char *str;
-
-    switch (s->rstate) {
-    case SSL_ST_READ_HEADER:
-        str = "read header";
-        break;
-    case SSL_ST_READ_BODY:
-        str = "read body";
-        break;
-    case SSL_ST_READ_DONE:
-        str = "read done";
-        break;
-    default:
-        str = "unknown";
-        break;
-    }
-    return (str);
-}
 
 const char *SSL_state_string(const SSL *s)
 {
@@ -817,24 +797,3 @@ const char *SSL_alert_desc_string_long(int value)
     }
     return (str);
 }
-
-const char *SSL_rstate_string(const SSL *s)
-{
-    const char *str;
-
-    switch (s->rstate) {
-    case SSL_ST_READ_HEADER:
-        str = "RH";
-        break;
-    case SSL_ST_READ_BODY:
-        str = "RB";
-        break;
-    case SSL_ST_READ_DONE:
-        str = "RD";
-        break;
-    default:
-        str = "unknown";
-        break;
-    }
-    return (str);
-}
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index e4a689e..19b79e9 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -396,10 +396,7 @@ int tls1_change_cipher_state(SSL *s, int which)
                        SSL_R_COMPRESSION_LIBRARY_ERROR);
                 goto err2;
             }
-            if (s->s3->rrec.comp == NULL)
-                s->s3->rrec.comp = (unsigned char *)
-                    OPENSSL_malloc(SSL3_RT_MAX_ENCRYPTED_LENGTH);
-            if (s->s3->rrec.comp == NULL)
+            if (!RECORD_LAYER_setup_comp_buffer(&s->rlayer))
                 goto err;
         }
 #endif
@@ -407,7 +404,7 @@ int tls1_change_cipher_state(SSL *s, int which)
          * this is done by dtls1_reset_seq_numbers for DTLS
          */
         if (!SSL_IS_DTLS(s))
-            memset(&(s->s3->read_sequence[0]), 0, 8);
+            RECORD_LAYER_reset_read_sequence(&s->rlayer);
         mac_secret = &(s->s3->read_mac_secret[0]);
         mac_secret_size = &(s->s3->read_mac_secret_size);
     } else {
@@ -445,7 +442,7 @@ int tls1_change_cipher_state(SSL *s, int which)
          * this is done by dtls1_reset_seq_numbers for DTLS
          */
         if (!SSL_IS_DTLS(s))
-            memset(&(s->s3->write_sequence[0]), 0, 8);
+            RECORD_LAYER_reset_write_sequence(&s->rlayer);
         mac_secret = &(s->s3->write_mac_secret[0]);
         mac_secret_size = &(s->s3->write_mac_secret_size);
     }
@@ -727,182 +724,6 @@ int tls1_setup_key_block(SSL *s)
     return (ret);
 }
 
-/*-
- * tls1_enc encrypts/decrypts the record in |s->wrec| / |s->rrec|, respectively.
- *
- * Returns:
- *   0: (in non-constant time) if the record is publically invalid (i.e. too
- *       short etc).
- *   1: if the record's padding is valid / the encryption was successful.
- *   -1: if the record's padding/AEAD-authenticator is invalid or, if sending,
- *       an internal error occurred.
- */
-int tls1_enc(SSL *s, int send)
-{
-    SSL3_RECORD *rec;
-    EVP_CIPHER_CTX *ds;
-    unsigned long l;
-    int bs, i, j, k, pad = 0, ret, mac_size = 0;
-    const EVP_CIPHER *enc;
-
-    if (send) {
-        if (EVP_MD_CTX_md(s->write_hash)) {
-            int n = EVP_MD_CTX_size(s->write_hash);
-            OPENSSL_assert(n >= 0);
-        }
-        ds = s->enc_write_ctx;
-        rec = &(s->s3->wrec);
-        if (s->enc_write_ctx == NULL)
-            enc = NULL;
-        else {
-            int ivlen;
-            enc = EVP_CIPHER_CTX_cipher(s->enc_write_ctx);
-            /* For TLSv1.1 and later explicit IV */
-            if (SSL_USE_EXPLICIT_IV(s)
-                && EVP_CIPHER_mode(enc) == EVP_CIPH_CBC_MODE)
-                ivlen = EVP_CIPHER_iv_length(enc);
-            else
-                ivlen = 0;
-            if (ivlen > 1) {
-                if (rec->data != rec->input)
-                    /*
-                     * we can't write into the input stream: Can this ever
-                     * happen?? (steve)
-                     */
-                    fprintf(stderr,
-                            "%s:%d: rec->data != rec->input\n",
-                            __FILE__, __LINE__);
-                else if (RAND_bytes(rec->input, ivlen) <= 0)
-                    return -1;
-            }
-        }
-    } else {
-        if (EVP_MD_CTX_md(s->read_hash)) {
-            int n = EVP_MD_CTX_size(s->read_hash);
-            OPENSSL_assert(n >= 0);
-        }
-        ds = s->enc_read_ctx;
-        rec = &(s->s3->rrec);
-        if (s->enc_read_ctx == NULL)
-            enc = NULL;
-        else
-            enc = EVP_CIPHER_CTX_cipher(s->enc_read_ctx);
-    }
-
-#ifdef KSSL_DEBUG
-    fprintf(stderr, "tls1_enc(%d)\n", send);
-#endif                          /* KSSL_DEBUG */
-
-    if ((s->session == NULL) || (ds == NULL) || (enc == NULL)) {
-        memmove(rec->data, rec->input, rec->length);
-        rec->input = rec->data;
-        ret = 1;
-    } else {
-        l = rec->length;
-        bs = EVP_CIPHER_block_size(ds->cipher);
-
-        if (EVP_CIPHER_flags(ds->cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) {
-            unsigned char buf[13], *seq;
-
-            seq = send ? s->s3->write_sequence : s->s3->read_sequence;
-
-            if (SSL_IS_DTLS(s)) {
-                unsigned char dtlsseq[9], *p = dtlsseq;
-
-                s2n(send ? s->d1->w_epoch : s->d1->r_epoch, p);
-                memcpy(p, &seq[2], 6);
-                memcpy(buf, dtlsseq, 8);
-            } else {
-                memcpy(buf, seq, 8);
-                for (i = 7; i >= 0; i--) { /* increment */
-                    ++seq[i];
-                    if (seq[i] != 0)
-                        break;
-                }
-            }
-
-            buf[8] = rec->type;
-            buf[9] = (unsigned char)(s->version >> 8);
-            buf[10] = (unsigned char)(s->version);
-            buf[11] = rec->length >> 8;
-            buf[12] = rec->length & 0xff;
-            pad = EVP_CIPHER_CTX_ctrl(ds, EVP_CTRL_AEAD_TLS1_AAD, 13, buf);
-            if (send) {
-                l += pad;
-                rec->length += pad;
-            }
-        } else if ((bs != 1) && send) {
-            i = bs - ((int)l % bs);
-
-            /* Add weird padding of upto 256 bytes */
-
-            /* we need to add 'i' padding bytes of value j */
-            j = i - 1;
-            if (s->options & SSL_OP_TLS_BLOCK_PADDING_BUG) {
-                if (s->s3->flags & TLS1_FLAGS_TLS_PADDING_BUG)
-                    j++;
-            }
-            for (k = (int)l; k < (int)(l + i); k++)
-                rec->input[k] = j;
-            l += i;
-            rec->length += i;
-        }
-#ifdef KSSL_DEBUG
-        {
-            unsigned long ui;
-            fprintf(stderr,
-                    "EVP_Cipher(ds=%p,rec->data=%p,rec->input=%p,l=%ld) ==>\n",
-                    ds, rec->data, rec->input, l);
-            fprintf(stderr,
-                    "\tEVP_CIPHER_CTX: %d buf_len, %d key_len [%lu %lu], %d iv_len\n",
-                    ds->buf_len, ds->cipher->key_len, DES_KEY_SZ,
-                    DES_SCHEDULE_SZ, ds->cipher->iv_len);
-            fprintf(stderr, "\t\tIV: ");
-            for (i = 0; i < ds->cipher->iv_len; i++)
-                fprintf(stderr, "%02X", ds->iv[i]);
-            fprintf(stderr, "\n");
-            fprintf(stderr, "\trec->input=");
-            for (ui = 0; ui < l; ui++)
-                fprintf(stderr, " %02x", rec->input[ui]);
-            fprintf(stderr, "\n");
-        }
-#endif                          /* KSSL_DEBUG */
-
-        if (!send) {
-            if (l == 0 || l % bs != 0)
-                return 0;
-        }
-
-        i = EVP_Cipher(ds, rec->data, rec->input, l);
-        if ((EVP_CIPHER_flags(ds->cipher) & EVP_CIPH_FLAG_CUSTOM_CIPHER)
-            ? (i < 0)
-            : (i == 0))
-            return -1;          /* AEAD can fail to verify MAC */
-        if (EVP_CIPHER_mode(enc) == EVP_CIPH_GCM_MODE && !send) {
-            rec->data += EVP_GCM_TLS_EXPLICIT_IV_LEN;
-            rec->input += EVP_GCM_TLS_EXPLICIT_IV_LEN;
-            rec->length -= EVP_GCM_TLS_EXPLICIT_IV_LEN;
-        }
-#ifdef KSSL_DEBUG
-        {
-            unsigned long i;
-            fprintf(stderr, "\trec->data=");
-            for (i = 0; i < l; i++)
-                fprintf(stderr, " %02x", rec->data[i]);
-            fprintf(stderr, "\n");
-        }
-#endif                          /* KSSL_DEBUG */
-
-        ret = 1;
-        if (!SSL_USE_ETM(s) && EVP_MD_CTX_md(s->read_hash) != NULL)
-            mac_size = EVP_MD_CTX_size(s->read_hash);
-        if ((bs != 1) && !send)
-            ret = tls1_cbc_remove_padding(s, rec, bs, mac_size);
-        if (pad && !send)
-            rec->length -= pad;
-    }
-    return ret;
-}
 
 int tls1_cert_verify_mac(SSL *s, int md_nid, unsigned char *out)
 {
@@ -959,121 +780,6 @@ int tls1_final_finish_mac(SSL *s, const char *str, int slen,
     return sizeof buf2;
 }
 
-int tls1_mac(SSL *ssl, unsigned char *md, int send)
-{
-    SSL3_RECORD *rec;
-    unsigned char *seq;
-    EVP_MD_CTX *hash;
-    size_t md_size;
-    int i;
-    EVP_MD_CTX hmac, *mac_ctx;
-    unsigned char header[13];
-    int stream_mac = (send ? (ssl->mac_flags & SSL_MAC_FLAG_WRITE_MAC_STREAM)
-                      : (ssl->mac_flags & SSL_MAC_FLAG_READ_MAC_STREAM));
-    int t;
-
-    if (send) {
-        rec = &(ssl->s3->wrec);
-        seq = &(ssl->s3->write_sequence[0]);
-        hash = ssl->write_hash;
-    } else {
-        rec = &(ssl->s3->rrec);
-        seq = &(ssl->s3->read_sequence[0]);
-        hash = ssl->read_hash;
-    }
-
-    t = EVP_MD_CTX_size(hash);
-    OPENSSL_assert(t >= 0);
-    md_size = t;
-
-    /* I should fix this up TLS TLS TLS TLS TLS XXXXXXXX */
-    if (stream_mac) {
-        mac_ctx = hash;
-    } else {
-        if (!EVP_MD_CTX_copy(&hmac, hash))
-            return -1;
-        mac_ctx = &hmac;
-    }
-
-    if (SSL_IS_DTLS(ssl)) {
-        unsigned char dtlsseq[8], *p = dtlsseq;
-
-        s2n(send ? ssl->d1->w_epoch : ssl->d1->r_epoch, p);
-        memcpy(p, &seq[2], 6);
-
-        memcpy(header, dtlsseq, 8);
-    } else
-        memcpy(header, seq, 8);
-
-    header[8] = rec->type;
-    header[9] = (unsigned char)(ssl->version >> 8);
-    header[10] = (unsigned char)(ssl->version);
-    header[11] = (rec->length) >> 8;
-    header[12] = (rec->length) & 0xff;
-
-    if (!send && !SSL_USE_ETM(ssl) &&
-        EVP_CIPHER_CTX_mode(ssl->enc_read_ctx) == EVP_CIPH_CBC_MODE &&
-        ssl3_cbc_record_digest_supported(mac_ctx)) {
-        /*
-         * This is a CBC-encrypted record. We must avoid leaking any
-         * timing-side channel information about how many blocks of data we
-         * are hashing because that gives an attacker a timing-oracle.
-         */
-        /* Final param == not SSLv3 */
-        ssl3_cbc_digest_record(mac_ctx,
-                               md, &md_size,
-                               header, rec->input,
-                               rec->length + md_size, rec->orig_len,
-                               ssl->s3->read_mac_secret,
-                               ssl->s3->read_mac_secret_size, 0);
-    } else {
-        EVP_DigestSignUpdate(mac_ctx, header, sizeof(header));
-        EVP_DigestSignUpdate(mac_ctx, rec->input, rec->length);
-        t = EVP_DigestSignFinal(mac_ctx, md, &md_size);
-        OPENSSL_assert(t > 0);
-        if (!send && !SSL_USE_ETM(ssl) && FIPS_mode())
-            tls_fips_digest_extra(ssl->enc_read_ctx,
-                                  mac_ctx, rec->input,
-                                  rec->length, rec->orig_len);
-    }
-
-    if (!stream_mac)
-        EVP_MD_CTX_cleanup(&hmac);
-#ifdef TLS_DEBUG
-    fprintf(stderr, "seq=");
-    {
-        int z;
-        for (z = 0; z < 8; z++)
-            fprintf(stderr, "%02X ", seq[z]);
-        fprintf(stderr, "\n");
-    }
-    fprintf(stderr, "rec=");
-    {
-        unsigned int z;
-        for (z = 0; z < rec->length; z++)
-            fprintf(stderr, "%02X ", rec->data[z]);
-        fprintf(stderr, "\n");
-    }
-#endif
-
-    if (!SSL_IS_DTLS(ssl)) {
-        for (i = 7; i >= 0; i--) {
-            ++seq[i];
-            if (seq[i] != 0)
-                break;
-        }
-    }
-#ifdef TLS_DEBUG
-    {
-        unsigned int z;
-        for (z = 0; z < md_size; z++)
-            fprintf(stderr, "%02X ", md[z]);
-        fprintf(stderr, "\n");
-    }
-#endif
-    return (md_size);
-}
-
 int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
                                 int len)
 {
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 40d6490..aef0ef6 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -3592,24 +3592,24 @@ int SSL_get_shared_sigalgs(SSL *s, int idx,
 }
 
 # ifndef OPENSSL_NO_HEARTBEATS
-int tls1_process_heartbeat(SSL *s)
+int tls1_process_heartbeat(SSL *s, unsigned char *p, unsigned int length)
 {
-    unsigned char *p = &s->s3->rrec.data[0], *pl;
+    unsigned char *pl;
     unsigned short hbtype;
     unsigned int payload;
     unsigned int padding = 16;  /* Use minimum padding */
 
     if (s->msg_callback)
         s->msg_callback(0, s->version, TLS1_RT_HEARTBEAT,
-                        &s->s3->rrec.data[0], s->s3->rrec.length,
+                        p, length,
                         s, s->msg_callback_arg);
 
     /* Read type and payload length first */
-    if (1 + 2 + 16 > s->s3->rrec.length)
+    if (1 + 2 + 16 > length)
         return 0;               /* silently discard */
     hbtype = *p++;
     n2s(p, payload);
-    if (1 + 2 + payload + 16 > s->s3->rrec.length)
+    if (1 + 2 + payload + 16 > length)
         return 0;               /* silently discard per RFC 6520 sec. 4 */
     pl = p;
 

From steve at openssl.org  Thu Mar 26 22:00:11 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Thu, 26 Mar 2015 22:00:11 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427407211.248263.26349.nullmailer@dev.openssl.org>

The branch master has been updated
       via  dd14f911714da77876a3c17e0168b6afef923be8 (commit)
      from  ee3ef9cbe9b355c460ebb06c3eee0e503fe1fb1a (commit)


- Log -----------------------------------------------------------------
commit dd14f911714da77876a3c17e0168b6afef923be8
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Feb 3 16:09:32 2015 +0000

    ASN1_TYPE documentation.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 doc/crypto/ASN1_STRING_length.pod |  2 +-
 doc/crypto/ASN1_TYPE_get.pod      | 70 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 doc/crypto/ASN1_TYPE_get.pod

diff --git a/doc/crypto/ASN1_STRING_length.pod b/doc/crypto/ASN1_STRING_length.pod
index f651e4f..6fb9c94 100644
--- a/doc/crypto/ASN1_STRING_length.pod
+++ b/doc/crypto/ASN1_STRING_length.pod
@@ -48,7 +48,7 @@ such as B<V_ASN1_OCTET_STRING>.
 ASN1_STRING_to_UTF8() converts the string B<in> to UTF8 format, the
 converted data is allocated in a buffer in B<*out>. The length of
 B<out> is returned or a negative error code. The buffer B<*out>
-should be free using OPENSSL_free().
+should be freed using OPENSSL_free().
 
 =head1 NOTES
 
diff --git a/doc/crypto/ASN1_TYPE_get.pod b/doc/crypto/ASN1_TYPE_get.pod
new file mode 100644
index 0000000..a6c65aa
--- /dev/null
+++ b/doc/crypto/ASN1_TYPE_get.pod
@@ -0,0 +1,70 @@
+=pod
+
+=head1 NAME
+
+ASN1_TYPE_get, ASN1_TYPE_set, ASN1_TYPE_set1, ASN1_TYPE_cmp - ASN1_TYPE utility
+functions
+
+=head1 SYNOPSIS
+
+ #include <openssl/asn1.h>
+
+ int ASN1_TYPE_get(ASN1_TYPE *a);
+ void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value);
+ int ASN1_TYPE_set1(ASN1_TYPE *a, int type, const void *value);
+ int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b);
+
+=head1 DESCRIPTION
+
+These functions allow an ASN1_TYPE structure to be manipulated. The
+ASN1_TYPE structure can contain any ASN.1 type or constructed type
+such as a SEQUENCE: it is effectively equivalent to the ASN.1 ANY type.
+
+ASN1_TYPE_get() returns the type of B<a>.
+
+ASN1_TYPE_set() sets the value of B<a> to B<type> and B<value>. This
+function uses the pointer B<value> internally so it must B<not> be freed
+up after the call.
+
+ASN1_TYPE_set1() sets the value of B<a> to B<type> a copy of B<value>.
+
+ASN1_TYPE_cmp() compares ASN.1 types B<a> and B<b> and returns 0 if
+they are identical and non-zero otherwise.
+
+=head1 NOTES
+
+The type and meaning of the B<value> parameter for ASN1_TYPE_set() and
+ASN1_TYPE_set1() is determined by the B<type> parameter.
+If B<type> is V_ASN1_NULL B<value> is ignored. If B<type> is V_ASN1_BOOLEAN
+then the boolean is set to TRUE if B<value> is not NULL. If B<type> is
+V_ASN1_OBJECT then value is an ASN1_OBJECT structure. Otherwise B<type>
+is and ASN1_STRING structure. If B<type> corresponds to a primitive type
+(or a string type) then the contents of the ASN1_STRING contain the content
+octets of the type. If B<type> corresponds to a constructed type or
+a tagged type (V_ASN1_SEQUENCE, V_ASN1_SET or V_ASN1_OTHER) then the
+ASN1_STRING contains the entire ASN.1 encoding verbatim (including tag and
+length octets).
+
+ASN1_TYPE_cmp() may not return zero if two types are equivalent but have
+different encodings. For example the single content octet of the boolean TRUE
+value under BER can have any non-zero encoding but ASN1_TYPE_cmp() will
+only return zero if the values are the same.
+
+If either or both of the parameters passed to ASN1_TYPE_cmp() is NULL the
+return value is non-zero. Technically if both parameters are NULL the two
+types could be absent OPTIONAL fields and so should match, however passing
+NULL values could also indicate a programming error (for example an
+unparseable type which returns NULL) for types which do B<not> match. So
+applications should handle the case of two absent values separately.
+
+=head1 RETURN VALUES
+
+ASN1_TYPE_get() returns the type of the ASN1_TYPE argument.
+
+ASN1_TYPE_set() does not return a value.
+
+ASN1_TYPE_set1() returns 1 for sucess and 0 for failure.
+
+ASN1_TYPE_cmp() returns 0 if the types are identical and non-zero otherwise.
+
+=cut

From steve at openssl.org  Thu Mar 26 22:26:58 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Thu, 26 Mar 2015 22:26:58 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427408818.345793.5906.nullmailer@dev.openssl.org>

The branch master has been updated
       via  ee9d76371ae8ea433c19162c2e1522dcd188e556 (commit)
       via  ea6b07b54c1f8fc2275a121cdda071e2df7bd6c1 (commit)
      from  dd14f911714da77876a3c17e0168b6afef923be8 (commit)


- Log -----------------------------------------------------------------
commit ee9d76371ae8ea433c19162c2e1522dcd188e556
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu Mar 26 15:39:55 2015 +0000

    Remove combine option from ASN.1 code.
    
    Remove the combine option. This was used for compatibility with some
    non standard behaviour in ancient versions of OpenSSL: specifically
    the X509_ATTRIBUTE and DSAPublicKey handling. Since these have now
    been revised it is no longer needed.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit ea6b07b54c1f8fc2275a121cdda071e2df7bd6c1
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu Mar 26 14:35:49 2015 +0000

    Simplify DSA public key handling.
    
    DSA public keys could exist in two forms: a single Integer type or a
    SEQUENCE containing the parameters and public key with a field called
    "write_params" deciding which form to use. These forms are non standard
    and were only used by functions containing "DSAPublicKey" in the name.
    
    Simplify code to only use the parameter form and encode the public key
    component directly in the DSA public key method.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/asn1/asn1.h     |  2 +-
 crypto/asn1/asn1_err.c |  2 +-
 crypto/asn1/asn1t.h    | 14 --------------
 crypto/asn1/tasn_fre.c | 28 +++++++---------------------
 crypto/asn1/tasn_new.c | 41 ++++++++++++++---------------------------
 crypto/asn1/tasn_utl.c |  2 --
 crypto/dsa/dsa.h       |  1 -
 crypto/dsa/dsa_ameth.c | 11 +++++++++--
 crypto/dsa/dsa_asn1.c  |  9 ++-------
 crypto/dsa/dsa_lib.c   |  1 -
 10 files changed, 34 insertions(+), 77 deletions(-)

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 0cf5c46..141e630 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -973,7 +973,7 @@ void ERR_load_ASN1_strings(void);
 # define ASN1_F_ASN1_INTEGER_TO_BN                        119
 # define ASN1_F_ASN1_ITEM_D2I_FP                          206
 # define ASN1_F_ASN1_ITEM_DUP                             191
-# define ASN1_F_ASN1_ITEM_EX_COMBINE_NEW                  121
+# define ASN1_F_ASN1_ITEM_EX_NEW                          121
 # define ASN1_F_ASN1_ITEM_EX_D2I                          120
 # define ASN1_F_ASN1_ITEM_I2D_BIO                         192
 # define ASN1_F_ASN1_ITEM_I2D_FP                          193
diff --git a/crypto/asn1/asn1_err.c b/crypto/asn1/asn1_err.c
index ff7a2eb..b70ddb7 100644
--- a/crypto/asn1/asn1_err.c
+++ b/crypto/asn1/asn1_err.c
@@ -101,7 +101,7 @@ static ERR_STRING_DATA ASN1_str_functs[] = {
     {ERR_FUNC(ASN1_F_ASN1_INTEGER_TO_BN), "ASN1_INTEGER_to_BN"},
     {ERR_FUNC(ASN1_F_ASN1_ITEM_D2I_FP), "ASN1_item_d2i_fp"},
     {ERR_FUNC(ASN1_F_ASN1_ITEM_DUP), "ASN1_item_dup"},
-    {ERR_FUNC(ASN1_F_ASN1_ITEM_EX_COMBINE_NEW), "ASN1_ITEM_EX_COMBINE_NEW"},
+    {ERR_FUNC(ASN1_F_ASN1_ITEM_EX_NEW), "ASN1_ITEM_EX_NEW"},
     {ERR_FUNC(ASN1_F_ASN1_ITEM_EX_D2I), "ASN1_ITEM_EX_D2I"},
     {ERR_FUNC(ASN1_F_ASN1_ITEM_I2D_BIO), "ASN1_item_i2d_bio"},
     {ERR_FUNC(ASN1_F_ASN1_ITEM_I2D_FP), "ASN1_item_i2d_fp"},
diff --git a/crypto/asn1/asn1t.h b/crypto/asn1/asn1t.h
index c54d3d4..7a2611e 100644
--- a/crypto/asn1/asn1t.h
+++ b/crypto/asn1/asn1t.h
@@ -299,11 +299,6 @@ extern "C" {
         (flags), (tag), offsetof(stname, field),\
         #field, ASN1_ITEM_ref(type) }
 
-/* used when the structure is combined with the parent */
-
-# define ASN1_EX_COMBINE(flags, tag, type) { \
-        (flags)|ASN1_TFLG_COMBINE, (tag), 0, NULL, ASN1_ITEM_ref(type) }
-
 /* implicit and explicit helper macros */
 
 # define ASN1_IMP_EX(stname, field, type, tag, ex) \
@@ -543,15 +538,6 @@ struct ASN1_ADB_TABLE_st {
 # define ASN1_TFLG_ADB_INT       (0x1<<9)
 
 /*
- * This flag means a parent structure is passed instead of the field: this is
- * useful is a SEQUENCE is being combined with a CHOICE for example. Since
- * this means the structure and item name will differ we need to use the
- * ASN1_CHOICE_END_name() macro for example.
- */
-
-# define ASN1_TFLG_COMBINE       (0x1<<10)
-
-/*
  * This flag when present in a SEQUENCE OF, SET OF or EXPLICIT causes
  * indefinite length constructed encoding to be used if required.
  */
diff --git a/crypto/asn1/tasn_fre.c b/crypto/asn1/tasn_fre.c
index fd9f046..e846561 100644
--- a/crypto/asn1/tasn_fre.c
+++ b/crypto/asn1/tasn_fre.c
@@ -63,24 +63,15 @@
 #include <openssl/objects.h>
 #include "asn1_locl.h"
 
-static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,
-                                   int combine);
-
 /* Free up an ASN1 structure */
 
 void ASN1_item_free(ASN1_VALUE *val, const ASN1_ITEM *it)
 {
-    asn1_item_combine_free(&val, it, 0);
+    ASN1_item_ex_free(&val, it);
 }
 
 void ASN1_item_ex_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-    asn1_item_combine_free(pval, it, 0);
-}
-
-static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,
-                                   int combine)
-{
     const ASN1_TEMPLATE *tt = NULL, *seqtt;
     const ASN1_EXTERN_FUNCS *ef;
     const ASN1_AUX *aux = it->funcs;
@@ -125,10 +116,8 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,
         }
         if (asn1_cb)
             asn1_cb(ASN1_OP_FREE_POST, pval, it, NULL);
-        if (!combine) {
-            OPENSSL_free(*pval);
-            *pval = NULL;
-        }
+        OPENSSL_free(*pval);
+        *pval = NULL;
         break;
 
     case ASN1_ITYPE_EXTERN:
@@ -163,10 +152,8 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,
         }
         if (asn1_cb)
             asn1_cb(ASN1_OP_FREE_POST, pval, it, NULL);
-        if (!combine) {
-            OPENSSL_free(*pval);
-            *pval = NULL;
-        }
+        OPENSSL_free(*pval);
+        *pval = NULL;
         break;
     }
 }
@@ -180,13 +167,12 @@ void asn1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
         for (i = 0; i < sk_ASN1_VALUE_num(sk); i++) {
             ASN1_VALUE *vtmp = sk_ASN1_VALUE_value(sk, i);
 
-            asn1_item_combine_free(&vtmp, ASN1_ITEM_ptr(tt->item), 0);
+            ASN1_item_ex_free(&vtmp, ASN1_ITEM_ptr(tt->item));
         }
         sk_ASN1_VALUE_free(sk);
         *pval = NULL;
     } else {
-        asn1_item_combine_free(pval, ASN1_ITEM_ptr(tt->item),
-                               tt->flags & ASN1_TFLG_COMBINE);
+        ASN1_item_ex_free(pval, ASN1_ITEM_ptr(tt->item));
     }
 }
 
diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c
index b1f4da2..1b36ecc 100644
--- a/crypto/asn1/tasn_new.c
+++ b/crypto/asn1/tasn_new.c
@@ -65,8 +65,6 @@
 #include <string.h>
 #include "asn1_locl.h"
 
-static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
-                                    int combine);
 static int asn1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
 static void asn1_item_clear(ASN1_VALUE **pval, const ASN1_ITEM *it);
 static int asn1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
@@ -85,12 +83,6 @@ ASN1_VALUE *ASN1_item_new(const ASN1_ITEM *it)
 
 int ASN1_item_ex_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
-    return asn1_item_ex_combine_new(pval, it, 0);
-}
-
-static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
-                                    int combine)
-{
     const ASN1_TEMPLATE *tt = NULL;
     const ASN1_EXTERN_FUNCS *ef;
     const ASN1_AUX *aux = it->funcs;
@@ -102,8 +94,7 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
     else
         asn1_cb = 0;
 
-    if (!combine)
-        *pval = NULL;
+    *pval = NULL;
 
 #ifdef CRYPTO_MDEBUG
     if (it->sname)
@@ -146,12 +137,10 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
                 return 1;
             }
         }
-        if (!combine) {
-            *pval = OPENSSL_malloc(it->size);
-            if (!*pval)
-                goto memerr;
-            memset(*pval, 0, it->size);
-        }
+        *pval = OPENSSL_malloc(it->size);
+        if (!*pval)
+            goto memerr;
+        memset(*pval, 0, it->size);
         asn1_set_choice_selector(pval, -1, it);
         if (asn1_cb && !asn1_cb(ASN1_OP_NEW_POST, pval, it, NULL))
             goto auxerr;
@@ -171,14 +160,12 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
                 return 1;
             }
         }
-        if (!combine) {
-            *pval = OPENSSL_malloc(it->size);
-            if (!*pval)
-                goto memerr;
-            memset(*pval, 0, it->size);
-            asn1_do_lock(pval, 0, it);
-            asn1_enc_init(pval, it);
-        }
+        *pval = OPENSSL_malloc(it->size);
+        if (!*pval)
+            goto memerr;
+        memset(*pval, 0, it->size);
+        asn1_do_lock(pval, 0, it);
+        asn1_enc_init(pval, it);
         for (i = 0, tt = it->templates; i < it->tcount; tt++, i++) {
             pseqval = asn1_get_field_ptr(pval, tt);
             if (!asn1_template_new(pseqval, tt))
@@ -195,7 +182,7 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
     return 1;
 
  memerr:
-    ASN1err(ASN1_F_ASN1_ITEM_EX_COMBINE_NEW, ERR_R_MALLOC_FAILURE);
+    ASN1err(ASN1_F_ASN1_ITEM_EX_NEW, ERR_R_MALLOC_FAILURE);
 #ifdef CRYPTO_MDEBUG
     if (it->sname)
         CRYPTO_pop_info();
@@ -203,7 +190,7 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
     return 0;
 
  auxerr:
-    ASN1err(ASN1_F_ASN1_ITEM_EX_COMBINE_NEW, ASN1_R_AUX_ERROR);
+    ASN1err(ASN1_F_ASN1_ITEM_EX_NEW, ASN1_R_AUX_ERROR);
     ASN1_item_ex_free(pval, it);
 #ifdef CRYPTO_MDEBUG
     if (it->sname)
@@ -278,7 +265,7 @@ static int asn1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
         goto done;
     }
     /* Otherwise pass it back to the item routine */
-    ret = asn1_item_ex_combine_new(pval, it, tt->flags & ASN1_TFLG_COMBINE);
+    ret = ASN1_item_ex_new(pval, it);
  done:
 #ifdef CRYPTO_MDEBUG
     if (it->sname)
diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c
index da7b029..17318ea 100644
--- a/crypto/asn1/tasn_utl.c
+++ b/crypto/asn1/tasn_utl.c
@@ -202,8 +202,6 @@ int asn1_enc_restore(int *len, unsigned char **out, ASN1_VALUE **pval,
 ASN1_VALUE **asn1_get_field_ptr(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
 {
     ASN1_VALUE **pvaltmp;
-    if (tt->flags & ASN1_TFLG_COMBINE)
-        return pval;
     pvaltmp = offset2ptr(*pval, tt->offset);
     /*
      * NOTE for BOOLEAN types the field is just a plain int so we can't
diff --git a/crypto/dsa/dsa.h b/crypto/dsa/dsa.h
index 949360f..8fd5596 100644
--- a/crypto/dsa/dsa.h
+++ b/crypto/dsa/dsa.h
@@ -160,7 +160,6 @@ struct dsa_st {
      */
     int pad;
     long version;
-    int write_params;
     BIGNUM *p;
     BIGNUM *q;                  /* == 20 */
     BIGNUM *g;
diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index 96d5c5a..65e07fd 100644
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -132,6 +132,7 @@ static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     unsigned char *penc = NULL;
     int penclen;
     ASN1_STRING *str = NULL;
+    ASN1_INTEGER *pubint = NULL;
 
     dsa = pkey->pkey.dsa;
     if (pkey->save_parameters && dsa->p && dsa->q && dsa->g) {
@@ -149,9 +150,15 @@ static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     } else
         ptype = V_ASN1_UNDEF;
 
-    dsa->write_params = 0;
+    pubint = BN_to_ASN1_INTEGER(dsa->pub_key, NULL);
 
-    penclen = i2d_DSAPublicKey(dsa, &penc);
+    if (pubint == NULL) {
+        DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
+
+    penclen = i2d_ASN1_INTEGER(pubint, &penc);
+    ASN1_INTEGER_free(pubint);
 
     if (penclen <= 0) {
         DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
diff --git a/crypto/dsa/dsa_asn1.c b/crypto/dsa/dsa_asn1.c
index 08ed52b..e7f80a8 100644
--- a/crypto/dsa/dsa_asn1.c
+++ b/crypto/dsa/dsa_asn1.c
@@ -132,17 +132,12 @@ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DSA, DSAparams, DSAparams)
  * key as an INTEGER or the parameters and public key in a SEQUENCE
  */
 
-ASN1_SEQUENCE(dsa_pub_internal) = {
+ASN1_SEQUENCE(DSAPublicKey) = {
         ASN1_SIMPLE(DSA, pub_key, BIGNUM),
         ASN1_SIMPLE(DSA, p, BIGNUM),
         ASN1_SIMPLE(DSA, q, BIGNUM),
         ASN1_SIMPLE(DSA, g, BIGNUM)
-} ASN1_SEQUENCE_END_name(DSA, dsa_pub_internal)
-
-ASN1_CHOICE_cb(DSAPublicKey, dsa_cb) = {
-        ASN1_SIMPLE(DSA, pub_key, BIGNUM),
-        ASN1_EX_COMBINE(0, 0, dsa_pub_internal)
-} ASN1_CHOICE_END_cb(DSA, DSAPublicKey, write_params)
+} ASN1_SEQUENCE_END_name(DSA, DSAPublicKey)
 
 IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DSA, DSAPublicKey, DSAPublicKey)
 
diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index bfd9106..c94be9d 100644
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -146,7 +146,6 @@ DSA *DSA_new_method(ENGINE *engine)
 
     ret->pad = 0;
     ret->version = 0;
-    ret->write_params = 1;
     ret->p = NULL;
     ret->q = NULL;
     ret->g = NULL;

From steve at openssl.org  Sat Mar 28 14:15:23 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sat, 28 Mar 2015 14:15:23 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427552123.111644.26453.nullmailer@dev.openssl.org>

The branch master has been updated
       via  23dc1706e8727642ee7bc3dc985a3068a524e3bd (commit)
      from  ee9d76371ae8ea433c19162c2e1522dcd188e556 (commit)


- Log -----------------------------------------------------------------
commit 23dc1706e8727642ee7bc3dc985a3068a524e3bd
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Mar 28 12:08:48 2015 +0000

    Make asn1_ex_i2c, asn1_ex_c2i static.
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

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

Summary of changes:
 crypto/asn1/asn1_locl.h | 5 -----
 crypto/asn1/tasn_dec.c  | 6 ++++--
 crypto/asn1/tasn_enc.c  | 6 ++++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/crypto/asn1/asn1_locl.h b/crypto/asn1/asn1_locl.h
index aa10bea..491a736 100644
--- a/crypto/asn1/asn1_locl.h
+++ b/crypto/asn1/asn1_locl.h
@@ -105,11 +105,6 @@ struct x509_crl_method_st {
     int (*crl_verify) (X509_CRL *crl, EVP_PKEY *pk);
 };
 
-int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
-                const ASN1_ITEM *it);
-int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
-                int utype, char *free_cont, const ASN1_ITEM *it);
-
 int asn1_get_choice_selector(ASN1_VALUE **pval, const ASN1_ITEM *it);
 int asn1_set_choice_selector(ASN1_VALUE **pval, int value,
                              const ASN1_ITEM *it);
diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index 531fad9..ef19fcd 100644
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -92,6 +92,8 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
                                  const ASN1_ITEM *it,
                                  int tag, int aclass, char opt,
                                  ASN1_TLC *ctx);
+static int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
+                       int utype, char *free_cont, const ASN1_ITEM *it);
 
 /* Table to convert tags to bit values, used for MSTRING type */
 static const unsigned long tag2bit[32] = {
@@ -770,8 +772,8 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
 
 /* Translate ASN1 content octets into a structure */
 
-int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
-                int utype, char *free_cont, const ASN1_ITEM *it)
+static int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
+                       int utype, char *free_cont, const ASN1_ITEM *it)
 {
     ASN1_VALUE **opval = NULL;
     ASN1_STRING *stmp;
diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c
index d758861..74f3eda 100644
--- a/crypto/asn1/tasn_enc.c
+++ b/crypto/asn1/tasn_enc.c
@@ -75,6 +75,8 @@ static int asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                                 const ASN1_TEMPLATE *tt, int tag, int aclass);
 static int asn1_item_flags_i2d(ASN1_VALUE *val, unsigned char **out,
                                const ASN1_ITEM *it, int flags);
+static int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype,
+                       const ASN1_ITEM *it);
 
 /*
  * Top level i2d equivalents: the 'ndef' variant instructs the encoder to use
@@ -517,8 +519,8 @@ static int asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out,
 
 /* Produce content octets from a structure */
 
-int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype,
-                const ASN1_ITEM *it)
+static int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype,
+                       const ASN1_ITEM *it)
 {
     ASN1_BOOLEAN *tbool = NULL;
     ASN1_STRING *strtmp;

From appro at openssl.org  Sat Mar 28 14:37:03 2015
From: appro at openssl.org (Andy Polyakov)
Date: Sat, 28 Mar 2015 14:37:03 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427553423.842913.30186.nullmailer@dev.openssl.org>

The branch master has been updated
       via  1818572d8395743704d917d91c3b909dd0a973d6 (commit)
      from  23dc1706e8727642ee7bc3dc985a3068a524e3bd (commit)


- Log -----------------------------------------------------------------
commit 1818572d8395743704d917d91c3b909dd0a973d6
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Mar 18 16:56:38 2015 +0100

    Configure: remove unused variables.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 Configurations/10-main.conf | 11 +++++++++--
 Configure                   | 31 -------------------------------
 2 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 9d38554..7cd109c 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -760,13 +760,20 @@
         perlasm_scheme   => "o32",
     },
 
-#### *BSD [do see comment about ${BSDthreads} in Configure!]
+#### *BSD
     "BSD-generic32" => {
+        # As for thread_cflag. Idea is to maintain "collective" set of
+        # flags, which would cover all BSD flavors. -pthread applies
+        # to them all, but is treated differently. OpenBSD expands is
+        # as -D_POSIX_THREAD -lc_r, which is sufficient. FreeBSD 4.x
+        # expands it as -lc_r, which has to be accompanied by explicit
+        # -D_THREAD_SAFE and sometimes -D_REENTRANT. FreeBSD 5.x
+        # expands it as -lc_r, which seems to be sufficient?
         cc               => "gcc",
         cflags           => "-Wall",
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3",
-        thread_cflag     => "${BSDthreads}",
+        thread_cflag     => "-pthread -D_THREAD_SAFE -D_REENTRANT",
         bn_ops           => "BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL",
         dso_scheme       => "dlfcn",
         shared_target    => "bsd-gcc-shared",
diff --git a/Configure b/Configure
index 5993f9b..a35bafd 100755
--- a/Configure
+++ b/Configure
@@ -121,42 +121,11 @@ my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
 # MD2_CHAR slags pentium pros
 my $x86_gcc_opts="RC4_INDEX MD2_INT";
 
-# MODIFY THESE PARAMETERS IF YOU ARE GOING TO USE THE 'util/speed.sh SCRIPT
-# Don't worry about these normally
-
-my $tcc="cc";
-my $tflags="-fast -Xa";
-my $tbn_mul="";
-my $tlib="-lnsl -lsocket";
 #$bits1="SIXTEEN_BIT ";
 #$bits2="THIRTY_TWO_BIT ";
 my $bits1="THIRTY_TWO_BIT ";
 my $bits2="SIXTY_FOUR_BIT ";
 
-my $x86_asm="x86cpuid.o:bn-586.o co-586.o x86-mont.o x86-gf2m.o:ecp_nistz256.o ecp_nistz256-x86.o:des-586.o crypt586.o:aes-586.o vpaes-x86.o aesni-x86.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o:cmll-x86.o:ghash-x86.o:e_padlock-x86.o";
-my $x86_asm_nocast=$x86_asm;$x86_asm_nocast=~s/cast\-586\.o//;
-
-my $x86_elf_asm="$x86_asm:elf";
-my $android_x86_elf_asm="$x86_asm:android";
-
-my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o:ecp_nistz256.o ecp_nistz256-x86_64.o::aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o::rc4-x86_64.o rc4-md5-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:ghash-x86_64.o aesni-gcm-x86_64.o:e_padlock-x86_64.o";
-my $win_x86_64_asm=$x86_asm;$win_x86_64_asm=~s/x86_64-gcc\.o/bn_asm.o/;
-my $ia64_asm="ia64cpuid.o:bn-ia64.o ia64-mont.o:::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o:::::ghash-ia64.o::void";
-my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o::des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o:aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o::md5-sparcv9.o:sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o::::::camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o:ghash-sparcv9.o::void";
-my $sparcv8_asm=":sparcv8.o::des_enc-sparc.o fcrypt_b.o:::::::::::::void";
-my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o::::::sha1-alpha.o:::::::ghash-alpha.o::void";
-my $mips64_asm=":bn-mips.o mips-mont.o:::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o sha512-mips.o::::::::";
-my $mips32_asm=$mips64_asm; $mips32_asm =~ s/\s*sha512\-mips\.o//;
-my $s390x_asm="s390xcap.o s390xcpuid.o:bn-s390x.o s390x-mont.o s390x-gf2m.o:::aes-s390x.o aes-ctr.o aes-xts.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::rc4-s390x.o:::::ghash-s390x.o:";
-my $s390x_32_asm=$s390x_asm;$s390x_32_asm=~s/bn\-s390x\.o/bn_asm.o/;
-my $armv4_asm="armcap.o armv4cpuid.o:bn_asm.o armv4-mont.o armv4-gf2m.o:ecp_nistz256.o ecp_nistz256-armv4.o::aes_cbc.o aes-armv4.o bsaes-armv7.o aesv8-armx.o:::sha1-armv4-large.o sha256-armv4.o sha512-armv4.o:::::::ghash-armv4.o ghashv8-armx.o::void";
-my $aarch64_asm="armcap.o arm64cpuid.o mem_clr.o::::aes_core.o aes_cbc.o aesv8-armx.o:::sha1-armv8.o sha256-armv8.o sha512-armv8.o:::::::ghashv8-armx.o:";
-my $parisc11_asm="pariscid.o:bn_asm.o parisc-mont.o:::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o::32";
-my $parisc20_64_asm="pariscid.o:pa-risc2W.o parisc-mont.o:::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o::64";
-my $parisc20_32_asm=$parisc20_64_asm;$parisc20_32_asm=~s/2W\./2\./;$parisc20_32_asm=~s/:64/:32/;
-my $ppc64_asm="ppccpuid.o ppccap.o:bn-ppc.o ppc-mont.o ppc64-mont.o:::aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o:::sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o:::::::ghashp8-ppc.o:";
-my $ppc32_asm=$ppc64_asm;
-
 # As for $BSDthreads. Idea is to maintain "collective" set of flags,
 # which would cover all BSD flavors. -pthread applies to them all,
 # but is treated differently. OpenBSD expands is as -D_POSIX_THREAD

From appro at openssl.org  Sat Mar 28 14:43:22 2015
From: appro at openssl.org (Andy Polyakov)
Date: Sat, 28 Mar 2015 14:43:22 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427553802.540328.31876.nullmailer@dev.openssl.org>

The branch master has been updated
       via  33b188a8e82df57208ec8263c263f8b6f47e8255 (commit)
       via  2779c08436e3935835118faa38892b6e755d732d (commit)
      from  1818572d8395743704d917d91c3b909dd0a973d6 (commit)


- Log -----------------------------------------------------------------
commit 33b188a8e82df57208ec8263c263f8b6f47e8255
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Mar 18 16:48:03 2015 +0100

    Engage vpaes-armv8 module.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 2779c08436e3935835118faa38892b6e755d732d
Author: Andy Polyakov <appro at openssl.org>
Date:   Tue Mar 17 09:57:27 2015 +0100

    Add vpaes-amrv8.pl module.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 Configure                     |    2 +-
 crypto/aes/Makefile           |    3 +
 crypto/aes/asm/vpaes-armv8.pl | 1248 +++++++++++++++++++++++++++++++++++++++++
 crypto/evp/e_aes.c            |    3 +
 4 files changed, 1255 insertions(+), 1 deletion(-)
 create mode 100755 crypto/aes/asm/vpaes-armv8.pl

diff --git a/Configure b/Configure
index a35bafd..ba8cd96 100755
--- a/Configure
+++ b/Configure
@@ -425,7 +425,7 @@ my %table=(
     aarch64_asm => {
 	template	=> 1,
 	cpuid_obj       => "armcap.o arm64cpuid.o mem_clr.o",
-	aes_obj         => "aes_core.o aes_cbc.o aesv8-armx.o",
+	aes_obj         => "aes_core.o aes_cbc.o aesv8-armx.o vpaes-armv8.o",
 	sha1_obj        => "sha1-armv8.o sha256-armv8.o sha512-armv8.o",
 	modes_obj       => "ghashv8-armx.o",
     },
diff --git a/crypto/aes/Makefile b/crypto/aes/Makefile
index 72fe789..2defcb1 100644
--- a/crypto/aes/Makefile
+++ b/crypto/aes/Makefile
@@ -91,6 +91,9 @@ aes-mips.S:	asm/aes-mips.pl
 aesv8-armx.S:	asm/aesv8-armx.pl
 	$(PERL) asm/aesv8-armx.pl $(PERLASM_SCHEME) $@
 aesv8-armx.o:	aesv8-armx.S
+vpaes-armv8.S:	asm/vpaes-armv8.pl
+	$(PERL) asm/vpaes-armv8.pl $(PERLASM_SCHEME) $@
+vpaes-armv8.o:	vpaes-armv8.S
 
 # GNU make "catch all"
 aes-%.S:	asm/aes-%.pl;	$(PERL) $< $(PERLASM_SCHEME) $@
diff --git a/crypto/aes/asm/vpaes-armv8.pl b/crypto/aes/asm/vpaes-armv8.pl
new file mode 100755
index 0000000..1144536
--- /dev/null
+++ b/crypto/aes/asm/vpaes-armv8.pl
@@ -0,0 +1,1248 @@
+#!/usr/bin/env perl
+
+######################################################################
+## Constant-time SSSE3 AES core implementation.
+## version 0.1
+##
+## By Mike Hamburg (Stanford University), 2009
+## Public domain.
+##
+## For details see http://shiftleft.org/papers/vector_aes/ and
+## http://crypto.stanford.edu/vpaes/.
+##
+######################################################################
+# ARMv8 NEON adaptation by <appro at openssl.org>
+#
+# Reason for undertaken effort is that there is at least one popular
+# SoC based on Cortex-A53 that doesn't have crypto extensions.
+#
+#                   CBC enc     ECB enc/dec(*)   [bit-sliced enc/dec]
+# Cortex-A53        21.5        18.1/20.6        [17.5/19.8         ]
+# Cortex-A57        36.0(**)    20.4/24.9(**)    [14.4/16.6         ]
+# X-Gene            45.9(**)    45.8/57.7(**)    [33.1/37.6(**)     ]
+#
+# (*)	ECB denotes approximate result for parallelizeable modes
+#	such as CBC decrypt, CTR, etc.;
+# (**)	these results are worse than scalar compiler-generated
+#	code, but it's constant-time and therefore preferred;
+
+$flavour = shift;
+while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {}
+
+$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
+( $xlate="${dir}arm-xlate.pl" and -f $xlate ) or
+( $xlate="${dir}../../perlasm/arm-xlate.pl" and -f $xlate) or
+die "can't locate arm-xlate.pl";
+
+open OUT,"| \"$^X\" $xlate $flavour $output";
+*STDOUT=*OUT;
+
+$code.=<<___;
+.text
+
+.type	_vpaes_consts,%object
+.align	7	// totally strategic alignment
+_vpaes_consts:
+.Lk_mc_forward:	// mc_forward
+	.quad	0x0407060500030201, 0x0C0F0E0D080B0A09
+	.quad	0x080B0A0904070605, 0x000302010C0F0E0D
+	.quad	0x0C0F0E0D080B0A09, 0x0407060500030201
+	.quad	0x000302010C0F0E0D, 0x080B0A0904070605
+.Lk_mc_backward:// mc_backward
+	.quad	0x0605040702010003, 0x0E0D0C0F0A09080B
+	.quad	0x020100030E0D0C0F, 0x0A09080B06050407
+	.quad	0x0E0D0C0F0A09080B, 0x0605040702010003
+	.quad	0x0A09080B06050407, 0x020100030E0D0C0F
+.Lk_sr:		// sr
+	.quad	0x0706050403020100, 0x0F0E0D0C0B0A0908
+	.quad	0x030E09040F0A0500, 0x0B06010C07020D08
+	.quad	0x0F060D040B020900, 0x070E050C030A0108
+	.quad	0x0B0E0104070A0D00, 0x0306090C0F020508
+
+//
+// "Hot" constants
+//
+.Lk_inv:	// inv, inva
+	.quad	0x0E05060F0D080180, 0x040703090A0B0C02
+	.quad	0x01040A060F0B0780, 0x030D0E0C02050809
+.Lk_ipt:	// input transform (lo, hi)
+	.quad	0xC2B2E8985A2A7000, 0xCABAE09052227808
+	.quad	0x4C01307D317C4D00, 0xCD80B1FCB0FDCC81
+.Lk_sbo:	// sbou, sbot
+	.quad	0xD0D26D176FBDC700, 0x15AABF7AC502A878
+	.quad	0xCFE474A55FBB6A00, 0x8E1E90D1412B35FA
+.Lk_sb1:	// sb1u, sb1t
+	.quad	0x3618D415FAE22300, 0x3BF7CCC10D2ED9EF
+	.quad	0xB19BE18FCB503E00, 0xA5DF7A6E142AF544
+.Lk_sb2:	// sb2u, sb2t
+	.quad	0x69EB88400AE12900, 0xC2A163C8AB82234A
+	.quad	0xE27A93C60B712400, 0x5EB7E955BC982FCD
+
+//
+//  Decryption stuff
+//
+.Lk_dipt:	// decryption input transform
+	.quad	0x0F505B040B545F00, 0x154A411E114E451A
+	.quad	0x86E383E660056500, 0x12771772F491F194
+.Lk_dsbo:	// decryption sbox final output
+	.quad	0x1387EA537EF94000, 0xC7AA6DB9D4943E2D
+	.quad	0x12D7560F93441D00, 0xCA4B8159D8C58E9C
+.Lk_dsb9:	// decryption sbox output *9*u, *9*t
+	.quad	0x851C03539A86D600, 0xCAD51F504F994CC9
+	.quad	0xC03B1789ECD74900, 0x725E2C9EB2FBA565
+.Lk_dsbd:	// decryption sbox output *D*u, *D*t
+	.quad	0x7D57CCDFE6B1A200, 0xF56E9B13882A4439
+	.quad	0x3CE2FAF724C6CB00, 0x2931180D15DEEFD3
+.Lk_dsbb:	// decryption sbox output *B*u, *B*t
+	.quad	0xD022649296B44200, 0x602646F6B0F2D404
+	.quad	0xC19498A6CD596700, 0xF3FF0C3E3255AA6B
+.Lk_dsbe:	// decryption sbox output *E*u, *E*t
+	.quad	0x46F2929626D4D000, 0x2242600464B4F6B0
+	.quad	0x0C55A6CDFFAAC100, 0x9467F36B98593E32
+
+//
+//  Key schedule constants
+//
+.Lk_dksd:	// decryption key schedule: invskew x*D
+	.quad	0xFEB91A5DA3E44700, 0x0740E3A45A1DBEF9
+	.quad	0x41C277F4B5368300, 0x5FDC69EAAB289D1E
+.Lk_dksb:	// decryption key schedule: invskew x*B
+	.quad	0x9A4FCA1F8550D500, 0x03D653861CC94C99
+	.quad	0x115BEDA7B6FC4A00, 0xD993256F7E3482C8
+.Lk_dkse:	// decryption key schedule: invskew x*E + 0x63
+	.quad	0xD5031CCA1FC9D600, 0x53859A4C994F5086
+	.quad	0xA23196054FDC7BE8, 0xCD5EF96A20B31487
+.Lk_dks9:	// decryption key schedule: invskew x*9
+	.quad	0xB6116FC87ED9A700, 0x4AED933482255BFC
+	.quad	0x4576516227143300, 0x8BB89FACE9DAFDCE
+
+.Lk_rcon:	// rcon
+	.quad	0x1F8391B9AF9DEEB6, 0x702A98084D7C7D81
+
+.Lk_opt:	// output transform
+	.quad	0xFF9F4929D6B66000, 0xF7974121DEBE6808
+	.quad	0x01EDBD5150BCEC00, 0xE10D5DB1B05C0CE0
+.Lk_deskew:	// deskew tables: inverts the sbox's "skew"
+	.quad	0x07E4A34047A4E300, 0x1DFEB95A5DBEF91A
+	.quad	0x5F36B5DC83EA6900, 0x2841C2ABF49D1E77
+
+.asciz  "Vector Permutaion AES for ARMv8, Mike Hamburg (Stanford University)"
+.size	_vpaes_consts,.-_vpaes_consts
+.align	6
+___
+

+{
+my ($inp,$out,$key) = map("x$_",(0..2));
+
+my ($invlo,$invhi,$iptlo,$ipthi,$sbou,$sbot) = map("v$_.16b",(18..23));
+my ($sb1u,$sb1t,$sb2u,$sb2t) = map("v$_.16b",(24..27));
+my ($sb9u,$sb9t,$sbdu,$sbdt,$sbbu,$sbbt,$sbeu,$sbet)=map("v$_.16b",(24..31));
+
+$code.=<<___;
+##
+##  _aes_preheat
+##
+##  Fills register %r10 -> .aes_consts (so you can -fPIC)
+##  and %xmm9-%xmm15 as specified below.
+##
+.type	_vpaes_encrypt_preheat,%function
+.align	4
+_vpaes_encrypt_preheat:
+	adr	x10, .Lk_inv
+	movi	v17.16b, #0x0f
+	ld1	{v18.2d-v19.2d}, [x10],#32	// .Lk_inv
+	ld1	{v20.2d-v23.2d}, [x10],#64	// .Lk_ipt, .Lk_sbo
+	ld1	{v24.2d-v27.2d}, [x10]		// .Lk_sb1, .Lk_sb2
+	ret
+.size	_vpaes_encrypt_preheat,.-_vpaes_encrypt_preheat
+
+##
+##  _aes_encrypt_core
+##
+##  AES-encrypt %xmm0.
+##
+##  Inputs:
+##     %xmm0 = input
+##     %xmm9-%xmm15 as in _vpaes_preheat
+##    (%rdx) = scheduled keys
+##
+##  Output in %xmm0
+##  Clobbers  %xmm1-%xmm5, %r9, %r10, %r11, %rax
+##  Preserves %xmm6 - %xmm8 so you get some local vectors
+##
+##
+.type	_vpaes_encrypt_core,%function
+.align 4
+_vpaes_encrypt_core:
+	mov	x9, $key
+	ldr	w8, [$key,#240]			// pull rounds
+	adr	x11, .Lk_mc_forward+16
+						// vmovdqa	.Lk_ipt(%rip),	%xmm2	# iptlo
+	ld1	{v16.2d}, [x9], #16		// vmovdqu	(%r9),	%xmm5		# round0 key
+	and	v1.16b, v7.16b, v17.16b		// vpand	%xmm9,	%xmm0,	%xmm1
+	ushr	v0.16b, v7.16b, #4		// vpsrlb	\$4,	%xmm0,	%xmm0
+	tbl	v1.16b, {$iptlo}, v1.16b	// vpshufb	%xmm1,	%xmm2,	%xmm1
+						// vmovdqa	.Lk_ipt+16(%rip), %xmm3	# ipthi
+	tbl	v2.16b, {$ipthi}, v0.16b	// vpshufb	%xmm0,	%xmm3,	%xmm2
+	eor	v0.16b, v1.16b, v16.16b		// vpxor	%xmm5,	%xmm1,	%xmm0
+	eor	v0.16b, v0.16b, v2.16b		// vpxor	%xmm2,	%xmm0,	%xmm0
+	b	.Lenc_entry
+
+.align 4
+.Lenc_loop:
+	// middle of middle round
+	add	x10, x11, #0x40
+	tbl	v4.16b, {$sb1t}, v2.16b		// vpshufb	%xmm2,	%xmm13,	%xmm4	# 4 = sb1u
+	ld1	{v1.2d}, [x11], #16		// vmovdqa	-0x40(%r11,%r10), %xmm1	# .Lk_mc_forward[]
+	tbl	v0.16b, {$sb1u}, v3.16b		// vpshufb	%xmm3,	%xmm12,	%xmm0	# 0 = sb1t
+	eor	v4.16b, v4.16b, v16.16b		// vpxor	%xmm5,	%xmm4,	%xmm4	# 4 = sb1u + k
+	tbl	v5.16b,	{$sb2t}, v2.16b		// vpshufb	%xmm2,	%xmm15,	%xmm5	# 4 = sb2u
+	eor	v0.16b, v0.16b, v4.16b		// vpxor	%xmm4,	%xmm0,	%xmm0	# 0 = A
+	tbl	v2.16b, {$sb2u}, v3.16b		// vpshufb	%xmm3,	%xmm14,	%xmm2	# 2 = sb2t
+	ld1	{v4.2d}, [x10]			// vmovdqa	(%r11,%r10), %xmm4	# .Lk_mc_backward[]
+	tbl	v3.16b, {v0.16b}, v1.16b	// vpshufb	%xmm1,	%xmm0,	%xmm3	# 0 = B
+	eor	v2.16b, v2.16b, v5.16b		// vpxor	%xmm5,	%xmm2,	%xmm2	# 2 = 2A
+	tbl	v0.16b, {v0.16b}, v4.16b	// vpshufb	%xmm4,	%xmm0,	%xmm0	# 3 = D
+	eor	v3.16b, v3.16b, v2.16b		// vpxor	%xmm2,	%xmm3,	%xmm3	# 0 = 2A+B
+	tbl	v4.16b, {v3.16b}, v1.16b	// vpshufb	%xmm1,	%xmm3,	%xmm4	# 0 = 2B+C
+	eor	v0.16b, v0.16b, v3.16b		// vpxor	%xmm3,	%xmm0,	%xmm0	# 3 = 2A+B+D
+	bic	x11, x11, #1<<6			// and		\$0x30,	%r11		# ... mod 4
+	eor	v0.16b, v0.16b, v4.16b		// vpxor	%xmm4,	%xmm0, %xmm0	# 0 = 2A+3B+C+D
+	sub	w8, w8, #1			// nr--
+
+.Lenc_entry:
+	// top of round
+	and	v1.16b, v0.16b, v17.16b		// vpand	%xmm0,	%xmm9,	%xmm1   # 0 = k
+	ushr	v0.16b, v0.16b, #4		// vpsrlb	\$4,	%xmm0,	%xmm0	# 1 = i
+	tbl	v5.16b, {$invhi}, v1.16b	// vpshufb	%xmm1,	%xmm11,	%xmm5	# 2 = a/k
+	eor	v1.16b, v1.16b, v0.16b		// vpxor	%xmm0,	%xmm1,	%xmm1	# 0 = j
+	tbl	v3.16b, {$invlo}, v0.16b	// vpshufb	%xmm0, 	%xmm10,	%xmm3  	# 3 = 1/i
+	tbl	v4.16b, {$invlo}, v1.16b	// vpshufb	%xmm1, 	%xmm10,	%xmm4  	# 4 = 1/j
+	eor	v3.16b, v3.16b, v5.16b		// vpxor	%xmm5,	%xmm3,	%xmm3	# 3 = iak = 1/i + a/k
+	eor	v4.16b, v4.16b, v5.16b		// vpxor	%xmm5,	%xmm4,	%xmm4  	# 4 = jak = 1/j + a/k
+	tbl	v2.16b, {$invlo}, v3.16b	// vpshufb	%xmm3,	%xmm10,	%xmm2  	# 2 = 1/iak
+	tbl	v3.16b, {$invlo}, v4.16b	// vpshufb	%xmm4,	%xmm10,	%xmm3	# 3 = 1/jak
+	eor	v2.16b, v2.16b, v1.16b		// vpxor	%xmm1,	%xmm2,	%xmm2  	# 2 = io
+	eor	v3.16b, v3.16b, v0.16b		// vpxor	%xmm0,	%xmm3,	%xmm3	# 3 = jo
+	ld1	{v16.2d}, [x9],#16		// vmovdqu	(%r9),	%xmm5
+	cbnz	w8, .Lenc_loop
+
+	// middle of last round
+	add	x10, x11, #0x80
+						// vmovdqa	-0x60(%r10), %xmm4	# 3 : sbou	.Lk_sbo
+						// vmovdqa	-0x50(%r10), %xmm0	# 0 : sbot	.Lk_sbo+16
+	tbl	v4.16b, {$sbou}, v2.16b		// vpshufb	%xmm2,	%xmm4,	%xmm4	# 4 = sbou
+	ld1	{v1.2d}, [x10]			// vmovdqa	0x40(%r11,%r10), %xmm1	# .Lk_sr[]
+	tbl	v0.16b, {$sbot}, v3.16b		// vpshufb	%xmm3,	%xmm0,	%xmm0	# 0 = sb1t
+	eor	v4.16b, v4.16b, v16.16b		// vpxor	%xmm5,	%xmm4,	%xmm4	# 4 = sb1u + k
+	eor	v0.16b, v0.16b, v4.16b		// vpxor	%xmm4,	%xmm0,	%xmm0	# 0 = A
+	tbl	v0.16b, {v0.16b}, v1.16b	// vpshufb	%xmm1,	%xmm0,	%xmm0
+	ret
+.size	_vpaes_encrypt_core,.-_vpaes_encrypt_core
+
+.globl	vpaes_encrypt
+.type	vpaes_encrypt,%function
+.align	4
+vpaes_encrypt:
+	stp	x29,x30,[sp,#-16]!
+	add	x29,sp,#0
+
+	ld1	{v7.16b}, [$inp]
+	bl	_vpaes_encrypt_preheat
+	bl	_vpaes_encrypt_core
+	st1	{v0.16b}, [$out]
+
+	ldp	x29,x30,[sp],#16
+	ret
+.size	vpaes_encrypt,.-vpaes_encrypt
+
+.type	_vpaes_encrypt_2x,%function
+.align 4
+_vpaes_encrypt_2x:
+	mov	x9, $key
+	ldr	w8, [$key,#240]			// pull rounds
+	adr	x11, .Lk_mc_forward+16
+						// vmovdqa	.Lk_ipt(%rip),	%xmm2	# iptlo
+	ld1	{v16.2d}, [x9], #16		// vmovdqu	(%r9),	%xmm5		# round0 key
+	and	v1.16b,  v14.16b,  v17.16b	// vpand	%xmm9,	%xmm0,	%xmm1
+	ushr	v0.16b,  v14.16b,  #4		// vpsrlb	\$4,	%xmm0,	%xmm0
+	 and	v9.16b,  v15.16b,  v17.16b
+	 ushr	v8.16b,  v15.16b,  #4
+	tbl	v1.16b,  {$iptlo}, v1.16b	// vpshufb	%xmm1,	%xmm2,	%xmm1
+	 tbl	v9.16b,  {$iptlo}, v9.16b
+						// vmovdqa	.Lk_ipt+16(%rip), %xmm3	# ipthi
+	tbl	v2.16b,  {$ipthi}, v0.16b	// vpshufb	%xmm0,	%xmm3,	%xmm2
+	 tbl	v10.16b, {$ipthi}, v8.16b
+	eor	v0.16b,  v1.16b,   v16.16b	// vpxor	%xmm5,	%xmm1,	%xmm0
+	 eor	v8.16b,  v9.16b,   v16.16b
+	eor	v0.16b,  v0.16b,   v2.16b	// vpxor	%xmm2,	%xmm0,	%xmm0
+	 eor	v8.16b,  v8.16b,   v10.16b
+	b	.Lenc_2x_entry
+
+.align 4
+.Lenc_2x_loop:
+	// middle of middle round
+	add	x10, x11, #0x40
+	tbl	v4.16b,  {$sb1t}, v2.16b	// vpshufb	%xmm2,	%xmm13,	%xmm4	# 4 = sb1u
+	 tbl	v12.16b, {$sb1t}, v10.16b
+	ld1	{v1.2d}, [x11], #16		// vmovdqa	-0x40(%r11,%r10), %xmm1	# .Lk_mc_forward[]
+	tbl	v0.16b,  {$sb1u}, v3.16b	// vpshufb	%xmm3,	%xmm12,	%xmm0	# 0 = sb1t
+	 tbl	v8.16b,  {$sb1u}, v11.16b
+	eor	v4.16b,  v4.16b,  v16.16b	// vpxor	%xmm5,	%xmm4,	%xmm4	# 4 = sb1u + k
+	 eor	v12.16b, v12.16b, v16.16b
+	tbl	v5.16b,	 {$sb2t}, v2.16b	// vpshufb	%xmm2,	%xmm15,	%xmm5	# 4 = sb2u
+	 tbl	v13.16b, {$sb2t}, v10.16b
+	eor	v0.16b,  v0.16b,  v4.16b	// vpxor	%xmm4,	%xmm0,	%xmm0	# 0 = A
+	 eor	v8.16b,  v8.16b,  v12.16b
+	tbl	v2.16b,  {$sb2u}, v3.16b	// vpshufb	%xmm3,	%xmm14,	%xmm2	# 2 = sb2t
+	 tbl	v10.16b, {$sb2u}, v11.16b
+	ld1	{v4.2d}, [x10]			// vmovdqa	(%r11,%r10), %xmm4	# .Lk_mc_backward[]
+	tbl	v3.16b,  {v0.16b}, v1.16b	// vpshufb	%xmm1,	%xmm0,	%xmm3	# 0 = B
+	 tbl	v11.16b, {v8.16b}, v1.16b
+	eor	v2.16b,  v2.16b,  v5.16b	// vpxor	%xmm5,	%xmm2,	%xmm2	# 2 = 2A
+	 eor	v10.16b, v10.16b, v13.16b
+	tbl	v0.16b,  {v0.16b}, v4.16b	// vpshufb	%xmm4,	%xmm0,	%xmm0	# 3 = D
+	 tbl	v8.16b,  {v8.16b}, v4.16b
+	eor	v3.16b,  v3.16b,  v2.16b	// vpxor	%xmm2,	%xmm3,	%xmm3	# 0 = 2A+B
+	 eor	v11.16b, v11.16b, v10.16b
+	tbl	v4.16b,  {v3.16b}, v1.16b	// vpshufb	%xmm1,	%xmm3,	%xmm4	# 0 = 2B+C
+	 tbl	v12.16b, {v11.16b},v1.16b
+	eor	v0.16b,  v0.16b,  v3.16b	// vpxor	%xmm3,	%xmm0,	%xmm0	# 3 = 2A+B+D
+	 eor	v8.16b,  v8.16b,  v11.16b
+	bic	x11, x11, #1<<6			// and		\$0x30,	%r11		# ... mod 4
+	eor	v0.16b,  v0.16b,  v4.16b	// vpxor	%xmm4,	%xmm0, %xmm0	# 0 = 2A+3B+C+D
+	 eor	v8.16b,  v8.16b,  v12.16b
+	sub	w8, w8, #1			// nr--
+
+.Lenc_2x_entry:
+	// top of round
+	and	v1.16b,  v0.16b, v17.16b	// vpand	%xmm0,	%xmm9,	%xmm1   # 0 = k
+	ushr	v0.16b,  v0.16b, #4		// vpsrlb	\$4,	%xmm0,	%xmm0	# 1 = i
+	 and	v9.16b,  v8.16b, v17.16b
+	 ushr	v8.16b,  v8.16b, #4
+	tbl	v5.16b,  {$invhi},v1.16b	// vpshufb	%xmm1,	%xmm11,	%xmm5	# 2 = a/k
+	 tbl	v13.16b, {$invhi},v9.16b
+	eor	v1.16b,  v1.16b,  v0.16b	// vpxor	%xmm0,	%xmm1,	%xmm1	# 0 = j
+	 eor	v9.16b,  v9.16b,  v8.16b
+	tbl	v3.16b,  {$invlo},v0.16b	// vpshufb	%xmm0, 	%xmm10,	%xmm3  	# 3 = 1/i
+	 tbl	v11.16b, {$invlo},v8.16b
+	tbl	v4.16b,  {$invlo},v1.16b	// vpshufb	%xmm1, 	%xmm10,	%xmm4  	# 4 = 1/j
+	 tbl	v12.16b, {$invlo},v9.16b
+	eor	v3.16b,  v3.16b,  v5.16b	// vpxor	%xmm5,	%xmm3,	%xmm3	# 3 = iak = 1/i + a/k
+	 eor	v11.16b, v11.16b, v13.16b
+	eor	v4.16b,  v4.16b,  v5.16b	// vpxor	%xmm5,	%xmm4,	%xmm4  	# 4 = jak = 1/j + a/k
+	 eor	v12.16b, v12.16b, v13.16b
+	tbl	v2.16b,  {$invlo},v3.16b	// vpshufb	%xmm3,	%xmm10,	%xmm2  	# 2 = 1/iak
+	 tbl	v10.16b, {$invlo},v11.16b
+	tbl	v3.16b,  {$invlo},v4.16b	// vpshufb	%xmm4,	%xmm10,	%xmm3	# 3 = 1/jak
+	 tbl	v11.16b, {$invlo},v12.16b
+	eor	v2.16b,  v2.16b,  v1.16b	// vpxor	%xmm1,	%xmm2,	%xmm2  	# 2 = io
+	 eor	v10.16b, v10.16b, v9.16b
+	eor	v3.16b,  v3.16b,  v0.16b	// vpxor	%xmm0,	%xmm3,	%xmm3	# 3 = jo
+	 eor	v11.16b, v11.16b, v8.16b
+	ld1	{v16.2d}, [x9],#16		// vmovdqu	(%r9),	%xmm5
+	cbnz	w8, .Lenc_2x_loop
+
+	// middle of last round
+	add	x10, x11, #0x80
+						// vmovdqa	-0x60(%r10), %xmm4	# 3 : sbou	.Lk_sbo
+						// vmovdqa	-0x50(%r10), %xmm0	# 0 : sbot	.Lk_sbo+16
+	tbl	v4.16b,  {$sbou}, v2.16b	// vpshufb	%xmm2,	%xmm4,	%xmm4	# 4 = sbou
+	 tbl	v12.16b, {$sbou}, v10.16b
+	ld1	{v1.2d}, [x10]			// vmovdqa	0x40(%r11,%r10), %xmm1	# .Lk_sr[]
+	tbl	v0.16b,  {$sbot}, v3.16b	// vpshufb	%xmm3,	%xmm0,	%xmm0	# 0 = sb1t
+	 tbl	v8.16b,  {$sbot}, v11.16b
+	eor	v4.16b,  v4.16b,  v16.16b	// vpxor	%xmm5,	%xmm4,	%xmm4	# 4 = sb1u + k
+	 eor	v12.16b, v12.16b, v16.16b
+	eor	v0.16b,  v0.16b,  v4.16b	// vpxor	%xmm4,	%xmm0,	%xmm0	# 0 = A
+	 eor	v8.16b,  v8.16b,  v12.16b
+	tbl	v0.16b,  {v0.16b},v1.16b	// vpshufb	%xmm1,	%xmm0,	%xmm0
+	 tbl	v1.16b,  {v8.16b},v1.16b
+	ret
+.size	_vpaes_encrypt_2x,.-_vpaes_encrypt_2x
+
+.type	_vpaes_decrypt_preheat,%function
+.align	4
+_vpaes_decrypt_preheat:
+	adr	x10, .Lk_inv
+	movi	v17.16b, #0x0f
+	adr	x11, .Lk_dipt
+	ld1	{v18.2d-v19.2d}, [x10],#32	// .Lk_inv
+	ld1	{v20.2d-v23.2d}, [x11],#64	// .Lk_dipt, .Lk_dsbo
+	ld1	{v24.2d-v27.2d}, [x11],#64	// .Lk_dsb9, .Lk_dsbd
+	ld1	{v28.2d-v31.2d}, [x11]		// .Lk_dsbb, .Lk_dsbe
+	ret
+.size	_vpaes_decrypt_preheat,.-_vpaes_decrypt_preheat
+
+##
+##  Decryption core
+##
+##  Same API as encryption core.
+##
+.type	_vpaes_decrypt_core,%function
+.align	4
+_vpaes_decrypt_core:
+	mov	x9, $key
+	ldr	w8, [$key,#240]			// pull rounds
+
+						// vmovdqa	.Lk_dipt(%rip), %xmm2	# iptlo
+	lsl	x11, x8, #4			// mov	%rax,	%r11;	shl	\$4, %r11
+	eor	x11, x11, #0x30			// xor		\$0x30,	%r11
+	adr	x10, .Lk_sr
+	and	x11, x11, #0x30			// and		\$0x30,	%r11
+	add	x11, x11, x10
+	adr	x10, .Lk_mc_forward+48
+
+	ld1	{v16.2d}, [x9],#16		// vmovdqu	(%r9),	%xmm4		# round0 key
+	and	v1.16b, v7.16b, v17.16b		// vpand	%xmm9,	%xmm0,	%xmm1
+	ushr	v0.16b, v7.16b, #4		// vpsrlb	\$4,	%xmm0,	%xmm0
+	tbl	v2.16b, {$iptlo}, v1.16b	// vpshufb	%xmm1,	%xmm2,	%xmm2
+	ld1	{v5.2d}, [x10]			// vmovdqa	.Lk_mc_forward+48(%rip), %xmm5
+						// vmovdqa	.Lk_dipt+16(%rip), %xmm1 # ipthi
+	tbl	v0.16b, {$ipthi}, v0.16b	// vpshufb	%xmm0,	%xmm1,	%xmm0
+	eor	v2.16b, v2.16b, v16.16b		// vpxor	%xmm4,	%xmm2,	%xmm2
+	eor	v0.16b, v0.16b, v2.16b		// vpxor	%xmm2,	%xmm0,	%xmm0
+	b	.Ldec_entry
+
+.align 4
+.Ldec_loop:
+//
+//  Inverse mix columns
+//
+						// vmovdqa	-0x20(%r10),%xmm4		# 4 : sb9u
+						// vmovdqa	-0x10(%r10),%xmm1		# 0 : sb9t
+	tbl	v4.16b, {$sb9u}, v2.16b		// vpshufb	%xmm2,	%xmm4,	%xmm4		# 4 = sb9u
+	tbl	v1.16b, {$sb9t}, v3.16b		// vpshufb	%xmm3,	%xmm1,	%xmm1		# 0 = sb9t
+	eor	v0.16b, v4.16b, v16.16b		// vpxor	%xmm4,	%xmm0,	%xmm0
+						// vmovdqa	0x00(%r10),%xmm4		# 4 : sbdu
+	eor	v0.16b, v0.16b, v1.16b		// vpxor	%xmm1,	%xmm0,	%xmm0		# 0 = ch
+						// vmovdqa	0x10(%r10),%xmm1		# 0 : sbdt
+
+	tbl	v4.16b, {$sbdu}, v2.16b		// vpshufb	%xmm2,	%xmm4,	%xmm4		# 4 = sbdu
+	tbl 	v0.16b, {v0.16b}, v5.16b	// vpshufb	%xmm5,	%xmm0,	%xmm0		# MC ch
+	tbl	v1.16b, {$sbdt}, v3.16b		// vpshufb	%xmm3,	%xmm1,	%xmm1		# 0 = sbdt
+	eor	v0.16b, v0.16b, v4.16b		// vpxor	%xmm4,	%xmm0,	%xmm0		# 4 = ch
+						// vmovdqa	0x20(%r10),	%xmm4		# 4 : sbbu
+	eor	v0.16b, v0.16b, v1.16b		// vpxor	%xmm1,	%xmm0,	%xmm0		# 0 = ch
+						// vmovdqa	0x30(%r10),	%xmm1		# 0 : sbbt
+
+	tbl	v4.16b, {$sbbu}, v2.16b		// vpshufb	%xmm2,	%xmm4,	%xmm4		# 4 = sbbu
+	tbl	v0.16b, {v0.16b}, v5.16b	// vpshufb	%xmm5,	%xmm0,	%xmm0		# MC ch
+	tbl	v1.16b, {$sbbt}, v3.16b		// vpshufb	%xmm3,	%xmm1,	%xmm1		# 0 = sbbt
+	eor	v0.16b, v0.16b, v4.16b		// vpxor	%xmm4,	%xmm0,	%xmm0		# 4 = ch
+						// vmovdqa	0x40(%r10),	%xmm4		# 4 : sbeu
+	eor	v0.16b, v0.16b, v1.16b		// vpxor	%xmm1,	%xmm0,	%xmm0		# 0 = ch
+						// vmovdqa	0x50(%r10),	%xmm1		# 0 : sbet
+
+	tbl	v4.16b, {$sbeu}, v2.16b		// vpshufb	%xmm2,	%xmm4,	%xmm4		# 4 = sbeu
+	tbl	v0.16b, {v0.16b}, v5.16b	// vpshufb	%xmm5,	%xmm0,	%xmm0		# MC ch
+	tbl	v1.16b, {$sbet}, v3.16b		// vpshufb	%xmm3,	%xmm1,	%xmm1		# 0 = sbet
+	eor	v0.16b, v0.16b, v4.16b		// vpxor	%xmm4,	%xmm0,	%xmm0		# 4 = ch
+	ext	v5.16b, v5.16b, v5.16b, #12	// vpalignr \$12,	%xmm5,	%xmm5,	%xmm5
+	eor	v0.16b, v0.16b, v1.16b		// vpxor	%xmm1,	%xmm0,	%xmm0		# 0 = ch
+	sub	w8, w8, #1			// sub		\$1,%rax			# nr--
+
+.Ldec_entry:
+	// top of round
+	and	v1.16b, v0.16b, v17.16b		// vpand	%xmm9,	%xmm0,	%xmm1	# 0 = k
+	ushr	v0.16b, v0.16b, #4		// vpsrlb	\$4,	%xmm0,	%xmm0	# 1 = i
+	tbl	v2.16b, {$invhi}, v1.16b	// vpshufb	%xmm1,	%xmm11,	%xmm2	# 2 = a/k
+	eor	v1.16b,	v1.16b, v0.16b		// vpxor	%xmm0,	%xmm1,	%xmm1	# 0 = j
+	tbl	v3.16b, {$invlo}, v0.16b	// vpshufb	%xmm0, 	%xmm10,	%xmm3	# 3 = 1/i
+	tbl	v4.16b, {$invlo}, v1.16b	// vpshufb	%xmm1,	%xmm10,	%xmm4	# 4 = 1/j
+	eor	v3.16b, v3.16b, v2.16b		// vpxor	%xmm2,	%xmm3,	%xmm3	# 3 = iak = 1/i + a/k
+	eor	v4.16b, v4.16b, v2.16b		// vpxor	%xmm2, 	%xmm4,	%xmm4	# 4 = jak = 1/j + a/k
+	tbl	v2.16b, {$invlo}, v3.16b	// vpshufb	%xmm3,	%xmm10,	%xmm2	# 2 = 1/iak
+	tbl	v3.16b, {$invlo}, v4.16b	// vpshufb	%xmm4,  %xmm10,	%xmm3	# 3 = 1/jak
+	eor	v2.16b, v2.16b, v1.16b		// vpxor	%xmm1,	%xmm2,	%xmm2	# 2 = io
+	eor	v3.16b, v3.16b, v0.16b		// vpxor	%xmm0,  %xmm3,	%xmm3	# 3 = jo
+	ld1	{v16.2d}, [x9],#16		// vmovdqu	(%r9),	%xmm0
+	cbnz	w8, .Ldec_loop
+
+	// middle of last round
+						// vmovdqa	0x60(%r10),	%xmm4	# 3 : sbou
+	tbl	v4.16b, {$sbou}, v2.16b		// vpshufb	%xmm2,	%xmm4,	%xmm4	# 4 = sbou
+						// vmovdqa	0x70(%r10),	%xmm1	# 0 : sbot
+	ld1	{v2.2d}, [x11]			// vmovdqa	-0x160(%r11),	%xmm2	# .Lk_sr-.Lk_dsbd=-0x160
+	tbl	v1.16b, {$sbot}, v3.16b		// vpshufb	%xmm3,	%xmm1,	%xmm1	# 0 = sb1t
+	eor	v4.16b, v4.16b, v16.16b		// vpxor	%xmm0,	%xmm4,	%xmm4	# 4 = sb1u + k
+	eor	v0.16b, v1.16b, v4.16b		// vpxor	%xmm4,	%xmm1,	%xmm0	# 0 = A
+	tbl	v0.16b, {v0.16b}, v2.16b	// vpshufb	%xmm2,	%xmm0,	%xmm0
+	ret
+.size	_vpaes_decrypt_core,.-_vpaes_decrypt_core
+
+.globl	vpaes_decrypt
+.type	vpaes_decrypt,%function
+.align	4
+vpaes_decrypt:
+	stp	x29,x30,[sp,#-16]!
+	add	x29,sp,#0
+
+	ld1	{v7.16b}, [$inp]
+	bl	_vpaes_decrypt_preheat
+	bl	_vpaes_decrypt_core
+	st1	{v0.16b}, [$out]
+
+	ldp	x29,x30,[sp],#16
+	ret
+.size	vpaes_decrypt,.-vpaes_decrypt
+
+// v14-v15 input, v0-v1 output
+.type	_vpaes_decrypt_2x,%function
+.align	4
+_vpaes_decrypt_2x:
+	mov	x9, $key
+	ldr	w8, [$key,#240]			// pull rounds
+
+						// vmovdqa	.Lk_dipt(%rip), %xmm2	# iptlo
+	lsl	x11, x8, #4			// mov	%rax,	%r11;	shl	\$4, %r11
+	eor	x11, x11, #0x30			// xor		\$0x30,	%r11
+	adr	x10, .Lk_sr
+	and	x11, x11, #0x30			// and		\$0x30,	%r11
+	add	x11, x11, x10
+	adr	x10, .Lk_mc_forward+48
+
+	ld1	{v16.2d}, [x9],#16		// vmovdqu	(%r9),	%xmm4		# round0 key
+	and	v1.16b,  v14.16b, v17.16b	// vpand	%xmm9,	%xmm0,	%xmm1
+	ushr	v0.16b,  v14.16b, #4		// vpsrlb	\$4,	%xmm0,	%xmm0
+	 and	v9.16b,  v15.16b, v17.16b
+	 ushr	v8.16b,  v15.16b, #4
+	tbl	v2.16b,  {$iptlo},v1.16b	// vpshufb	%xmm1,	%xmm2,	%xmm2
+	 tbl	v10.16b, {$iptlo},v9.16b
+	ld1	{v5.2d}, [x10]			// vmovdqa	.Lk_mc_forward+48(%rip), %xmm5
+						// vmovdqa	.Lk_dipt+16(%rip), %xmm1 # ipthi
+	tbl	v0.16b,  {$ipthi},v0.16b	// vpshufb	%xmm0,	%xmm1,	%xmm0
+	 tbl	v8.16b,  {$ipthi},v8.16b
+	eor	v2.16b,  v2.16b,  v16.16b	// vpxor	%xmm4,	%xmm2,	%xmm2
+	 eor	v10.16b, v10.16b, v16.16b
+	eor	v0.16b,  v0.16b,  v2.16b	// vpxor	%xmm2,	%xmm0,	%xmm0
+	 eor	v8.16b,  v8.16b,  v10.16b
+	b	.Ldec_2x_entry
+
+.align 4
+.Ldec_2x_loop:
+//
+//  Inverse mix columns
+//
+						// vmovdqa	-0x20(%r10),%xmm4		# 4 : sb9u
+						// vmovdqa	-0x10(%r10),%xmm1		# 0 : sb9t
+	tbl	v4.16b,  {$sb9u}, v2.16b	// vpshufb	%xmm2,	%xmm4,	%xmm4		# 4 = sb9u
+	 tbl	v12.16b, {$sb9u}, v10.16b
+	tbl	v1.16b,  {$sb9t}, v3.16b	// vpshufb	%xmm3,	%xmm1,	%xmm1		# 0 = sb9t
+	 tbl	v9.16b,  {$sb9t}, v11.16b
+	eor	v0.16b,  v4.16b,  v16.16b	// vpxor	%xmm4,	%xmm0,	%xmm0
+	 eor	v8.16b,  v12.16b, v16.16b
+						// vmovdqa	0x00(%r10),%xmm4		# 4 : sbdu
+	eor	v0.16b,  v0.16b,  v1.16b	// vpxor	%xmm1,	%xmm0,	%xmm0		# 0 = ch
+	 eor	v8.16b,  v8.16b,  v9.16b	// vpxor	%xmm1,	%xmm0,	%xmm0		# 0 = ch
+						// vmovdqa	0x10(%r10),%xmm1		# 0 : sbdt
+
+	tbl	v4.16b,  {$sbdu}, v2.16b	// vpshufb	%xmm2,	%xmm4,	%xmm4		# 4 = sbdu
+	 tbl	v12.16b, {$sbdu}, v10.16b
+	tbl 	v0.16b,  {v0.16b},v5.16b	// vpshufb	%xmm5,	%xmm0,	%xmm0		# MC ch
+	 tbl 	v8.16b,  {v8.16b},v5.16b
+	tbl	v1.16b,  {$sbdt}, v3.16b	// vpshufb	%xmm3,	%xmm1,	%xmm1		# 0 = sbdt
+	 tbl	v9.16b,  {$sbdt}, v11.16b
+	eor	v0.16b,  v0.16b,  v4.16b	// vpxor	%xmm4,	%xmm0,	%xmm0		# 4 = ch
+	 eor	v8.16b,  v8.16b,  v12.16b
+						// vmovdqa	0x20(%r10),	%xmm4		# 4 : sbbu
+	eor	v0.16b,  v0.16b,  v1.16b	// vpxor	%xmm1,	%xmm0,	%xmm0		# 0 = ch
+	 eor	v8.16b,  v8.16b,  v9.16b
+						// vmovdqa	0x30(%r10),	%xmm1		# 0 : sbbt
+
+	tbl	v4.16b,  {$sbbu}, v2.16b	// vpshufb	%xmm2,	%xmm4,	%xmm4		# 4 = sbbu
+	 tbl	v12.16b, {$sbbu}, v10.16b
+	tbl	v0.16b,  {v0.16b},v5.16b	// vpshufb	%xmm5,	%xmm0,	%xmm0		# MC ch
+	 tbl	v8.16b,  {v8.16b},v5.16b
+	tbl	v1.16b,  {$sbbt}, v3.16b	// vpshufb	%xmm3,	%xmm1,	%xmm1		# 0 = sbbt
+	 tbl	v9.16b,  {$sbbt}, v11.16b
+	eor	v0.16b,  v0.16b,  v4.16b	// vpxor	%xmm4,	%xmm0,	%xmm0		# 4 = ch
+	 eor	v8.16b,  v8.16b,  v12.16b
+						// vmovdqa	0x40(%r10),	%xmm4		# 4 : sbeu
+	eor	v0.16b,  v0.16b,  v1.16b	// vpxor	%xmm1,	%xmm0,	%xmm0		# 0 = ch
+	 eor	v8.16b,  v8.16b,  v9.16b
+						// vmovdqa	0x50(%r10),	%xmm1		# 0 : sbet
+
+	tbl	v4.16b,  {$sbeu}, v2.16b	// vpshufb	%xmm2,	%xmm4,	%xmm4		# 4 = sbeu
+	 tbl	v12.16b, {$sbeu}, v10.16b
+	tbl	v0.16b,  {v0.16b},v5.16b	// vpshufb	%xmm5,	%xmm0,	%xmm0		# MC ch
+	 tbl	v8.16b,  {v8.16b},v5.16b
+	tbl	v1.16b,  {$sbet}, v3.16b	// vpshufb	%xmm3,	%xmm1,	%xmm1		# 0 = sbet
+	 tbl	v9.16b,  {$sbet}, v11.16b
+	eor	v0.16b,  v0.16b,  v4.16b	// vpxor	%xmm4,	%xmm0,	%xmm0		# 4 = ch
+	 eor	v8.16b,  v8.16b,  v12.16b
+	ext	v5.16b,  v5.16b,  v5.16b, #12	// vpalignr \$12,	%xmm5,	%xmm5,	%xmm5
+	eor	v0.16b,  v0.16b,  v1.16b	// vpxor	%xmm1,	%xmm0,	%xmm0		# 0 = ch
+	 eor	v8.16b,  v8.16b,  v9.16b
+	sub	w8, w8, #1			// sub		\$1,%rax			# nr--
+
+.Ldec_2x_entry:
+	// top of round
+	and	v1.16b,  v0.16b,  v17.16b	// vpand	%xmm9,	%xmm0,	%xmm1	# 0 = k
+	ushr	v0.16b,  v0.16b,  #4		// vpsrlb	\$4,	%xmm0,	%xmm0	# 1 = i
+	 and	v9.16b,  v8.16b,  v17.16b
+	 ushr	v8.16b,  v8.16b,  #4
+	tbl	v2.16b,  {$invhi},v1.16b	// vpshufb	%xmm1,	%xmm11,	%xmm2	# 2 = a/k
+	 tbl	v10.16b, {$invhi},v9.16b
+	eor	v1.16b,	 v1.16b,  v0.16b	// vpxor	%xmm0,	%xmm1,	%xmm1	# 0 = j
+	 eor	v9.16b,	 v9.16b,  v8.16b
+	tbl	v3.16b,  {$invlo},v0.16b	// vpshufb	%xmm0, 	%xmm10,	%xmm3	# 3 = 1/i
+	 tbl	v11.16b, {$invlo},v8.16b
+	tbl	v4.16b,  {$invlo},v1.16b	// vpshufb	%xmm1,	%xmm10,	%xmm4	# 4 = 1/j
+	 tbl	v12.16b, {$invlo},v9.16b
+	eor	v3.16b,  v3.16b,  v2.16b	// vpxor	%xmm2,	%xmm3,	%xmm3	# 3 = iak = 1/i + a/k
+	 eor	v11.16b, v11.16b, v10.16b
+	eor	v4.16b,  v4.16b,  v2.16b	// vpxor	%xmm2, 	%xmm4,	%xmm4	# 4 = jak = 1/j + a/k
+	 eor	v12.16b, v12.16b, v10.16b
+	tbl	v2.16b,  {$invlo},v3.16b	// vpshufb	%xmm3,	%xmm10,	%xmm2	# 2 = 1/iak
+	 tbl	v10.16b, {$invlo},v11.16b
+	tbl	v3.16b,  {$invlo},v4.16b	// vpshufb	%xmm4,  %xmm10,	%xmm3	# 3 = 1/jak
+	 tbl	v11.16b, {$invlo},v12.16b
+	eor	v2.16b,  v2.16b,  v1.16b	// vpxor	%xmm1,	%xmm2,	%xmm2	# 2 = io
+	 eor	v10.16b, v10.16b, v9.16b
+	eor	v3.16b,  v3.16b,  v0.16b	// vpxor	%xmm0,  %xmm3,	%xmm3	# 3 = jo
+	 eor	v11.16b, v11.16b, v8.16b
+	ld1	{v16.2d}, [x9],#16		// vmovdqu	(%r9),	%xmm0
+	cbnz	w8, .Ldec_2x_loop
+
+	// middle of last round
+						// vmovdqa	0x60(%r10),	%xmm4	# 3 : sbou
+	tbl	v4.16b,  {$sbou}, v2.16b	// vpshufb	%xmm2,	%xmm4,	%xmm4	# 4 = sbou
+	 tbl	v12.16b, {$sbou}, v10.16b
+						// vmovdqa	0x70(%r10),	%xmm1	# 0 : sbot
+	tbl	v1.16b,  {$sbot}, v3.16b	// vpshufb	%xmm3,	%xmm1,	%xmm1	# 0 = sb1t
+	 tbl	v9.16b,  {$sbot}, v11.16b
+	ld1	{v2.2d}, [x11]			// vmovdqa	-0x160(%r11),	%xmm2	# .Lk_sr-.Lk_dsbd=-0x160
+	eor	v4.16b,  v4.16b,  v16.16b	// vpxor	%xmm0,	%xmm4,	%xmm4	# 4 = sb1u + k
+	 eor	v12.16b, v12.16b, v16.16b
+	eor	v0.16b,  v1.16b,  v4.16b	// vpxor	%xmm4,	%xmm1,	%xmm0	# 0 = A
+	 eor	v8.16b,  v9.16b,  v12.16b
+	tbl	v0.16b,  {v0.16b},v2.16b	// vpshufb	%xmm2,	%xmm0,	%xmm0
+	 tbl	v1.16b,  {v8.16b},v2.16b
+	ret
+.size	_vpaes_decrypt_2x,.-_vpaes_decrypt_2x
+___
+}

+{
+my ($inp,$bits,$out,$dir)=("x0","w1","x2","w3");
+my ($invlo,$invhi,$iptlo,$ipthi,$rcon) = map("v$_.16b",(18..21,8));
+
+$code.=<<___;
+########################################################
+##                                                    ##
+##                  AES key schedule                  ##
+##                                                    ##
+########################################################
+.type	_vpaes_key_preheat,%function
+.align	4
+_vpaes_key_preheat:
+	adr	x10, .Lk_inv
+	movi	v16.16b, #0x5b			// .Lk_s63
+	adr	x11, .Lk_sb1
+	movi	v17.16b, #0x0f			// .Lk_s0F
+	ld1	{v18.2d-v21.2d}, [x10]		// .Lk_inv, .Lk_ipt
+	adr	x10, .Lk_dksd
+	ld1	{v22.2d-v23.2d}, [x11]		// .Lk_sb1
+	adr	x11, .Lk_mc_forward
+	ld1	{v24.2d-v27.2d}, [x10],#64	// .Lk_dksd, .Lk_dksb
+	ld1	{v28.2d-v31.2d}, [x10],#64	// .Lk_dkse, .Lk_dks9
+	ld1	{v8.2d}, [x10]			// .Lk_rcon
+	ld1	{v9.2d}, [x11]			// .Lk_mc_forward[0]
+	ret
+.size	_vpaes_key_preheat,.-_vpaes_key_preheat
+
+.type	_vpaes_schedule_core,%function
+.align	4
+_vpaes_schedule_core:
+	stp	x29, x30, [sp,#-16]!
+	add	x29,sp,#0
+
+	bl	_vpaes_key_preheat		// load the tables
+
+	ld1	{v0.16b}, [$inp],#16		// vmovdqu	(%rdi),	%xmm0		# load key (unaligned)
+
+	// input transform
+	mov	v3.16b, v0.16b			// vmovdqa	%xmm0,	%xmm3
+	bl	_vpaes_schedule_transform
+	mov	v7.16b, v0.16b			// vmovdqa	%xmm0,	%xmm7
+
+	adr	x10, .Lk_sr			// lea	.Lk_sr(%rip),%r10
+	add	x8, x8, x10
+	cbnz	$dir, .Lschedule_am_decrypting
+
+	// encrypting, output zeroth round key after transform
+	st1	{v0.2d}, [$out]			// vmovdqu	%xmm0,	(%rdx)
+	b	.Lschedule_go
+
+.Lschedule_am_decrypting:
+	// decrypting, output zeroth round key after shiftrows
+	ld1	{v1.2d}, [x8]			// vmovdqa	(%r8,%r10),	%xmm1
+	tbl	v3.16b, {v3.16b}, v1.16b	// vpshufb  %xmm1,	%xmm3,	%xmm3
+	st1	{v3.2d}, [$out]			// vmovdqu	%xmm3,	(%rdx)
+	eor	x8, x8, #0x30			// xor	\$0x30, %r8
+
+.Lschedule_go:
+	cmp	$bits, #192			// cmp	\$192,	%esi
+	bhi	.Lschedule_256
+	beq	.Lschedule_192
+	// 128: fall though
+
+##
+##  .schedule_128
+##
+##  128-bit specific part of key schedule.
+##
+##  This schedule is really simple, because all its parts
+##  are accomplished by the subroutines.
+##
+.Lschedule_128:
+	mov	$inp, #10			// mov	\$10, %esi
+
+.Loop_schedule_128:
+	sub	$inp, $inp, #1			// dec	%esi
+	bl 	_vpaes_schedule_round
+	cbz 	$inp, .Lschedule_mangle_last
+	bl	_vpaes_schedule_mangle		// write output
+	b 	.Loop_schedule_128
+
+##
+##  .aes_schedule_192
+##
+##  192-bit specific part of key schedule.
+##
+##  The main body of this schedule is the same as the 128-bit
+##  schedule, but with more smearing.  The long, high side is
+##  stored in %xmm7 as before, and the short, low side is in
+##  the high bits of %xmm6.
+##
+##  This schedule is somewhat nastier, however, because each
+##  round produces 192 bits of key material, or 1.5 round keys.
+##  Therefore, on each cycle we do 2 rounds and produce 3 round
+##  keys.
+##
+.align	4
+.Lschedule_192:
+	sub	$inp, $inp, #8
+	ld1	{v0.16b}, [$inp]		// vmovdqu	8(%rdi),%xmm0		# load key part 2 (very unaligned)
+	bl	_vpaes_schedule_transform	// input transform
+	mov	v6.16b, v0.16b			// vmovdqa	%xmm0,	%xmm6		# save short part
+	eor	v4.16b, v4.16b, v4.16b		// vpxor	%xmm4,	%xmm4, %xmm4	# clear 4
+	ins	v6.d[0], v4.d[0]		// vmovhlps	%xmm4,	%xmm6,	%xmm6		# clobber low side with zeros
+	mov	$inp, #4			// mov	\$4,	%esi
+
+.Loop_schedule_192:
+	sub	$inp, $inp, #1			// dec	%esi
+	bl	_vpaes_schedule_round
+	ext	v0.16b, v6.16b, v0.16b, #8	// vpalignr	\$8,%xmm6,%xmm0,%xmm0
+	bl	_vpaes_schedule_mangle		// save key n
+	bl	_vpaes_schedule_192_smear
+	bl	_vpaes_schedule_mangle		// save key n+1
+	bl	_vpaes_schedule_round
+	cbz 	$inp, .Lschedule_mangle_last
+	bl	_vpaes_schedule_mangle		// save key n+2
+	bl	_vpaes_schedule_192_smear
+	b	.Loop_schedule_192
+
+##
+##  .aes_schedule_256
+##
+##  256-bit specific part of key schedule.
+##
+##  The structure here is very similar to the 128-bit
+##  schedule, but with an additional "low side" in
+##  %xmm6.  The low side's rounds are the same as the
+##  high side's, except no rcon and no rotation.
+##
+.align	4
+.Lschedule_256:
+	ld1	{v0.16b}, [$inp]		// vmovdqu	16(%rdi),%xmm0		# load key part 2 (unaligned)
+	bl	_vpaes_schedule_transform	// input transform
+	mov	$inp, #7			// mov	\$7, %esi
+	
+.Loop_schedule_256:
+	sub	$inp, $inp, #1			// dec	%esi
+	bl	_vpaes_schedule_mangle		// output low result
+	mov	v6.16b, v0.16b			// vmovdqa	%xmm0,	%xmm6		# save cur_lo in xmm6
+
+	// high round
+	bl	_vpaes_schedule_round
+	cbz 	$inp, .Lschedule_mangle_last
+	bl	_vpaes_schedule_mangle	
+
+	// low round. swap xmm7 and xmm6
+	dup	v0.4s, v0.s[3]			// vpshufd	\$0xFF,	%xmm0,	%xmm0
+	movi	v4.16b, #0
+	mov	v5.16b, v7.16b			// vmovdqa	%xmm7,	%xmm5
+	mov	v7.16b, v6.16b			// vmovdqa	%xmm6,	%xmm7
+	bl	_vpaes_schedule_low_round
+	mov	v7.16b, v5.16b			// vmovdqa	%xmm5,	%xmm7
+	
+	b	.Loop_schedule_256
+
+##
+##  .aes_schedule_mangle_last
+##
+##  Mangler for last round of key schedule
+##  Mangles %xmm0
+##    when encrypting, outputs out(%xmm0) ^ 63
+##    when decrypting, outputs unskew(%xmm0)
+##
+##  Always called right before return... jumps to cleanup and exits
+##
+.align	4
+.Lschedule_mangle_last:
+	// schedule last round key from xmm0
+	adr	x11, .Lk_deskew			// lea	.Lk_deskew(%rip),%r11	# prepare to deskew
+	cbnz	$dir, .Lschedule_mangle_last_dec
+
+	// encrypting
+	ld1	{v1.2d}, [x8]			// vmovdqa	(%r8,%r10),%xmm1
+	adr	x11, .Lk_opt			// lea	.Lk_opt(%rip),	%r11		# prepare to output transform
+	add	$out, $out, #32			// add	\$32,	%rdx
+	tbl	v0.16b, {v0.16b}, v1.16b	// vpshufb	%xmm1,	%xmm0,	%xmm0		# output permute
+
+.Lschedule_mangle_last_dec:
+	ld1	{v20.2d-v21.2d}, [x11]		// reload constants
+	sub	$out, $out, #16			// add	\$-16,	%rdx 
+	eor	v0.16b, v0.16b, v16.16b		// vpxor	.Lk_s63(%rip),	%xmm0,	%xmm0
+	bl	_vpaes_schedule_transform	// output transform
+	st1	{v0.2d}, [$out]			// vmovdqu	%xmm0,	(%rdx)		# save last key
+
+	// cleanup
+	eor	v0.16b, v0.16b, v0.16b		// vpxor	%xmm0,	%xmm0,	%xmm0
+	eor	v1.16b, v1.16b, v1.16b		// vpxor	%xmm1,	%xmm1,	%xmm1
+	eor	v2.16b, v2.16b, v2.16b		// vpxor	%xmm2,	%xmm2,	%xmm2
+	eor	v3.16b, v3.16b, v3.16b		// vpxor	%xmm3,	%xmm3,	%xmm3
+	eor	v4.16b, v4.16b, v4.16b		// vpxor	%xmm4,	%xmm4,	%xmm4
+	eor	v5.16b, v5.16b, v5.16b		// vpxor	%xmm5,	%xmm5,	%xmm5
+	eor	v6.16b, v6.16b, v6.16b		// vpxor	%xmm6,	%xmm6,	%xmm6
+	eor	v7.16b, v7.16b, v7.16b		// vpxor	%xmm7,	%xmm7,	%xmm7
+	ldp	x29, x30, [sp],#16
+	ret
+.size	_vpaes_schedule_core,.-_vpaes_schedule_core
+
+##
+##  .aes_schedule_192_smear
+##
+##  Smear the short, low side in the 192-bit key schedule.
+##
+##  Inputs:
+##    %xmm7: high side, b  a  x  y
+##    %xmm6:  low side, d  c  0  0
+##    %xmm13: 0
+##
+##  Outputs:
+##    %xmm6: b+c+d  b+c  0  0
+##    %xmm0: b+c+d  b+c  b  a
+##
+.type	_vpaes_schedule_192_smear,%function
+.align	4
+_vpaes_schedule_192_smear:
+	movi	v1.16b, #0
+	dup	v0.4s, v7.s[3]
+	ins	v1.s[3], v6.s[2]	// vpshufd	\$0x80,	%xmm6,	%xmm1	# d c 0 0 -> c 0 0 0
+	ins	v0.s[0], v7.s[2]	// vpshufd	\$0xFE,	%xmm7,	%xmm0	# b a _ _ -> b b b a
+	eor	v6.16b, v6.16b, v1.16b	// vpxor	%xmm1,	%xmm6,	%xmm6	# -> c+d c 0 0
+	eor	v1.16b, v1.16b, v1.16b	// vpxor	%xmm1,	%xmm1,	%xmm1
+	eor	v6.16b, v6.16b, v0.16b	// vpxor	%xmm0,	%xmm6,	%xmm6	# -> b+c+d b+c b a
+	mov	v0.16b, v6.16b		// vmovdqa	%xmm6,	%xmm0
+	ins	v6.d[0], v1.d[0]	// vmovhlps	%xmm1,	%xmm6,	%xmm6	# clobber low side with zeros
+	ret
+.size	_vpaes_schedule_192_smear,.-_vpaes_schedule_192_smear
+
+##
+##  .aes_schedule_round
+##
+##  Runs one main round of the key schedule on %xmm0, %xmm7
+##
+##  Specifically, runs subbytes on the high dword of %xmm0
+##  then rotates it by one byte and xors into the low dword of
+##  %xmm7.
+##
+##  Adds rcon from low byte of %xmm8, then rotates %xmm8 for
+##  next rcon.
+##
+##  Smears the dwords of %xmm7 by xoring the low into the
+##  second low, result into third, result into highest.
+##
+##  Returns results in %xmm7 = %xmm0.
+##  Clobbers %xmm1-%xmm4, %r11.
+##
+.type	_vpaes_schedule_round,%function
+.align	4
+_vpaes_schedule_round:
+	// extract rcon from xmm8
+	movi	v4.16b, #0			// vpxor	%xmm4,	%xmm4,	%xmm4
+	ext	v1.16b, $rcon, v4.16b, #15	// vpalignr	\$15,	%xmm8,	%xmm4,	%xmm1
+	ext	$rcon, $rcon, $rcon, #15	// vpalignr	\$15,	%xmm8,	%xmm8,	%xmm8
+	eor	v7.16b, v7.16b, v1.16b		// vpxor	%xmm1,	%xmm7,	%xmm7
+
+	// rotate
+	dup	v0.4s, v0.s[3]			// vpshufd	\$0xFF,	%xmm0,	%xmm0
+	ext	v0.16b, v0.16b, v0.16b, #1	// vpalignr	\$1,	%xmm0,	%xmm0,	%xmm0
+
+	// fall through...
+
+	// low round: same as high round, but no rotation and no rcon.
+_vpaes_schedule_low_round:
+	// smear xmm7
+	ext	v1.16b, v4.16b, v7.16b, #12	// vpslldq	\$4,	%xmm7,	%xmm1
+	eor	v7.16b, v7.16b, v1.16b		// vpxor	%xmm1,	%xmm7,	%xmm7
+	ext	v4.16b, v4.16b, v7.16b, #8	// vpslldq	\$8,	%xmm7,	%xmm4
+
+	// subbytes
+	and	v1.16b, v0.16b, v17.16b		// vpand	%xmm9,	%xmm0,	%xmm1		# 0 = k
+	ushr	v0.16b, v0.16b, #4		// vpsrlb	\$4,	%xmm0,	%xmm0		# 1 = i
+	 eor	v7.16b, v7.16b, v4.16b		// vpxor	%xmm4,	%xmm7,	%xmm7
+	tbl	v2.16b, {$invhi}, v1.16b	// vpshufb	%xmm1,	%xmm11,	%xmm2		# 2 = a/k
+	eor	v1.16b, v1.16b, v0.16b		// vpxor	%xmm0,	%xmm1,	%xmm1		# 0 = j
+	tbl	v3.16b, {$invlo}, v0.16b	// vpshufb	%xmm0, 	%xmm10,	%xmm3		# 3 = 1/i
+	eor	v3.16b, v3.16b, v2.16b		// vpxor	%xmm2,	%xmm3,	%xmm3		# 3 = iak = 1/i + a/k
+	tbl	v4.16b, {$invlo}, v1.16b	// vpshufb	%xmm1,	%xmm10,	%xmm4		# 4 = 1/j
+	 eor	v7.16b, v7.16b, v16.16b		// vpxor	.Lk_s63(%rip),	%xmm7,	%xmm7
+	tbl	v3.16b, {$invlo}, v3.16b	// vpshufb	%xmm3,	%xmm10,	%xmm3		# 2 = 1/iak
+	eor	v4.16b, v4.16b, v2.16b		// vpxor	%xmm2,	%xmm4,	%xmm4		# 4 = jak = 1/j + a/k
+	tbl	v2.16b, {$invlo}, v4.16b	// vpshufb	%xmm4,	%xmm10,	%xmm2		# 3 = 1/jak
+	eor	v3.16b, v3.16b, v1.16b		// vpxor	%xmm1,	%xmm3,	%xmm3		# 2 = io
+	eor	v2.16b, v2.16b, v0.16b		// vpxor	%xmm0,	%xmm2,	%xmm2		# 3 = jo
+	tbl	v4.16b, {v23.16b}, v3.16b	// vpshufb	%xmm3,	%xmm13,	%xmm4		# 4 = sbou
+	tbl	v1.16b, {v22.16b}, v2.16b	// vpshufb	%xmm2,	%xmm12,	%xmm1		# 0 = sb1t
+	eor	v1.16b, v1.16b, v4.16b		// vpxor	%xmm4,	%xmm1,	%xmm1		# 0 = sbox output
+
+	// add in smeared stuff
+	eor	v0.16b, v1.16b, v7.16b		// vpxor	%xmm7,	%xmm1,	%xmm0
+	eor	v7.16b, v1.16b, v7.16b		// vmovdqa	%xmm0,	%xmm7
+	ret
+.size	_vpaes_schedule_round,.-_vpaes_schedule_round
+
+##
+##  .aes_schedule_transform
+##
+##  Linear-transform %xmm0 according to tables at (%r11)
+##
+##  Requires that %xmm9 = 0x0F0F... as in preheat
+##  Output in %xmm0
+##  Clobbers %xmm1, %xmm2
+##
+.type	_vpaes_schedule_transform,%function
+.align	4
+_vpaes_schedule_transform:
+	and	v1.16b, v0.16b, v17.16b		// vpand	%xmm9,	%xmm0,	%xmm1
+	ushr	v0.16b, v0.16b, #4		// vpsrlb	\$4,	%xmm0,	%xmm0
+						// vmovdqa	(%r11),	%xmm2 	# lo
+	tbl	v2.16b, {$iptlo}, v1.16b	// vpshufb	%xmm1,	%xmm2,	%xmm2
+						// vmovdqa	16(%r11),	%xmm1 # hi
+	tbl	v0.16b, {$ipthi}, v0.16b	// vpshufb	%xmm0,	%xmm1,	%xmm0
+	eor	v0.16b, v0.16b, v2.16b		// vpxor	%xmm2,	%xmm0,	%xmm0
+	ret
+.size	_vpaes_schedule_transform,.-_vpaes_schedule_transform
+
+##
+##  .aes_schedule_mangle
+##
+##  Mangle xmm0 from (basis-transformed) standard version
+##  to our version.
+##
+##  On encrypt,
+##    xor with 0x63
+##    multiply by circulant 0,1,1,1
+##    apply shiftrows transform
+##
+##  On decrypt,
+##    xor with 0x63
+##    multiply by "inverse mixcolumns" circulant E,B,D,9
+##    deskew
+##    apply shiftrows transform
+##
+##
+##  Writes out to (%rdx), and increments or decrements it
+##  Keeps track of round number mod 4 in %r8
+##  Preserves xmm0
+##  Clobbers xmm1-xmm5
+##
+.type	_vpaes_schedule_mangle,%function
+.align	4
+_vpaes_schedule_mangle:
+	mov	v4.16b, v0.16b			// vmovdqa	%xmm0,	%xmm4	# save xmm0 for later
+						// vmovdqa	.Lk_mc_forward(%rip),%xmm5
+	cbnz	$dir, .Lschedule_mangle_dec
+
+	// encrypting
+	eor	v4.16b, v0.16b, v16.16b		// vpxor	.Lk_s63(%rip),	%xmm0,	%xmm4
+	add	$out, $out, #16			// add	\$16,	%rdx
+	tbl	v4.16b, {v4.16b}, v9.16b	// vpshufb	%xmm5,	%xmm4,	%xmm4
+	tbl	v1.16b, {v4.16b}, v9.16b	// vpshufb	%xmm5,	%xmm4,	%xmm1
+	tbl	v3.16b, {v1.16b}, v9.16b	// vpshufb	%xmm5,	%xmm1,	%xmm3
+	eor	v4.16b, v4.16b, v1.16b		// vpxor	%xmm1,	%xmm4,	%xmm4
+	ld1	{v1.2d}, [x8]			// vmovdqa	(%r8,%r10),	%xmm1
+	eor	v3.16b, v3.16b, v4.16b		// vpxor	%xmm4,	%xmm3,	%xmm3
+
+	b	.Lschedule_mangle_both
+.align	4
+.Lschedule_mangle_dec:
+	// inverse mix columns
+						// lea	.Lk_dksd(%rip),%r11
+	ushr	v1.16b, v4.16b, #4		// vpsrlb	\$4,	%xmm4,	%xmm1	# 1 = hi
+	and	v4.16b, v4.16b, v17.16b		// vpand	%xmm9,	%xmm4,	%xmm4	# 4 = lo
+
+						// vmovdqa	0x00(%r11),	%xmm2
+	tbl	v2.16b, {v24.16b}, v4.16b	// vpshufb	%xmm4,	%xmm2,	%xmm2
+						// vmovdqa	0x10(%r11),	%xmm3
+	tbl	v3.16b,	{v25.16b}, v1.16b	// vpshufb	%xmm1,	%xmm3,	%xmm3
+	eor	v3.16b, v3.16b, v2.16b		// vpxor	%xmm2,	%xmm3,	%xmm3
+	tbl	v3.16b, {v3.16b}, v9.16b	// vpshufb	%xmm5,	%xmm3,	%xmm3
+
+						// vmovdqa	0x20(%r11),	%xmm2
+	tbl	v2.16b, {v26.16b}, v4.16b	// vpshufb	%xmm4,	%xmm2,	%xmm2
+	eor	v2.16b, v2.16b, v3.16b		// vpxor	%xmm3,	%xmm2,	%xmm2
+						// vmovdqa	0x30(%r11),	%xmm3
+	tbl	v3.16b, {v27.16b}, v1.16b	// vpshufb	%xmm1,	%xmm3,	%xmm3
+	eor	v3.16b, v3.16b, v2.16b		// vpxor	%xmm2,	%xmm3,	%xmm3
+	tbl	v3.16b, {v3.16b}, v9.16b	// vpshufb	%xmm5,	%xmm3,	%xmm3
+
+						// vmovdqa	0x40(%r11),	%xmm2
+	tbl	v2.16b, {v28.16b}, v4.16b	// vpshufb	%xmm4,	%xmm2,	%xmm2
+	eor	v2.16b, v2.16b, v3.16b		// vpxor	%xmm3,	%xmm2,	%xmm2
+						// vmovdqa	0x50(%r11),	%xmm3
+	tbl	v3.16b, {v29.16b}, v1.16b	// vpshufb	%xmm1,	%xmm3,	%xmm3
+	eor	v3.16b, v3.16b, v2.16b		// vpxor	%xmm2,	%xmm3,	%xmm3
+
+						// vmovdqa	0x60(%r11),	%xmm2
+	tbl	v2.16b, {v30.16b}, v4.16b	// vpshufb	%xmm4,	%xmm2,	%xmm2
+	tbl	v3.16b, {v3.16b}, v9.16b	// vpshufb	%xmm5,	%xmm3,	%xmm3
+						// vmovdqa	0x70(%r11),	%xmm4
+	tbl	v4.16b, {v31.16b}, v1.16b	// vpshufb	%xmm1,	%xmm4,	%xmm4
+	ld1	{v1.2d}, [x8]			// vmovdqa	(%r8,%r10),	%xmm1
+	eor	v2.16b, v2.16b, v3.16b		// vpxor	%xmm3,	%xmm2,	%xmm2
+	eor	v3.16b, v4.16b, v2.16b		// vpxor	%xmm2,	%xmm4,	%xmm3
+
+	sub	$out, $out, #16			// add	\$-16,	%rdx
+
+.Lschedule_mangle_both:
+	tbl	v3.16b, {v3.16b}, v1.16b	// vpshufb	%xmm1,	%xmm3,	%xmm3
+	add	x8, x8, #64-16			// add	\$-16,	%r8
+	bic	x8, x8, #1<<6			// and	\$0x30,	%r8
+	st1	{v3.2d}, [$out]			// vmovdqu	%xmm3,	(%rdx)
+	ret
+.size	_vpaes_schedule_mangle,.-_vpaes_schedule_mangle
+
+.globl	vpaes_set_encrypt_key
+.type	vpaes_set_encrypt_key,%function
+.align	4
+vpaes_set_encrypt_key:
+	stp	x29,x30,[sp,#-16]!
+	add	x29,sp,#0
+	stp	d8,d9,[sp,#-16]!	// ABI spec says so
+
+	lsr	w9, $bits, #5		// shr	\$5,%eax
+	add	w9, w9, #5		// \$5,%eax
+	str	w9, [$out,#240]		// mov	%eax,240(%rdx)	# AES_KEY->rounds = nbits/32+5;
+
+	mov	$dir, #0		// mov	\$0,%ecx
+	mov	x8, #0x30		// mov	\$0x30,%r8d
+	bl	_vpaes_schedule_core
+	eor	x0, x0, x0
+
+	ldp	d8,d9,[sp],#16
+	ldp	x29,x30,[sp],#16
+	ret
+.size	vpaes_set_encrypt_key,.-vpaes_set_encrypt_key
+
+.globl	vpaes_set_decrypt_key
+.type	vpaes_set_decrypt_key,%function
+.align	4
+vpaes_set_decrypt_key:
+	stp	x29,x30,[sp,#-16]!
+	add	x29,sp,#0
+	stp	d8,d9,[sp,#-16]!	// ABI spec says so
+
+	lsr	w9, $bits, #5		// shr	\$5,%eax
+	add	w9, w9, #5		// \$5,%eax
+	str	w9, [$out,#240]		// mov	%eax,240(%rdx)	# AES_KEY->rounds = nbits/32+5;
+	lsl	w9, w9, #4		// shl	\$4,%eax
+	add	$out, $out, #16		// lea	16(%rdx,%rax),%rdx
+	add	$out, $out, x9
+
+	mov	$dir, #1		// mov	\$1,%ecx
+	lsr	w8, $bits, #1		// shr	\$1,%r8d
+	and	x8, x8, #32		// and	\$32,%r8d
+	eor	x8, x8, #32		// xor	\$32,%r8d	# nbits==192?0:32
+	bl	_vpaes_schedule_core
+
+	ldp	d8,d9,[sp],#16
+	ldp	x29,x30,[sp],#16
+	ret
+.size	vpaes_set_decrypt_key,.-vpaes_set_decrypt_key
+___
+}
+{
+my ($inp,$out,$len,$key,$ivec,$dir) = map("x$_",(0..5));
+
+$code.=<<___;
+.globl	vpaes_cbc_encrypt
+.type	vpaes_cbc_encrypt,%function
+.align	4
+vpaes_cbc_encrypt:
+	cbz	$len, .Lcbc_abort
+	cmp	w5, #0			// check direction
+	b.eq	vpaes_cbc_decrypt
+
+	stp	x29,x30,[sp,#-16]!
+	add	x29,sp,#0
+
+	mov	x17, $len		// reassign
+	mov	x2,  $key		// reassign
+
+	ld1	{v0.16b}, [$ivec]	// load ivec
+	bl	_vpaes_encrypt_preheat
+	b	.Lcbc_enc_loop
+
+.align	4
+.Lcbc_enc_loop:
+	ld1	{v7.16b}, [$inp],#16	// load input
+	eor	v7.16b, v7.16b, v0.16b	// xor with ivec
+	bl	_vpaes_encrypt_core
+	st1	{v0.16b}, [$out],#16	// save output
+	subs	x17, x17, #16
+	b.hi	.Lcbc_enc_loop
+
+	st1	{v0.16b}, [$ivec]	// write ivec
+
+	ldp	x29,x30,[sp],#16
+.Lcbc_abort:
+	ret
+.size	vpaes_cbc_encrypt,.-vpaes_cbc_encrypt
+
+.type	vpaes_cbc_decrypt,%function
+.align	4
+vpaes_cbc_decrypt:
+	stp	x29,x30,[sp,#-16]!
+	add	x29,sp,#0
+	stp	d8,d9,[sp,#-16]!	// ABI spec says so
+	stp	d10,d11,[sp,#-16]!
+	stp	d12,d13,[sp,#-16]!
+	stp	d14,d15,[sp,#-16]!
+
+	mov	x17, $len		// reassign
+	mov	x2,  $key		// reassign
+	ld1	{v6.16b}, [$ivec]	// load ivec
+	bl	_vpaes_decrypt_preheat
+	tst	x17, #16
+	b.eq	.Lcbc_dec_loop2x
+
+	ld1	{v7.16b}, [$inp], #16	// load input
+	bl	_vpaes_decrypt_core
+	eor	v0.16b, v0.16b, v6.16b	// xor with ivec
+	orr	v6.16b, v7.16b, v7.16b	// next ivec value
+	st1	{v0.16b}, [$out], #16
+	subs	x17, x17, #16
+	b.ls	.Lcbc_dec_done
+
+.align	4
+.Lcbc_dec_loop2x:
+	ld1	{v14.16b,v15.16b}, [$inp], #32
+	bl	_vpaes_decrypt_2x
+	eor	v0.16b, v0.16b, v6.16b	// xor with ivec
+	eor	v1.16b, v1.16b, v14.16b
+	orr	v6.16b, v15.16b, v15.16b
+	st1	{v0.16b,v1.16b}, [$out], #32
+	subs	x17, x17, #32
+	b.hi	.Lcbc_dec_loop2x
+
+.Lcbc_dec_done:
+	st1	{v6.16b}, [$ivec]
+
+	ldp	d14,d15,[sp],#16
+	ldp	d12,d13,[sp],#16
+	ldp	d10,d11,[sp],#16
+	ldp	d8,d9,[sp],#16
+	ldp	x29,x30,[sp],#16
+	ret
+.size	vpaes_cbc_decrypt,.-vpaes_cbc_decrypt
+___
+if (1) {
+$code.=<<___;
+.globl	vpaes_ecb_encrypt
+.type	vpaes_ecb_encrypt,%function
+.align	4
+vpaes_ecb_encrypt:
+	stp	x29,x30,[sp,#-16]!
+	add	x29,sp,#0
+	stp	d8,d9,[sp,#-16]!	// ABI spec says so
+	stp	d10,d11,[sp,#-16]!
+	stp	d12,d13,[sp,#-16]!
+	stp	d14,d15,[sp,#-16]!
+
+	mov	x17, $len
+	mov	x2,  $key
+	bl	_vpaes_encrypt_preheat
+	tst	x17, #16
+	b.eq	.Lecb_enc_loop
+
+	ld1	{v7.16b}, [$inp],#16
+	bl	_vpaes_encrypt_core
+	st1	{v0.16b}, [$out],#16
+	subs	x17, x17, #16
+	b.ls	.Lecb_enc_done
+
+.align	4
+.Lecb_enc_loop:
+	ld1	{v14.16b,v15.16b}, [$inp], #32
+	bl	_vpaes_encrypt_2x
+	st1	{v0.16b,v1.16b}, [$out], #32
+	subs	x17, x17, #32
+	b.hi	.Lecb_enc_loop
+
+.Lecb_enc_done:
+	ldp	d14,d15,[sp],#16
+	ldp	d12,d13,[sp],#16
+	ldp	d10,d11,[sp],#16
+	ldp	d8,d9,[sp],#16
+	ldp	x29,x30,[sp],#16
+	ret
+.size	vpaes_ecb_encrypt,.-vpaes_ecb_encrypt
+
+.globl	vpaes_ecb_decrypt
+.type	vpaes_ecb_decrypt,%function
+.align	4
+vpaes_ecb_decrypt:
+	stp	x29,x30,[sp,#-16]!
+	add	x29,sp,#0
+	stp	d8,d9,[sp,#-16]!	// ABI spec says so
+	stp	d10,d11,[sp,#-16]!
+	stp	d12,d13,[sp,#-16]!
+	stp	d14,d15,[sp,#-16]!
+
+	mov	x17, $len
+	mov	x2,  $key
+	bl	_vpaes_decrypt_preheat
+	tst	x17, #16
+	b.eq	.Lecb_dec_loop
+
+	ld1	{v7.16b}, [$inp],#16
+	bl	_vpaes_encrypt_core
+	st1	{v0.16b}, [$out],#16
+	subs	x17, x17, #16
+	b.ls	.Lecb_dec_done
+
+.align	4
+.Lecb_dec_loop:
+	ld1	{v14.16b,v15.16b}, [$inp], #32
+	bl	_vpaes_decrypt_2x
+	st1	{v0.16b,v1.16b}, [$out], #32
+	subs	x17, x17, #32
+	b.hi	.Lecb_dec_loop
+
+.Lecb_dec_done:
+	ldp	d14,d15,[sp],#16
+	ldp	d12,d13,[sp],#16
+	ldp	d10,d11,[sp],#16
+	ldp	d8,d9,[sp],#16
+	ldp	x29,x30,[sp],#16
+	ret
+.size	vpaes_ecb_decrypt,.-vpaes_ecb_decrypt
+___
+}	}
+print $code;
+
+close STDOUT;
diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 4fab21b..7b4d84f 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -980,6 +980,9 @@ const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
 #   if defined(BSAES_ASM)
 #    define BSAES_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON)
 #   endif
+#   if defined(VPAES_ASM)
+#    define VPAES_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON)
+#   endif
 #   define HWAES_CAPABLE (OPENSSL_armcap_P & ARMV8_AES)
 #   define HWAES_set_encrypt_key aes_v8_set_encrypt_key
 #   define HWAES_set_decrypt_key aes_v8_set_decrypt_key

From rsalz at openssl.org  Sat Mar 28 14:54:41 2015
From: rsalz at openssl.org (Rich Salz)
Date: Sat, 28 Mar 2015 14:54:41 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427554481.147682.1595.nullmailer@dev.openssl.org>

The branch master has been updated
       via  c5ba2d990420e1778ca4a90bf882e0f806404af0 (commit)
      from  33b188a8e82df57208ec8263c263f8b6f47e8255 (commit)


- Log -----------------------------------------------------------------
commit c5ba2d990420e1778ca4a90bf882e0f806404af0
Author: Rich Salz <rsalz at openssl.org>
Date:   Sat Mar 28 10:54:15 2015 -0400

    free NULL cleanup
    
    EVP_.*free; this gets:
            EVP_CIPHER_CTX_free EVP_PKEY_CTX_free EVP_PKEY_asn1_free
            EVP_PKEY_asn1_set_free EVP_PKEY_free EVP_PKEY_free_it
            EVP_PKEY_meth_free; and also EVP_CIPHER_CTX_cleanup
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

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

Summary of changes:
 apps/dgst.c                     |  3 +--
 apps/genpkey.c                  | 15 +++++----------
 apps/pkcs12.c                   |  3 +--
 apps/pkeyutl.c                  |  3 +--
 apps/req.c                      |  5 ++---
 apps/s_cb.c                     |  3 +--
 apps/s_client.c                 |  3 +--
 apps/s_server.c                 |  9 +++------
 crypto/asn1/d2i_pr.c            |  2 +-
 crypto/asn1/d2i_pu.c            |  2 +-
 crypto/asn1/x_pkey.c            |  3 +--
 crypto/asn1/x_pubkey.c          |  3 +--
 crypto/cms/cms_asn1.c           | 15 +++++----------
 crypto/cms/cms_env.c            |  9 +++------
 crypto/cms/cms_kari.c           |  8 +++-----
 crypto/cms/cms_sd.c             |  9 +++------
 crypto/dh/dh_ameth.c            |  6 ++----
 crypto/ec/ec_ameth.c            |  3 +--
 crypto/evp/digest.c             |  3 +--
 crypto/evp/evp_enc.c            |  7 ++++---
 crypto/evp/evp_extra_test.c     | 20 +++++---------------
 crypto/evp/evp_test.c           |  9 +++------
 crypto/evp/p_lib.c              |  1 +
 crypto/evp/pmeth_fn.c           |  3 +--
 crypto/evp/pmeth_gn.c           |  3 +--
 crypto/evp/pmeth_lib.c          |  6 ++----
 crypto/pem/pem_pk8.c            |  3 +--
 crypto/pem/pem_pkey.c           |  9 +++------
 crypto/pem/pvkfmt.c             |  6 ++----
 crypto/pkcs12/p12_kiss.c        |  2 +-
 crypto/pkcs7/pk7_doit.c         | 13 +++++--------
 crypto/pkcs7/pk7_lib.c          |  3 +--
 crypto/ts/ts_rsp_sign.c         |  3 +--
 crypto/x509/x509_cmp.c          |  6 ++----
 crypto/x509/x509_vfy.c          |  6 ++----
 demos/cms/cms_ddec.c            |  3 +--
 demos/cms/cms_dec.c             |  3 +--
 demos/cms/cms_sign.c            |  3 +--
 demos/cms/cms_sign2.c           |  6 ++----
 demos/smime/smdec.c             |  3 +--
 demos/smime/smsign.c            |  3 +--
 demos/smime/smsign2.c           |  6 ++----
 doc/crypto/EVP_PKEY_CTX_new.pod |  1 +
 doc/crypto/EVP_PKEY_new.pod     |  1 +
 engines/ccgost/gost2001_keyx.c  |  7 +++----
 engines/e_chil.c                |  3 +--
 ssl/s3_srvr.c                   |  3 +--
 ssl/ssl_cert.c                  |  6 ++----
 48 files changed, 90 insertions(+), 165 deletions(-)

diff --git a/apps/dgst.c b/apps/dgst.c
index ac3b583..7006000 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -384,8 +384,7 @@ int MAIN(int argc, char **argv)
         }
         r = 1;
  mac_end:
-        if (mac_ctx)
-            EVP_PKEY_CTX_free(mac_ctx);
+        EVP_PKEY_CTX_free(mac_ctx);
         if (r == 0)
             goto end;
     }
diff --git a/apps/genpkey.c b/apps/genpkey.c
index 5b7f433..bd81d51 100644
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -268,10 +268,8 @@ int MAIN(int argc, char **argv)
     ret = 0;
 
  end:
-    if (pkey)
-        EVP_PKEY_free(pkey);
-    if (ctx)
-        EVP_PKEY_CTX_free(ctx);
+    EVP_PKEY_free(pkey);
+    EVP_PKEY_CTX_free(ctx);
     BIO_free_all(out);
     BIO_free(in);
     if (pass)
@@ -317,10 +315,8 @@ static int init_keygen_file(BIO *err, EVP_PKEY_CTX **pctx,
  err:
     BIO_puts(err, "Error initializing context\n");
     ERR_print_errors(err);
-    if (ctx)
-        EVP_PKEY_CTX_free(ctx);
-    if (pkey)
-        EVP_PKEY_free(pkey);
+    EVP_PKEY_CTX_free(ctx);
+    EVP_PKEY_free(pkey);
     return 0;
 
 }
@@ -375,8 +371,7 @@ int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
  err:
     BIO_printf(err, "Error initializing %s context\n", algname);
     ERR_print_errors(err);
-    if (ctx)
-        EVP_PKEY_CTX_free(ctx);
+    EVP_PKEY_CTX_free(ctx);
     return 0;
 
 }
diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index e33fe24..a60a055 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -672,8 +672,7 @@ int MAIN(int argc, char **argv)
         CRYPTO_push_info("process -export_cert: freeing");
 # endif
 
-        if (key)
-            EVP_PKEY_free(key);
+        EVP_PKEY_free(key);
         if (certs)
             sk_X509_pop_free(certs, X509_free);
         if (ucert)
diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c
index aaa9074..1028686 100644
--- a/apps/pkeyutl.c
+++ b/apps/pkeyutl.c
@@ -332,8 +332,7 @@ int MAIN(int argc, char **argv)
         BIO_write(out, buf_out, buf_outlen);
 
  end:
-    if (ctx)
-        EVP_PKEY_CTX_free(ctx);
+    EVP_PKEY_CTX_free(ctx);
     BIO_free(in);
     BIO_free_all(out);
     if (buf_in)
diff --git a/apps/req.c b/apps/req.c
index 231535b..3cedf2c 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -874,9 +874,9 @@ int MAIN(int argc, char **argv)
 
         if (pkey == NULL) {
             pkey = X509_REQ_get_pubkey(req);
-            tmp = 1;
             if (pkey == NULL)
                 goto end;
+            tmp = 1;
         }
 
         i = X509_REQ_verify(req, pkey);
@@ -1013,8 +1013,7 @@ int MAIN(int argc, char **argv)
     BIO_free(in);
     BIO_free_all(out);
     EVP_PKEY_free(pkey);
-    if (genctx)
-        EVP_PKEY_CTX_free(genctx);
+    EVP_PKEY_CTX_free(genctx);
     if (pkeyopts)
         sk_OPENSSL_STRING_free(pkeyopts);
     if (sigopts)
diff --git a/apps/s_cb.c b/apps/s_cb.c
index ea7d35c..7e69fc8 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -1242,8 +1242,7 @@ void ssl_excert_free(SSL_EXCERT *exc)
     while (exc) {
         if (exc->cert)
             X509_free(exc->cert);
-        if (exc->key)
-            EVP_PKEY_free(exc->key);
+        EVP_PKEY_free(exc->key);
         if (exc->chain)
             sk_X509_pop_free(exc->chain, X509_free);
         curr = exc;
diff --git a/apps/s_client.c b/apps/s_client.c
index 0874983..ec11617 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -2030,8 +2030,7 @@ int MAIN(int argc, char **argv)
         X509_free(cert);
     if (crls)
         sk_X509_CRL_pop_free(crls, X509_CRL_free);
-    if (key)
-        EVP_PKEY_free(key);
+    EVP_PKEY_free(key);
     if (chain)
         sk_X509_pop_free(chain, X509_free);
     if (pass)
diff --git a/apps/s_server.c b/apps/s_server.c
index 37c40cb..f97a97d 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2011,10 +2011,8 @@ int MAIN(int argc, char *argv[])
         sk_X509_CRL_pop_free(crls, X509_CRL_free);
     if (s_dcert)
         X509_free(s_dcert);
-    if (s_key)
-        EVP_PKEY_free(s_key);
-    if (s_dkey)
-        EVP_PKEY_free(s_dkey);
+    EVP_PKEY_free(s_key);
+    EVP_PKEY_free(s_dkey);
     if (s_chain)
         sk_X509_pop_free(s_chain, X509_free);
     if (s_dchain)
@@ -2037,8 +2035,7 @@ int MAIN(int argc, char *argv[])
         SSL_CTX_free(ctx2);
     if (s_cert2)
         X509_free(s_cert2);
-    if (s_key2)
-        EVP_PKEY_free(s_key2);
+    EVP_PKEY_free(s_key2);
     BIO_free(serverinfo_in);
 # ifndef OPENSSL_NO_NEXTPROTONEG
     if (next_proto.data)
diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c
index 5f1a96d..793532f 100644
--- a/crypto/asn1/d2i_pr.c
+++ b/crypto/asn1/d2i_pr.c
@@ -113,7 +113,7 @@ EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
         (*a) = ret;
     return (ret);
  err:
-    if ((ret != NULL) && ((a == NULL) || (*a != ret)))
+    if (a == NULL || *a != ret)
         EVP_PKEY_free(ret);
     return (NULL);
 }
diff --git a/crypto/asn1/d2i_pu.c b/crypto/asn1/d2i_pu.c
index 33542dd..189cfdd 100644
--- a/crypto/asn1/d2i_pu.c
+++ b/crypto/asn1/d2i_pu.c
@@ -130,7 +130,7 @@ EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
         (*a) = ret;
     return (ret);
  err:
-    if ((ret != NULL) && ((a == NULL) || (*a != ret)))
+    if (a == NULL || *a != ret)
         EVP_PKEY_free(ret);
     return (NULL);
 }
diff --git a/crypto/asn1/x_pkey.c b/crypto/asn1/x_pkey.c
index f4396e7..f24c0ce 100644
--- a/crypto/asn1/x_pkey.c
+++ b/crypto/asn1/x_pkey.c
@@ -144,8 +144,7 @@ void X509_PKEY_free(X509_PKEY *x)
     if (x->enc_algor != NULL)
         X509_ALGOR_free(x->enc_algor);
     ASN1_OCTET_STRING_free(x->enc_pkey);
-    if (x->dec_pkey != NULL)
-        EVP_PKEY_free(x->dec_pkey);
+    EVP_PKEY_free(x->dec_pkey);
     if ((x->key_data != NULL) && (x->key_free))
         OPENSSL_free(x->key_data);
     OPENSSL_free(x);
diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c
index cefaf3a..3c72997 100644
--- a/crypto/asn1/x_pubkey.c
+++ b/crypto/asn1/x_pubkey.c
@@ -174,8 +174,7 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)
     return ret;
 
  error:
-    if (ret != NULL)
-        EVP_PKEY_free(ret);
+    EVP_PKEY_free(ret);
     return (NULL);
 }
 
diff --git a/crypto/cms/cms_asn1.c b/crypto/cms/cms_asn1.c
index 9a71919..03de7af 100644
--- a/crypto/cms/cms_asn1.c
+++ b/crypto/cms/cms_asn1.c
@@ -93,8 +93,7 @@ static int cms_si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 {
     if (operation == ASN1_OP_FREE_POST) {
         CMS_SignerInfo *si = (CMS_SignerInfo *)*pval;
-        if (si->pkey)
-            EVP_PKEY_free(si->pkey);
+        EVP_PKEY_free(si->pkey);
         if (si->signer)
             X509_free(si->signer);
         if (si->pctx)
@@ -171,8 +170,7 @@ static int cms_rek_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 {
     CMS_RecipientEncryptedKey *rek = (CMS_RecipientEncryptedKey *)*pval;
     if (operation == ASN1_OP_FREE_POST) {
-        if (rek->pkey)
-            EVP_PKEY_free(rek->pkey);
+        EVP_PKEY_free(rek->pkey);
     }
     return 1;
 }
@@ -202,8 +200,7 @@ static int cms_kari_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
         EVP_CIPHER_CTX_set_flags(&kari->ctx, EVP_CIPHER_CTX_FLAG_WRAP_ALLOW);
         kari->pctx = NULL;
     } else if (operation == ASN1_OP_FREE_POST) {
-        if (kari->pctx)
-            EVP_PKEY_CTX_free(kari->pctx);
+        EVP_PKEY_CTX_free(kari->pctx);
         EVP_CIPHER_CTX_cleanup(&kari->ctx);
     }
     return 1;
@@ -250,12 +247,10 @@ static int cms_ri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
         CMS_RecipientInfo *ri = (CMS_RecipientInfo *)*pval;
         if (ri->type == CMS_RECIPINFO_TRANS) {
             CMS_KeyTransRecipientInfo *ktri = ri->d.ktri;
-            if (ktri->pkey)
-                EVP_PKEY_free(ktri->pkey);
+            EVP_PKEY_free(ktri->pkey);
             if (ktri->recip)
                 X509_free(ktri->recip);
-            if (ktri->pctx)
-                EVP_PKEY_CTX_free(ktri->pctx);
+            EVP_PKEY_CTX_free(ktri->pctx);
         } else if (ri->type == CMS_RECIPINFO_KEK) {
             CMS_KEKRecipientInfo *kekri = ri->d.kekri;
             if (kekri->key) {
diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c
index d1252f8..3b4b930 100644
--- a/crypto/cms/cms_env.c
+++ b/crypto/cms/cms_env.c
@@ -279,8 +279,7 @@ CMS_RecipientInfo *CMS_add1_recipient_cert(CMS_ContentInfo *cms,
  err:
     if (ri)
         M_ASN1_free_of(ri, CMS_RecipientInfo);
-    if (pk)
-        EVP_PKEY_free(pk);
+    EVP_PKEY_free(pk);
     return NULL;
 
 }
@@ -476,10 +475,8 @@ static int cms_RecipientInfo_ktri_decrypt(CMS_ContentInfo *cms,
     ec->keylen = eklen;
 
  err:
-    if (ktri->pctx) {
-        EVP_PKEY_CTX_free(ktri->pctx);
-        ktri->pctx = NULL;
-    }
+    EVP_PKEY_CTX_free(ktri->pctx);
+    ktri->pctx = NULL;
     if (!ret && ek)
         OPENSSL_free(ek);
 
diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c
index 196b5c6..5aaba59 100644
--- a/crypto/cms/cms_kari.c
+++ b/crypto/cms/cms_kari.c
@@ -218,8 +218,7 @@ int CMS_RecipientInfo_kari_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pk)
     kari->pctx = pctx;
     return 1;
  err:
-    if (pctx)
-        EVP_PKEY_CTX_free(pctx);
+    EVP_PKEY_CTX_free(pctx);
     return 0;
 }
 
@@ -331,10 +330,9 @@ static int cms_kari_create_ephemeral_key(CMS_KeyAgreeRecipientInfo *kari,
     kari->pctx = pctx;
     rv = 1;
  err:
-    if (!rv && pctx)
+    if (!rv)
         EVP_PKEY_CTX_free(pctx);
-    if (ekey)
-        EVP_PKEY_free(ekey);
+    EVP_PKEY_free(ekey);
     return rv;
 }
 
diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
index c45d30e..71c234c 100644
--- a/crypto/cms/cms_sd.c
+++ b/crypto/cms/cms_sd.c
@@ -487,8 +487,7 @@ void CMS_SignerInfo_set1_signer_cert(CMS_SignerInfo *si, X509 *signer)
 {
     if (signer) {
         CRYPTO_add(&signer->references, 1, CRYPTO_LOCK_X509);
-        if (si->pkey)
-            EVP_PKEY_free(si->pkey);
+        EVP_PKEY_free(si->pkey);
         si->pkey = X509_get_pubkey(signer);
     }
     if (si->signer)
@@ -651,8 +650,7 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,
 
  err:
     EVP_MD_CTX_cleanup(&mctx);
-    if (pctx)
-        EVP_PKEY_CTX_free(pctx);
+    EVP_PKEY_CTX_free(pctx);
     return r;
 
 }
@@ -875,8 +873,7 @@ int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain)
     }
 
  err:
-    if (pkctx)
-        EVP_PKEY_CTX_free(pkctx);
+    EVP_PKEY_CTX_free(pkctx);
     EVP_MD_CTX_cleanup(&mctx);
     return r;
 
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index c71538f..cfa2e2d 100644
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -708,8 +708,7 @@ static int dh_cms_set_peerkey(EVP_PKEY_CTX *pctx,
  err:
     if (public_key)
         ASN1_INTEGER_free(public_key);
-    if (pkpeer)
-        EVP_PKEY_free(pkpeer);
+    EVP_PKEY_free(pkpeer);
     DH_free(dhpeer);
     return rv;
 }
@@ -849,8 +848,7 @@ static int dh_cms_encrypt(CMS_RecipientInfo *ri)
     X509_ALGOR_get0(&aoid, NULL, NULL, talg);
     /* Is everything uninitialised? */
     if (aoid == OBJ_nid2obj(NID_undef)) {
-        ASN1_INTEGER *pubk;
-        pubk = BN_to_ASN1_INTEGER(pkey->pkey.dh->pub_key, NULL);
+        ASN1_INTEGER *pubk = BN_to_ASN1_INTEGER(pkey->pkey.dh->pub_key, NULL);
         if (!pubk)
             goto err;
         /* Set the key */
diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index 4be85a9..65c3d56 100644
--- a/crypto/ec/ec_ameth.c
+++ b/crypto/ec/ec_ameth.c
@@ -704,8 +704,7 @@ static int ecdh_cms_set_peerkey(EVP_PKEY_CTX *pctx,
         rv = 1;
  err:
     EC_KEY_free(ecpeer);
-    if (pkpeer)
-        EVP_PKEY_free(pkpeer);
+    EVP_PKEY_free(pkpeer);
     return rv;
 }
 
diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index 48c7b00..ce95350 100644
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.c
@@ -352,8 +352,7 @@ int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx)
         OPENSSL_cleanse(ctx->md_data, ctx->digest->ctx_size);
         OPENSSL_free(ctx->md_data);
     }
-    if (ctx->pctx)
-        EVP_PKEY_CTX_free(ctx->pctx);
+    EVP_PKEY_CTX_free(ctx->pctx);
 #ifndef OPENSSL_NO_ENGINE
     if (ctx->engine)
         /*
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index 3d40b04..3468b6b 100644
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -522,14 +522,15 @@ int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
 
 void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)
 {
-    if (ctx) {
-        EVP_CIPHER_CTX_cleanup(ctx);
+    EVP_CIPHER_CTX_cleanup(ctx);
+    if (ctx)
         OPENSSL_free(ctx);
-    }
 }
 
 int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c)
 {
+    if (!c)
+        return 0;
     if (c->cipher != NULL) {
         if (c->cipher->cleanup && !c->cipher->cleanup(c))
             return 0;
diff --git a/crypto/evp/evp_extra_test.c b/crypto/evp/evp_extra_test.c
index c474134..567ed0f 100644
--- a/crypto/evp/evp_extra_test.c
+++ b/crypto/evp/evp_extra_test.c
@@ -265,9 +265,7 @@ static EVP_PKEY *load_example_rsa_key(void)
     pkey = NULL;
 
  out:
-    if (pkey) {
-        EVP_PKEY_free(pkey);
-    }
+    EVP_PKEY_free(pkey);
     RSA_free(rsa);
 
     return ret;
@@ -321,9 +319,7 @@ static int test_EVP_DigestSignInit(void)
 
     EVP_MD_CTX_cleanup(&md_ctx);
     EVP_MD_CTX_cleanup(&md_ctx_verify);
-    if (pkey) {
-        EVP_PKEY_free(pkey);
-    }
+    EVP_PKEY_free(pkey);
     if (sig) {
         OPENSSL_free(sig);
     }
@@ -354,9 +350,7 @@ static int test_EVP_DigestVerifyInit(void)
     }
 
     EVP_MD_CTX_cleanup(&md_ctx);
-    if (pkey) {
-        EVP_PKEY_free(pkey);
-    }
+    EVP_PKEY_free(pkey);
 
     return ret;
 }
@@ -387,9 +381,7 @@ static int test_d2i_AutoPrivateKey(const unsigned char *input,
         ERR_print_errors_fp(stderr);
     }
 
-    if (pkey != NULL) {
-        EVP_PKEY_free(pkey);
-    }
+    EVP_PKEY_free(pkey);
     return ret;
 }
 
@@ -422,9 +414,7 @@ static int test_EVP_PKCS82PKEY(void)
         PKCS8_PRIV_KEY_INFO_free(p8inf);
     }
 
-    if (pkey != NULL) {
-        EVP_PKEY_free(pkey);
-    }
+    EVP_PKEY_free(pkey);
 
     return ret;
 }
diff --git a/crypto/evp/evp_test.c b/crypto/evp/evp_test.c
index 1524658..68d5bde 100644
--- a/crypto/evp/evp_test.c
+++ b/crypto/evp/evp_test.c
@@ -1051,10 +1051,8 @@ static int mac_test_run(struct evp_test *t)
         EVP_MD_CTX_destroy(mctx);
     if (mac)
         OPENSSL_free(mac);
-    if (genctx)
-        EVP_PKEY_CTX_free(genctx);
-    if (key)
-        EVP_PKEY_free(key);
+    EVP_PKEY_CTX_free(genctx);
+    EVP_PKEY_free(key);
     t->err = err;
     return 1;
 }
@@ -1139,8 +1137,7 @@ static void pkey_test_cleanup(struct evp_test *t)
         OPENSSL_free(kdata->input);
     if (kdata->output)
         OPENSSL_free(kdata->output);
-    if (kdata->ctx)
-        EVP_PKEY_CTX_free(kdata->ctx);
+    EVP_PKEY_CTX_free(kdata->ctx);
 }
 
 static int pkey_test_parse(struct evp_test *t,
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 604faf2..a96fae6 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -409,6 +409,7 @@ void EVP_PKEY_free(EVP_PKEY *x)
 
 static void EVP_PKEY_free_it(EVP_PKEY *x)
 {
+    /* internal function; x is never NULL */
     if (x->ameth && x->ameth->pkey_free) {
         x->ameth->pkey_free(x);
         x->pkey.ptr = NULL;
diff --git a/crypto/evp/pmeth_fn.c b/crypto/evp/pmeth_fn.c
index 829b5f0..abf2160 100644
--- a/crypto/evp/pmeth_fn.c
+++ b/crypto/evp/pmeth_fn.c
@@ -315,8 +315,7 @@ int EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *ctx, EVP_PKEY *peer)
         return -1;
     }
 
-    if (ctx->peerkey)
-        EVP_PKEY_free(ctx->peerkey);
+    EVP_PKEY_free(ctx->peerkey);
     ctx->peerkey = peer;
 
     ret = ctx->pmeth->ctrl(ctx, EVP_PKEY_CTRL_PEER_KEY, 1, peer);
diff --git a/crypto/evp/pmeth_gn.c b/crypto/evp/pmeth_gn.c
index a5ae484..78467c9 100644
--- a/crypto/evp/pmeth_gn.c
+++ b/crypto/evp/pmeth_gn.c
@@ -207,7 +207,6 @@ EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e,
     if (EVP_PKEY_keygen(mac_ctx, &mac_key) <= 0)
         goto merr;
  merr:
-    if (mac_ctx)
-        EVP_PKEY_CTX_free(mac_ctx);
+    EVP_PKEY_CTX_free(mac_ctx);
     return mac_key;
 }
diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index 9183e40..b20a902 100644
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -363,10 +363,8 @@ void EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx)
         return;
     if (ctx->pmeth && ctx->pmeth->cleanup)
         ctx->pmeth->cleanup(ctx);
-    if (ctx->pkey)
-        EVP_PKEY_free(ctx->pkey);
-    if (ctx->peerkey)
-        EVP_PKEY_free(ctx->peerkey);
+    EVP_PKEY_free(ctx->pkey);
+    EVP_PKEY_free(ctx->peerkey);
 #ifndef OPENSSL_NO_ENGINE
     if (ctx->engine)
         /*
diff --git a/crypto/pem/pem_pk8.c b/crypto/pem/pem_pk8.c
index 0d76026..529d077 100644
--- a/crypto/pem/pem_pk8.c
+++ b/crypto/pem/pem_pk8.c
@@ -183,8 +183,7 @@ EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
     if (!ret)
         return NULL;
     if (x) {
-        if (*x)
-            EVP_PKEY_free(*x);
+        EVP_PKEY_free(*x);
         *x = ret;
     }
     return ret;
diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c
index fd7e8b0..80c316e 100644
--- a/crypto/pem/pem_pkey.c
+++ b/crypto/pem/pem_pkey.c
@@ -96,8 +96,7 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
             goto p8err;
         ret = EVP_PKCS82PKEY(p8inf);
         if (x) {
-            if (*x)
-                EVP_PKEY_free((EVP_PKEY *)*x);
+            EVP_PKEY_free((EVP_PKEY *)*x);
             *x = ret;
         }
         PKCS8_PRIV_KEY_INFO_free(p8inf);
@@ -124,8 +123,7 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
             goto p8err;
         ret = EVP_PKCS82PKEY(p8inf);
         if (x) {
-            if (*x)
-                EVP_PKEY_free((EVP_PKEY *)*x);
+            EVP_PKEY_free((EVP_PKEY *)*x);
             *x = ret;
         }
         PKCS8_PRIV_KEY_INFO_free(p8inf);
@@ -186,8 +184,7 @@ EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x)
             goto err;
         }
         if (x) {
-            if (*x)
-                EVP_PKEY_free((EVP_PKEY *)*x);
+            EVP_PKEY_free((EVP_PKEY *)*x);
             *x = ret;
         }
     }
diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c
index 0f2390d..14ddb33 100644
--- a/crypto/pem/pvkfmt.c
+++ b/crypto/pem/pvkfmt.c
@@ -336,8 +336,7 @@ static EVP_PKEY *b2i_dss(const unsigned char **in, unsigned int length,
  memerr:
     PEMerr(PEM_F_B2I_DSS, ERR_R_MALLOC_FAILURE);
     DSA_free(dsa);
-    if (ret)
-        EVP_PKEY_free(ret);
+    EVP_PKEY_free(ret);
     if (ctx)
         BN_CTX_free(ctx);
     return NULL;
@@ -385,8 +384,7 @@ static EVP_PKEY *b2i_rsa(const unsigned char **in, unsigned int length,
  memerr:
     PEMerr(PEM_F_B2I_RSA, ERR_R_MALLOC_FAILURE);
     RSA_free(rsa);
-    if (ret)
-        EVP_PKEY_free(ret);
+    EVP_PKEY_free(ret);
     return NULL;
 }
 
diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c
index 4fd8b8c..fcfa986 100644
--- a/crypto/pkcs12/p12_kiss.c
+++ b/crypto/pkcs12/p12_kiss.c
@@ -161,7 +161,7 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
 
  err:
 
-    if (pkey && *pkey)
+    if (pkey)
         EVP_PKEY_free(*pkey);
     if (cert && *cert)
         X509_free(*cert);
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index b7c66a3..639e217 100644
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -179,10 +179,8 @@ static int pkcs7_encode_rinfo(PKCS7_RECIP_INFO *ri,
     ret = 1;
 
  err:
-    if (pkey)
-        EVP_PKEY_free(pkey);
-    if (pctx)
-        EVP_PKEY_CTX_free(pctx);
+    EVP_PKEY_free(pkey);
+    EVP_PKEY_CTX_free(pctx);
     if (ek)
         OPENSSL_free(ek);
     return ret;
@@ -240,8 +238,7 @@ static int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen,
     *peklen = eklen;
 
  err:
-    if (pctx)
-        EVP_PKEY_CTX_free(pctx);
+    EVP_PKEY_CTX_free(pctx);
     if (!ret && ek)
         OPENSSL_free(ek);
 
@@ -1077,8 +1074,8 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
         PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, PKCS7_R_SIGNATURE_FAILURE);
         ret = -1;
         goto err;
-    } else
-        ret = 1;
+    }
+    ret = 1;
  err:
     EVP_MD_CTX_cleanup(&mdc_tmp);
     return (ret);
diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index 6409d28..956f3f2 100644
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -556,8 +556,7 @@ int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
     return 1;
 
  err:
-    if (pkey)
-        EVP_PKEY_free(pkey);
+    EVP_PKEY_free(pkey);
     return 0;
 }
 
diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c
index b510ceb..037ab64 100644
--- a/crypto/ts/ts_rsp_sign.c
+++ b/crypto/ts/ts_rsp_sign.c
@@ -216,8 +216,7 @@ int TS_RESP_CTX_set_signer_cert(TS_RESP_CTX *ctx, X509 *signer)
 
 int TS_RESP_CTX_set_signer_key(TS_RESP_CTX *ctx, EVP_PKEY *key)
 {
-    if (ctx->signer_key)
-        EVP_PKEY_free(ctx->signer_key);
+    EVP_PKEY_free(ctx->signer_key);
     ctx->signer_key = key;
     CRYPTO_add(&ctx->signer_key->references, +1, CRYPTO_LOCK_EVP_PKEY);
 
diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
index 51c47cc..c7b0fe1 100644
--- a/crypto/x509/x509_cmp.c
+++ b/crypto/x509/x509_cmp.c
@@ -342,8 +342,7 @@ int X509_check_private_key(X509 *x, EVP_PKEY *k)
     case -2:
         X509err(X509_F_X509_CHECK_PRIVATE_KEY, X509_R_UNKNOWN_KEY_TYPE);
     }
-    if (xk)
-        EVP_PKEY_free(xk);
+    EVP_PKEY_free(xk);
     if (ret > 0)
         return 1;
     return 0;
@@ -436,8 +435,7 @@ int X509_chain_check_suiteb(int *perror_depth, X509 *x, STACK_OF(X509) *chain,
     /* Final check: root CA signature */
     rv = check_suite_b(pk, X509_get_signature_nid(x), &tflags);
  end:
-    if (pk)
-        EVP_PKEY_free(pk);
+    EVP_PKEY_free(pk);
     if (rv != X509_V_OK) {
         /* Invalid signature or LOS errors are for previous cert */
         if ((rv == X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index 61f02b5..9cf39db 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -1933,10 +1933,8 @@ int X509_get_pubkey_parameters(EVP_PKEY *pkey, STACK_OF(X509) *chain)
         }
         if (!EVP_PKEY_missing_parameters(ktmp))
             break;
-        else {
-            EVP_PKEY_free(ktmp);
-            ktmp = NULL;
-        }
+        EVP_PKEY_free(ktmp);
+        ktmp = NULL;
     }
     if (ktmp == NULL) {
         X509err(X509_F_X509_GET_PUBKEY_PARAMETERS,
diff --git a/demos/cms/cms_ddec.c b/demos/cms/cms_ddec.c
index 7247e57..1e06cea 100644
--- a/demos/cms/cms_ddec.c
+++ b/demos/cms/cms_ddec.c
@@ -72,8 +72,7 @@ int main(int argc, char **argv)
         CMS_ContentInfo_free(cms);
     if (rcert)
         X509_free(rcert);
-    if (rkey)
-        EVP_PKEY_free(rkey);
+    EVP_PKEY_free(rkey);
 
     BIO_free(in);
     BIO_free(out);
diff --git a/demos/cms/cms_dec.c b/demos/cms/cms_dec.c
index e9782d7..71a0e4f 100644
--- a/demos/cms/cms_dec.c
+++ b/demos/cms/cms_dec.c
@@ -63,8 +63,7 @@ int main(int argc, char **argv)
         CMS_ContentInfo_free(cms);
     if (rcert)
         X509_free(rcert);
-    if (rkey)
-        EVP_PKEY_free(rkey);
+    EVP_PKEY_free(rkey);
 
     BIO_free(in);
     BIO_free(out);
diff --git a/demos/cms/cms_sign.c b/demos/cms/cms_sign.c
index 9f2cff0..3ad5ce8 100644
--- a/demos/cms/cms_sign.c
+++ b/demos/cms/cms_sign.c
@@ -73,8 +73,7 @@ int main(int argc, char **argv)
         CMS_ContentInfo_free(cms);
     if (scert)
         X509_free(scert);
-    if (skey)
-        EVP_PKEY_free(skey);
+    EVP_PKEY_free(skey);
 
     BIO_free(in);
     BIO_free(out);
diff --git a/demos/cms/cms_sign2.c b/demos/cms/cms_sign2.c
index 23c6eb8..3276de1 100644
--- a/demos/cms/cms_sign2.c
+++ b/demos/cms/cms_sign2.c
@@ -82,13 +82,11 @@ int main(int argc, char **argv)
 
     if (scert)
         X509_free(scert);
-    if (skey)
-        EVP_PKEY_free(skey);
+    EVP_PKEY_free(skey);
 
     if (scert2)
         X509_free(scert2);
-    if (skey)
-        EVP_PKEY_free(skey2);
+    EVP_PKEY_free(skey2);
 
     BIO_free(in);
     BIO_free(out);
diff --git a/demos/smime/smdec.c b/demos/smime/smdec.c
index b50f8df..a418707 100644
--- a/demos/smime/smdec.c
+++ b/demos/smime/smdec.c
@@ -63,8 +63,7 @@ int main(int argc, char **argv)
         PKCS7_free(p7);
     if (rcert)
         X509_free(rcert);
-    if (rkey)
-        EVP_PKEY_free(rkey);
+    EVP_PKEY_free(rkey);
 
     BIO_free(in);
     BIO_free(out);
diff --git a/demos/smime/smsign.c b/demos/smime/smsign.c
index 6b9dfdd..455efcb 100644
--- a/demos/smime/smsign.c
+++ b/demos/smime/smsign.c
@@ -73,8 +73,7 @@ int main(int argc, char **argv)
         PKCS7_free(p7);
     if (scert)
         X509_free(scert);
-    if (skey)
-        EVP_PKEY_free(skey);
+    EVP_PKEY_free(skey);
 
     BIO_free(in);
     BIO_free(out);
diff --git a/demos/smime/smsign2.c b/demos/smime/smsign2.c
index 5d9de35..5f20a40 100644
--- a/demos/smime/smsign2.c
+++ b/demos/smime/smsign2.c
@@ -82,13 +82,11 @@ int main(int argc, char **argv)
 
     if (scert)
         X509_free(scert);
-    if (skey)
-        EVP_PKEY_free(skey);
+    EVP_PKEY_free(skey);
 
     if (scert2)
         X509_free(scert2);
-    if (skey)
-        EVP_PKEY_free(skey2);
+    EVP_PKEY_free(skey2);
 
     BIO_free(in);
     BIO_free(out);
diff --git a/doc/crypto/EVP_PKEY_CTX_new.pod b/doc/crypto/EVP_PKEY_CTX_new.pod
index a9af867..17d5e74 100644
--- a/doc/crypto/EVP_PKEY_CTX_new.pod
+++ b/doc/crypto/EVP_PKEY_CTX_new.pod
@@ -26,6 +26,7 @@ during parameter generation of key genration for some algorithms.
 EVP_PKEY_CTX_dup() duplicates the context B<ctx>.
 
 EVP_PKEY_CTX_free() frees up the context B<ctx>.
+If B<ctx> is NULL, nothing is done.
 
 =head1 NOTES
 
diff --git a/doc/crypto/EVP_PKEY_new.pod b/doc/crypto/EVP_PKEY_new.pod
index 10687e4..d26b03f 100644
--- a/doc/crypto/EVP_PKEY_new.pod
+++ b/doc/crypto/EVP_PKEY_new.pod
@@ -18,6 +18,7 @@ The EVP_PKEY_new() function allocates an empty B<EVP_PKEY>
 structure which is used by OpenSSL to store private keys.
 
 EVP_PKEY_free() frees up the private key B<key>.
+If B<key> is NULL, nothing is done.
 
 =head1 NOTES
 
diff --git a/engines/ccgost/gost2001_keyx.c b/engines/ccgost/gost2001_keyx.c
index db1bdc1..864d01b 100644
--- a/engines/ccgost/gost2001_keyx.c
+++ b/engines/ccgost/gost2001_keyx.c
@@ -189,7 +189,7 @@ int pkey_GOST01cp_encrypt(EVP_PKEY_CTX *pctx, unsigned char *out,
     }
     ASN1_OBJECT_free(gkt->key_agreement_info->cipher);
     gkt->key_agreement_info->cipher = OBJ_nid2obj(param->nid);
-    if (key_is_ephemeral && sec_key)
+    if (key_is_ephemeral)
         EVP_PKEY_free(sec_key);
     if (!key_is_ephemeral) {
         /* Set control "public key from client certificate used" */
@@ -204,7 +204,7 @@ int pkey_GOST01cp_encrypt(EVP_PKEY_CTX *pctx, unsigned char *out,
     GOST_KEY_TRANSPORT_free(gkt);
     return ret;
  err:
-    if (key_is_ephemeral && sec_key)
+    if (key_is_ephemeral)
         EVP_PKEY_free(sec_key);
     GOST_KEY_TRANSPORT_free(gkt);
     return -1;
@@ -284,8 +284,7 @@ int pkey_GOST01cp_decrypt(EVP_PKEY_CTX *pctx, unsigned char *key,
 
     ret = 1;
  err:
-    if (eph_key)
-        EVP_PKEY_free(eph_key);
+    EVP_PKEY_free(eph_key);
     if (gkt)
         GOST_KEY_TRANSPORT_free(gkt);
     return ret;
diff --git a/engines/e_chil.c b/engines/e_chil.c
index c06ab1a..68c9145 100644
--- a/engines/e_chil.c
+++ b/engines/e_chil.c
@@ -887,8 +887,7 @@ static EVP_PKEY *hwcrhk_load_pubkey(ENGINE *eng, const char *key_id,
 
     return res;
  err:
-    if (res)
-        EVP_PKEY_free(res);
+    EVP_PKEY_free(res);
     return NULL;
 }
 
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 68a8c81..5b17e52 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -2869,8 +2869,7 @@ int ssl3_get_client_key_exchange(SSL *s)
         EVP_PKEY_CTX_free(pkey_ctx);
         if (ret)
             return ret;
-        else
-            goto err;
+        goto err;
     } else {
         al = SSL_AD_HANDSHAKE_FAILURE;
         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_UNKNOWN_CIPHER_TYPE);
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index f05a60a..d6401b4 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -402,10 +402,8 @@ void ssl_cert_clear_certs(CERT *c)
             X509_free(cpk->x509);
             cpk->x509 = NULL;
         }
-        if (cpk->privatekey) {
-            EVP_PKEY_free(cpk->privatekey);
-            cpk->privatekey = NULL;
-        }
+        EVP_PKEY_free(cpk->privatekey);
+        cpk->privatekey = NULL;
         if (cpk->chain) {
             sk_X509_pop_free(cpk->chain, X509_free);
             cpk->chain = NULL;

From appro at openssl.org  Sat Mar 28 14:56:54 2015
From: appro at openssl.org (Andy Polyakov)
Date: Sat, 28 Mar 2015 14:56:54 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1427554614.051181.9165.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  c8ece537e341126b979b185b32fc716db6db9f0c (commit)
      from  8338cf0bdb9a5b17cd46a0bf8f58c15f10960586 (commit)


- Log -----------------------------------------------------------------
commit c8ece537e341126b979b185b32fc716db6db9f0c
Author: Andy Polyakov <appro at openssl.org>
Date:   Fri Mar 13 11:12:19 2015 +0100

    ec/asm/ecp_nistz256-x86_64.pl: update commentary with before-after performance data.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit b06a6f7cc44baa0c17207a8f72c4ac360be7b555)

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

Summary of changes:
 crypto/ec/asm/ecp_nistz256-x86_64.pl | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/crypto/ec/asm/ecp_nistz256-x86_64.pl b/crypto/ec/asm/ecp_nistz256-x86_64.pl
index 5b21574..84379fc 100755
--- a/crypto/ec/asm/ecp_nistz256-x86_64.pl
+++ b/crypto/ec/asm/ecp_nistz256-x86_64.pl
@@ -30,20 +30,24 @@
 
 # Further optimization by <appro at openssl.org>:
 #
-#		this/original
-# Opteron	+12-49%
-# Bulldozer	+14-45%
-# P4		+18-46%
-# Westmere	+12-34%
-# Sandy Bridge	+9-35%
-# Ivy Bridge	+9-35%
-# Haswell	+8-37%
-# Broadwell	+18-58%
-# Atom		+15-50%
-# VIA Nano	+43-160%
+#		this/original	with/without -DECP_NISTZ256_ASM(*)
+# Opteron	+12-49%		+110-150%
+# Bulldozer	+14-45%		+175-210%
+# P4		+18-46%		n/a :-(
+# Westmere	+12-34%		+80-87%
+# Sandy Bridge	+9-35%		+110-120%
+# Ivy Bridge	+9-35%		+110-125%
+# Haswell	+8-37%		+140-160%
+# Broadwell	+18-58%		+145-210%
+# Atom		+15-50%		+130-180%
+# VIA Nano	+43-160%	+300-480%
+#
+# (*)	"without -DECP_NISTZ256_ASM" refers to build with
+#	"enable-ec_nistp_64_gcc_128";
 #
 # Ranges denote minimum and maximum improvement coefficients depending
-# on benchmark.
+# on benchmark. Lower coefficients are for ECDSA sign, relatively fastest
+# server-side operation. Keep in mind that +100% means 2x improvement.
 
 $flavour = shift;
 $output  = shift;

From appro at openssl.org  Sat Mar 28 14:59:54 2015
From: appro at openssl.org (Andy Polyakov)
Date: Sat, 28 Mar 2015 14:59:54 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427554794.265004.9875.nullmailer@dev.openssl.org>

The branch master has been updated
       via  f0e6871df2e4641d0532e8f99d26c7a6454d03df (commit)
      from  c5ba2d990420e1778ca4a90bf882e0f806404af0 (commit)


- Log -----------------------------------------------------------------
commit f0e6871df2e4641d0532e8f99d26c7a6454d03df
Author: Andy Polyakov <appro at openssl.org>
Date:   Fri Mar 13 11:12:19 2015 +0100

    ec/asm/ecp_nistz256-x86_64.pl: update commentary with before-after performance data.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/ec/asm/ecp_nistz256-x86_64.pl | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/crypto/ec/asm/ecp_nistz256-x86_64.pl b/crypto/ec/asm/ecp_nistz256-x86_64.pl
index cdff22a..86ee382 100755
--- a/crypto/ec/asm/ecp_nistz256-x86_64.pl
+++ b/crypto/ec/asm/ecp_nistz256-x86_64.pl
@@ -30,21 +30,24 @@
 
 # Further optimization by <appro at openssl.org>:
 #
-#		this/original
-# Opteron	+12-49%
-# Bulldozer	+14-45%
-# P4		+18-46%
-# Westmere	+12-34%
-# Sandy Bridge	+9-35%
-# Ivy Bridge	+9-35%
-# Haswell	+8-37%
-# Broadwell	+18-58%
-# Atom		+15-50%
-# VIA Nano	+43-160%
+#		this/original	with/without -DECP_NISTZ256_ASM(*)
+# Opteron	+12-49%		+110-150%
+# Bulldozer	+14-45%		+175-210%
+# P4		+18-46%		n/a :-(
+# Westmere	+12-34%		+80-87%
+# Sandy Bridge	+9-35%		+110-120%
+# Ivy Bridge	+9-35%		+110-125%
+# Haswell	+8-37%		+140-160%
+# Broadwell	+18-58%		+145-210%
+# Atom		+15-50%		+130-180%
+# VIA Nano	+43-160%	+300-480%
+#
+# (*)	"without -DECP_NISTZ256_ASM" refers to build with
+#	"enable-ec_nistp_64_gcc_128";
 #
 # Ranges denote minimum and maximum improvement coefficients depending
-# on benchmark. Lower coefficients are for ECDSA sign, relatively
-# fastest server-side operation.
+# on benchmark. Lower coefficients are for ECDSA sign, relatively fastest
+# server-side operation. Keep in mind that +100% means 2x improvement.
 
 $flavour = shift;
 $output  = shift;

From steve at openssl.org  Sat Mar 28 15:41:55 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sat, 28 Mar 2015 15:41:55 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427557315.964339.16406.nullmailer@dev.openssl.org>

The branch master has been updated
       via  b1f3442857c1fd76e91941141bf671d19e90a79d (commit)
      from  f0e6871df2e4641d0532e8f99d26c7a6454d03df (commit)


- Log -----------------------------------------------------------------
commit b1f3442857c1fd76e91941141bf671d19e90a79d
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Mar 28 13:53:16 2015 +0000

    Remove d2i_X509_PKEY and i2d_X509_PKEY
    
    Remove partially implemented d2i_X509_PKEY and i2d_X509_PKEY: nothing
    uses them and they don't work properly. Update ordinals.
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

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

Summary of changes:
 crypto/asn1/x_pkey.c | 38 --------------------------------------
 crypto/x509/x509.h   |  3 ---
 util/libeay.num      |  4 ++--
 3 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/crypto/asn1/x_pkey.c b/crypto/asn1/x_pkey.c
index f24c0ce..2b131e4 100644
--- a/crypto/asn1/x_pkey.c
+++ b/crypto/asn1/x_pkey.c
@@ -63,44 +63,6 @@
 #include <openssl/asn1_mac.h>
 #include <openssl/x509.h>
 
-/* need to implement */
-int i2d_X509_PKEY(X509_PKEY *a, unsigned char **pp)
-{
-    return (0);
-}
-
-X509_PKEY *d2i_X509_PKEY(X509_PKEY **a, const unsigned char **pp, long length)
-{
-    int i;
-    M_ASN1_D2I_vars(a, X509_PKEY *, X509_PKEY_new);
-
-    M_ASN1_D2I_Init();
-    M_ASN1_D2I_start_sequence();
-    M_ASN1_D2I_get_x(X509_ALGOR, ret->enc_algor, d2i_X509_ALGOR);
-    M_ASN1_D2I_get_x(ASN1_OCTET_STRING, ret->enc_pkey, d2i_ASN1_OCTET_STRING);
-
-    ret->cipher.cipher =
-        EVP_get_cipherbyname(OBJ_nid2ln
-                             (OBJ_obj2nid(ret->enc_algor->algorithm)));
-    if (ret->cipher.cipher == NULL) {
-        c.error = ASN1_R_UNSUPPORTED_CIPHER;
-        c.line = __LINE__;
-        goto err;
-    }
-    if (ret->enc_algor->parameter->type == V_ASN1_OCTET_STRING) {
-        i = ret->enc_algor->parameter->value.octet_string->length;
-        if (i > EVP_MAX_IV_LENGTH) {
-            c.error = ASN1_R_IV_TOO_LARGE;
-            c.line = __LINE__;
-            goto err;
-        }
-        memcpy(ret->cipher.iv,
-               ret->enc_algor->parameter->value.octet_string->data, i);
-    } else
-        memset(ret->cipher.iv, 0, EVP_MAX_IV_LENGTH);
-    M_ASN1_D2I_Finish(a, X509_PKEY_free, ASN1_F_D2I_X509_PKEY);
-}
-
 X509_PKEY *X509_PKEY_new(void)
 {
     X509_PKEY *ret = NULL;
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index 7a59dab..6f481b5 100644
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -782,9 +782,6 @@ int X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x);
 
 X509_PKEY *X509_PKEY_new(void);
 void X509_PKEY_free(X509_PKEY *a);
-int i2d_X509_PKEY(X509_PKEY *a, unsigned char **pp);
-X509_PKEY *d2i_X509_PKEY(X509_PKEY **a, const unsigned char **pp,
-                         long length);
 
 DECLARE_ASN1_FUNCTIONS(NETSCAPE_SPKI)
 DECLARE_ASN1_FUNCTIONS(NETSCAPE_SPKAC)
diff --git a/util/libeay.num b/util/libeay.num
index b848411..50ddb97 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -755,7 +755,7 @@ d2i_X509_CRL_fp                         761	EXIST::FUNCTION:STDIO
 d2i_X509_EXTENSION                      762	EXIST::FUNCTION:
 d2i_X509_NAME                           763	EXIST::FUNCTION:
 d2i_X509_NAME_ENTRY                     764	EXIST::FUNCTION:
-d2i_X509_PKEY                           765	EXIST::FUNCTION:
+d2i_X509_PKEY                           765	NOEXIST::FUNCTION:
 d2i_X509_PUBKEY                         766	EXIST::FUNCTION:
 d2i_X509_REQ                            767	EXIST::FUNCTION:
 d2i_X509_REQ_INFO                       768	EXIST::FUNCTION:
@@ -857,7 +857,7 @@ i2d_X509_CRL_fp                         864	EXIST::FUNCTION:STDIO
 i2d_X509_EXTENSION                      865	EXIST::FUNCTION:
 i2d_X509_NAME                           866	EXIST::FUNCTION:
 i2d_X509_NAME_ENTRY                     867	EXIST::FUNCTION:
-i2d_X509_PKEY                           868	EXIST::FUNCTION:
+i2d_X509_PKEY                           868	NOEXIST::FUNCTION:
 i2d_X509_PUBKEY                         869	EXIST::FUNCTION:
 i2d_X509_REQ                            870	EXIST::FUNCTION:
 i2d_X509_REQ_INFO                       871	EXIST::FUNCTION:

From steve at openssl.org  Sun Mar 29 02:30:03 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 29 Mar 2015 02:30:03 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427596203.029352.30950.nullmailer@dev.openssl.org>

The branch master has been updated
       via  79a578b90244b890c8a6a8fc26c03943da71c054 (commit)
      from  b1f3442857c1fd76e91941141bf671d19e90a79d (commit)


- Log -----------------------------------------------------------------
commit 79a578b90244b890c8a6a8fc26c03943da71c054
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu Mar 26 15:56:00 2015 +0000

    Add private/public key conversion tests
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 test/Makefile           | 13 +++++--
 test/testdsa.pem        | 12 ++++++
 test/testdsapub.pem     | 12 ++++++
 test/testec-p256.pem    |  5 +++
 test/testecpub-p256.pem |  4 ++
 test/testrsapub.pem     |  4 ++
 test/tkey               | 99 +++++++++++++++++++++++++++++++++++++++++++++++++
 test/trsa               | 83 -----------------------------------------
 8 files changed, 145 insertions(+), 87 deletions(-)
 create mode 100644 test/testdsa.pem
 create mode 100644 test/testdsapub.pem
 create mode 100644 test/testec-p256.pem
 create mode 100644 test/testecpub-p256.pem
 create mode 100644 test/testrsapub.pem
 create mode 100644 test/tkey
 delete mode 100644 test/trsa

diff --git a/test/Makefile b/test/Makefile
index fc16227..f4635b8 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -231,8 +231,9 @@ test_x509: ../apps/openssl$(EXE_EXT) tx509 testx509.pem v3-cert1.pem v3-cert2.pe
 	echo test second x509v3 certificate
 	sh ./tx509 v3-cert2.pem 2>/dev/null
 
-test_rsa: $(RSATEST)$(EXE_EXT) ../apps/openssl$(EXE_EXT) trsa testrsa.pem
-	@sh ./trsa 2>/dev/null
+test_rsa: $(RSATEST)$(EXE_EXT) ../apps/openssl$(EXE_EXT) tkey testrsa.pem
+	@sh ./tkey testrsa.pem rsa private 2>/dev/null
+	@sh ./tkey testrsapub.pem rsa public 2>/dev/null
 	../util/shlib_wrap.sh ./$(RSATEST)
 
 test_crl: ../apps/openssl$(EXE_EXT) tcrl testcrl.pem
@@ -258,9 +259,11 @@ test_bn: $(BNTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) bctest
 	@echo 'test a^b%c implementations'
 	../util/shlib_wrap.sh ./$(EXPTEST)
 
-test_ec: $(ECTEST)$(EXE_EXT)
+test_ec: $(ECTEST)$(EXE_EXT) tkey testec-p256.pem
 	@echo 'test elliptic curves'
 	../util/shlib_wrap.sh ./$(ECTEST)
+	@sh ./tkey testec-p256.pem ec private 2>/dev/null
+	@sh ./tkey testecpub-p256.pem ec public 2>/dev/null
 
 test_ecdsa: $(ECDSATEST)$(EXE_EXT)
 	@echo 'test ecdsa'
@@ -279,10 +282,12 @@ test_dh: $(DHTEST)$(EXE_EXT)
 	@echo "Generate a set of DH parameters"
 	../util/shlib_wrap.sh ./$(DHTEST)
 
-test_dsa: $(DSATEST)$(EXE_EXT)
+test_dsa: $(DSATEST)$(EXE_EXT) tkey testdsa.pem
 	@echo "Generate a set of DSA parameters"
 	../util/shlib_wrap.sh ./$(DSATEST)
 	../util/shlib_wrap.sh ./$(DSATEST) -app2_1
+	@sh ./tkey testdsa.pem dsa private 2>/dev/null
+	@sh ./tkey testdsapub.pem dsa public 2>/dev/null
 
 test_gen testreq.pem: ../apps/openssl$(EXE_EXT) testgen test.cnf
 	@echo "Generate and verify a certificate request"
diff --git a/test/testdsa.pem b/test/testdsa.pem
new file mode 100644
index 0000000..b2ca5ba
--- /dev/null
+++ b/test/testdsa.pem
@@ -0,0 +1,12 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIBvQIBAAKBgQD9Ko2Ezy2mKeOV4oJsjy8Ves9Av6bPvr5y6iFTVpGQewjzsAHS
+l3eAxwyrvE0cx8cQ4ODieVRnWibZIEoF2NRUBw3l/6o8wo1BZTnF7wtZpNr6QcCQ
+QNC3CaQZ0lw2rOewGxqZpeXmYurfceRnsZBSpQiw8kW+JTgCbRJtVAYF1wIVAN+X
+sK/vqcIQlD6ZV055LoV4qv0jAoGBAL52x3C4paZkU61ZTiIgUKPXBpanQ4a7nsjd
+iSjzgnto+rveVuFkZQKaD7Wts8SLpojBat7supr+qF1pWVpRwxOXofdO72XdKm5u
+3co7sLnqf/WVCmzX9/unlAsGfDG1R6RqA71MnQJ5q56LwAzqK23ZfGt5v1Wpho36
+FY/JnLZ2AoGBAMyZoH2YF7/wO7CbGD6bGet3q+zxksOp+6gz2+ae23Gajpd3u4Jz
+bOxqjk4vrQaTrMPRRWXWJxC5WwLMalzwke75wi8gGT6+EUxFoLXlSmRQN+h4f+Ab
+OHFQiiW9v3xrgUKPiYWPEz/bhYw5DC73vPfkHXxmV495KiSIx4fvfH1BAhUAv3HU
+l7iXVdDF5BKF2B+Vd8w9+MI=
+-----END DSA PRIVATE KEY-----
diff --git a/test/testdsapub.pem b/test/testdsapub.pem
new file mode 100644
index 0000000..70e7d5c
--- /dev/null
+++ b/test/testdsapub.pem
@@ -0,0 +1,12 @@
+-----BEGIN PUBLIC KEY-----
+MIIBuDCCASwGByqGSM44BAEwggEfAoGBAP0qjYTPLaYp45XigmyPLxV6z0C/ps++
+vnLqIVNWkZB7CPOwAdKXd4DHDKu8TRzHxxDg4OJ5VGdaJtkgSgXY1FQHDeX/qjzC
+jUFlOcXvC1mk2vpBwJBA0LcJpBnSXDas57AbGpml5eZi6t9x5GexkFKlCLDyRb4l
+OAJtEm1UBgXXAhUA35ewr++pwhCUPplXTnkuhXiq/SMCgYEAvnbHcLilpmRTrVlO
+IiBQo9cGlqdDhrueyN2JKPOCe2j6u95W4WRlApoPta2zxIumiMFq3uy6mv6oXWlZ
+WlHDE5eh907vZd0qbm7dyjuwuep/9ZUKbNf3+6eUCwZ8MbVHpGoDvUydAnmrnovA
+DOorbdl8a3m/VamGjfoVj8mctnYDgYUAAoGBAMyZoH2YF7/wO7CbGD6bGet3q+zx
+ksOp+6gz2+ae23Gajpd3u4JzbOxqjk4vrQaTrMPRRWXWJxC5WwLMalzwke75wi8g
+GT6+EUxFoLXlSmRQN+h4f+AbOHFQiiW9v3xrgUKPiYWPEz/bhYw5DC73vPfkHXxm
+V495KiSIx4fvfH1B
+-----END PUBLIC KEY-----
diff --git a/test/testec-p256.pem b/test/testec-p256.pem
new file mode 100644
index 0000000..fb79a4c
--- /dev/null
+++ b/test/testec-p256.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIDYEX2yQlhJXDIwBEwcfyAn2eICEKJxqsAPGChey1a2toAoGCCqGSM49
+AwEHoUQDQgAEJXwAdITiPFcSUsaRI2nlzTNRn++q6F38XrH8m8sf28DQ+2Oob5SU
+zvgjVS0e70pIqH6bSXDgPc8mKtSs9Zi26Q==
+-----END EC PRIVATE KEY-----
diff --git a/test/testecpub-p256.pem b/test/testecpub-p256.pem
new file mode 100644
index 0000000..60695b8
--- /dev/null
+++ b/test/testecpub-p256.pem
@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEJXwAdITiPFcSUsaRI2nlzTNRn++q
+6F38XrH8m8sf28DQ+2Oob5SUzvgjVS0e70pIqH6bSXDgPc8mKtSs9Zi26Q==
+-----END PUBLIC KEY-----
diff --git a/test/testrsapub.pem b/test/testrsapub.pem
new file mode 100644
index 0000000..bee2b95
--- /dev/null
+++ b/test/testrsapub.pem
@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKrbeqkuRk8VcRmWFmtP+LviMB3+6diz
+WW3DwaffznyHGAFwUJ/ITv0XtbsCyl3QoyKGhrOAy3RvPK5M38iuXT0CAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/test/tkey b/test/tkey
new file mode 100644
index 0000000..611ed7d
--- /dev/null
+++ b/test/tkey
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+t=$1
+ktype=$2
+ptype=$3
+
+if ../util/shlib_wrap.sh ../apps/openssl no-$ktype; then
+  echo skipping $ktype $ptype conversion test
+  exit 0
+fi
+
+if [ $ptype = "public" ]; then
+    cmd="../util/shlib_wrap.sh ../apps/openssl $ktype -pubin -pubout"
+else
+    cmd="../util/shlib_wrap.sh ../apps/openssl $ktype"
+fi
+
+echo testing $ktype $ptype conversions
+cp $t $ktype-fff.p
+
+echo "p -> d"
+$cmd -in $ktype-fff.p -inform p -outform d >$ktype-f.d
+if [ $? != 0 ]; then exit 1; fi
+echo "p -> p"
+$cmd -in $ktype-fff.p -inform p -outform p >$ktype-f.p
+if [ $? != 0 ]; then exit 1; fi
+
+echo "d -> d"
+$cmd -in $ktype-f.d -inform d -outform d >$ktype-ff.d1
+if [ $? != 0 ]; then exit 1; fi
+echo "p -> d"
+$cmd -in $ktype-f.p -inform p -outform d >$ktype-ff.d3
+if [ $? != 0 ]; then exit 1; fi
+
+echo "d -> p"
+$cmd -in $ktype-f.d -inform d -outform p >$ktype-ff.p1
+if [ $? != 0 ]; then exit 1; fi
+echo "p -> p"
+$cmd -in $ktype-f.p -inform p -outform p >$ktype-ff.p3
+if [ $? != 0 ]; then exit 1; fi
+
+cmp $ktype-fff.p $ktype-f.p
+if [ $? != 0 ]; then exit 1; fi
+cmp $ktype-fff.p $ktype-ff.p1
+if [ $? != 0 ]; then exit 1; fi
+cmp $ktype-fff.p $ktype-ff.p3
+if [ $? != 0 ]; then exit 1; fi
+
+cmp $ktype-f.p $ktype-ff.p1
+if [ $? != 0 ]; then exit 1; fi
+cmp $ktype-f.p $ktype-ff.p3
+if [ $? != 0 ]; then exit 1; fi
+
+/bin/rm -f $ktype-f.* $ktype-ff.* $ktype-fff.*
+
+if [ $ptype = "public" ]; then
+    exit 0
+fi
+
+cmd="../util/shlib_wrap.sh ../apps/openssl pkey"
+
+echo testing $ktype PKCS#8 conversions
+
+$cmd -in $t -out $ktype-fff.p
+
+echo "p -> d"
+$cmd -in $ktype-fff.p -inform p -outform d >$ktype-f.d
+if [ $? != 0 ]; then exit 1; fi
+echo "p -> p"
+$cmd -in $ktype-fff.p -inform p -outform p >$ktype-f.p
+if [ $? != 0 ]; then exit 1; fi
+
+echo "d -> d"
+$cmd -in $ktype-f.d -inform d -outform d >$ktype-ff.d1
+if [ $? != 0 ]; then exit 1; fi
+echo "p -> d"
+$cmd -in $ktype-f.p -inform p -outform d >$ktype-ff.d3
+if [ $? != 0 ]; then exit 1; fi
+
+echo "d -> p"
+$cmd -in $ktype-f.d -inform d -outform p >$ktype-ff.p1
+if [ $? != 0 ]; then exit 1; fi
+echo "p -> p"
+$cmd -in $ktype-f.p -inform p -outform p >$ktype-ff.p3
+if [ $? != 0 ]; then exit 1; fi
+
+cmp $ktype-fff.p $ktype-f.p
+if [ $? != 0 ]; then exit 1; fi
+cmp $ktype-fff.p $ktype-ff.p1
+if [ $? != 0 ]; then exit 1; fi
+cmp $ktype-fff.p $ktype-ff.p3
+if [ $? != 0 ]; then exit 1; fi
+
+cmp $ktype-f.p $ktype-ff.p1
+if [ $? != 0 ]; then exit 1; fi
+cmp $ktype-f.p $ktype-ff.p3
+if [ $? != 0 ]; then exit 1; fi
+
+/bin/rm -f $ktype-f.* $ktype-ff.* $ktype-fff.*
diff --git a/test/trsa b/test/trsa
deleted file mode 100644
index 5a2290f..0000000
--- a/test/trsa
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-
-if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then
-  echo skipping rsa conversion test
-  exit 0
-fi
-
-cmd='../util/shlib_wrap.sh ../apps/openssl rsa'
-
-if [ "$1"x != "x" ]; then
-	t=$1
-else
-	t=testrsa.pem
-fi
-
-echo testing rsa conversions
-cp $t rsa-fff.p
-
-echo "p -> d"
-$cmd -in rsa-fff.p -inform p -outform d >rsa-f.d
-if [ $? != 0 ]; then exit 1; fi
-#echo "p -> t"
-#$cmd -in rsa-fff.p -inform p -outform t >rsa-f.t
-#if [ $? != 0 ]; then exit 1; fi
-echo "p -> p"
-$cmd -in rsa-fff.p -inform p -outform p >rsa-f.p
-if [ $? != 0 ]; then exit 1; fi
-
-echo "d -> d"
-$cmd -in rsa-f.d -inform d -outform d >rsa-ff.d1
-if [ $? != 0 ]; then exit 1; fi
-#echo "t -> d"
-#$cmd -in rsa-f.t -inform t -outform d >rsa-ff.d2
-#if [ $? != 0 ]; then exit 1; fi
-echo "p -> d"
-$cmd -in rsa-f.p -inform p -outform d >rsa-ff.d3
-if [ $? != 0 ]; then exit 1; fi
-
-#echo "d -> t"
-#$cmd -in rsa-f.d -inform d -outform t >rsa-ff.t1
-#if [ $? != 0 ]; then exit 1; fi
-#echo "t -> t"
-#$cmd -in rsa-f.t -inform t -outform t >rsa-ff.t2
-#if [ $? != 0 ]; then exit 1; fi
-#echo "p -> t"
-#$cmd -in rsa-f.p -inform p -outform t >rsa-ff.t3
-#if [ $? != 0 ]; then exit 1; fi
-
-echo "d -> p"
-$cmd -in rsa-f.d -inform d -outform p >rsa-ff.p1
-if [ $? != 0 ]; then exit 1; fi
-#echo "t -> p"
-#$cmd -in rsa-f.t -inform t -outform p >rsa-ff.p2
-#if [ $? != 0 ]; then exit 1; fi
-echo "p -> p"
-$cmd -in rsa-f.p -inform p -outform p >rsa-ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-cmp rsa-fff.p rsa-f.p
-if [ $? != 0 ]; then exit 1; fi
-cmp rsa-fff.p rsa-ff.p1
-if [ $? != 0 ]; then exit 1; fi
-#cmp rsa-fff.p rsa-ff.p2
-#if [ $? != 0 ]; then exit 1; fi
-cmp rsa-fff.p rsa-ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-#cmp rsa-f.t rsa-ff.t1
-#if [ $? != 0 ]; then exit 1; fi
-#cmp rsa-f.t rsa-ff.t2
-#if [ $? != 0 ]; then exit 1; fi
-#cmp rsa-f.t rsa-ff.t3
-#if [ $? != 0 ]; then exit 1; fi
-
-cmp rsa-f.p rsa-ff.p1
-if [ $? != 0 ]; then exit 1; fi
-#cmp rsa-f.p rsa-ff.p2
-#if [ $? != 0 ]; then exit 1; fi
-cmp rsa-f.p rsa-ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-/bin/rm -f rsa-f.* rsa-ff.* rsa-fff.*
-exit 0

From levitte at openssl.org  Sun Mar 29 10:55:29 2015
From: levitte at openssl.org (Richard Levitte)
Date: Sun, 29 Mar 2015 10:55:29 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427626529.937324.27060.nullmailer@dev.openssl.org>

The branch master has been updated
       via  6a919b44f745c1d764b6b0593b2a60bd8e342c67 (commit)
      from  79a578b90244b890c8a6a8fc26c03943da71c054 (commit)


- Log -----------------------------------------------------------------
commit 6a919b44f745c1d764b6b0593b2a60bd8e342c67
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Mar 29 09:42:58 2015 +0200

    Have a shared library version thats reasonable with our version scheme
    
    The FAQ says this:
    
        After the release of OpenSSL 1.0.0 the versioning scheme changed. Letter
        releases (e.g. 1.0.1a) can only contain bug and security fixes and no
        new features. Minor releases change the last number (e.g. 1.0.2) and
        can contain new features that retain binary compatibility. Changes to
        the middle number are considered major releases and neither source nor
        binary compatibility is guaranteed.
    
    With such a scheme (and with the thinking that it's nice if the shared
    library version stays on track with the OpenSSL version), it's rather
    futile to keep the minor release number in the shared library version.
    The deed already done with OpenSSL 1.0.x can't be changed, but with
    1.x.y, x=1 and on, 1.x as shared library version is sufficient.
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

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

Summary of changes:
 crypto/opensslv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index b86665d..97c27e7 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -88,7 +88,7 @@ extern "C" {
  * should only keep the versions that are binary compatible with the current.
  */
 # define SHLIB_VERSION_HISTORY ""
-# define SHLIB_VERSION_NUMBER "1.1.0"
+# define SHLIB_VERSION_NUMBER "1.1"
 
 
 #ifdef  __cplusplus

From appro at openssl.org  Sun Mar 29 13:22:49 2015
From: appro at openssl.org (Andy Polyakov)
Date: Sun, 29 Mar 2015 13:22:49 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427635369.420939.12790.nullmailer@dev.openssl.org>

The branch master has been updated
       via  51f8d095562f36cdaa6893597b5c609e943b0565 (commit)
      from  6a919b44f745c1d764b6b0593b2a60bd8e342c67 (commit)


- Log -----------------------------------------------------------------
commit 51f8d095562f36cdaa6893597b5c609e943b0565
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Mar 28 15:21:35 2015 +0100

    sha/asm/sha256-armv4.pl: fix compile issue in kernel
    and eliminate little-endian dependency.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/sha/asm/sha256-armv4.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl
index 4fee74d..fac0533 100644
--- a/crypto/sha/asm/sha256-armv4.pl
+++ b/crypto/sha/asm/sha256-armv4.pl
@@ -73,7 +73,9 @@ $code.=<<___ if ($i<16);
 	eor	$t0,$e,$e,ror#`$Sigma1[1]-$Sigma1[0]`
 	add	$a,$a,$t2			@ h+=Maj(a,b,c) from the past
 	eor	$t0,$t0,$e,ror#`$Sigma1[2]-$Sigma1[0]`	@ Sigma1(e)
+# ifndef __ARMEB__
 	rev	$t1,$t1
+# endif
 #else
 	@ ldrb	$t1,[$inp,#3]			@ $i
 	add	$a,$a,$t2			@ h+=Maj(a,b,c) from the past
@@ -166,6 +168,7 @@ $code=<<___;
 #else
 .syntax unified
 # ifdef __thumb2__
+#  define adrl adr
 .thumb
 # else
 .code   32
@@ -460,7 +463,7 @@ sha256_block_data_order_neon:
 	stmdb	sp!,{r4-r12,lr}
 
 	sub	$H,sp,#16*4+16
-	adr	$Ktbl,K256
+	adrl	$Ktbl,K256
 	bic	$H,$H,#15		@ align for 128-bit stores
 	mov	$t2,sp
 	mov	sp,$H			@ alloca

From appro at openssl.org  Sun Mar 29 13:24:54 2015
From: appro at openssl.org (Andy Polyakov)
Date: Sun, 29 Mar 2015 13:24:54 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427635494.626471.13706.nullmailer@dev.openssl.org>

The branch master has been updated
       via  b1a5d1c652086257930a1f62ae51c9cdee654b2c (commit)
      from  51f8d095562f36cdaa6893597b5c609e943b0565 (commit)


- Log -----------------------------------------------------------------
commit b1a5d1c652086257930a1f62ae51c9cdee654b2c
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Mar 28 15:27:34 2015 +0100

    sha/asm/sha512-armv4.pl: adapt for use in Linux kernel context.
    
    Follow-up to sha256-armv4.pl in cooperation with Ard Biesheuvel
    (Linaro) and Sami Tolvanen (Google).
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/sha/asm/sha512-armv4.pl | 65 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 56 insertions(+), 9 deletions(-)

diff --git a/crypto/sha/asm/sha512-armv4.pl b/crypto/sha/asm/sha512-armv4.pl
index daab297..a2b11a8 100644
--- a/crypto/sha/asm/sha512-armv4.pl
+++ b/crypto/sha/asm/sha512-armv4.pl
@@ -5,6 +5,8 @@
 # project. The module is, however, dual licensed under OpenSSL and
 # CRYPTOGAMS licenses depending on where you obtain it. For further
 # details see http://www.openssl.org/~appro/cryptogams/.
+#
+# Permission to use under GPL terms is granted.
 # ====================================================================
 
 # SHA512 block procedure for ARMv4. September 2007.
@@ -136,6 +138,9 @@ $code.=<<___;
 	teq	$t0,#$magic
 
 	ldr	$t3,[sp,#$Coff+0]	@ c.lo
+#if __ARM_ARCH__>=7
+	it	eq			@ Thumb2 thing, sanity check in ARM
+#endif
 	orreq	$Ktbl,$Ktbl,#1
 	@ Sigma0(x)	(ROTR((x),28) ^ ROTR((x),34) ^ ROTR((x),39))
 	@ LO		lo>>28^hi<<4  ^ hi>>2^lo<<30 ^ hi>>7^lo<<25
@@ -173,7 +178,17 @@ $code.=<<___;
 ___
 }
 $code=<<___;
-#include "arm_arch.h"
+#ifndef __KERNEL__
+# include "arm_arch.h"
+# define VFP_ABI_PUSH	vstmdb	sp!,{d8-d15}
+# define VFP_ABI_POP	vldmia	sp!,{d8-d15}
+#else
+# define __ARM_ARCH__ __LINUX_ARM_ARCH__
+# define __ARM_MAX_ARCH__ 7
+# define VFP_ABI_PUSH
+# define VFP_ABI_POP
+#endif
+
 #ifdef __ARMEL__
 # define LO 0
 # define HI 4
@@ -185,7 +200,18 @@ $code=<<___;
 #endif
 
 .text
+#if __ARM_ARCH__<7
 .code	32
+#else
+.syntax unified
+# ifdef __thumb2__
+#  define adrl adr
+.thumb
+# else
+.code   32
+# endif
+#endif
+
 .type	K512,%object
 .align	5
 K512:
@@ -230,7 +256,7 @@ WORD64(0x3c9ebe0a,0x15c9bebc, 0x431d67c4,0x9c100d4c)
 WORD64(0x4cc5d4be,0xcb3e42b6, 0x597f299c,0xfc657e2a)
 WORD64(0x5fcb6fab,0x3ad6faec, 0x6c44198c,0x4a475817)
 .size	K512,.-K512
-#if __ARM_MAX_ARCH__>=7
+#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
 .LOPENSSL_armcap:
 .word	OPENSSL_armcap_P-sha512_block_data_order
 .skip	32-4
@@ -241,14 +267,18 @@ WORD64(0x5fcb6fab,0x3ad6faec, 0x6c44198c,0x4a475817)
 .global	sha512_block_data_order
 .type	sha512_block_data_order,%function
 sha512_block_data_order:
+#if __ARM_ARCH__<7
 	sub	r3,pc,#8		@ sha512_block_data_order
-	add	$len,$inp,$len,lsl#7	@ len to point at the end of inp
-#if __ARM_MAX_ARCH__>=7
+#else
+	adr	r3,sha512_block_data_order
+#endif
+#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
 	ldr	r12,.LOPENSSL_armcap
 	ldr	r12,[r3,r12]		@ OPENSSL_armcap_P
 	tst	r12,#1
 	bne	.LNEON
 #endif
+	add	$len,$inp,$len,lsl#7	@ len to point at the end of inp
 	stmdb	sp!,{r4-r12,lr}
 	sub	$Ktbl,r3,#672		@ K512
 	sub	sp,sp,#9*8
@@ -362,6 +392,9 @@ $code.=<<___;
 ___
 	&BODY_00_15(0x17);
 $code.=<<___;
+#if __ARM_ARCH__>=7
+	ittt	eq			@ Thumb2 thing, sanity check in ARM
+#endif
 	ldreq	$t0,[sp,#`$Xoff+8*(16-1)`+0]
 	ldreq	$t1,[sp,#`$Xoff+8*(16-1)`+4]
 	beq	.L16_79
@@ -446,6 +479,7 @@ $code.=<<___;
 	moveq	pc,lr			@ be binary compatible with V4, yet
 	bx	lr			@ interoperable with Thumb ISA:-)
 #endif
+.size	sha512_block_data_order,.-sha512_block_data_order
 ___
 
 {
@@ -552,11 +586,15 @@ $code.=<<___;
 .arch	armv7-a
 .fpu	neon
 
+.global	sha512_block_data_order_neon
+.type	sha512_block_data_order_neon,%function
 .align	4
+sha512_block_data_order_neon:
 .LNEON:
 	dmb				@ errata #451034 on early Cortex A8
-	vstmdb	sp!,{d8-d15}		@ ABI specification says so
-	sub	$Ktbl,r3,#672		@ K512
+	add	$len,$inp,$len,lsl#7	@ len to point at the end of inp
+	VFP_ABI_PUSH
+	adrl	$Ktbl,K512
 	vldmia	$ctx,{$A-$H}		@ load context
 .Loop_neon:
 ___
@@ -581,16 +619,16 @@ $code.=<<___;
 	sub		$Ktbl,#640	@ rewind K512
 	bne		.Loop_neon
 
-	vldmia	sp!,{d8-d15}		@ epilogue
+	VFP_ABI_POP
 	ret				@ bx lr
+.size	sha512_block_data_order_neon,.-sha512_block_data_order_neon
 #endif
 ___
 }
 $code.=<<___;
-.size	sha512_block_data_order,.-sha512_block_data_order
 .asciz	"SHA512 block transform for ARMv4/NEON, CRYPTOGAMS by <appro\@openssl.org>"
 .align	2
-#if __ARM_MAX_ARCH__>=7
+#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
 .comm	OPENSSL_armcap_P,4,4
 #endif
 ___
@@ -598,5 +636,14 @@ ___
 $code =~ s/\`([^\`]*)\`/eval $1/gem;
 $code =~ s/\bbx\s+lr\b/.word\t0xe12fff1e/gm;	# make it possible to compile with -march=armv4
 $code =~ s/\bret\b/bx	lr/gm;
+
+open SELF,$0;
+while(<SELF>) {
+	next if (/^#!/);
+	last if (!s/^#/@/ and !/^$/);
+	print;
+}
+close SELF;
+
 print $code;
 close STDOUT; # enforce flush

From levitte at openssl.org  Mon Mar 30 03:33:27 2015
From: levitte at openssl.org (Richard Levitte)
Date: Mon, 30 Mar 2015 03:33:27 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427686407.736644.30027.nullmailer@dev.openssl.org>

The branch master has been updated
       via  06affe3dac65592a341547f5a47e52cedb7b71f8 (commit)
      from  b1a5d1c652086257930a1f62ae51c9cdee654b2c (commit)


- Log -----------------------------------------------------------------
commit 06affe3dac65592a341547f5a47e52cedb7b71f8
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Mar 25 14:41:58 2015 +0100

    Initialised 'ok' and redo the logic.
    
    The logic with how 'ok' was calculated didn't quite convey what's "ok",
    so the logic is slightly redone to make it less confusing.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 engines/ccgost/gost_sign.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/ccgost/gost_sign.c b/engines/ccgost/gost_sign.c
index b3e1007..fad2004 100644
--- a/engines/ccgost/gost_sign.c
+++ b/engines/ccgost/gost_sign.c
@@ -167,7 +167,7 @@ int gost_do_verify(const unsigned char *dgst, int dgst_len,
     BIGNUM *q2 = NULL;
     BIGNUM *u = NULL, *v = NULL, *z1 = NULL, *z2 = NULL;
     BIGNUM *tmp2 = NULL, *tmp3 = NULL;
-    int ok;
+    int ok = 0;
     BN_CTX *ctx = BN_CTX_new();
     if(!ctx) {
         GOSTerr(GOST_F_GOST_DO_VERIFY, ERR_R_MALLOC_FAILURE);
@@ -208,9 +208,9 @@ int gost_do_verify(const unsigned char *dgst, int dgst_len,
     BN_mod_exp(tmp2, dsa->pub_key, z2, dsa->p, ctx);
     BN_mod_mul(tmp3, tmp, tmp2, dsa->p, ctx);
     BN_mod(u, tmp3, dsa->q, ctx);
-    ok = BN_cmp(u, sig->r);
+    ok = (BN_cmp(u, sig->r) == 0);
 
-    if (ok != 0) {
+    if (!ok) {
         GOSTerr(GOST_F_GOST_DO_VERIFY, GOST_R_SIGNATURE_MISMATCH);
     }
 err:
@@ -219,7 +219,7 @@ err:
         BN_CTX_end(ctx);
         BN_CTX_free(ctx);
     }
-    return (ok == 0);
+    return ok;
 }
 
 /*

From steve at openssl.org  Mon Mar 30 21:04:56 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Mon, 30 Mar 2015 21:04:56 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427749496.825686.5983.nullmailer@dev.openssl.org>

The branch master has been updated
       via  e93c8748ab40d876285147e3112c7a520d68880e (commit)
       via  22f5bd3dd2a660f6f50ef86de78985b995c63a85 (commit)
       via  94f4b4b31314c07a4b6c9898e14c1023a112d0d0 (commit)
       via  3a1f43023acb7852969658d0ffedcd9bdb561a47 (commit)
      from  06affe3dac65592a341547f5a47e52cedb7b71f8 (commit)


- Log -----------------------------------------------------------------
commit e93c8748ab40d876285147e3112c7a520d68880e
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Mar 28 15:10:54 2015 +0000

    Remove duplicate code.
    
    Update code to use ASN1_TYPE_pack_sequence and ASN1_TYPE_unpack_sequence
    instead of performing the same operation manually.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 22f5bd3dd2a660f6f50ef86de78985b995c63a85
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Mar 28 14:07:47 2015 +0000

    New ASN1_TYPE SEQUENCE functions.
    
    Add new functions ASN1_TYPE_pack_sequence and ASN1_TYPE_unpack_sequence:
    these encode and decode ASN.1 SEQUENCE using an ASN1_TYPE structure.
    
    Update ordinals.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 94f4b4b31314c07a4b6c9898e14c1023a112d0d0
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Mar 28 15:25:46 2015 +0000

    Rewrite X509_PKEY_new to avoid old ASN1. macros.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 3a1f43023acb7852969658d0ffedcd9bdb561a47
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Mar 30 20:31:49 2015 +0100

    Remove unnecessary asn1_mac.h includes.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/asn1/a_d2i_fp.c       |  2 +-
 crypto/asn1/a_type.c         | 31 +++++++++++++++++++++++++++++++
 crypto/asn1/asn1.h           |  3 +++
 crypto/asn1/n_pkey.c         |  1 -
 crypto/asn1/p5_pbev2.c       | 15 ++++-----------
 crypto/asn1/x_pkey.c         | 21 ++++++++++++++-------
 crypto/cms/cms_pwri.c        | 10 +++-------
 crypto/evp/p5_crpt.c         |  5 ++---
 crypto/evp/p5_crpt2.c        | 26 +++++---------------------
 crypto/evp/p_lib.c           |  1 -
 crypto/pkcs12/p12_crpt.c     | 10 ++--------
 crypto/pkcs12/p12_npas.c     |  5 +----
 crypto/rsa/rsa_ameth.c       | 28 ++++++----------------------
 doc/crypto/ASN1_TYPE_get.pod | 23 ++++++++++++++++++++++-
 util/libeay.num              |  2 ++
 15 files changed, 96 insertions(+), 87 deletions(-)

diff --git a/crypto/asn1/a_d2i_fp.c b/crypto/asn1/a_d2i_fp.c
index 49deb61..c0d9e1e 100644
--- a/crypto/asn1/a_d2i_fp.c
+++ b/crypto/asn1/a_d2i_fp.c
@@ -60,7 +60,7 @@
 #include <limits.h>
 #include "cryptlib.h"
 #include <openssl/buffer.h>
-#include <openssl/asn1_mac.h>
+#include <openssl/asn1.h>
 
 static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb);
 
diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c
index d52ed46..864ebec 100644
--- a/crypto/asn1/a_type.c
+++ b/crypto/asn1/a_type.c
@@ -152,3 +152,34 @@ int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b)
 
     return result;
 }
+
+ASN1_TYPE *ASN1_TYPE_pack_sequence(const ASN1_ITEM *it, void *s, ASN1_TYPE **t)
+{
+    ASN1_OCTET_STRING *oct;
+    ASN1_TYPE *rt;
+
+    oct = ASN1_item_pack(s, it, NULL);
+    if (oct == NULL)
+        return NULL;
+
+    if (t && *t) {
+        rt = *t;
+    } else {
+        rt = ASN1_TYPE_new();
+        if (rt == NULL) {
+            ASN1_OCTET_STRING_free(oct);
+            return NULL;
+        }
+        if (t)
+            *t = rt;
+    }
+    ASN1_TYPE_set(rt, V_ASN1_SEQUENCE, oct);
+    return rt;
+}
+
+void *ASN1_TYPE_unpack_sequence(const ASN1_ITEM *it, const ASN1_TYPE *t)
+{
+    if (t->type != V_ASN1_SEQUENCE || t->value.sequence == NULL)
+        return NULL;
+    return ASN1_item_unpack(t->value.sequence, it);
+}
diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 141e630..30de831 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -592,6 +592,9 @@ void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value);
 int ASN1_TYPE_set1(ASN1_TYPE *a, int type, const void *value);
 int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b);
 
+ASN1_TYPE *ASN1_TYPE_pack_sequence(const ASN1_ITEM *it, void *s, ASN1_TYPE **t);
+void *ASN1_TYPE_unpack_sequence(const ASN1_ITEM *it, const ASN1_TYPE *t);
+
 ASN1_OBJECT *ASN1_OBJECT_new(void);
 void ASN1_OBJECT_free(ASN1_OBJECT *a);
 int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp);
diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c
index d5a5514..cd6391e 100644
--- a/crypto/asn1/n_pkey.c
+++ b/crypto/asn1/n_pkey.c
@@ -62,7 +62,6 @@
 # include <openssl/rsa.h>
 # include <openssl/objects.h>
 # include <openssl/asn1t.h>
-# include <openssl/asn1_mac.h>
 # include <openssl/evp.h>
 # include <openssl/x509.h>
 
diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c
index 60abbe2..4b9045e 100644
--- a/crypto/asn1/p5_pbev2.c
+++ b/crypto/asn1/p5_pbev2.c
@@ -165,17 +165,14 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
 
     if (!(ret = X509_ALGOR_new()))
         goto merr;
-    if (!(ret->parameter = ASN1_TYPE_new()))
-        goto merr;
 
     ret->algorithm = OBJ_nid2obj(NID_pbes2);
 
     /* Encode PBE2PARAM into parameter */
 
-    if (!ASN1_item_pack(pbe2, ASN1_ITEM_rptr(PBE2PARAM),
-                        &ret->parameter->value.sequence))
+    if (!ASN1_TYPE_pack_sequence(ASN1_ITEM_rptr(PBE2PARAM), pbe2,
+                                 &ret->parameter))
          goto merr;
-    ret->parameter->type = V_ASN1_SEQUENCE;
 
     PBE2PARAM_free(pbe2);
     pbe2 = NULL;
@@ -261,13 +258,9 @@ X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen,
 
     /* Encode PBKDF2PARAM into parameter of pbe2 */
 
-    if (!(keyfunc->parameter = ASN1_TYPE_new()))
-        goto merr;
-
-    if (!ASN1_item_pack(kdf, ASN1_ITEM_rptr(PBKDF2PARAM),
-                        &keyfunc->parameter->value.sequence))
+    if (!ASN1_TYPE_pack_sequence(ASN1_ITEM_rptr(PBKDF2PARAM), kdf,
+                                 &keyfunc->parameter))
          goto merr;
-    keyfunc->parameter->type = V_ASN1_SEQUENCE;
 
     PBKDF2PARAM_free(kdf);
     return keyfunc;
diff --git a/crypto/asn1/x_pkey.c b/crypto/asn1/x_pkey.c
index 2b131e4..98e4a3d 100644
--- a/crypto/asn1/x_pkey.c
+++ b/crypto/asn1/x_pkey.c
@@ -60,18 +60,22 @@
 #include "cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/objects.h>
-#include <openssl/asn1_mac.h>
 #include <openssl/x509.h>
 
 X509_PKEY *X509_PKEY_new(void)
 {
     X509_PKEY *ret = NULL;
-    ASN1_CTX c;
 
-    M_ASN1_New_Malloc(ret, X509_PKEY);
+    ret = OPENSSL_malloc(sizeof(X509_PKEY));
+    if (!ret)
+        goto err;
+    memset(ret, 0, sizeof(X509_PKEY));
+
     ret->version = 0;
-    M_ASN1_New(ret->enc_algor, X509_ALGOR_new);
-    M_ASN1_New(ret->enc_pkey, ASN1_OCTET_STRING_new);
+    ret->enc_algor = X509_ALGOR_new();
+    ret->enc_pkey = ASN1_OCTET_STRING_new();
+    if (!ret->enc_algor || !ret->enc_pkey)
+        goto err;
     ret->dec_pkey = NULL;
     ret->key_length = 0;
     ret->key_data = NULL;
@@ -79,8 +83,11 @@ X509_PKEY *X509_PKEY_new(void)
     ret->cipher.cipher = NULL;
     memset(ret->cipher.iv, 0, EVP_MAX_IV_LENGTH);
     ret->references = 1;
-    return (ret);
-    M_ASN1_New_Error(ASN1_F_X509_PKEY_NEW);
+    return ret;
+err:
+    X509_PKEY_free(ret);
+    ASN1err(ASN1_F_X509_PKEY_NEW, ERR_R_MALLOC_FAILURE);
+    return NULL;
 }
 
 void X509_PKEY_free(X509_PKEY *x)
diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c
index 83a65d2..4f1b31d 100644
--- a/crypto/cms/cms_pwri.c
+++ b/crypto/cms/cms_pwri.c
@@ -320,8 +320,6 @@ int cms_RecipientInfo_pwri_crypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri,
 {
     CMS_EncryptedContentInfo *ec;
     CMS_PasswordRecipientInfo *pwri;
-    const unsigned char *p = NULL;
-    int plen;
     int r = 0;
     X509_ALGOR *algtmp, *kekalg = NULL;
     EVP_CIPHER_CTX kekctx;
@@ -346,11 +344,9 @@ int cms_RecipientInfo_pwri_crypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri,
         return 0;
     }
 
-    if (algtmp->parameter->type == V_ASN1_SEQUENCE) {
-        p = algtmp->parameter->value.sequence->data;
-        plen = algtmp->parameter->value.sequence->length;
-        kekalg = d2i_X509_ALGOR(NULL, &p, plen);
-    }
+    kekalg = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(X509_ALGOR),
+                                       algtmp->parameter);
+
     if (kekalg == NULL) {
         CMSerr(CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT,
                CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER);
diff --git a/crypto/evp/p5_crpt.c b/crypto/evp/p5_crpt.c
index d06ab90..921006c 100644
--- a/crypto/evp/p5_crpt.c
+++ b/crypto/evp/p5_crpt.c
@@ -82,7 +82,6 @@ int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
     PBEPARAM *pbe;
     int saltlen, iter;
     unsigned char *salt;
-    const unsigned char *pbuf;
     int mdsize;
     int rv = 0;
     EVP_MD_CTX_init(&ctx);
@@ -94,8 +93,8 @@ int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
         return 0;
     }
 
-    pbuf = param->value.sequence->data;
-    if (!(pbe = d2i_PBEPARAM(NULL, &pbuf, param->value.sequence->length))) {
+    pbe = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(PBEPARAM), param);
+    if (pbe == NULL) {
         EVPerr(EVP_F_PKCS5_PBE_KEYIVGEN, EVP_R_DECODE_ERROR);
         return 0;
     }
diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c
index 27e3fa5..ca3fa9c 100644
--- a/crypto/evp/p5_crpt2.c
+++ b/crypto/evp/p5_crpt2.c
@@ -190,23 +190,14 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
                           ASN1_TYPE *param, const EVP_CIPHER *c,
                           const EVP_MD *md, int en_de)
 {
-    const unsigned char *pbuf;
-    int plen;
     PBE2PARAM *pbe2 = NULL;
     const EVP_CIPHER *cipher;
     EVP_PBE_KEYGEN *kdf;
 
     int rv = 0;
 
-    if (param == NULL || param->type != V_ASN1_SEQUENCE ||
-        param->value.sequence == NULL) {
-        EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN, EVP_R_DECODE_ERROR);
-        goto err;
-    }
-
-    pbuf = param->value.sequence->data;
-    plen = param->value.sequence->length;
-    if (!(pbe2 = d2i_PBE2PARAM(NULL, &pbuf, plen))) {
+    pbe2 = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(PBE2PARAM), param);
+    if (pbe2 == NULL) {
         EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN, EVP_R_DECODE_ERROR);
         goto err;
     }
@@ -248,8 +239,7 @@ int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass,
                              const EVP_CIPHER *c, const EVP_MD *md, int en_de)
 {
     unsigned char *salt, key[EVP_MAX_KEY_LENGTH];
-    const unsigned char *pbuf;
-    int saltlen, iter, plen;
+    int saltlen, iter;
     int rv = 0;
     unsigned int keylen = 0;
     int prf_nid, hmac_md_nid;
@@ -265,15 +255,9 @@ int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass,
 
     /* Decode parameter */
 
-    if (!param || (param->type != V_ASN1_SEQUENCE)) {
-        EVPerr(EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN, EVP_R_DECODE_ERROR);
-        goto err;
-    }
-
-    pbuf = param->value.sequence->data;
-    plen = param->value.sequence->length;
+    kdf = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(PBKDF2PARAM), param);
 
-    if (!(kdf = d2i_PBKDF2PARAM(NULL, &pbuf, plen))) {
+    if (kdf == NULL) {
         EVPerr(EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN, EVP_R_DECODE_ERROR);
         goto err;
     }
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index a96fae6..fb8f175 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -62,7 +62,6 @@
 #include <openssl/err.h>
 #include <openssl/objects.h>
 #include <openssl/evp.h>
-#include <openssl/asn1_mac.h>
 #include <openssl/x509.h>
 #ifndef OPENSSL_NO_RSA
 # include <openssl/rsa.h>
diff --git a/crypto/pkcs12/p12_crpt.c b/crypto/pkcs12/p12_crpt.c
index 3a166e6..e50096b 100644
--- a/crypto/pkcs12/p12_crpt.c
+++ b/crypto/pkcs12/p12_crpt.c
@@ -74,18 +74,12 @@ int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
     PBEPARAM *pbe;
     int saltlen, iter, ret;
     unsigned char *salt;
-    const unsigned char *pbuf;
     unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH];
 
     /* Extract useful info from parameter */
-    if (param == NULL || param->type != V_ASN1_SEQUENCE ||
-        param->value.sequence == NULL) {
-        PKCS12err(PKCS12_F_PKCS12_PBE_KEYIVGEN, PKCS12_R_DECODE_ERROR);
-        return 0;
-    }
 
-    pbuf = param->value.sequence->data;
-    if (!(pbe = d2i_PBEPARAM(NULL, &pbuf, param->value.sequence->length))) {
+    pbe = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(PBEPARAM), param);
+    if (pbe == NULL) {
         PKCS12err(PKCS12_F_PKCS12_PBE_KEYIVGEN, PKCS12_R_DECODE_ERROR);
         return 0;
     }
diff --git a/crypto/pkcs12/p12_npas.c b/crypto/pkcs12/p12_npas.c
index a89b61a..f756033 100644
--- a/crypto/pkcs12/p12_npas.c
+++ b/crypto/pkcs12/p12_npas.c
@@ -221,10 +221,7 @@ static int newpass_bag(PKCS12_SAFEBAG *bag, char *oldpass, char *newpass)
 static int alg_get(X509_ALGOR *alg, int *pnid, int *piter, int *psaltlen)
 {
     PBEPARAM *pbe;
-    const unsigned char *p;
-
-    p = alg->parameter->value.sequence->data;
-    pbe = d2i_PBEPARAM(NULL, &p, alg->parameter->value.sequence->length);
+    pbe = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(PBEPARAM), alg->parameter);
     if (!pbe)
         return 0;
     *pnid = OBJ_obj2nid(alg->algorithm);
diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
index 46b0fdc..379bf4c 100644
--- a/crypto/rsa/rsa_ameth.c
+++ b/crypto/rsa/rsa_ameth.c
@@ -271,34 +271,23 @@ static int rsa_priv_print(BIO *bp, const EVP_PKEY *pkey, int indent,
 /* Given an MGF1 Algorithm ID decode to an Algorithm Identifier */
 static X509_ALGOR *rsa_mgf1_decode(X509_ALGOR *alg)
 {
-    const unsigned char *p;
-    int plen;
     if (alg == NULL)
         return NULL;
     if (OBJ_obj2nid(alg->algorithm) != NID_mgf1)
         return NULL;
-    if (alg->parameter->type != V_ASN1_SEQUENCE)
-        return NULL;
-
-    p = alg->parameter->value.sequence->data;
-    plen = alg->parameter->value.sequence->length;
-    return d2i_X509_ALGOR(NULL, &p, plen);
+    return ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(X509_ALGOR),
+                                     alg->parameter);
 }
 
 static RSA_PSS_PARAMS *rsa_pss_decode(const X509_ALGOR *alg,
                                       X509_ALGOR **pmaskHash)
 {
-    const unsigned char *p;
-    int plen;
     RSA_PSS_PARAMS *pss;
 
     *pmaskHash = NULL;
 
-    if (!alg->parameter || alg->parameter->type != V_ASN1_SEQUENCE)
-        return NULL;
-    p = alg->parameter->value.sequence->data;
-    plen = alg->parameter->value.sequence->length;
-    pss = d2i_RSA_PSS_PARAMS(NULL, &p, plen);
+    pss = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(RSA_PSS_PARAMS),
+                                    alg->parameter);
 
     if (!pss)
         return NULL;
@@ -768,17 +757,12 @@ static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,
 static RSA_OAEP_PARAMS *rsa_oaep_decode(const X509_ALGOR *alg,
                                         X509_ALGOR **pmaskHash)
 {
-    const unsigned char *p;
-    int plen;
     RSA_OAEP_PARAMS *pss;
 
     *pmaskHash = NULL;
 
-    if (!alg->parameter || alg->parameter->type != V_ASN1_SEQUENCE)
-        return NULL;
-    p = alg->parameter->value.sequence->data;
-    plen = alg->parameter->value.sequence->length;
-    pss = d2i_RSA_OAEP_PARAMS(NULL, &p, plen);
+    pss = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(RSA_OAEP_PARAMS),
+                                    alg->parameter);
 
     if (!pss)
         return NULL;
diff --git a/doc/crypto/ASN1_TYPE_get.pod b/doc/crypto/ASN1_TYPE_get.pod
index a6c65aa..79f2e38 100644
--- a/doc/crypto/ASN1_TYPE_get.pod
+++ b/doc/crypto/ASN1_TYPE_get.pod
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-ASN1_TYPE_get, ASN1_TYPE_set, ASN1_TYPE_set1, ASN1_TYPE_cmp - ASN1_TYPE utility
+ASN1_TYPE_get, ASN1_TYPE_set, ASN1_TYPE_set1, ASN1_TYPE_cmp, ASN1_TYPE_unpack_sequence, ASN1_TYPE_pack_sequence - ASN1_TYPE utility
 functions
 
 =head1 SYNOPSIS
@@ -14,6 +14,10 @@ functions
  int ASN1_TYPE_set1(ASN1_TYPE *a, int type, const void *value);
  int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b);
 
+ void *ASN1_TYPE_unpack_sequence(const ASN1_ITEM *it, const ASN1_TYPE *t);
+ ASN1_TYPE *ASN1_TYPE_pack_sequence(const ASN1_ITEM *it, void *s,
+                                    ASN1_TYPE **t);
+
 =head1 DESCRIPTION
 
 These functions allow an ASN1_TYPE structure to be manipulated. The
@@ -31,6 +35,17 @@ ASN1_TYPE_set1() sets the value of B<a> to B<type> a copy of B<value>.
 ASN1_TYPE_cmp() compares ASN.1 types B<a> and B<b> and returns 0 if
 they are identical and non-zero otherwise.
 
+ASN1_TYPE_unpack_sequence() attempts to parse the SEQUENCE present in
+B<t> using the ASN.1 structure B<it>. If successful it returns a pointer
+to the ASN.1 structure corresponding to B<it> which must be freed by the
+caller. If it fails it return NULL.
+
+ASN1_TYPE_pack_sequence() attempts to encode the ASN.1 structure B<s>
+corresponding to B<it> into an ASN1_TYPE. If successful the encoded
+ASN1_TYPE is returned. If B<t> and B<*t> are not NULL the encoded type
+is written to B<t> overwriting any existing data. If B<t> is not NULL
+but B<*t> is NULL the returned ASN1_TYPE is written to B<*t>.
+
 =head1 NOTES
 
 The type and meaning of the B<value> parameter for ASN1_TYPE_set() and
@@ -67,4 +82,10 @@ ASN1_TYPE_set1() returns 1 for sucess and 0 for failure.
 
 ASN1_TYPE_cmp() returns 0 if the types are identical and non-zero otherwise.
 
+ASN1_TYPE_unpack_sequence() returns a pointer to an ASN.1 structure or
+NULL on failure.
+
+ASN1_TYPE_pack_sequence() return an ASN1_TYPE structure if it succeeds or
+NULL on failure.
+
 =cut
diff --git a/util/libeay.num b/util/libeay.num
index 50ddb97..54a4ccc 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4553,3 +4553,5 @@ OCSP_resp_get0_signature                4911	EXIST::FUNCTION:
 OBJ_length                              4912	EXIST::FUNCTION:
 OBJ_get0_data                           4913	EXIST::FUNCTION:
 X509_NAME_ENTRY_set                     4914	EXIST::FUNCTION:
+ASN1_TYPE_pack_sequence                 4915	EXIST::FUNCTION:
+ASN1_TYPE_unpack_sequence               4916	EXIST::FUNCTION:

From levitte at openssl.org  Tue Mar 31 13:22:16 2015
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 31 Mar 2015 13:22:16 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427808136.481588.32558.nullmailer@dev.openssl.org>

The branch master has been updated
       via  8bf5b8ab22ccab31ff74d352dd370d81267e09a7 (commit)
      from  e93c8748ab40d876285147e3112c7a520d68880e (commit)


- Log -----------------------------------------------------------------
commit 8bf5b8ab22ccab31ff74d352dd370d81267e09a7
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Mar 27 01:41:00 2015 +0100

    Fix some faults in util/mk1mf.pl
    
    When building on Unix, there are times when the 'EX_LIB' MINFO variable
    contains valuable information.  Make sure to take care of it.
    
    fixrules in util/pl/unix.pl was previously changed with a simpler fix of
    rules, with a comment claiming that's compatible with -j.  Unfortunately,
    this breaks multiline rules and doesn't change anything for single line
    rules.  While at it, do not prefix pure echo lines with a 'cd $(TEST_D) &&',
    as that's rather silly.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 util/mk1mf.pl   |  3 +++
 util/pl/unix.pl | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index d3379d2..3ad17f6 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -393,6 +393,9 @@ for (;;)
 	if ($key eq "LIBKRB5")
 		{ $ex_libs .= " $val" if $val ne "";}
 
+	if ($key eq "EX_LIBS")
+		{ $ex_libs .= " $val" if $val ne "";}
+
 	if ($key eq "TEST" && (!$fipscanisteronly || $dir =~ /^fips/ ))
 		{ $test.=&var_add($dir,$val, 0); }
 
diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index df4de71..c4b7e8e 100644
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -230,8 +230,8 @@ sub fixrules
   my ($str) = @_;
 
   # Compatible with -j...
-  $str =~ s/^(\s+@?)/$1cd \$(TEST_D) && /;
-  return $str;
+#  $str =~ s/^(\s+@?)/$1cd \$(TEST_D) && /;
+#  return $str;
 
   # Compatible with not -j.
   my @t = split("\n", $str);
@@ -243,11 +243,11 @@ sub fixrules
     if (!$prev)
       {
       if ($t =~ /^@/)
-	{
+        {
         $t =~ s/^@/\@cd \$(TEST_D) && /;
         }
-      elsif ($t !~ /^\s*#/)
-	{
+      elsif ($t !~ /^\s*#/ && $t !~ /^echo/)
+        {
         $t = 'cd $(TEST_D) && ' . $t;
         }
       }

From matt at openssl.org  Tue Mar 31 13:40:01 2015
From: matt at openssl.org (Matt Caswell)
Date: Tue, 31 Mar 2015 13:40:01 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427809201.141512.3681.nullmailer@dev.openssl.org>

The branch master has been updated
       via  747e16398d704a667cc99f8a0b1912c36b7de52d (commit)
       via  1b34e25c17493f3c4109510fc5cfb9474ab234ea (commit)
      from  8bf5b8ab22ccab31ff74d352dd370d81267e09a7 (commit)


- Log -----------------------------------------------------------------
commit 747e16398d704a667cc99f8a0b1912c36b7de52d
Author: Matt Caswell <matt at openssl.org>
Date:   Sat Mar 28 00:33:05 2015 +0000

    Clean up record layer
    
    Fix up various things that were missed during the record layer work. All
    instances where we are breaking the encapsulation rules.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 1b34e25c17493f3c4109510fc5cfb9474ab234ea
Author: Matt Caswell <matt at openssl.org>
Date:   Sat Mar 28 00:24:18 2015 +0000

    Fix record layer "make clean"
    
    The "clean" target in libssl has been updated to handle the new record
    layer sub-directory.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 ssl/Makefile              |   4 +-
 ssl/record/rec_layer_d1.c | 124 ++++++++++++++++++++++---------------------
 ssl/record/rec_layer_s3.c | 131 ++++++++++++++++++++++++----------------------
 ssl/record/record_locl.h  |  16 ++++++
 4 files changed, 153 insertions(+), 122 deletions(-)

diff --git a/ssl/Makefile b/ssl/Makefile
index d876d91..39cba8b 100644
--- a/ssl/Makefile
+++ b/ssl/Makefile
@@ -105,7 +105,9 @@ dclean:
 	mv -f Makefile.new $(MAKEFILE)
 
 clean:
-	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+	rm -f $(LIBOBJ) *.obj lib tags core .pure .nfs* *.old *.bak fluff
+	rm -f record/*.obj record/lib record/retags record/core \
+	record/.pure record/.nfs* record/*.old record/*.bak record/fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c
index 80f10be..c58af7f 100644
--- a/ssl/record/rec_layer_d1.c
+++ b/ssl/record/rec_layer_d1.c
@@ -480,7 +480,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
      * We are not handshaking and have no data yet, so process data buffered
      * during the last handshake in advance, if any.
      */
-    if (s->state == SSL_ST_OK && rr->length == 0) {
+    if (s->state == SSL_ST_OK && SSL3_RECORD_get_length(rr) == 0) {
         pitem *item;
         item = pqueue_pop(s->rlayer.d->buffered_app_data.q);
         if (item) {
@@ -505,7 +505,8 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         goto start;
 
     /* get new packet if necessary */
-    if ((rr->length == 0) || (s->rlayer.rstate == SSL_ST_READ_BODY)) {
+    if ((SSL3_RECORD_get_length(rr) == 0)
+            || (s->rlayer.rstate == SSL_ST_READ_BODY)) {
         ret = dtls1_get_record(s);
         if (ret <= 0) {
             ret = dtls1_read_failed(s, ret);
@@ -518,7 +519,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
     }
 
     if (s->d1->listen && rr->type != SSL3_RT_HANDSHAKE) {
-        rr->length = 0;
+        SSL3_RECORD_set_length(rr, 0);
         goto start;
     }
 
@@ -526,18 +527,18 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
 
     if (s->s3->change_cipher_spec /* set when we receive ChangeCipherSpec,
                                    * reset by ssl3_get_finished */
-        && (rr->type != SSL3_RT_HANDSHAKE)) {
+        && (SSL3_RECORD_get_type(rr) != SSL3_RT_HANDSHAKE)) {
         /*
          * We now have application data between CCS and Finished. Most likely
          * the packets were reordered on their way, so buffer the application
          * data for later processing rather than dropping the connection.
          */
         if (dtls1_buffer_record(s, &(s->rlayer.d->buffered_app_data),
-            rr->seq_num) < 0) {
+            SSL3_RECORD_get_seq_num(rr)) < 0) {
             SSLerr(SSL_F_DTLS1_READ_BYTES, ERR_R_INTERNAL_ERROR);
             return -1;
         }
-        rr->length = 0;
+        SSL3_RECORD_set_length(rr, 0);
         goto start;
     }
 
@@ -546,13 +547,14 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
      * 'peek' mode)
      */
     if (s->shutdown & SSL_RECEIVED_SHUTDOWN) {
-        rr->length = 0;
+        SSL3_RECORD_set_length(rr, 0);
         s->rwstate = SSL_NOTHING;
         return (0);
     }
 
-    if (type == rr->type) {     /* SSL3_RT_APPLICATION_DATA or
-                                 * SSL3_RT_HANDSHAKE */
+    if (type == SSL3_RECORD_get_type(rr)) {
+        /* SSL3_RT_APPLICATION_DATA or
+         * SSL3_RT_HANDSHAKE */
         /*
          * make sure that we are not getting application data when we are
          * doing a handshake for the first time
@@ -567,18 +569,18 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         if (len <= 0)
             return (len);
 
-        if ((unsigned int)len > rr->length)
-            n = rr->length;
+        if ((unsigned int)len > SSL3_RECORD_get_length(rr))
+            n = SSL3_RECORD_get_length(rr);
         else
             n = (unsigned int)len;
 
-        memcpy(buf, &(rr->data[rr->off]), n);
+        memcpy(buf, &(SSL3_RECORD_get_data(rr)[SSL3_RECORD_get_off(rr)]), n);
         if (!peek) {
-            rr->length -= n;
-            rr->off += n;
-            if (rr->length == 0) {
+            SSL3_RECORD_add_length(rr, -n);
+            SSL3_RECORD_add_off(rr, n);
+            if (SSL3_RECORD_get_length(rr) == 0) {
                 s->rlayer.rstate = SSL_ST_READ_HEADER;
-                rr->off = 0;
+                SSL3_RECORD_set_off(rr, 0);
             }
         }
 #ifndef OPENSSL_NO_SCTP
@@ -587,7 +589,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
          * data first, so retry.
          */
         if (BIO_dgram_is_sctp(SSL_get_rbio(s)) &&
-            rr->type == SSL3_RT_APPLICATION_DATA &&
+            SSL3_RECORD_get_type(rr) == SSL3_RT_APPLICATION_DATA &&
             (s->state == DTLS1_SCTP_ST_SR_READ_SOCK
              || s->state == DTLS1_SCTP_ST_CR_READ_SOCK)) {
             s->rwstate = SSL_READING;
@@ -624,24 +626,24 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         unsigned char *dest = NULL;
         unsigned int *dest_len = NULL;
 
-        if (rr->type == SSL3_RT_HANDSHAKE) {
+        if (SSL3_RECORD_get_type(rr) == SSL3_RT_HANDSHAKE) {
             dest_maxlen = sizeof s->rlayer.d->handshake_fragment;
             dest = s->rlayer.d->handshake_fragment;
             dest_len = &s->rlayer.d->handshake_fragment_len;
-        } else if (rr->type == SSL3_RT_ALERT) {
+        } else if (SSL3_RECORD_get_type(rr) == SSL3_RT_ALERT) {
             dest_maxlen = sizeof(s->rlayer.d->alert_fragment);
             dest = s->rlayer.d->alert_fragment;
             dest_len = &s->rlayer.d->alert_fragment_len;
         }
 #ifndef OPENSSL_NO_HEARTBEATS
-        else if (rr->type == TLS1_RT_HEARTBEAT) {
+        else if (SSL3_RECORD_get_type(rr) == TLS1_RT_HEARTBEAT) {
             /* We allow a 0 return */
-            if(dtls1_process_heartbeat(s, SSL3_RECORD_get_data(&s->rlayer.rrec),
-                    SSL3_RECORD_get_length(&s->rlayer.rrec)) < 0) {
+            if(dtls1_process_heartbeat(s, SSL3_RECORD_get_data(rr),
+                    SSL3_RECORD_get_length(rr)) < 0) {
                 return -1;
             }
             /* Exit and notify application to read again */
-            rr->length = 0;
+            SSL3_RECORD_set_length(rr, 0);
             s->rwstate = SSL_READING;
             BIO_clear_retry_flags(SSL_get_rbio(s));
             BIO_set_retry_read(SSL_get_rbio(s));
@@ -649,12 +651,12 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         }
 #endif
         /* else it's a CCS message, or application data or wrong */
-        else if (rr->type != SSL3_RT_CHANGE_CIPHER_SPEC) {
+        else if (SSL3_RECORD_get_type(rr) != SSL3_RT_CHANGE_CIPHER_SPEC) {
             /*
              * Application data while renegotiating is allowed. Try again
              * reading.
              */
-            if (rr->type == SSL3_RT_APPLICATION_DATA) {
+            if (SSL3_RECORD_get_type(rr)  == SSL3_RT_APPLICATION_DATA) {
                 BIO *bio;
                 s->s3->in_read_app_data = 2;
                 bio = SSL_get_rbio(s);
@@ -675,7 +677,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
              * XDTLS: In a pathalogical case, the Client Hello may be
              * fragmented--don't always expect dest_maxlen bytes
              */
-            if (rr->length < dest_maxlen) {
+            if (SSL3_RECORD_get_length(rr)  < dest_maxlen) {
 #ifdef DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
                 /*
                  * for normal alerts rr->length is 2, while
@@ -684,15 +686,16 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
                  */
                 FIX ME
 #endif
-                 s->rlayer.rstate = SSL_ST_READ_HEADER;
-                rr->length = 0;
+                s->rlayer.rstate = SSL_ST_READ_HEADER;
+                SSL3_RECORD_set_length(rr, 0);
                 goto start;
             }
 
             /* now move 'n' bytes: */
             for (k = 0; k < dest_maxlen; k++) {
-                dest[k] = rr->data[rr->off++];
-                rr->length--;
+                dest[k] = SSL3_RECORD_get_data(rr)[SSL3_RECORD_get_off(rr)];
+                SSL3_RECORD_add_off(rr, 1);
+                SSL3_RECORD_add_length(rr, -1);
             }
             *dest_len = dest_maxlen;
         }
@@ -864,15 +867,15 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
     if (s->shutdown & SSL_SENT_SHUTDOWN) { /* but we have not received a
                                             * shutdown */
         s->rwstate = SSL_NOTHING;
-        rr->length = 0;
+        SSL3_RECORD_set_length(rr, 0);
         return (0);
     }
 
-    if (rr->type == SSL3_RT_CHANGE_CIPHER_SPEC) {
+    if (SSL3_RECORD_get_type(rr) == SSL3_RT_CHANGE_CIPHER_SPEC) {
         struct ccs_header_st ccs_hdr;
         unsigned int ccs_hdr_len = DTLS1_CCS_HEADER_LENGTH;
 
-        dtls1_get_ccs_header(rr->data, &ccs_hdr);
+        dtls1_get_ccs_header(SSL3_RECORD_get_data(rr), &ccs_hdr);
 
         if (s->version == DTLS1_BAD_VER)
             ccs_hdr_len = 3;
@@ -882,18 +885,19 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
          * what the record payload has to look like
          */
         /* XDTLS: check that epoch is consistent */
-        if ((rr->length != ccs_hdr_len) ||
-            (rr->off != 0) || (rr->data[0] != SSL3_MT_CCS)) {
+        if ((SSL3_RECORD_get_length(rr) != ccs_hdr_len)
+                || (SSL3_RECORD_get_off(rr) != 0)
+                || (SSL3_RECORD_get_data(rr)[0] != SSL3_MT_CCS)) {
             i = SSL_AD_ILLEGAL_PARAMETER;
             SSLerr(SSL_F_DTLS1_READ_BYTES, SSL_R_BAD_CHANGE_CIPHER_SPEC);
             goto err;
         }
 
-        rr->length = 0;
+        SSL3_RECORD_set_length(rr, 0);
 
         if (s->msg_callback)
             s->msg_callback(0, s->version, SSL3_RT_CHANGE_CIPHER_SPEC,
-                            rr->data, 1, s, s->msg_callback_arg);
+                SSL3_RECORD_get_data(rr), 1, s, s->msg_callback_arg);
 
         /*
          * We can't process a CCS now, because previous handshake messages
@@ -936,8 +940,8 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
 
         /* this may just be a stale retransmit */
         dtls1_get_message_header(rr->data, &msg_hdr);
-        if (rr->epoch != s->rlayer.d->r_epoch) {
-            rr->length = 0;
+        if (SSL3_RECORD_get_epoch(rr) != s->rlayer.d->r_epoch) {
+            SSL3_RECORD_set_length(rr, 0);
             goto start;
         }
 
@@ -950,7 +954,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
                 return -1;
 
             dtls1_retransmit_buffered_messages(s);
-            rr->length = 0;
+            SSL3_RECORD_set_length(rr, 0);
             goto start;
         }
 
@@ -988,11 +992,11 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         goto start;
     }
 
-    switch (rr->type) {
+    switch (SSL3_RECORD_get_type(rr)) {
     default:
         /* TLS just ignores unknown message types */
         if (s->version == TLS1_VERSION) {
-            rr->length = 0;
+            SSL3_RECORD_set_length(rr, 0);
             goto start;
         }
         al = SSL_AD_UNEXPECTED_MESSAGE;
@@ -1139,12 +1143,12 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
             goto err;
     }
 
-    p = wb->buf + prefix_len;
+    p = SSL3_BUFFER_get_buf(wb) + prefix_len;
 
     /* write the header */
 
     *(p++) = type & 0xff;
-    wr->type = type;
+    SSL3_RECORD_set_type(wr, type);
     /*
      * Special case: for hello verify request, client version 1.0 and we
      * haven't decided which version to use yet send back using version 1.0
@@ -1179,9 +1183,9 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
         eivlen = 0;
 
     /* lets setup the record stuff. */
-    wr->data = p + eivlen;      /* make room for IV in case of CBC */
-    wr->length = (int)len;
-    wr->input = (unsigned char *)buf;
+    SSL3_RECORD_set_data(wr, p + eivlen); /* make room for IV in case of CBC */
+    SSL3_RECORD_set_length(wr, (int)len);
+    SSL3_RECORD_set_input(wr, (unsigned char *)buf);
 
     /*
      * we now 'read' from wr->input, wr->length bytes into wr->data
@@ -1194,8 +1198,9 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
             goto err;
         }
     } else {
-        memcpy(wr->data, wr->input, wr->length);
-        wr->input = wr->data;
+        memcpy(SSL3_RECORD_get_data(wr), SSL3_RECORD_get_input(wr),
+               SSL3_RECORD_get_length(wr));
+        SSL3_RECORD_reset_input(wr);
     }
 
     /*
@@ -1205,17 +1210,18 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
      */
 
     if (mac_size != 0) {
-        if (s->method->ssl3_enc->mac(s, &(p[wr->length + eivlen]), 1) < 0)
+        if (s->method->ssl3_enc->mac(s,
+                &(p[SSL3_RECORD_get_length(wr) + eivlen]), 1) < 0)
             goto err;
-        wr->length += mac_size;
+        SSL3_RECORD_add_length(wr, mac_size);
     }
 
     /* this is true regardless of mac size */
-    wr->input = p;
-    wr->data = p;
+    SSL3_RECORD_set_data(wr, p);
+    SSL3_RECORD_reset_input(wr);
 
     if (eivlen)
-        wr->length += eivlen;
+        SSL3_RECORD_add_length(wr, eivlen);
 
     if (s->method->ssl3_enc->enc(s, 1) < 1)
         goto err;
@@ -1237,7 +1243,7 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
 
     memcpy(pseq, &(s->rlayer.write_sequence[2]), 6);
     pseq += 6;
-    s2n(wr->length, pseq);
+    s2n(SSL3_RECORD_get_length(wr), pseq);
 
     if (s->msg_callback)
         s->msg_callback(1, 0, SSL3_RT_HEADER, pseq - DTLS1_RT_HEADER_LENGTH,
@@ -1247,8 +1253,8 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
      * we should now have wr->data pointing to the encrypted data, which is
      * wr->length long
      */
-    wr->type = type;            /* not needed but helps for debugging */
-    wr->length += DTLS1_RT_HEADER_LENGTH;
+    SSL3_RECORD_set_type(wr, type); /* not needed but helps for debugging */
+    SSL3_RECORD_add_length(wr, DTLS1_RT_HEADER_LENGTH);
 
     ssl3_record_sequence_update(&(s->rlayer.write_sequence[0]));
 
@@ -1261,8 +1267,8 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
     }
 
     /* now let's set up wb */
-    wb->left = prefix_len + wr->length;
-    wb->offset = 0;
+    SSL3_BUFFER_set_left(wb, prefix_len + SSL3_RECORD_get_length(wr));
+    SSL3_BUFFER_set_offset(wb, 0);
 
     /*
      * memorize arguments so that ssl3_write_pending can detect bad write
diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index dc89be8..de8dac2 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -683,7 +683,7 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
      * first check if there is a SSL3_BUFFER still being written out.  This
      * will happen with non blocking IO
      */
-    if (wb->left != 0)
+    if (SSL3_BUFFER_get_left(wb) != 0)
         return (ssl3_write_pending(s, type, buf, len));
 
     /* If we have an alert to send, lets send it */
@@ -694,7 +694,7 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
         /* if it went, fall through and send more stuff */
     }
 
-    if (wb->buf == NULL)
+    if (!SSL3_BUFFER_is_initialised(wb))
         if (!ssl3_setup_write_buffer(s))
             return -1;
 
@@ -754,26 +754,26 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
          * multiple of SSL3_ALIGN_PAYLOAD, so if we want to align the real
          * payload, then we can just pretent we simply have two headers.
          */
-        align = (long)wb->buf + 2 * SSL3_RT_HEADER_LENGTH;
+        align = (long)SSL3_BUFFER_get_buf(wb) + 2 * SSL3_RT_HEADER_LENGTH;
         align = (-align) & (SSL3_ALIGN_PAYLOAD - 1);
 #endif
-        p = wb->buf + align;
-        wb->offset = align;
+        p = SSL3_BUFFER_get_buf(wb) + align;
+        SSL3_BUFFER_set_offset(wb, align);
     } else if (prefix_len) {
-        p = wb->buf + wb->offset + prefix_len;
+        p = SSL3_BUFFER_get_buf(wb) + SSL3_BUFFER_get_offset(wb) + prefix_len;
     } else {
 #if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0
-        align = (long)wb->buf + SSL3_RT_HEADER_LENGTH;
+        align = (long)SSL3_BUFFER_get_buf(wb) + SSL3_RT_HEADER_LENGTH;
         align = (-align) & (SSL3_ALIGN_PAYLOAD - 1);
 #endif
-        p = wb->buf + align;
-        wb->offset = align;
+        p = SSL3_BUFFER_get_buf(wb) + align;
+        SSL3_BUFFER_set_offset(wb, align);
     }
 
     /* write the header */
 
     *(p++) = type & 0xff;
-    wr->type = type;
+    SSL3_RECORD_set_type(wr, type);
 
     *(p++) = (s->version >> 8);
     /*
@@ -806,9 +806,10 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
         eivlen = 0;
 
     /* lets setup the record stuff. */
-    wr->data = p + eivlen;
-    wr->length = (int)len;
-    wr->input = (unsigned char *)buf;
+    SSL3_RECORD_set_data(wr, p + eivlen);
+    SSL3_RECORD_set_length(wr, (int)len);
+    SSL3_RECORD_set_input(wr, (unsigned char *)buf);
+
 
     /*
      * we now 'read' from wr->input, wr->length bytes into wr->data
@@ -822,7 +823,7 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
         }
     } else {
         memcpy(wr->data, wr->input, wr->length);
-        wr->input = wr->data;
+        SSL3_RECORD_reset_input(wr);
     }
 
     /*
@@ -834,17 +835,17 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
     if (!SSL_USE_ETM(s) && mac_size != 0) {
         if (s->method->ssl3_enc->mac(s, &(p[wr->length + eivlen]), 1) < 0)
             goto err;
-        wr->length += mac_size;
+        SSL3_RECORD_add_length(wr, mac_size);
     }
 
-    wr->input = p;
-    wr->data = p;
+    SSL3_RECORD_set_data(wr, p);
+    SSL3_RECORD_reset_input(wr);
 
     if (eivlen) {
         /*
          * if (RAND_pseudo_bytes(p, eivlen) <= 0) goto err;
          */
-        wr->length += eivlen;
+        SSL3_RECORD_add_length(wr, eivlen);
     }
 
     if (s->method->ssl3_enc->enc(s, 1) < 1)
@@ -853,11 +854,11 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
     if (SSL_USE_ETM(s) && mac_size != 0) {
         if (s->method->ssl3_enc->mac(s, p + wr->length, 1) < 0)
             goto err;
-        wr->length += mac_size;
+        SSL3_RECORD_add_length(wr, mac_size);
     }
 
     /* record length after mac and block padding */
-    s2n(wr->length, plen);
+    s2n(SSL3_RECORD_get_length(wr), plen);
 
     if (s->msg_callback)
         s->msg_callback(1, 0, SSL3_RT_HEADER, plen - 5, 5, s,
@@ -867,19 +868,19 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
      * we should now have wr->data pointing to the encrypted data, which is
      * wr->length long
      */
-    wr->type = type;            /* not needed but helps for debugging */
-    wr->length += SSL3_RT_HEADER_LENGTH;
+    SSL3_RECORD_set_type(wr, type);  /* not needed but helps for debugging */
+    SSL3_RECORD_add_length(wr, SSL3_RT_HEADER_LENGTH);
 
     if (create_empty_fragment) {
         /*
          * we are in a recursive call; just return the length, don't write
          * out anything here
          */
-        return wr->length;
+        return SSL3_RECORD_get_length(wr);
     }
 
     /* now let's set up wb */
-    wb->left = prefix_len + wr->length;
+    SSL3_BUFFER_set_left(wb, prefix_len + SSL3_RECORD_get_length(wr));
 
     /*
      * memorize arguments so that ssl3_write_pending can detect bad write
@@ -917,15 +918,15 @@ int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
         if (s->wbio != NULL) {
             s->rwstate = SSL_WRITING;
             i = BIO_write(s->wbio,
-                          (char *)&(wb->buf[wb->offset]),
-                          (unsigned int)wb->left);
+                (char *)&(SSL3_BUFFER_get_buf(wb)[SSL3_BUFFER_get_offset(wb)]),
+                (unsigned int)SSL3_BUFFER_get_left(wb));
         } else {
             SSLerr(SSL_F_SSL3_WRITE_PENDING, SSL_R_BIO_NOT_SET);
             i = -1;
         }
-        if (i == wb->left) {
-            wb->left = 0;
-            wb->offset += i;
+        if (i == SSL3_BUFFER_get_left(wb)) {
+            SSL3_BUFFER_set_left(wb, 0);
+            SSL3_BUFFER_add_offset(wb, i);
             s->rwstate = SSL_NOTHING;
             return (s->rlayer.wpend_ret);
         } else if (i <= 0) {
@@ -934,12 +935,12 @@ int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
                  * For DTLS, just drop it. That's kind of the whole point in
                  * using a datagram service
                  */
-                wb->left = 0;
+                SSL3_BUFFER_set_left(wb, 0);
             }
             return (i);
         }
-        wb->offset += i;
-        wb->left -= i;
+        SSL3_BUFFER_add_offset(wb, i);
+        SSL3_BUFFER_add_left(wb, -i);
     }
 }
 
@@ -1039,7 +1040,8 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
     rr = &s->rlayer.rrec;
 
     /* get new packet if necessary */
-    if ((rr->length == 0) || (s->rlayer.rstate == SSL_ST_READ_BODY)) {
+    if ((SSL3_RECORD_get_length(rr) == 0)
+            || (s->rlayer.rstate == SSL_ST_READ_BODY)) {
         ret = ssl3_get_record(s);
         if (ret <= 0)
             return (ret);
@@ -1049,7 +1051,7 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
 
     if (s->s3->change_cipher_spec /* set when we receive ChangeCipherSpec,
                                    * reset by ssl3_get_finished */
-        && (rr->type != SSL3_RT_HANDSHAKE)) {
+        && (SSL3_RECORD_get_type(rr) != SSL3_RT_HANDSHAKE)) {
         al = SSL_AD_UNEXPECTED_MESSAGE;
         SSLerr(SSL_F_SSL3_READ_BYTES, SSL_R_DATA_BETWEEN_CCS_AND_FINISHED);
         goto f_err;
@@ -1060,13 +1062,14 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
      * 'peek' mode)
      */
     if (s->shutdown & SSL_RECEIVED_SHUTDOWN) {
-        rr->length = 0;
+        SSL3_RECORD_set_length(rr, 0);
         s->rwstate = SSL_NOTHING;
         return (0);
     }
 
-    if (type == rr->type) {     /* SSL3_RT_APPLICATION_DATA or
-                                 * SSL3_RT_HANDSHAKE */
+    if (type == SSL3_RECORD_get_type(rr)) {
+        /* SSL3_RT_APPLICATION_DATA or
+         * SSL3_RT_HANDSHAKE */
         /*
          * make sure that we are not getting application data when we are
          * doing a handshake for the first time
@@ -1081,18 +1084,18 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         if (len <= 0)
             return (len);
 
-        if ((unsigned int)len > rr->length)
-            n = rr->length;
+        if ((unsigned int)len > SSL3_RECORD_get_length(rr))
+            n = SSL3_RECORD_get_length(rr);
         else
             n = (unsigned int)len;
 
         memcpy(buf, &(rr->data[rr->off]), n);
         if (!peek) {
-            rr->length -= n;
-            rr->off += n;
-            if (rr->length == 0) {
+            SSL3_RECORD_add_length(rr, -n);
+            SSL3_RECORD_add_off(rr, n);
+            if (SSL3_RECORD_get_length(rr) == 0) {
                 s->rlayer.rstate = SSL_ST_READ_HEADER;
-                rr->off = 0;
+                SSL3_RECORD_set_off(rr, 0);
                 if (s->mode & SSL_MODE_RELEASE_BUFFERS
                     && SSL3_BUFFER_get_left(&s->rlayer.rbuf) == 0)
                     ssl3_release_read_buffer(s);
@@ -1115,25 +1118,25 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         unsigned char *dest = NULL;
         unsigned int *dest_len = NULL;
 
-        if (rr->type == SSL3_RT_HANDSHAKE) {
+        if (SSL3_RECORD_get_type(rr) == SSL3_RT_HANDSHAKE) {
             dest_maxlen = sizeof s->rlayer.handshake_fragment;
             dest = s->rlayer.handshake_fragment;
             dest_len = &s->rlayer.handshake_fragment_len;
-        } else if (rr->type == SSL3_RT_ALERT) {
+        } else if (SSL3_RECORD_get_type(rr) == SSL3_RT_ALERT) {
             dest_maxlen = sizeof s->rlayer.alert_fragment;
             dest = s->rlayer.alert_fragment;
             dest_len = &s->rlayer.alert_fragment_len;
         }
 #ifndef OPENSSL_NO_HEARTBEATS
-        else if (rr->type == TLS1_RT_HEARTBEAT) {
+        else if (SSL3_RECORD_get_type(rr)== TLS1_RT_HEARTBEAT) {
             /* We can ignore 0 return values */
-            if(tls1_process_heartbeat(s, SSL3_RECORD_get_data(&s->rlayer.rrec),
-                    SSL3_RECORD_get_length(&s->rlayer.rrec)) < 0) {
+            if(tls1_process_heartbeat(s, SSL3_RECORD_get_data(rr),
+                    SSL3_RECORD_get_length(rr)) < 0) {
                 return -1;
             }
 
             /* Exit and notify application to read again */
-            rr->length = 0;
+            SSL3_RECORD_set_length(rr, 0);
             s->rwstate = SSL_READING;
             BIO_clear_retry_flags(SSL_get_rbio(s));
             BIO_set_retry_read(SSL_get_rbio(s));
@@ -1143,13 +1146,15 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
 
         if (dest_maxlen > 0) {
             n = dest_maxlen - *dest_len; /* available space in 'dest' */
-            if (rr->length < n)
-                n = rr->length; /* available bytes */
+            if (SSL3_RECORD_get_length(rr) < n)
+                n = SSL3_RECORD_get_length(rr); /* available bytes */
 
             /* now move 'n' bytes: */
             while (n-- > 0) {
-                dest[(*dest_len)++] = rr->data[rr->off++];
-                rr->length--;
+                dest[(*dest_len)++] =
+                    SSL3_RECORD_get_data(rr)[SSL3_RECORD_get_off(rr)];
+                SSL3_RECORD_add_off(rr, 1);
+                SSL3_RECORD_add_length(rr, -1);
             }
 
             if (*dest_len < dest_maxlen)
@@ -1235,7 +1240,7 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         (s->rlayer.handshake_fragment[0] == SSL3_MT_CLIENT_HELLO) &&
         (s->session != NULL) && (s->session->cipher != NULL) &&
         !(s->ctx->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)) {
-        rr->length = 0;
+        SSL3_RECORD_set_length(rr, 0);
         ssl3_send_alert(s, SSL3_AL_WARNING, SSL_AD_NO_RENEGOTIATION);
         goto start;
     }
@@ -1306,17 +1311,18 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
     if (s->shutdown & SSL_SENT_SHUTDOWN) { /* but we have not received a
                                             * shutdown */
         s->rwstate = SSL_NOTHING;
-        rr->length = 0;
+        SSL3_RECORD_set_length(rr, 0);
         return (0);
     }
 
-    if (rr->type == SSL3_RT_CHANGE_CIPHER_SPEC) {
+    if (SSL3_RECORD_get_type(rr) == SSL3_RT_CHANGE_CIPHER_SPEC) {
         /*
          * 'Change Cipher Spec' is just a single byte, so we know exactly
          * what the record payload has to look like
          */
-        if ((rr->length != 1) || (rr->off != 0) ||
-            (rr->data[0] != SSL3_MT_CCS)) {
+        if ((SSL3_RECORD_get_length(rr) != 1)
+            || (SSL3_RECORD_get_off(rr) != 0)
+            || (SSL3_RECORD_get_data(rr)[0] != SSL3_MT_CCS)) {
             al = SSL_AD_ILLEGAL_PARAMETER;
             SSLerr(SSL_F_SSL3_READ_BYTES, SSL_R_BAD_CHANGE_CIPHER_SPEC);
             goto f_err;
@@ -1337,11 +1343,12 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
 
         s->s3->flags &= ~SSL3_FLAGS_CCS_OK;
 
-        rr->length = 0;
+        SSL3_RECORD_set_length(rr, 0);
 
         if (s->msg_callback)
             s->msg_callback(0, s->version, SSL3_RT_CHANGE_CIPHER_SPEC,
-                            rr->data, 1, s, s->msg_callback_arg);
+                            SSL3_RECORD_get_data(rr), 1, s,
+                            s->msg_callback_arg);
 
         s->s3->change_cipher_spec = 1;
         if (!ssl3_do_change_cipher_spec(s))
@@ -1388,14 +1395,14 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         goto start;
     }
 
-    switch (rr->type) {
+    switch (SSL3_RECORD_get_type(rr)) {
     default:
         /*
          * TLS up to v1.1 just ignores unknown message types: TLS v1.2 give
          * an unexpected message alert.
          */
         if (s->version >= TLS1_VERSION && s->version <= TLS1_1_VERSION) {
-            rr->length = 0;
+            SSL3_RECORD_set_length(rr, 0);
             goto start;
         }
         al = SSL_AD_UNEXPECTED_MESSAGE;
diff --git a/ssl/record/record_locl.h b/ssl/record/record_locl.h
index 26b5a15..72f8e55 100644
--- a/ssl/record/record_locl.h
+++ b/ssl/record/record_locl.h
@@ -155,6 +155,11 @@ void dtls1_record_bitmap_update(SSL *s, DTLS1_BITMAP *bitmap);
 #define SSL3_BUFFER_get_len(b)              ((b)->len)
 #define SSL3_BUFFER_set_len(b, l)           ((b)->len = (l))
 #define SSL3_BUFFER_get_left(b)             ((b)->left)
+#define SSL3_BUFFER_set_left(b, l)          ((b)->left = (l))
+#define SSL3_BUFFER_add_left(b, l)          ((b)->left += (l))
+#define SSL3_BUFFER_get_offset(b)           ((b)->offset)
+#define SSL3_BUFFER_set_offset(b, o)        ((b)->offset = (o))
+#define SSL3_BUFFER_add_offset(b, o)        ((b)->offset += (o))
 #define SSL3_BUFFER_is_initialised(b)       ((b)->buf != NULL)
 
 void SSL3_BUFFER_set_data(SSL3_BUFFER *b, const unsigned char *d, int n);
@@ -167,9 +172,20 @@ int ssl3_release_write_buffer(SSL *s);
 /* Macros/functions provided by the SSL3_RECORD component */
 
 #define SSL3_RECORD_get_type(r)                 ((r)->type)
+#define SSL3_RECORD_set_type(r, t)              ((r)->type = (t))
 #define SSL3_RECORD_get_length(r)               ((r)->length)
+#define SSL3_RECORD_set_length(r, l)            ((r)->length = (l))
+#define SSL3_RECORD_add_length(r, l)            ((r)->length += (l))
 #define SSL3_RECORD_get_data(r)                 ((r)->data)
+#define SSL3_RECORD_set_data(r, d)              ((r)->data = (d))
+#define SSL3_RECORD_get_input(r)                ((r)->input)
+#define SSL3_RECORD_set_input(r, i)             ((r)->input = (i))
+#define SSL3_RECORD_reset_input(r)              ((r)->input = (r)->data)
 #define SSL3_RECORD_get_seq_num(r)              ((r)->seq_num)
+#define SSL3_RECORD_get_off(r)                  ((r)->off)
+#define SSL3_RECORD_set_off(r, o)               ((r)->off = (o))
+#define SSL3_RECORD_add_off(r, o)               ((r)->off += (o))
+#define SSL3_RECORD_get_epoch(r)                ((r)->epoch)
 
 void SSL3_RECORD_clear(SSL3_RECORD *r);
 void SSL3_RECORD_release(SSL3_RECORD *r);

From matt at openssl.org  Tue Mar 31 15:43:31 2015
From: matt at openssl.org (Matt Caswell)
Date: Tue, 31 Mar 2015 15:43:31 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1427816611.282196.22934.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  a63d3ac012f4a1c3e7440dc9d419d8bc6041ee46 (commit)
      from  8a46e51ed83300e16eb6daebf664f141f6c313df (commit)


- Log -----------------------------------------------------------------
commit a63d3ac012f4a1c3e7440dc9d419d8bc6041ee46
Author: Douglas E Engert <deengert at gmail.com>
Date:   Wed Mar 25 23:52:28 2015 +0000

    Ensure EC private keys retain leading zeros
    
    RFC5915 requires the use of the I2OSP primitive as defined in RFC3447
    for storing an EC Private Key. This converts the private key into an
    OCTETSTRING and retains any leading zeros. This commit ensures that those
    leading zeros are present if required.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit 30cd4ff294252c4b6a4b69cbef6a5b4117705d22)
    
    Conflicts:
    	crypto/ec/ec_asn1.c

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

Summary of changes:
 crypto/ec/ec_asn1.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index b4b0e9f..4ad8494 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -1114,7 +1114,7 @@ int i2d_ECPrivateKey(EC_KEY *a, unsigned char **out)
 {
     int ret = 0, ok = 0;
     unsigned char *buffer = NULL;
-    size_t buf_len = 0, tmp_len;
+    size_t buf_len = 0, tmp_len, bn_len;
     EC_PRIVATEKEY *priv_key = NULL;
 
     if (a == NULL || a->group == NULL || a->priv_key == NULL ||
@@ -1130,18 +1130,32 @@ int i2d_ECPrivateKey(EC_KEY *a, unsigned char **out)
 
     priv_key->version = a->version;
 
-    buf_len = (size_t)BN_num_bytes(a->priv_key);
+    bn_len = (size_t)BN_num_bytes(a->priv_key);
+
+    /* Octetstring may need leading zeros if BN is to short */
+
+    buf_len = (EC_GROUP_get_degree(a->group) + 7) / 8;
+
+    if (bn_len > buf_len) {
+        ECerr(EC_F_I2D_ECPRIVATEKEY, EC_R_BUFFER_TOO_SMALL);
+        goto err;
+    }
+
     buffer = OPENSSL_malloc(buf_len);
     if (buffer == NULL) {
         ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_MALLOC_FAILURE);
         goto err;
     }
 
-    if (!BN_bn2bin(a->priv_key, buffer)) {
+    if (!BN_bn2bin(a->priv_key, buffer + buf_len - bn_len)) {
         ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_BN_LIB);
         goto err;
     }
 
+    if (buf_len - bn_len > 0) {
+        memset(buffer, 0, buf_len - bn_len);
+    }
+
     if (!M_ASN1_OCTET_STRING_set(priv_key->privateKey, buffer, buf_len)) {
         ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_ASN1_LIB);
         goto err;

From matt at openssl.org  Tue Mar 31 15:43:50 2015
From: matt at openssl.org (Matt Caswell)
Date: Tue, 31 Mar 2015 15:43:50 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427816630.357196.23484.nullmailer@dev.openssl.org>

The branch master has been updated
       via  30cd4ff294252c4b6a4b69cbef6a5b4117705d22 (commit)
      from  747e16398d704a667cc99f8a0b1912c36b7de52d (commit)


- Log -----------------------------------------------------------------
commit 30cd4ff294252c4b6a4b69cbef6a5b4117705d22
Author: Douglas E Engert <deengert at gmail.com>
Date:   Wed Mar 25 23:52:28 2015 +0000

    Ensure EC private keys retain leading zeros
    
    RFC5915 requires the use of the I2OSP primitive as defined in RFC3447
    for storing an EC Private Key. This converts the private key into an
    OCTETSTRING and retains any leading zeros. This commit ensures that those
    leading zeros are present if required.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 crypto/ec/ec_asn1.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index 9bba26e..97c5906 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -1110,7 +1110,7 @@ int i2d_ECPrivateKey(EC_KEY *a, unsigned char **out)
 {
     int ret = 0, ok = 0;
     unsigned char *buffer = NULL;
-    size_t buf_len = 0, tmp_len;
+    size_t buf_len = 0, tmp_len, bn_len;
     EC_PRIVATEKEY *priv_key = NULL;
 
     if (a == NULL || a->group == NULL || a->priv_key == NULL ||
@@ -1126,18 +1126,32 @@ int i2d_ECPrivateKey(EC_KEY *a, unsigned char **out)
 
     priv_key->version = a->version;
 
-    buf_len = (size_t)BN_num_bytes(a->priv_key);
+    bn_len = (size_t)BN_num_bytes(a->priv_key);
+
+    /* Octetstring may need leading zeros if BN is to short */
+
+    buf_len = (EC_GROUP_get_degree(a->group) + 7) / 8;
+
+    if (bn_len > buf_len) {
+        ECerr(EC_F_I2D_ECPRIVATEKEY, EC_R_BUFFER_TOO_SMALL);
+        goto err;
+    }
+
     buffer = OPENSSL_malloc(buf_len);
     if (buffer == NULL) {
         ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_MALLOC_FAILURE);
         goto err;
     }
 
-    if (!BN_bn2bin(a->priv_key, buffer)) {
+    if (!BN_bn2bin(a->priv_key, buffer + buf_len - bn_len)) {
         ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_BN_LIB);
         goto err;
     }
 
+    if (buf_len - bn_len > 0) {
+        memset(buffer, 0, buf_len - bn_len);
+    }
+
     if (!ASN1_OCTET_STRING_set(priv_key->privateKey, buffer, buf_len)) {
         ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_ASN1_LIB);
         goto err;

From matt at openssl.org  Tue Mar 31 15:43:43 2015
From: matt at openssl.org (Matt Caswell)
Date: Tue, 31 Mar 2015 15:43:43 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1427816623.056020.23210.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  3d5bb773ecd78f75984fb096bb0be7808d3dc18d (commit)
      from  c8ece537e341126b979b185b32fc716db6db9f0c (commit)


- Log -----------------------------------------------------------------
commit 3d5bb773ecd78f75984fb096bb0be7808d3dc18d
Author: Douglas E Engert <deengert at gmail.com>
Date:   Wed Mar 25 23:52:28 2015 +0000

    Ensure EC private keys retain leading zeros
    
    RFC5915 requires the use of the I2OSP primitive as defined in RFC3447
    for storing an EC Private Key. This converts the private key into an
    OCTETSTRING and retains any leading zeros. This commit ensures that those
    leading zeros are present if required.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit 30cd4ff294252c4b6a4b69cbef6a5b4117705d22)
    
    Conflicts:
    	crypto/ec/ec_asn1.c

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

Summary of changes:
 crypto/ec/ec_asn1.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index b4b0e9f..4ad8494 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -1114,7 +1114,7 @@ int i2d_ECPrivateKey(EC_KEY *a, unsigned char **out)
 {
     int ret = 0, ok = 0;
     unsigned char *buffer = NULL;
-    size_t buf_len = 0, tmp_len;
+    size_t buf_len = 0, tmp_len, bn_len;
     EC_PRIVATEKEY *priv_key = NULL;
 
     if (a == NULL || a->group == NULL || a->priv_key == NULL ||
@@ -1130,18 +1130,32 @@ int i2d_ECPrivateKey(EC_KEY *a, unsigned char **out)
 
     priv_key->version = a->version;
 
-    buf_len = (size_t)BN_num_bytes(a->priv_key);
+    bn_len = (size_t)BN_num_bytes(a->priv_key);
+
+    /* Octetstring may need leading zeros if BN is to short */
+
+    buf_len = (EC_GROUP_get_degree(a->group) + 7) / 8;
+
+    if (bn_len > buf_len) {
+        ECerr(EC_F_I2D_ECPRIVATEKEY, EC_R_BUFFER_TOO_SMALL);
+        goto err;
+    }
+
     buffer = OPENSSL_malloc(buf_len);
     if (buffer == NULL) {
         ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_MALLOC_FAILURE);
         goto err;
     }
 
-    if (!BN_bn2bin(a->priv_key, buffer)) {
+    if (!BN_bn2bin(a->priv_key, buffer + buf_len - bn_len)) {
         ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_BN_LIB);
         goto err;
     }
 
+    if (buf_len - bn_len > 0) {
+        memset(buffer, 0, buf_len - bn_len);
+    }
+
     if (!M_ASN1_OCTET_STRING_set(priv_key->privateKey, buffer, buf_len)) {
         ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_ASN1_LIB);
         goto err;

From levitte at openssl.org  Tue Mar 31 18:16:36 2015
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 31 Mar 2015 18:16:36 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427825796.075112.14655.nullmailer@dev.openssl.org>

The branch master has been updated
       via  a72d89fda6a97e47fa65d49c50b6d4649a4965e2 (commit)
       via  0190de80d57ec234f4b15bdab0efd71264239c62 (commit)
       via  a80e33b991e29988309964439fa8dba30af7ea5c (commit)
       via  dee502be89e78e2979e3bd1d7724cf79daa6ef61 (commit)
      from  30cd4ff294252c4b6a4b69cbef6a5b4117705d22 (commit)


- Log -----------------------------------------------------------------
commit a72d89fda6a97e47fa65d49c50b6d4649a4965e2
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 31 17:19:43 2015 +0200

    Now that we've removed the need for symlinks, we can safely remove util/mklinks.pl
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 0190de80d57ec234f4b15bdab0efd71264239c62
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Mar 27 01:31:03 2015 +0100

    Remove remaining variables for symlinked/copied headers and tests
    
    GitConfigure:   no more 'no-symlinks'
    
    util/bat.sh, util/mk1mf.pl, util/pl/VC-32.pl, util/pl/unix.pl:
    - Remove all uses of EXHEADER.
      That includes removing the use if INC_D and INCO_D.
    - Replace the check for TEST with a check for [A-Z0-9_]*TEST.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit a80e33b991e29988309964439fa8dba30af7ea5c
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 26 21:44:59 2015 +0100

    Remove EXHEADER, TEST, APPS, links:, install: and uninstall: where relevant
    
    With no more symlinks, there's no need for those variables, or the links
    target.  This also goes for all install: and uninstall: targets that do
    nothing but copy $(EXHEADER) files, since that's now taken care of by the
    top Makefile.
    
    Also, removed METHTEST from test/Makefile.  It looks like an old test that's
    forgotten...
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit dee502be89e78e2979e3bd1d7724cf79daa6ef61
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 26 21:33:18 2015 +0100

    Stop symlinking, move files to intended directory
    
    Rather than making include/openssl/foo.h a symlink to
    crypto/foo/foo.h, this change moves the file to include/openssl/foo.h
    once and for all.
    
    Likewise, move crypto/foo/footest.c to test/footest.c, instead of
    symlinking it there.
    
    Originally-by: Geoff Thorpe <geoff at openssl.org>
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 .gitignore                                      |  14 +--
 Configure                                       |  28 ++---
 GitConfigure                                    |   2 +-
 Makefile.org                                    |  26 ++---
 apps/Makefile                                   |   8 +-
 crypto/Makefile                                 |  24 +----
 crypto/aes/Makefile                             |  19 +---
 crypto/asn1/Makefile                            |  18 +---
 crypto/bf/Makefile                              |  21 +---
 crypto/bio/Makefile                             |  18 +---
 crypto/bn/Makefile                              |  18 +---
 crypto/buffer/Makefile                          |  18 +---
 crypto/camellia/Makefile                        |  18 +---
 crypto/cast/Makefile                            |  18 +---
 crypto/cmac/Makefile                            |  18 +---
 crypto/cms/Makefile                             |  18 +---
 crypto/comp/Makefile                            |  18 +---
 crypto/conf/Makefile                            |  18 +---
 crypto/des/Makefile                             |  21 +---
 crypto/dh/Makefile                              |  18 +---
 crypto/dsa/Makefile                             |  18 +---
 crypto/dso/Makefile                             |  18 +---
 crypto/ec/Makefile                              |  18 +---
 crypto/ecdh/Makefile                            |  18 +---
 crypto/ecdsa/Makefile                           |  18 +---
 crypto/engine/Makefile                          |  18 +---
 crypto/err/Makefile                             |  18 +---
 crypto/err/openssl.ec                           |  63 +++++------
 crypto/evp/Makefile                             |  22 +---
 crypto/hmac/Makefile                            |  18 +---
 crypto/idea/Makefile                            |  18 +---
 crypto/jpake/Makefile                           |  19 +---
 crypto/krb5/Makefile                            |  18 +---
 crypto/lhash/Makefile                           |  18 +---
 crypto/md2/Makefile                             |  18 +---
 crypto/md4/Makefile                             |  18 +---
 crypto/md5/Makefile                             |  18 +---
 crypto/mdc2/Makefile                            |  18 +---
 crypto/modes/Makefile                           |  19 +---
 crypto/objects/Makefile                         |  28 ++---
 crypto/ocsp/Makefile                            |  18 +---
 crypto/pem/Makefile                             |  18 +---
 crypto/pkcs12/Makefile                          |  18 +---
 crypto/pkcs7/Makefile                           |  20 +---
 crypto/pqueue/Makefile                          |  18 +---
 crypto/rand/Makefile                            |  18 +---
 crypto/rc2/Makefile                             |  18 +---
 crypto/rc4/Makefile                             |  18 +---
 crypto/rc5/Makefile                             |  18 +---
 crypto/ripemd/Makefile                          |  18 +---
 crypto/rsa/Makefile                             |  18 +---
 crypto/seed/Makefile                            |  18 +---
 crypto/sha/Makefile                             |  18 +---
 crypto/srp/Makefile                             |  18 +---
 crypto/stack/Makefile                           |  18 +---
 crypto/store/Makefile                           |  20 +---
 crypto/ts/Makefile                              |  20 +---
 crypto/txt_db/Makefile                          |  18 +---
 crypto/ui/Makefile                              |  19 +---
 crypto/whrlpool/Makefile                        |  18 +---
 crypto/x509/Makefile                            |  18 +---
 crypto/x509v3/Makefile                          |  18 +---
 engines/Makefile                                |   8 +-
 engines/ccgost/Makefile                         |   5 -
 {crypto/aes => include/openssl}/aes.h           |   0
 {crypto/asn1 => include/openssl}/asn1.h         |   0
 {crypto/asn1 => include/openssl}/asn1_mac.h     |   0
 {crypto/asn1 => include/openssl}/asn1t.h        |   0
 {crypto/bio => include/openssl}/bio.h           |   0
 {crypto/bf => include/openssl}/blowfish.h       |   0
 {crypto/bn => include/openssl}/bn.h             |   0
 {crypto/buffer => include/openssl}/buffer.h     |   0
 {crypto/camellia => include/openssl}/camellia.h |   0
 {crypto/cast => include/openssl}/cast.h         |   0
 {crypto/cmac => include/openssl}/cmac.h         |   0
 {crypto/cms => include/openssl}/cms.h           |   0
 {crypto/comp => include/openssl}/comp.h         |   0
 {crypto/conf => include/openssl}/conf.h         |   0
 {crypto/conf => include/openssl}/conf_api.h     |   0
 {crypto => include/openssl}/crypto.h            |   0
 {crypto/des => include/openssl}/des.h           |   0
 {crypto/dh => include/openssl}/dh.h             |   0
 {crypto/dsa => include/openssl}/dsa.h           |   0
 {crypto/dso => include/openssl}/dso.h           |   0
 {ssl => include/openssl}/dtls1.h                |   0
 e_os2.h => include/openssl/e_os2.h              |   0
 {crypto => include/openssl}/ebcdic.h            |   0
 {crypto/ec => include/openssl}/ec.h             |   0
 {crypto/ecdh => include/openssl}/ecdh.h         |   0
 {crypto/ecdsa => include/openssl}/ecdsa.h       |   0
 {crypto/engine => include/openssl}/engine.h     |   0
 {crypto/err => include/openssl}/err.h           |   0
 {crypto/evp => include/openssl}/evp.h           |   0
 {crypto/hmac => include/openssl}/hmac.h         |   0
 {crypto/idea => include/openssl}/idea.h         |   0
 {crypto/jpake => include/openssl}/jpake.h       |   0
 {crypto/krb5 => include/openssl}/krb5_asn.h     |   0
 {ssl => include/openssl}/kssl.h                 |   0
 {crypto/lhash => include/openssl}/lhash.h       |   0
 {crypto/md2 => include/openssl}/md2.h           |   0
 {crypto/md4 => include/openssl}/md4.h           |   0
 {crypto/md5 => include/openssl}/md5.h           |   0
 {crypto/mdc2 => include/openssl}/mdc2.h         |   0
 {crypto/modes => include/openssl}/modes.h       |   0
 {crypto/objects => include/openssl}/obj_mac.h   |   0
 {crypto/objects => include/openssl}/objects.h   |   0
 {crypto/ocsp => include/openssl}/ocsp.h         |   0
 {crypto => include/openssl}/opensslv.h          |   0
 {crypto => include/openssl}/ossl_typ.h          |   0
 {crypto/pem => include/openssl}/pem.h           |   0
 {crypto/pem => include/openssl}/pem2.h          |   0
 {crypto/pkcs12 => include/openssl}/pkcs12.h     |   0
 {crypto/pkcs7 => include/openssl}/pkcs7.h       |   0
 {crypto/pqueue => include/openssl}/pqueue.h     |   0
 {crypto/rand => include/openssl}/rand.h         |   0
 {crypto/rc2 => include/openssl}/rc2.h           |   0
 {crypto/rc4 => include/openssl}/rc4.h           |   0
 {crypto/rc5 => include/openssl}/rc5.h           |   0
 {crypto/ripemd => include/openssl}/ripemd.h     |   0
 {crypto/rsa => include/openssl}/rsa.h           |   0
 {crypto/stack => include/openssl}/safestack.h   |   0
 {crypto/seed => include/openssl}/seed.h         |   0
 {crypto/sha => include/openssl}/sha.h           |   0
 {crypto/srp => include/openssl}/srp.h           |   0
 {ssl => include/openssl}/srtp.h                 |   0
 {ssl => include/openssl}/ssl.h                  |   0
 {ssl => include/openssl}/ssl2.h                 |   0
 {ssl => include/openssl}/ssl23.h                |   0
 {ssl => include/openssl}/ssl3.h                 |   0
 {crypto/stack => include/openssl}/stack.h       |   0
 {crypto/store => include/openssl}/store.h       |   0
 {crypto => include/openssl}/symhacks.h          |   0
 {ssl => include/openssl}/tls1.h                 |   0
 {crypto/ts => include/openssl}/ts.h             |   0
 {crypto/txt_db => include/openssl}/txt_db.h     |   0
 {crypto/ui => include/openssl}/ui.h             |   0
 {crypto/whrlpool => include/openssl}/whrlpool.h |   0
 {crypto/x509 => include/openssl}/x509.h         |   0
 {crypto/x509 => include/openssl}/x509_vfy.h     |   0
 {crypto/x509v3 => include/openssl}/x509v3.h     |   0
 ssl/Makefile                                    |  22 +---
 test/Makefile                                   |  13 +--
 {crypto/bf => test}/bftest.c                    |   0
 {crypto/bn => test}/bntest.c                    |   0
 {crypto/cast => test}/casttest.c                |   0
 {crypto => test}/constant_time_test.c           |   0
 {crypto/des => test}/destest.c                  |   0
 {crypto/dh => test}/dhtest.c                    |   0
 {crypto/dsa => test}/dsatest.c                  |   0
 {crypto/ecdh => test}/ecdhtest.c                |   0
 {crypto/ecdsa => test}/ecdsatest.c              |   0
 {crypto/ec => test}/ectest.c                    |   0
 {crypto/engine => test}/enginetest.c            |   0
 {crypto/evp => test}/evp_extra_test.c           |   0
 {crypto/evp => test}/evp_test.c                 |   0
 {crypto/evp => test}/evptests.txt               |   0
 {crypto/bn => test}/exptest.c                   |   0
 {engines/ccgost => test}/gost2814789test.c      |   0
 {ssl => test}/heartbeat_test.c                  |   0
 {crypto/hmac => test}/hmactest.c                |   0
 {crypto/idea => test}/ideatest.c                |   0
 {crypto/jpake => test}/jpaketest.c              |   0
 {crypto/md2 => test}/md2test.c                  |   0
 {crypto/md4 => test}/md4test.c                  |   0
 {crypto/md5 => test}/md5test.c                  |   0
 {crypto/mdc2 => test}/mdc2test.c                |   0
 {crypto/evp => test}/p5_crpt2_test.c            |   0
 {crypto/rand => test}/randtest.c                |   0
 {crypto/rc2 => test}/rc2test.c                  |   0
 {crypto/rc4 => test}/rc4test.c                  |   0
 {crypto/rc5 => test}/rc5test.c                  |   0
 {crypto/ripemd => test}/rmdtest.c               |   0
 {crypto/rsa => test}/rsa_test.c                 |   0
 {crypto/sha => test}/sha1test.c                 |   0
 {crypto/sha => test}/sha256t.c                  |   0
 {crypto/sha => test}/sha512t.c                  |   0
 {crypto/srp => test}/srptest.c                  |   0
 {ssl => test}/ssltest.c                         |   0
 {crypto/x509v3 => test}/v3nametest.c            |   0
 {crypto/whrlpool => test}/wp_test.c             |   0
 tools/Makefile                                  |   3 -
 util/bat.sh                                     |   3 -
 util/mk1mf.pl                                   |  40 ++-----
 util/mkdef.pl                                   | 138 ++++++++++++------------
 util/mklink.pl                                  |  73 -------------
 util/mkstack.pl                                 |   4 +-
 util/pl/VC-32.pl                                |   4 -
 util/pl/unix.pl                                 |   5 +-
 188 files changed, 212 insertions(+), 1291 deletions(-)
 rename {crypto/aes => include/openssl}/aes.h (100%)
 rename {crypto/asn1 => include/openssl}/asn1.h (100%)
 rename {crypto/asn1 => include/openssl}/asn1_mac.h (100%)
 rename {crypto/asn1 => include/openssl}/asn1t.h (100%)
 rename {crypto/bio => include/openssl}/bio.h (100%)
 rename {crypto/bf => include/openssl}/blowfish.h (100%)
 rename {crypto/bn => include/openssl}/bn.h (100%)
 rename {crypto/buffer => include/openssl}/buffer.h (100%)
 rename {crypto/camellia => include/openssl}/camellia.h (100%)
 rename {crypto/cast => include/openssl}/cast.h (100%)
 rename {crypto/cmac => include/openssl}/cmac.h (100%)
 rename {crypto/cms => include/openssl}/cms.h (100%)
 rename {crypto/comp => include/openssl}/comp.h (100%)
 rename {crypto/conf => include/openssl}/conf.h (100%)
 rename {crypto/conf => include/openssl}/conf_api.h (100%)
 rename {crypto => include/openssl}/crypto.h (100%)
 rename {crypto/des => include/openssl}/des.h (100%)
 rename {crypto/dh => include/openssl}/dh.h (100%)
 rename {crypto/dsa => include/openssl}/dsa.h (100%)
 rename {crypto/dso => include/openssl}/dso.h (100%)
 rename {ssl => include/openssl}/dtls1.h (100%)
 rename e_os2.h => include/openssl/e_os2.h (100%)
 rename {crypto => include/openssl}/ebcdic.h (100%)
 rename {crypto/ec => include/openssl}/ec.h (100%)
 rename {crypto/ecdh => include/openssl}/ecdh.h (100%)
 rename {crypto/ecdsa => include/openssl}/ecdsa.h (100%)
 rename {crypto/engine => include/openssl}/engine.h (100%)
 rename {crypto/err => include/openssl}/err.h (100%)
 rename {crypto/evp => include/openssl}/evp.h (100%)
 rename {crypto/hmac => include/openssl}/hmac.h (100%)
 rename {crypto/idea => include/openssl}/idea.h (100%)
 rename {crypto/jpake => include/openssl}/jpake.h (100%)
 rename {crypto/krb5 => include/openssl}/krb5_asn.h (100%)
 rename {ssl => include/openssl}/kssl.h (100%)
 rename {crypto/lhash => include/openssl}/lhash.h (100%)
 rename {crypto/md2 => include/openssl}/md2.h (100%)
 rename {crypto/md4 => include/openssl}/md4.h (100%)
 rename {crypto/md5 => include/openssl}/md5.h (100%)
 rename {crypto/mdc2 => include/openssl}/mdc2.h (100%)
 rename {crypto/modes => include/openssl}/modes.h (100%)
 rename {crypto/objects => include/openssl}/obj_mac.h (100%)
 rename {crypto/objects => include/openssl}/objects.h (100%)
 rename {crypto/ocsp => include/openssl}/ocsp.h (100%)
 rename {crypto => include/openssl}/opensslv.h (100%)
 rename {crypto => include/openssl}/ossl_typ.h (100%)
 rename {crypto/pem => include/openssl}/pem.h (100%)
 rename {crypto/pem => include/openssl}/pem2.h (100%)
 rename {crypto/pkcs12 => include/openssl}/pkcs12.h (100%)
 rename {crypto/pkcs7 => include/openssl}/pkcs7.h (100%)
 rename {crypto/pqueue => include/openssl}/pqueue.h (100%)
 rename {crypto/rand => include/openssl}/rand.h (100%)
 rename {crypto/rc2 => include/openssl}/rc2.h (100%)
 rename {crypto/rc4 => include/openssl}/rc4.h (100%)
 rename {crypto/rc5 => include/openssl}/rc5.h (100%)
 rename {crypto/ripemd => include/openssl}/ripemd.h (100%)
 rename {crypto/rsa => include/openssl}/rsa.h (100%)
 rename {crypto/stack => include/openssl}/safestack.h (100%)
 rename {crypto/seed => include/openssl}/seed.h (100%)
 rename {crypto/sha => include/openssl}/sha.h (100%)
 rename {crypto/srp => include/openssl}/srp.h (100%)
 rename {ssl => include/openssl}/srtp.h (100%)
 rename {ssl => include/openssl}/ssl.h (100%)
 rename {ssl => include/openssl}/ssl2.h (100%)
 rename {ssl => include/openssl}/ssl23.h (100%)
 rename {ssl => include/openssl}/ssl3.h (100%)
 rename {crypto/stack => include/openssl}/stack.h (100%)
 rename {crypto/store => include/openssl}/store.h (100%)
 rename {crypto => include/openssl}/symhacks.h (100%)
 rename {ssl => include/openssl}/tls1.h (100%)
 rename {crypto/ts => include/openssl}/ts.h (100%)
 rename {crypto/txt_db => include/openssl}/txt_db.h (100%)
 rename {crypto/ui => include/openssl}/ui.h (100%)
 rename {crypto/whrlpool => include/openssl}/whrlpool.h (100%)
 rename {crypto/x509 => include/openssl}/x509.h (100%)
 rename {crypto/x509 => include/openssl}/x509_vfy.h (100%)
 rename {crypto/x509v3 => include/openssl}/x509v3.h (100%)
 rename {crypto/bf => test}/bftest.c (100%)
 rename {crypto/bn => test}/bntest.c (100%)
 rename {crypto/cast => test}/casttest.c (100%)
 rename {crypto => test}/constant_time_test.c (100%)
 rename {crypto/des => test}/destest.c (100%)
 rename {crypto/dh => test}/dhtest.c (100%)
 rename {crypto/dsa => test}/dsatest.c (100%)
 rename {crypto/ecdh => test}/ecdhtest.c (100%)
 rename {crypto/ecdsa => test}/ecdsatest.c (100%)
 rename {crypto/ec => test}/ectest.c (100%)
 rename {crypto/engine => test}/enginetest.c (100%)
 rename {crypto/evp => test}/evp_extra_test.c (100%)
 rename {crypto/evp => test}/evp_test.c (100%)
 rename {crypto/evp => test}/evptests.txt (100%)
 rename {crypto/bn => test}/exptest.c (100%)
 rename {engines/ccgost => test}/gost2814789test.c (100%)
 rename {ssl => test}/heartbeat_test.c (100%)
 rename {crypto/hmac => test}/hmactest.c (100%)
 rename {crypto/idea => test}/ideatest.c (100%)
 rename {crypto/jpake => test}/jpaketest.c (100%)
 rename {crypto/md2 => test}/md2test.c (100%)
 rename {crypto/md4 => test}/md4test.c (100%)
 rename {crypto/md5 => test}/md5test.c (100%)
 rename {crypto/mdc2 => test}/mdc2test.c (100%)
 rename {crypto/evp => test}/p5_crpt2_test.c (100%)
 rename {crypto/rand => test}/randtest.c (100%)
 rename {crypto/rc2 => test}/rc2test.c (100%)
 rename {crypto/rc4 => test}/rc4test.c (100%)
 rename {crypto/rc5 => test}/rc5test.c (100%)
 rename {crypto/ripemd => test}/rmdtest.c (100%)
 rename {crypto/rsa => test}/rsa_test.c (100%)
 rename {crypto/sha => test}/sha1test.c (100%)
 rename {crypto/sha => test}/sha256t.c (100%)
 rename {crypto/sha => test}/sha512t.c (100%)
 rename {crypto/srp => test}/srptest.c (100%)
 rename {ssl => test}/ssltest.c (100%)
 rename {crypto/x509v3 => test}/v3nametest.c (100%)
 rename {crypto/whrlpool => test}/wp_test.c (100%)
 delete mode 100755 util/mklink.pl

diff --git a/.gitignore b/.gitignore
index 2f27dc6..9f85632 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,6 @@
 /MINFO
 /TABLE
 /*.a
-/include
 /*.pc
 /rehash.time
 /inc.*
@@ -22,17 +21,6 @@
 /out.*
 /tmp.*
 
-# Most *.c files under test/ are symlinks
-/test/*.c
-# Apart from these
-!/test/asn1test.c
-!/test/methtest.c
-!/test/dummytest.c
-!/test/igetest.c
-!/test/r160test.c
-!/test/fips_algvs.c
-!/test/testutil.c
-
 /test/*.ss
 /test/*.srl
 /test/.rnd
@@ -94,8 +82,8 @@ crypto/sha/asm/sha512-sse2.asm
 !/crypto/des/times/486-50.sol
 
 # Misc auto generated files
+include/openssl/opensslconf.h
 /tools/c_rehash
-/test/evptests.txt
 lib
 Makefile.save
 *.bak
diff --git a/Configure b/Configure
index ba8cd96..97c2573 100755
--- a/Configure
+++ b/Configure
@@ -779,13 +779,13 @@ my $no_gmp=0;
 my @skip=();
 my $Makefile="Makefile";
 my $des_locl="crypto/des/des_locl.h";
-my $des	="crypto/des/des.h";
-my $bn	="crypto/bn/bn.h";
-my $md2	="crypto/md2/md2.h";
-my $rc4	="crypto/rc4/rc4.h";
+my $des	="include/openssl/des.h";
+my $bn	="include/openssl/bn.h";
+my $md2	="include/openssl/md2.h";
+my $rc4	="include/openssl/rc4.h";
 my $rc4_locl="crypto/rc4/rc4_locl.h";
-my $idea	="crypto/idea/idea.h";
-my $rc2	="crypto/rc2/rc2.h";
+my $idea	="include/openssl/idea.h";
+my $rc2	="include/openssl/rc2.h";
 my $bf	="crypto/bf/bf_locl.h";
 my $bn_asm	="bn_asm.o";
 my $des_enc="des_enc.o fcrypt_b.o";
@@ -848,7 +848,6 @@ my $libs;
 my $libkrb5="";
 my $target;
 my $options;
-my $symlink;
 my $make_depend=0;
 my %withargs=();
 my $build_prefix = "release_";
@@ -869,7 +868,6 @@ while($argv_unprocessed)
 	$libs="";
 	$target="";
 	$options="";
-	$symlink=1;
 
 	$argv_unprocessed=0;
 	$argvstring=join(' ', at argvcopy);
@@ -1192,8 +1190,6 @@ foreach (sort (keys %disabled))
 		{ }
 	elsif (/^zlib-dynamic$/)
 		{ }
-	elsif (/^symlinks$/)
-		{ $symlink = 0; }
 	elsif (/^sse2$/)
 		{ $no_sse2 = 1; }
 	else
@@ -1702,7 +1698,7 @@ my $shlib_version_history = "unknown";
 my $shlib_major = "unknown";
 my $shlib_minor = "unknown";
 
-open(IN,'<crypto/opensslv.h') || die "unable to read opensslv.h:$!\n";
+open(IN,'<include/openssl/opensslv.h') || die "unable to read opensslv.h:$!\n";
 while (<IN>)
 	{
 	$version=$1 if /OPENSSL.VERSION.TEXT.*OpenSSL (\S+) /;
@@ -1923,8 +1919,8 @@ foreach (sort split(/\s+/,$bn_ops))
 	}
 
 open(IN,'<crypto/opensslconf.h.in') || die "unable to read crypto/opensslconf.h.in:$!\n";
-unlink("crypto/opensslconf.h.new") || die "unable to remove old crypto/opensslconf.h.new:$!\n" if -e "crypto/opensslconf.h.new";
-open(OUT,'>crypto/opensslconf.h.new') || die "unable to create crypto/opensslconf.h.new:$!\n";
+unlink("include/openssl/opensslconf.h.new") || die "unable to remove old include/openssl/opensslconf.h.new:$!\n" if -e "include/openssl/opensslconf.h.new";
+open(OUT,'>include/openssl/opensslconf.h.new') || die "unable to create include/openssl/opensslconf.h.new:$!\n";
 print OUT "/* opensslconf.h */\n";
 print OUT "/* WARNING: Generated automatically from opensslconf.h.in by Configure. */\n\n";
 
@@ -2039,8 +2035,8 @@ print OUT "#ifdef  __cplusplus\n";
 print OUT "}\n";
 print OUT "#endif\n";
 close(OUT);
-rename("crypto/opensslconf.h","crypto/opensslconf.h.bak") || die "unable to rename crypto/opensslconf.h\n" if -e "crypto/opensslconf.h";
-rename("crypto/opensslconf.h.new","crypto/opensslconf.h") || die "unable to rename crypto/opensslconf.h.new\n";
+rename("include/openssl/opensslconf.h","include/openssl/opensslconf.h.bak") || die "unable to rename include/openssl/opensslconf.h\n" if -e "include/openssl/opensslconf.h";
+rename("include/openssl/opensslconf.h.new","include/openssl/opensslconf.h") || die "unable to rename include/openssl/opensslconf.h.new\n";
 
 
 # Fix the date
@@ -2082,9 +2078,7 @@ EOF
 } else {
 	my $make_command = "$make PERL=\'$perl\'";
 	my $make_targets = "";
-	$make_targets .= " links" if $symlink;
 	$make_targets .= " depend" if $depflags ne $default_depflags && $make_depend;
-	$make_targets .= " gentests" if $symlink;
 	(system $make_command.$make_targets) == 0 or die "make $make_targets failed"
 		if $make_targets ne "";
 	if ( $perl =~ m@^/@) {
diff --git a/GitConfigure b/GitConfigure
index 0821031..3451553 100755
--- a/GitConfigure
+++ b/GitConfigure
@@ -2,7 +2,7 @@
 
 BRANCH=`git rev-parse --abbrev-ref HEAD`
 
-./Configure $@ no-symlinks
+./Configure $@
 make files
 util/mk1mf.pl OUT=out.$BRANCH TMP=tmp.$BRANCH INC=inc.$BRANCH copy > makefile.$BRANCH
 MAKE=make
diff --git a/Makefile.org b/Makefile.org
index 0d09ad4..de08a47 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -137,6 +137,7 @@ BASEADDR=
 DIRS=   crypto ssl engines apps test tools
 ENGDIRS= ccgost
 SHLIBDIRS= crypto ssl
+INSTALL_SUBS= engines apps tools
 
 # dirs in crypto to build
 SDIRS=  \
@@ -180,7 +181,6 @@ BASENAME=       openssl
 NAME=           $(BASENAME)-$(VERSION)
 TARFILE=        $(NAME).tar
 WTARFILE=       $(NAME)-win.tar
-EXHEADER=       e_os2.h
 HEADER=         e_os.h
 
 # Directories created on install if they don't exist.
@@ -205,7 +205,7 @@ CLEARENV=	TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}	\
 		$${INCLUDE+INCLUDE} $${INCLUDES+INCLUDES}	\
 		$${DIR+DIR} $${DIRS+DIRS} $${SRC+SRC}		\
 		$${LIBSRC+LIBSRC} $${LIBOBJ+LIBOBJ} $${ALL+ALL}	\
-		$${EXHEADER+EXHEADER} $${HEADER+HEADER}		\
+		$${HEADER+HEADER}				\
 		$${GENERAL+GENERAL} $${CFLAGS+CFLAGS}		\
 		$${ASFLAGS+ASFLAGS} $${AFLAGS+AFLAGS}		\
 		$${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS} $${SCRIPTS+SCRIPTS}	\
@@ -426,11 +426,6 @@ files:
 	$(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO
 	@set -e; target=files; $(RECURSIVE_BUILD_CMD)
 
-links:
-	@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
-	@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
-	@set -e; target=links; $(RECURSIVE_BUILD_CMD)
-
 gentests:
 	@(cd test && echo "generating dummy tests (if needed)..." && \
 	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on generate );
@@ -486,10 +481,10 @@ util/libeay.num::
 util/ssleay.num::
 	$(PERL) util/mkdef.pl ssl update
 
-crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl crypto/objects/obj_mac.h
-	$(PERL) crypto/objects/obj_dat.pl crypto/objects/obj_mac.h crypto/objects/obj_dat.h
-crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num
-	$(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num crypto/objects/obj_mac.h
+crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl include/openssl/obj_mac.h
+	$(PERL) crypto/objects/obj_dat.pl include/openssl/obj_mac.h crypto/objects/obj_dat.h
+include/openssl/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num
+	$(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num include/openssl/obj_mac.h
 crypto/objects/obj_xref.h: crypto/objects/objxref.pl crypto/objects/obj_xref.txt crypto/objects/obj_mac.num
 	$(PERL) crypto/objects/objxref.pl crypto/objects/obj_mac.num crypto/objects/obj_xref.txt >crypto/objects/obj_xref.h
 
@@ -547,12 +542,11 @@ uninstall: uninstall_sw uninstall_docs
 
 install_sw:
 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALLDIRS)
-	@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
-	do \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+	@set -e; for i in include/openssl/*.h; do \
+	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$$i; \
+	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$$i ); \
 	done;
-	@set -e; target=install; $(RECURSIVE_BUILD_CMD)
+	@set -e; target=install; for dir in $(INSTALL_SUBS); do $(BUILD_CMD); done
 	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
 	do \
 		if [ -f "$$i" ]; then \
diff --git a/apps/Makefile b/apps/Makefile
index ac2663a..25e197f 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -68,12 +68,10 @@ E_SRC=	verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca.
 
 SRC=$(E_SRC)
 
-EXHEADER=
 HEADER=	apps.h progs.h s_apps.h \
-	testdsa.h testrsa.h \
-	$(EXHEADER)
+	testdsa.h testrsa.h
 
-ALL=    $(GENERAL) $(SRC) $(HEADER)
+ALL=	$(GENERAL) $(SRC) $(HEADER)
 
 top:
 	@(cd ..; $(MAKE) DIRS=$(DIR) all)
@@ -135,8 +133,6 @@ tags:
 
 tests:
 
-links:
-
 lint:
 	lint -DLINT $(INCLUDES) $(SRC)>fluff
 
diff --git a/crypto/Makefile b/crypto/Makefile
index 5eddc5a..ec5af47 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -31,7 +31,6 @@ CPUID_OBJ=mem_clr.o
 LIBS=
 
 GENERAL=Makefile README crypto-lib.com install.com
-TEST=constant_time_test.c
 
 LIB= $(TOP)/libcrypto.a
 SHARED_LIB= libcrypto$(SHLIB_EXT)
@@ -44,12 +43,10 @@ LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= crypto.h opensslv.h opensslconf.h ebcdic.h symhacks.h \
-	ossl_typ.h
 HEADER=	cryptlib.h buildinf.h md32_common.h o_str.h o_dir.h \
-	constant_time_locl.h $(EXHEADER)
+	constant_time_locl.h
 
-ALL=    $(GENERAL) $(SRC) $(HEADER)
+ALL=	$(GENERAL) $(SRC) $(HEADER)
 
 top:
 	@(cd ..; $(MAKE) DIRS=$(DIR) all)
@@ -95,12 +92,6 @@ files:
 	$(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
 	@target=files; $(RECURSIVE_MAKE)
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS)
-	@target=links; $(RECURSIVE_MAKE)
-
 # lib: $(LIB): are splitted to avoid end-less loop
 lib:	$(LIB)
 	@touch lib
@@ -116,17 +107,6 @@ shared: buildinf.h lib subdirs
 libs:
 	@target=lib; $(RECURSIVE_MAKE)
 
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ;\
-	do \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-	@target=install; $(RECURSIVE_MAKE)
-
-uninstall:
-
 lint:
 	@target=lint; $(RECURSIVE_MAKE)
 
diff --git a/crypto/aes/Makefile b/crypto/aes/Makefile
index 2defcb1..5c3b2d3 100644
--- a/crypto/aes/Makefile
+++ b/crypto/aes/Makefile
@@ -18,9 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile
-#TEST=aestest.c
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c aes_ofb.c \
@@ -30,8 +27,7 @@ LIBOBJ=aes_misc.o aes_ecb.o aes_cfb.o aes_ofb.o aes_ige.o aes_wrap.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= aes.h
-HEADER= aes_locl.h $(EXHEADER)
+HEADER= aes_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -104,19 +100,6 @@ bsaes-armv7.o:	bsaes-armv7.S
 files:
 	$(PERL) $(TOP)/util/files.pl "AES_ENC=$(AES_ENC)" Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/asn1/Makefile b/crypto/asn1/Makefile
index 2a15f16..ff5e3ba 100644
--- a/crypto/asn1/Makefile
+++ b/crypto/asn1/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile README
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=	a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \
@@ -48,8 +46,7 @@ LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER=  asn1.h asn1_mac.h asn1t.h
-HEADER=	$(EXHEADER) asn1_locl.h
+HEADER=	asn1_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -74,19 +71,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/bf/Makefile b/crypto/bf/Makefile
index dd2c2c7..928e94d 100644
--- a/crypto/bf/Makefile
+++ b/crypto/bf/Makefile
@@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile
-TEST=bftest.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c 
@@ -27,8 +25,7 @@ LIBOBJ=bf_skey.o bf_ecb.o $(BF_ENC) bf_cfb64.o bf_ofb64.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= blowfish.h
-HEADER=	bf_pi.h bf_locl.h $(EXHEADER)
+HEADER=	bf_pi.h bf_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -48,22 +45,6 @@ bf-586.s:	asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-# We need to use force because 'install' matches 'INSTALL' on case
-# insensitive systems
-FRC.install:
-install: FRC.install
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/bio/Makefile b/crypto/bio/Makefile
index c395d80..5477ffb 100644
--- a/crypto/bio/Makefile
+++ b/crypto/bio/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= bio_lib.c bio_cb.c bio_err.c \
@@ -34,8 +32,7 @@ LIBOBJ= bio_lib.o bio_cb.o bio_err.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= bio.h
-HEADER=	bio_lcl.h $(EXHEADER)
+HEADER=	bio_lcl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -52,19 +49,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
index d1019c9..5b45f11 100644
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile
-TEST=bntest.c exptest.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=	bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c bn_mod.c \
@@ -36,8 +34,7 @@ LIBOBJ=	bn_add.o bn_div.o bn_exp.o bn_lib.o bn_ctx.o bn_mul.o bn_mod.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= bn.h
-HEADER=	bn_lcl.h bn_prime.h $(EXHEADER)
+HEADER=	bn_lcl.h bn_prime.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -148,19 +145,6 @@ armv4-gf2m.o:	armv4-gf2m.S
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 div:
 	rm -f a.out
 	gcc -I.. -g div.c ../../libcrypto.a
diff --git a/crypto/buffer/Makefile b/crypto/buffer/Makefile
index 2efba47..d87738c 100644
--- a/crypto/buffer/Makefile
+++ b/crypto/buffer/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= buffer.c buf_str.c buf_err.c
@@ -22,8 +20,7 @@ LIBOBJ= buffer.o buf_str.o buf_err.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= buffer.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -40,19 +37,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/camellia/Makefile b/crypto/camellia/Makefile
index a5b983b..2602dbf 100644
--- a/crypto/camellia/Makefile
+++ b/crypto/camellia/Makefile
@@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile
-#TEST=camelliatest.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=camellia.c cmll_misc.c cmll_ecb.c cmll_cbc.c cmll_ofb.c \
@@ -29,8 +27,7 @@ LIBOBJ= cmll_ecb.o cmll_ofb.o cmll_cfb.o cmll_ctr.o $(CMLL_ENC)
 
 SRC= $(LIBSRC)
 
-EXHEADER= camellia.h
-HEADER= cmll_locl.h $(EXHEADER)
+HEADER= cmll_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -54,19 +51,6 @@ cmllt4-sparcv9.s: asm/cmllt4-sparcv9.pl ../perlasm/sparcv9_modes.pl
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/cast/Makefile b/crypto/cast/Makefile
index 0acc38f..08d24b0 100644
--- a/crypto/cast/Makefile
+++ b/crypto/cast/Makefile
@@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile
-TEST=casttest.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c 
@@ -27,8 +25,7 @@ LIBOBJ=c_skey.o c_ecb.o $(CAST_ENC) c_cfb64.o c_ofb64.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= cast.h
-HEADER=	cast_s.h cast_lcl.h $(EXHEADER)
+HEADER=	cast_s.h cast_lcl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -48,19 +45,6 @@ cast-586.s:	asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/cmac/Makefile b/crypto/cmac/Makefile
index 2e92a14..87a20fc 100644
--- a/crypto/cmac/Makefile
+++ b/crypto/cmac/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=cmac.c cm_ameth.c cm_pmeth.c
@@ -22,8 +20,7 @@ LIBOBJ=cmac.o cm_ameth.o cm_pmeth.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= cmac.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -40,19 +37,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/cms/Makefile b/crypto/cms/Makefile
index b767e25..47aec7c 100644
--- a/crypto/cms/Makefile
+++ b/crypto/cms/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c cms_err.c \
@@ -26,8 +24,7 @@ LIBOBJ= cms_lib.o cms_asn1.o cms_att.o cms_io.o cms_smime.o cms_err.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER=  cms.h
-HEADER=	cms_lcl.h $(EXHEADER)
+HEADER=	cms_lcl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -46,19 +43,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/comp/Makefile b/crypto/comp/Makefile
index efda832..4d1ef52 100644
--- a/crypto/comp/Makefile
+++ b/crypto/comp/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= comp_lib.c comp_err.c \
@@ -25,8 +23,7 @@ LIBOBJ=	comp_lib.o comp_err.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= comp.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -43,19 +40,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/conf/Makefile b/crypto/conf/Makefile
index 78bb324..8af03a6 100644
--- a/crypto/conf/Makefile
+++ b/crypto/conf/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= conf_err.c conf_lib.c conf_api.c conf_def.c conf_mod.c \
@@ -25,8 +23,7 @@ LIBOBJ=	conf_err.o conf_lib.o conf_api.o conf_def.o conf_mod.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= conf.h conf_api.h
-HEADER=	conf_def.h $(EXHEADER)
+HEADER=	conf_def.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -43,19 +40,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/des/Makefile b/crypto/des/Makefile
index 10b7e34..2a8f06f 100644
--- a/crypto/des/Makefile
+++ b/crypto/des/Makefile
@@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile
-TEST=destest.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=	cbc_cksm.c cbc_enc.c  cfb64enc.c cfb_enc.c  \
@@ -41,8 +39,7 @@ LIBOBJ= set_key.o  ecb_enc.o  cbc_enc.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= des.h
-HEADER=	des_locl.h rpc_des.h spr.h des_ver.h $(EXHEADER)
+HEADER=	des_locl.h rpc_des.h spr.h des_ver.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -69,22 +66,6 @@ crypt586.s:	asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-# We need to use force because 'install' matches 'INSTALL' on case
-# insensitive systems
-FRC.install:
-install: FRC.install
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/dh/Makefile b/crypto/dh/Makefile
index 6af06d9..8f468e3 100644
--- a/crypto/dh/Makefile
+++ b/crypto/dh/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST= dhtest.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_depr.c \
@@ -24,8 +22,7 @@ LIBOBJ= dh_asn1.o dh_gen.o dh_key.o dh_lib.o dh_check.o dh_err.o dh_depr.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= dh.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -42,19 +39,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/dsa/Makefile b/crypto/dsa/Makefile
index 5c1982c..4571b88 100644
--- a/crypto/dsa/Makefile
+++ b/crypto/dsa/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=dsatest.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c dsa_sign.c \
@@ -24,8 +22,7 @@ LIBOBJ= dsa_gen.o dsa_key.o dsa_lib.o dsa_asn1.o dsa_vrf.o dsa_sign.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= dsa.h
-HEADER=	dsa_locl.h $(EXHEADER)
+HEADER=	dsa_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -42,19 +39,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/dso/Makefile b/crypto/dso/Makefile
index 07f5d8d..0471fc4 100644
--- a/crypto/dso/Makefile
+++ b/crypto/dso/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c \
@@ -24,8 +22,7 @@ LIBOBJ= dso_dl.o dso_dlfcn.o dso_err.o dso_lib.o dso_null.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= dso.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -42,19 +39,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/ec/Makefile b/crypto/ec/Makefile
index b6d50c7..5425967 100644
--- a/crypto/ec/Makefile
+++ b/crypto/ec/Makefile
@@ -15,8 +15,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile
-TEST=ectest.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=	ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c\
@@ -33,8 +31,7 @@ LIBOBJ=	ec_lib.o ecp_smpl.o ecp_mont.o ecp_nist.o ec_cvt.o ec_mult.o\
 
 SRC= $(LIBSRC)
 
-EXHEADER= ec.h
-HEADER=	ec_lcl.h $(EXHEADER)
+HEADER=	ec_lcl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -63,19 +60,6 @@ ecp_nistz256-armv4.o:	ecp_nistz256-armv4.S
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/ecdh/Makefile b/crypto/ecdh/Makefile
index df1b03a..03c6948 100644
--- a/crypto/ecdh/Makefile
+++ b/crypto/ecdh/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=ecdhtest.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=	ech_lib.c ech_ossl.c ech_key.c ech_err.c ech_kdf.c
@@ -23,8 +21,7 @@ LIBOBJ=	ech_lib.o ech_ossl.o ech_key.o ech_err.o ech_kdf.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= ecdh.h
-HEADER=	ech_locl.h $(EXHEADER)
+HEADER=	ech_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -41,19 +38,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/ecdsa/Makefile b/crypto/ecdsa/Makefile
index da08d2d..be6f849 100644
--- a/crypto/ecdsa/Makefile
+++ b/crypto/ecdsa/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=ecdsatest.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=	ecs_lib.c ecs_asn1.c ecs_ossl.c ecs_sign.c ecs_vrf.c ecs_err.c
@@ -23,8 +21,7 @@ LIBOBJ=	ecs_lib.o ecs_asn1.o ecs_ossl.o ecs_sign.o ecs_vrf.o ecs_err.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= ecdsa.h
-HEADER=	ecs_locl.h $(EXHEADER)
+HEADER=	ecs_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -41,19 +38,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/engine/Makefile b/crypto/engine/Makefile
index 0bdd2aa..1739410 100644
--- a/crypto/engine/Makefile
+++ b/crypto/engine/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST= enginetest.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \
@@ -32,8 +30,7 @@ LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= engine.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -50,19 +47,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/err/Makefile b/crypto/err/Makefile
index 862b23b..0e95d0e 100644
--- a/crypto/err/Makefile
+++ b/crypto/err/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=err.c err_all.c err_prn.c
@@ -22,8 +20,7 @@ LIBOBJ=err.o err_all.o err_prn.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= err.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -40,19 +37,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec
index 3c268d2..8a10b80 100644
--- a/crypto/err/openssl.ec
+++ b/crypto/err/openssl.ec
@@ -4,37 +4,38 @@
 
 # files that may have to be rewritten by util/mkerr.pl
 L ERR		NONE				NONE
-L BN		crypto/bn/bn.h			crypto/bn/bn_err.c
-L RSA		crypto/rsa/rsa.h		crypto/rsa/rsa_err.c
-L DH		crypto/dh/dh.h			crypto/dh/dh_err.c
-L EVP		crypto/evp/evp.h		crypto/evp/evp_err.c
-L BUF		crypto/buffer/buffer.h		crypto/buffer/buf_err.c
-L OBJ		crypto/objects/objects.h	crypto/objects/obj_err.c
-L PEM		crypto/pem/pem.h		crypto/pem/pem_err.c
-L DSA		crypto/dsa/dsa.h		crypto/dsa/dsa_err.c
-L X509		crypto/x509/x509.h		crypto/x509/x509_err.c
-L ASN1		crypto/asn1/asn1.h		crypto/asn1/asn1_err.c
-L CONF		crypto/conf/conf.h		crypto/conf/conf_err.c
-L CRYPTO	crypto/crypto.h			crypto/cpt_err.c
-L EC		crypto/ec/ec.h			crypto/ec/ec_err.c
-L SSL		ssl/ssl.h			ssl/ssl_err.c
-L BIO		crypto/bio/bio.h		crypto/bio/bio_err.c
-L PKCS7		crypto/pkcs7/pkcs7.h		crypto/pkcs7/pkcs7err.c
-L X509V3	crypto/x509v3/x509v3.h		crypto/x509v3/v3err.c
-L PKCS12	crypto/pkcs12/pkcs12.h		crypto/pkcs12/pk12err.c
-L RAND		crypto/rand/rand.h		crypto/rand/rand_err.c
-L DSO		crypto/dso/dso.h		crypto/dso/dso_err.c
-L ENGINE	crypto/engine/engine.h		crypto/engine/eng_err.c
-L OCSP		crypto/ocsp/ocsp.h		crypto/ocsp/ocsp_err.c
-L UI		crypto/ui/ui.h			crypto/ui/ui_err.c
-L COMP		crypto/comp/comp.h		crypto/comp/comp_err.c
-L ECDSA		crypto/ecdsa/ecdsa.h		crypto/ecdsa/ecs_err.c
-L ECDH		crypto/ecdh/ecdh.h		crypto/ecdh/ech_err.c
-L STORE		crypto/store/store.h		crypto/store/str_err.c
-L TS		crypto/ts/ts.h			crypto/ts/ts_err.c
-L HMAC		crypto/hmac/hmac.h		crypto/hmac/hmac_err.c
-L CMS		crypto/cms/cms.h		crypto/cms/cms_err.c
-L JPAKE		crypto/jpake/jpake.h		crypto/jpake/jpake_err.c
+L BN		include/openssl/bn.h		crypto/bn/bn_err.c
+L RSA		include/openssl/rsa.h		crypto/rsa/rsa_err.c
+L DH		include/openssl/dh.h		crypto/dh/dh_err.c
+L EVP		include/openssl/evp.h		crypto/evp/evp_err.c
+L BUF		include/openssl/buffer.h	crypto/buffer/buf_err.c
+L OBJ		include/openssl/objects.h	crypto/objects/obj_err.c
+L PEM		include/openssl/pem.h		crypto/pem/pem_err.c
+L DSA		include/openssl/dsa.h		crypto/dsa/dsa_err.c
+L X509		include/openssl/x509.h		crypto/x509/x509_err.c
+L ASN1		include/openssl/asn1.h		crypto/asn1/asn1_err.c
+L CONF		include/openssl/conf.h		crypto/conf/conf_err.c
+L CRYPTO	include/openssl/crypto.h	crypto/cpt_err.c
+L EC		include/openssl/ec.h		crypto/ec/ec_err.c
+L SSL		include/openssl/ssl.h		ssl/ssl_err.c
+L BIO		include/openssl/bio.h		crypto/bio/bio_err.c
+L PKCS7		include/openssl/pkcs7.h		crypto/pkcs7/pkcs7err.c
+L X509V3	include/openssl/x509v3.h	crypto/x509v3/v3err.c
+L PKCS12	include/openssl/pkcs12.h	crypto/pkcs12/pk12err.c
+L RAND		include/openssl/rand.h		crypto/rand/rand_err.c
+L DSO		include/openssl/dso.h		crypto/dso/dso_err.c
+L ENGINE	include/openssl/engine.h	crypto/engine/eng_err.c
+L OCSP		include/openssl/ocsp.h		crypto/ocsp/ocsp_err.c
+L UI		include/openssl/ui.h		crypto/ui/ui_err.c
+L COMP		include/openssl/comp.h		crypto/comp/comp_err.c
+L ECDSA		include/openssl/ecdsa.h		crypto/ecdsa/ecs_err.c
+L ECDH		include/openssl/ecdh.h		crypto/ecdh/ech_err.c
+L STORE		include/openssl/store.h		crypto/store/str_err.c
+L TS		include/openssl/ts.h		crypto/ts/ts_err.c
+L HMAC		include/openssl/hmac.h		crypto/hmac/hmac_err.c
+L CMS		include/openssl/cms.h		crypto/cms/cms_err.c
+L JPAKE		include/openssl/jpake.h		crypto/jpake/jpake_err.c
+L FIPS		include/openssl/fips.h		crypto/fips_err.h
 
 # additional header files to be scanned for function names
 L NONE		crypto/x509/x509_vfy.h		NONE
diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile
index d72e6e7..c523a6d 100644
--- a/crypto/evp/Makefile
+++ b/crypto/evp/Makefile
@@ -13,9 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=evp_test.c p5_crpt2_test.c evp_extra_test.c
-TESTDATA=evptests.txt
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c evp_cnf.c \
@@ -46,10 +43,9 @@ LIBOBJ=	encode.o digest.o evp_enc.o evp_key.o evp_acnf.o evp_cnf.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= evp.h
-HEADER=	evp_locl.h $(EXHEADER)
+HEADER=	evp_locl.h
 
-ALL=    $(GENERAL) $(SRC) $(HEADER)
+ALL=	$(GENERAL) $(SRC) $(HEADER)
 
 top:
 	(cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
@@ -64,20 +60,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@[ -f $(TESTDATA) ] && cp $(TESTDATA) ../../test && echo "$(TESTDATA) -> ../../test/$(TESTDATA)"
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/hmac/Makefile b/crypto/hmac/Makefile
index 42a9778..f51612e 100644
--- a/crypto/hmac/Makefile
+++ b/crypto/hmac/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=hmactest.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=hmac.c hm_ameth.c hm_pmeth.c
@@ -22,8 +20,7 @@ LIBOBJ=hmac.o hm_ameth.o hm_pmeth.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= hmac.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -40,19 +37,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/idea/Makefile b/crypto/idea/Makefile
index b2e7add..345b602 100644
--- a/crypto/idea/Makefile
+++ b/crypto/idea/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=ideatest.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c i_skey.c
@@ -22,8 +20,7 @@ LIBOBJ=i_cbc.o i_cfb64.o i_ofb64.o i_ecb.o i_skey.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= idea.h
-HEADER=	idea_lcl.h $(EXHEADER)
+HEADER=	idea_lcl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -40,19 +37,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/jpake/Makefile b/crypto/jpake/Makefile
index 112dfb1..1f01d73 100644
--- a/crypto/jpake/Makefile
+++ b/crypto/jpake/Makefile
@@ -3,13 +3,16 @@ TOP=../..
 
 CFLAGS= $(INCLUDES) $(CFLAG)
 
+GENERAL= Makefile
+
 LIB=$(TOP)/libcrypto.a
 LIBOBJ=jpake.o jpake_err.o
 LIBSRC=jpake.c jpake_err.c
 SRC= $(LIBSRC)
 
-EXHEADER=jpake.h
-TEST=jpaketest.c
+HEADER=
+
+ALL= $(GENERAL) $(SRC) $(HEADER)
 
 top:
 	(cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
@@ -24,18 +27,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 depend:
 	@[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
 	$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
diff --git a/crypto/krb5/Makefile b/crypto/krb5/Makefile
index 1407739..3d923c4 100644
--- a/crypto/krb5/Makefile
+++ b/crypto/krb5/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile README
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= krb5_asn.c
@@ -23,8 +21,7 @@ LIBOBJ= krb5_asn.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= krb5_asn.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -41,19 +38,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/lhash/Makefile b/crypto/lhash/Makefile
index 82bddac..ca7f373 100644
--- a/crypto/lhash/Makefile
+++ b/crypto/lhash/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=lhash.c lh_stats.c
@@ -22,8 +20,7 @@ LIBOBJ=lhash.o lh_stats.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= lhash.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -40,19 +37,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/md2/Makefile b/crypto/md2/Makefile
index 17f878a..153c48e 100644
--- a/crypto/md2/Makefile
+++ b/crypto/md2/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=md2test.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=md2_dgst.c md2_one.c
@@ -22,8 +20,7 @@ LIBOBJ=md2_dgst.o md2_one.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= md2.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -40,19 +37,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/md4/Makefile b/crypto/md4/Makefile
index af68603..90aec00 100644
--- a/crypto/md4/Makefile
+++ b/crypto/md4/Makefile
@@ -14,8 +14,6 @@ AR=             ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=md4test.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=md4_dgst.c md4_one.c
@@ -23,8 +21,7 @@ LIBOBJ=md4_dgst.o md4_one.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= md4.h
-HEADER= md4_locl.h $(EXHEADER)
+HEADER= md4_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -41,19 +38,6 @@ lib:    $(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/md5/Makefile b/crypto/md5/Makefile
index 5e9464f..79a14bd 100644
--- a/crypto/md5/Makefile
+++ b/crypto/md5/Makefile
@@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile
-TEST=md5test.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=md5_dgst.c md5_one.c
@@ -27,8 +25,7 @@ LIBOBJ=md5_dgst.o md5_one.o $(MD5_ASM_OBJ)
 
 SRC= $(LIBSRC)
 
-EXHEADER= md5.h
-HEADER= md5_locl.h $(EXHEADER)
+HEADER= md5_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -58,19 +55,6 @@ md5-sparcv9.S:	asm/md5-sparcv9.pl
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/mdc2/Makefile b/crypto/mdc2/Makefile
index 766008e..18915c8 100644
--- a/crypto/mdc2/Makefile
+++ b/crypto/mdc2/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST= mdc2test.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=mdc2dgst.c mdc2_one.c
@@ -22,8 +20,7 @@ LIBOBJ=mdc2dgst.o mdc2_one.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= mdc2.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -40,19 +37,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/modes/Makefile b/crypto/modes/Makefile
index 658af0c..ed2a9e3 100644
--- a/crypto/modes/Makefile
+++ b/crypto/modes/Makefile
@@ -17,8 +17,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= cbc128.c ctr128.c cts128.c cfb128.c ofb128.c gcm128.c \
@@ -28,9 +26,7 @@ LIBOBJ= cbc128.o ctr128.o cts128.o cfb128.o ofb128.o gcm128.o \
 
 SRC= $(LIBSRC)
 
-#EXHEADER= store.h str_compat.h
-EXHEADER= modes.h
-HEADER=	modes_lcl.h $(EXHEADER)
+HEADER=	modes_lcl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -74,19 +70,6 @@ ghashv8-armx.o:	ghashv8-armx.S
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/objects/Makefile b/crypto/objects/Makefile
index c6ea71e..ad2db1e 100644
--- a/crypto/objects/Makefile
+++ b/crypto/objects/Makefile
@@ -14,8 +14,6 @@ PERL=		perl
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile README
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=	o_names.c obj_dat.c obj_lib.c obj_err.c obj_xref.c
@@ -23,8 +21,7 @@ LIBOBJ= o_names.o obj_dat.o obj_lib.o obj_err.o obj_xref.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= objects.h obj_mac.h
-HEADER=	$(EXHEADER) obj_dat.h obj_xref.h
+HEADER=	obj_dat.h obj_xref.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -38,13 +35,13 @@ lib:	$(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib
 
-obj_dat.h: obj_dat.pl obj_mac.h
-	$(PERL) obj_dat.pl obj_mac.h obj_dat.h
+obj_dat.h: obj_dat.pl ../../include/openssl/obj_mac.h
+	$(PERL) obj_dat.pl ../../include/openssl/obj_mac.h obj_dat.h
 
 # objects.pl both reads and writes obj_mac.num
-obj_mac.h: objects.pl objects.txt obj_mac.num
-	$(PERL) objects.pl objects.txt obj_mac.num obj_mac.h
-	@sleep 1; touch obj_mac.h; sleep 1
+../../include/openssl/obj_mac.h: objects.pl objects.txt obj_mac.num
+	$(PERL) objects.pl objects.txt obj_mac.num ../../include/openssl/obj_mac.h
+	@sleep 1; touch ../../include/openssl/obj_mac.h; sleep 1
 
 obj_xref.h: objxref.pl obj_xref.txt obj_mac.num
 	$(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h
@@ -53,19 +50,6 @@ obj_xref.h: objxref.pl obj_xref.txt obj_mac.num
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/ocsp/Makefile b/crypto/ocsp/Makefile
index 098e663..77f015d 100644
--- a/crypto/ocsp/Makefile
+++ b/crypto/ocsp/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile README
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= ocsp_asn.c ocsp_ext.c ocsp_ht.c ocsp_lib.c ocsp_cl.c \
@@ -25,8 +23,7 @@ LIBOBJ= ocsp_asn.o ocsp_ext.o ocsp_ht.o ocsp_lib.o ocsp_cl.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= ocsp.h
-HEADER=	ocsp_lcl.h $(EXHEADER)
+HEADER=	ocsp_lcl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -43,19 +40,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/pem/Makefile b/crypto/pem/Makefile
index b3e554a..09a6cc8 100644
--- a/crypto/pem/Makefile
+++ b/crypto/pem/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c \
@@ -25,8 +23,7 @@ LIBOBJ=	pem_sign.o pem_seal.o pem_info.o pem_lib.o pem_all.o pem_err.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= pem.h pem2.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -43,19 +40,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links: $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/pkcs12/Makefile b/crypto/pkcs12/Makefile
index 3a7498f..0746146 100644
--- a/crypto/pkcs12/Makefile
+++ b/crypto/pkcs12/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= p12_add.c p12_asn.c p12_attr.c p12_crpt.c p12_crt.c p12_decr.c \
@@ -26,8 +24,7 @@ LIBOBJ= p12_add.o p12_asn.o p12_attr.o p12_crpt.o p12_crt.o p12_decr.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER=  pkcs12.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -46,19 +43,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/pkcs7/Makefile b/crypto/pkcs7/Makefile
index 987bddf..4f218e8 100644
--- a/crypto/pkcs7/Makefile
+++ b/crypto/pkcs7/Makefile
@@ -12,12 +12,10 @@ AR=		ar r
 
 PEX_LIBS=
 EX_LIBS=
- 
+
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile README
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=	pk7_asn1.c pk7_lib.c pkcs7err.c pk7_doit.c pk7_smime.c pk7_attr.c \
@@ -27,8 +25,7 @@ LIBOBJ= pk7_asn1.o pk7_lib.o pkcs7err.o pk7_doit.o pk7_smime.o pk7_attr.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER=  pkcs7.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -47,19 +44,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/pqueue/Makefile b/crypto/pqueue/Makefile
index 3c2d33d..503b69c 100644
--- a/crypto/pqueue/Makefile
+++ b/crypto/pqueue/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=pqueue.c
@@ -22,8 +20,7 @@ LIBOBJ=pqueue.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= pqueue.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -40,19 +37,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/rand/Makefile b/crypto/rand/Makefile
index 27694aa..bb9ef9a 100644
--- a/crypto/rand/Makefile
+++ b/crypto/rand/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST= randtest.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \
@@ -24,8 +22,7 @@ LIBOBJ=md_rand.o randfile.o rand_lib.o rand_err.o rand_egd.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= rand.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -42,19 +39,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/rc2/Makefile b/crypto/rc2/Makefile
index 73eac34..22e1b49 100644
--- a/crypto/rc2/Makefile
+++ b/crypto/rc2/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=rc2test.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c rc2ofb64.c
@@ -22,8 +20,7 @@ LIBOBJ=rc2_ecb.o rc2_skey.o rc2_cbc.o rc2cfb64.o rc2ofb64.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= rc2.h
-HEADER=	rc2_locl.h $(EXHEADER)
+HEADER=	rc2_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -40,19 +37,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/rc4/Makefile b/crypto/rc4/Makefile
index f7be5f9..b09da2d 100644
--- a/crypto/rc4/Makefile
+++ b/crypto/rc4/Makefile
@@ -17,8 +17,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile
-TEST=rc4test.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=rc4_skey.c rc4_enc.c
@@ -26,8 +24,7 @@ LIBOBJ=$(RC4_ENC)
 
 SRC= $(LIBSRC)
 
-EXHEADER= rc4.h
-HEADER=	$(EXHEADER) rc4_locl.h
+HEADER=	rc4_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -68,19 +65,6 @@ rc4-%.s:	asm/rc4-%.pl;	$(PERL) $< $(PERLASM_SCHEME) $@
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/rc5/Makefile b/crypto/rc5/Makefile
index 8a8b00e..4336e6e 100644
--- a/crypto/rc5/Makefile
+++ b/crypto/rc5/Makefile
@@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile
-TEST=rc5test.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=rc5_skey.c rc5_ecb.c rc5_enc.c rc5cfb64.c rc5ofb64.c 
@@ -27,8 +25,7 @@ LIBOBJ=rc5_skey.o rc5_ecb.o $(RC5_ENC) rc5cfb64.o rc5ofb64.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= rc5.h
-HEADER=	rc5_locl.h $(EXHEADER)
+HEADER=	rc5_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -48,19 +45,6 @@ rc5-586.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/ripemd/Makefile b/crypto/ripemd/Makefile
index d5b1067..a5aea85 100644
--- a/crypto/ripemd/Makefile
+++ b/crypto/ripemd/Makefile
@@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile
-TEST=rmdtest.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=rmd_dgst.c rmd_one.c
@@ -27,8 +25,7 @@ LIBOBJ=rmd_dgst.o rmd_one.o $(RMD160_ASM_OBJ)
 
 SRC= $(LIBSRC)
 
-EXHEADER= ripemd.h
-HEADER= rmd_locl.h rmdconst.h $(EXHEADER)
+HEADER= rmd_locl.h rmdconst.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -48,19 +45,6 @@ rmd-586.s:	asm/rmd-586.pl ../perlasm/x86asm.pl
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/rsa/Makefile b/crypto/rsa/Makefile
index 28213bf..be8dc75 100644
--- a/crypto/rsa/Makefile
+++ b/crypto/rsa/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=rsa_test.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c \
@@ -28,8 +26,7 @@ LIBOBJ= rsa_eay.o rsa_gen.o rsa_lib.o rsa_sign.o rsa_saos.o rsa_err.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= rsa.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -46,19 +43,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/seed/Makefile b/crypto/seed/Makefile
index 4bc55e4..b4ea879 100644
--- a/crypto/seed/Makefile
+++ b/crypto/seed/Makefile
@@ -14,8 +14,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=seed.c seed_ecb.c seed_cbc.c seed_cfb.c seed_ofb.c
@@ -23,8 +21,7 @@ LIBOBJ=seed.o seed_ecb.o seed_cbc.o seed_cfb.o seed_ofb.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= seed.h
-HEADER= seed_locl.h $(EXHEADER)
+HEADER= seed_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -41,19 +38,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/sha/Makefile b/crypto/sha/Makefile
index 17dcbc8..593aa79 100644
--- a/crypto/sha/Makefile
+++ b/crypto/sha/Makefile
@@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile
-TEST=sha1test.c sha256t.c sha512t.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=sha1dgst.c sha1_one.c sha256.c sha512.c
@@ -27,8 +25,7 @@ LIBOBJ=sha1dgst.o sha1_one.o sha256.o sha512.o $(SHA1_ASM_OBJ)
 
 SRC= $(LIBSRC)
 
-EXHEADER= sha.h
-HEADER= sha_locl.h $(EXHEADER)
+HEADER= sha_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -103,19 +100,6 @@ sha512-armv8.o:		sha512-armv8.S
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/srp/Makefile b/crypto/srp/Makefile
index 3674dd6..5967ca1 100644
--- a/crypto/srp/Makefile
+++ b/crypto/srp/Makefile
@@ -14,8 +14,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=srptest.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=srp_lib.c srp_vfy.c
@@ -23,8 +21,7 @@ LIBOBJ=srp_lib.o srp_vfy.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= srp.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 top:
 	(cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
@@ -39,19 +36,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/stack/Makefile b/crypto/stack/Makefile
index 5327692..f97b3e8 100644
--- a/crypto/stack/Makefile
+++ b/crypto/stack/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=stack.c
@@ -22,8 +20,7 @@ LIBOBJ=stack.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= stack.h safestack.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -40,19 +37,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/store/Makefile b/crypto/store/Makefile
index 0dcfd78..79e31b5 100644
--- a/crypto/store/Makefile
+++ b/crypto/store/Makefile
@@ -13,9 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-#TEST= storetest.c
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= str_err.c str_lib.c str_meth.c str_mem.c
@@ -23,9 +20,7 @@ LIBOBJ= str_err.o str_lib.o str_meth.o str_mem.o
 
 SRC= $(LIBSRC)
 
-#EXHEADER= store.h str_compat.h
-EXHEADER= store.h
-HEADER=	$(EXHEADER) str_locl.h
+HEADER=	str_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -42,19 +37,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/ts/Makefile b/crypto/ts/Makefile
index 32872a7..9635991 100644
--- a/crypto/ts/Makefile
+++ b/crypto/ts/Makefile
@@ -17,12 +17,10 @@ AR=		ar r
 
 PEX_LIBS=
 EX_LIBS=
- 
+
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL= Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=	ts_err.c ts_req_utils.c ts_req_print.c ts_rsp_utils.c ts_rsp_print.c \
@@ -34,8 +32,7 @@ LIBOBJ= ts_err.o ts_req_utils.o ts_req_print.o ts_rsp_utils.o ts_rsp_print.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= ts.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -54,19 +51,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/txt_db/Makefile b/crypto/txt_db/Makefile
index e6f3033..454bda0 100644
--- a/crypto/txt_db/Makefile
+++ b/crypto/txt_db/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=txt_db.c
@@ -22,8 +20,7 @@ LIBOBJ=txt_db.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= txt_db.h
-HEADER=	$(EXHEADER)
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -40,19 +37,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/ui/Makefile b/crypto/ui/Makefile
index f0376a3..4ab59a1 100644
--- a/crypto/ui/Makefile
+++ b/crypto/ui/Makefile
@@ -13,9 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-#TEST= uitest.c
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= ui_err.c ui_lib.c ui_openssl.c ui_util.c
@@ -23,8 +20,7 @@ LIBOBJ= ui_err.o ui_lib.o ui_openssl.o ui_util.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= ui.h
-HEADER=	$(EXHEADER) ui_locl.h
+HEADER=	ui_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -41,19 +37,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/whrlpool/Makefile b/crypto/whrlpool/Makefile
index 566b996..31c63ad 100644
--- a/crypto/whrlpool/Makefile
+++ b/crypto/whrlpool/Makefile
@@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile
-TEST=wp_test.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=wp_dgst.c wp_block.c
@@ -27,8 +25,7 @@ LIBOBJ=wp_dgst.o $(WP_ASM_OBJ)
 
 SRC= $(LIBSRC)
 
-EXHEADER= whrlpool.h
-HEADER= wp_locl.h $(EXHEADER)
+HEADER= wp_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -53,19 +50,6 @@ $(LIBOBJ): $(LIBSRC)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/x509/Makefile b/crypto/x509/Makefile
index 9572ed2..914129a 100644
--- a/crypto/x509/Makefile
+++ b/crypto/x509/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile README
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=	x509_def.c x509_d2.c x509_r2x.c x509_cmp.c \
@@ -34,8 +32,7 @@ LIBOBJ= x509_def.o x509_d2.o x509_r2x.o x509_cmp.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= x509.h x509_vfy.h
-HEADER=	$(EXHEADER) x509_lcl.h
+HEADER=	x509_lcl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -52,19 +49,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/x509v3/Makefile b/crypto/x509v3/Makefile
index f232e67..30c1ede 100644
--- a/crypto/x509v3/Makefile
+++ b/crypto/x509v3/Makefile
@@ -13,8 +13,6 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile README
-TEST=v3nametest.c
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=	v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c v3_ia5.c v3_lib.c \
@@ -32,8 +30,7 @@ v3_asid.o v3_addr.o v3_scts.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= x509v3.h
-HEADER=	$(EXHEADER) pcy_int.h
+HEADER=	pcy_int.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -50,19 +47,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
diff --git a/engines/Makefile b/engines/Makefile
index da4ae77..769a4e5 100644
--- a/engines/Makefile
+++ b/engines/Makefile
@@ -29,8 +29,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile engines.com install.com engine_vector.mar
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBNAMES= 4758cca gmp padlock capi
@@ -47,7 +45,6 @@ LIBOBJ= e_4758cca.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= 
 HEADER=	e_4758cca_err.c e_4758cca_err.h \
 	e_gmp_err.c e_gmp_err.h \
 	e_chil_err.c e_chil_err.h \
@@ -56,7 +53,7 @@ HEADER=	e_4758cca_err.c e_4758cca_err.h \
 	e_ubsec_err.c e_ubsec_err.h \
 	e_capi_err.c e_capi_err.h
 
-ALL=    $(GENERAL) $(SRC) $(HEADER)
+ALL=	$(GENERAL) $(SRC) $(HEADER)
 
 top:
 	(cd ..; $(MAKE) DIRS=$(DIR) all)
@@ -90,9 +87,6 @@ files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 	@target=files; $(RECURSIVE_MAKE)
 
-links:
-	@target=links; $(RECURSIVE_MAKE)
-
 # XXXXX This currently only works on systems that use .so as suffix
 # for shared libraries as well as for Cygwin which uses the
 # dlfcn_name_converter and therefore stores the engines with .so suffix, too.
diff --git a/engines/ccgost/Makefile b/engines/ccgost/Makefile
index c44b704..edd1e50 100644
--- a/engines/ccgost/Makefile
+++ b/engines/ccgost/Makefile
@@ -8,8 +8,6 @@ AR= ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 LIB=$(TOP)/libcrypto.a
 
-TEST=gost2814789test.c
-
 LIBSRC= gost2001.c gost2001_keyx.c gost89.c gost94_keyx.c gost_ameth.c gost_asn1.c gost_crypt.c gost_ctl.c gost_eng.c gosthash.c gost_keywrap.c gost_md.c gost_params.c gost_pmeth.c gost_sign.c
 
 LIBOBJ= e_gost_err.o gost2001_keyx.o gost2001.o gost89.o gost94_keyx.o gost_ameth.o gost_asn1.o gost_crypt.o gost_ctl.o gost_eng.o gosthash.o gost_keywrap.o gost_md.o gost_params.o gost_pmeth.o gost_sign.o
@@ -63,9 +61,6 @@ install:
 		mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \
 	fi
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-
 tests:
 
 depend:
diff --git a/crypto/aes/aes.h b/include/openssl/aes.h
similarity index 100%
rename from crypto/aes/aes.h
rename to include/openssl/aes.h
diff --git a/crypto/asn1/asn1.h b/include/openssl/asn1.h
similarity index 100%
rename from crypto/asn1/asn1.h
rename to include/openssl/asn1.h
diff --git a/crypto/asn1/asn1_mac.h b/include/openssl/asn1_mac.h
similarity index 100%
rename from crypto/asn1/asn1_mac.h
rename to include/openssl/asn1_mac.h
diff --git a/crypto/asn1/asn1t.h b/include/openssl/asn1t.h
similarity index 100%
rename from crypto/asn1/asn1t.h
rename to include/openssl/asn1t.h
diff --git a/crypto/bio/bio.h b/include/openssl/bio.h
similarity index 100%
rename from crypto/bio/bio.h
rename to include/openssl/bio.h
diff --git a/crypto/bf/blowfish.h b/include/openssl/blowfish.h
similarity index 100%
rename from crypto/bf/blowfish.h
rename to include/openssl/blowfish.h
diff --git a/crypto/bn/bn.h b/include/openssl/bn.h
similarity index 100%
rename from crypto/bn/bn.h
rename to include/openssl/bn.h
diff --git a/crypto/buffer/buffer.h b/include/openssl/buffer.h
similarity index 100%
rename from crypto/buffer/buffer.h
rename to include/openssl/buffer.h
diff --git a/crypto/camellia/camellia.h b/include/openssl/camellia.h
similarity index 100%
rename from crypto/camellia/camellia.h
rename to include/openssl/camellia.h
diff --git a/crypto/cast/cast.h b/include/openssl/cast.h
similarity index 100%
rename from crypto/cast/cast.h
rename to include/openssl/cast.h
diff --git a/crypto/cmac/cmac.h b/include/openssl/cmac.h
similarity index 100%
rename from crypto/cmac/cmac.h
rename to include/openssl/cmac.h
diff --git a/crypto/cms/cms.h b/include/openssl/cms.h
similarity index 100%
rename from crypto/cms/cms.h
rename to include/openssl/cms.h
diff --git a/crypto/comp/comp.h b/include/openssl/comp.h
similarity index 100%
rename from crypto/comp/comp.h
rename to include/openssl/comp.h
diff --git a/crypto/conf/conf.h b/include/openssl/conf.h
similarity index 100%
rename from crypto/conf/conf.h
rename to include/openssl/conf.h
diff --git a/crypto/conf/conf_api.h b/include/openssl/conf_api.h
similarity index 100%
rename from crypto/conf/conf_api.h
rename to include/openssl/conf_api.h
diff --git a/crypto/crypto.h b/include/openssl/crypto.h
similarity index 100%
rename from crypto/crypto.h
rename to include/openssl/crypto.h
diff --git a/crypto/des/des.h b/include/openssl/des.h
similarity index 100%
rename from crypto/des/des.h
rename to include/openssl/des.h
diff --git a/crypto/dh/dh.h b/include/openssl/dh.h
similarity index 100%
rename from crypto/dh/dh.h
rename to include/openssl/dh.h
diff --git a/crypto/dsa/dsa.h b/include/openssl/dsa.h
similarity index 100%
rename from crypto/dsa/dsa.h
rename to include/openssl/dsa.h
diff --git a/crypto/dso/dso.h b/include/openssl/dso.h
similarity index 100%
rename from crypto/dso/dso.h
rename to include/openssl/dso.h
diff --git a/ssl/dtls1.h b/include/openssl/dtls1.h
similarity index 100%
rename from ssl/dtls1.h
rename to include/openssl/dtls1.h
diff --git a/e_os2.h b/include/openssl/e_os2.h
similarity index 100%
rename from e_os2.h
rename to include/openssl/e_os2.h
diff --git a/crypto/ebcdic.h b/include/openssl/ebcdic.h
similarity index 100%
rename from crypto/ebcdic.h
rename to include/openssl/ebcdic.h
diff --git a/crypto/ec/ec.h b/include/openssl/ec.h
similarity index 100%
rename from crypto/ec/ec.h
rename to include/openssl/ec.h
diff --git a/crypto/ecdh/ecdh.h b/include/openssl/ecdh.h
similarity index 100%
rename from crypto/ecdh/ecdh.h
rename to include/openssl/ecdh.h
diff --git a/crypto/ecdsa/ecdsa.h b/include/openssl/ecdsa.h
similarity index 100%
rename from crypto/ecdsa/ecdsa.h
rename to include/openssl/ecdsa.h
diff --git a/crypto/engine/engine.h b/include/openssl/engine.h
similarity index 100%
rename from crypto/engine/engine.h
rename to include/openssl/engine.h
diff --git a/crypto/err/err.h b/include/openssl/err.h
similarity index 100%
rename from crypto/err/err.h
rename to include/openssl/err.h
diff --git a/crypto/evp/evp.h b/include/openssl/evp.h
similarity index 100%
rename from crypto/evp/evp.h
rename to include/openssl/evp.h
diff --git a/crypto/hmac/hmac.h b/include/openssl/hmac.h
similarity index 100%
rename from crypto/hmac/hmac.h
rename to include/openssl/hmac.h
diff --git a/crypto/idea/idea.h b/include/openssl/idea.h
similarity index 100%
rename from crypto/idea/idea.h
rename to include/openssl/idea.h
diff --git a/crypto/jpake/jpake.h b/include/openssl/jpake.h
similarity index 100%
rename from crypto/jpake/jpake.h
rename to include/openssl/jpake.h
diff --git a/crypto/krb5/krb5_asn.h b/include/openssl/krb5_asn.h
similarity index 100%
rename from crypto/krb5/krb5_asn.h
rename to include/openssl/krb5_asn.h
diff --git a/ssl/kssl.h b/include/openssl/kssl.h
similarity index 100%
rename from ssl/kssl.h
rename to include/openssl/kssl.h
diff --git a/crypto/lhash/lhash.h b/include/openssl/lhash.h
similarity index 100%
rename from crypto/lhash/lhash.h
rename to include/openssl/lhash.h
diff --git a/crypto/md2/md2.h b/include/openssl/md2.h
similarity index 100%
rename from crypto/md2/md2.h
rename to include/openssl/md2.h
diff --git a/crypto/md4/md4.h b/include/openssl/md4.h
similarity index 100%
rename from crypto/md4/md4.h
rename to include/openssl/md4.h
diff --git a/crypto/md5/md5.h b/include/openssl/md5.h
similarity index 100%
rename from crypto/md5/md5.h
rename to include/openssl/md5.h
diff --git a/crypto/mdc2/mdc2.h b/include/openssl/mdc2.h
similarity index 100%
rename from crypto/mdc2/mdc2.h
rename to include/openssl/mdc2.h
diff --git a/crypto/modes/modes.h b/include/openssl/modes.h
similarity index 100%
rename from crypto/modes/modes.h
rename to include/openssl/modes.h
diff --git a/crypto/objects/obj_mac.h b/include/openssl/obj_mac.h
similarity index 100%
rename from crypto/objects/obj_mac.h
rename to include/openssl/obj_mac.h
diff --git a/crypto/objects/objects.h b/include/openssl/objects.h
similarity index 100%
rename from crypto/objects/objects.h
rename to include/openssl/objects.h
diff --git a/crypto/ocsp/ocsp.h b/include/openssl/ocsp.h
similarity index 100%
rename from crypto/ocsp/ocsp.h
rename to include/openssl/ocsp.h
diff --git a/crypto/opensslv.h b/include/openssl/opensslv.h
similarity index 100%
rename from crypto/opensslv.h
rename to include/openssl/opensslv.h
diff --git a/crypto/ossl_typ.h b/include/openssl/ossl_typ.h
similarity index 100%
rename from crypto/ossl_typ.h
rename to include/openssl/ossl_typ.h
diff --git a/crypto/pem/pem.h b/include/openssl/pem.h
similarity index 100%
rename from crypto/pem/pem.h
rename to include/openssl/pem.h
diff --git a/crypto/pem/pem2.h b/include/openssl/pem2.h
similarity index 100%
rename from crypto/pem/pem2.h
rename to include/openssl/pem2.h
diff --git a/crypto/pkcs12/pkcs12.h b/include/openssl/pkcs12.h
similarity index 100%
rename from crypto/pkcs12/pkcs12.h
rename to include/openssl/pkcs12.h
diff --git a/crypto/pkcs7/pkcs7.h b/include/openssl/pkcs7.h
similarity index 100%
rename from crypto/pkcs7/pkcs7.h
rename to include/openssl/pkcs7.h
diff --git a/crypto/pqueue/pqueue.h b/include/openssl/pqueue.h
similarity index 100%
rename from crypto/pqueue/pqueue.h
rename to include/openssl/pqueue.h
diff --git a/crypto/rand/rand.h b/include/openssl/rand.h
similarity index 100%
rename from crypto/rand/rand.h
rename to include/openssl/rand.h
diff --git a/crypto/rc2/rc2.h b/include/openssl/rc2.h
similarity index 100%
rename from crypto/rc2/rc2.h
rename to include/openssl/rc2.h
diff --git a/crypto/rc4/rc4.h b/include/openssl/rc4.h
similarity index 100%
rename from crypto/rc4/rc4.h
rename to include/openssl/rc4.h
diff --git a/crypto/rc5/rc5.h b/include/openssl/rc5.h
similarity index 100%
rename from crypto/rc5/rc5.h
rename to include/openssl/rc5.h
diff --git a/crypto/ripemd/ripemd.h b/include/openssl/ripemd.h
similarity index 100%
rename from crypto/ripemd/ripemd.h
rename to include/openssl/ripemd.h
diff --git a/crypto/rsa/rsa.h b/include/openssl/rsa.h
similarity index 100%
rename from crypto/rsa/rsa.h
rename to include/openssl/rsa.h
diff --git a/crypto/stack/safestack.h b/include/openssl/safestack.h
similarity index 100%
rename from crypto/stack/safestack.h
rename to include/openssl/safestack.h
diff --git a/crypto/seed/seed.h b/include/openssl/seed.h
similarity index 100%
rename from crypto/seed/seed.h
rename to include/openssl/seed.h
diff --git a/crypto/sha/sha.h b/include/openssl/sha.h
similarity index 100%
rename from crypto/sha/sha.h
rename to include/openssl/sha.h
diff --git a/crypto/srp/srp.h b/include/openssl/srp.h
similarity index 100%
rename from crypto/srp/srp.h
rename to include/openssl/srp.h
diff --git a/ssl/srtp.h b/include/openssl/srtp.h
similarity index 100%
rename from ssl/srtp.h
rename to include/openssl/srtp.h
diff --git a/ssl/ssl.h b/include/openssl/ssl.h
similarity index 100%
rename from ssl/ssl.h
rename to include/openssl/ssl.h
diff --git a/ssl/ssl2.h b/include/openssl/ssl2.h
similarity index 100%
rename from ssl/ssl2.h
rename to include/openssl/ssl2.h
diff --git a/ssl/ssl23.h b/include/openssl/ssl23.h
similarity index 100%
rename from ssl/ssl23.h
rename to include/openssl/ssl23.h
diff --git a/ssl/ssl3.h b/include/openssl/ssl3.h
similarity index 100%
rename from ssl/ssl3.h
rename to include/openssl/ssl3.h
diff --git a/crypto/stack/stack.h b/include/openssl/stack.h
similarity index 100%
rename from crypto/stack/stack.h
rename to include/openssl/stack.h
diff --git a/crypto/store/store.h b/include/openssl/store.h
similarity index 100%
rename from crypto/store/store.h
rename to include/openssl/store.h
diff --git a/crypto/symhacks.h b/include/openssl/symhacks.h
similarity index 100%
rename from crypto/symhacks.h
rename to include/openssl/symhacks.h
diff --git a/ssl/tls1.h b/include/openssl/tls1.h
similarity index 100%
rename from ssl/tls1.h
rename to include/openssl/tls1.h
diff --git a/crypto/ts/ts.h b/include/openssl/ts.h
similarity index 100%
rename from crypto/ts/ts.h
rename to include/openssl/ts.h
diff --git a/crypto/txt_db/txt_db.h b/include/openssl/txt_db.h
similarity index 100%
rename from crypto/txt_db/txt_db.h
rename to include/openssl/txt_db.h
diff --git a/crypto/ui/ui.h b/include/openssl/ui.h
similarity index 100%
rename from crypto/ui/ui.h
rename to include/openssl/ui.h
diff --git a/crypto/whrlpool/whrlpool.h b/include/openssl/whrlpool.h
similarity index 100%
rename from crypto/whrlpool/whrlpool.h
rename to include/openssl/whrlpool.h
diff --git a/crypto/x509/x509.h b/include/openssl/x509.h
similarity index 100%
rename from crypto/x509/x509.h
rename to include/openssl/x509.h
diff --git a/crypto/x509/x509_vfy.h b/include/openssl/x509_vfy.h
similarity index 100%
rename from crypto/x509/x509_vfy.h
rename to include/openssl/x509_vfy.h
diff --git a/crypto/x509v3/x509v3.h b/include/openssl/x509v3.h
similarity index 100%
rename from crypto/x509v3/x509v3.h
rename to include/openssl/x509v3.h
diff --git a/ssl/Makefile b/ssl/Makefile
index 39cba8b..4168306 100644
--- a/ssl/Makefile
+++ b/ssl/Makefile
@@ -15,8 +15,6 @@ KRB5_INCLUDES=
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile README ssl-lib.com install.com
-TEST=ssltest.c heartbeat_test.c
-APPS=
 
 LIB=$(TOP)/libssl.a
 SHARED_LIB= libssl$(SHLIB_EXT)
@@ -47,10 +45,9 @@ LIBOBJ= \
 
 SRC= $(LIBSRC)
 
-EXHEADER= ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h kssl.h srtp.h
-HEADER=	$(EXHEADER) ssl_locl.h kssl_lcl.h  record/record_locl.h record/record.h
+HEADER=	ssl_locl.h kssl_lcl.h  record/record_locl.h record/record.h
 
-ALL=    $(GENERAL) $(SRC) $(HEADER)
+ALL=	$(GENERAL) $(SRC) $(HEADER)
 
 top:
 	(cd ..; $(MAKE) DIRS=$(DIR) all)
@@ -70,21 +67,6 @@ shared: lib
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
-uninstall:
-
 tags:
 	ctags $(SRC)
 
diff --git a/test/Makefile b/test/Makefile
index f4635b8..2e3efd8 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -12,7 +12,6 @@ PERL=		perl
 # KRB5 stuff
 KRB5_INCLUDES=
 LIBKRB5=
-TEST=		igetest.c
 
 PEX_LIBS=
 EX_LIBS= #-lnsl -lsocket
@@ -56,7 +55,6 @@ GOST2814789TEST=gost2814789test
 RANDTEST=	randtest
 DHTEST=		dhtest
 DSATEST=	dsatest
-METHTEST=	methtest
 SSLTEST=	ssltest
 RSATEST=	rsa_test
 ENGINETEST=	enginetest
@@ -111,10 +109,9 @@ SRC=	$(BNTEST).c $(ECTEST).c  $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
 	$(GOST2814789TEST).c $(HEARTBEATTEST).c $(P5_CRPT2_TEST).c \
 	$(CONSTTIMETEST).c testutil.c
 
-EXHEADER= 
-HEADER=	testutil.h $(EXHEADER)
+HEADER=	testutil.h
 
-ALL=    $(GENERAL) $(SRC) $(HEADER)
+ALL=	$(GENERAL) $(SRC) $(HEADER)
 
 top:
 	(cd ..; $(MAKE) DIRS=$(DIR) TESTS=$(TESTS) all)
@@ -126,18 +123,12 @@ exe:	$(EXE) dummytest$(EXE_EXT)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-
 generate: $(SRC)
 $(SRC):
 	@sh $(TOP)/util/point.sh dummytest.c $@
 
 errors:
 
-install:
-
-uninstall:
-
 tags:
 	ctags $(SRC)
 
diff --git a/crypto/bf/bftest.c b/test/bftest.c
similarity index 100%
rename from crypto/bf/bftest.c
rename to test/bftest.c
diff --git a/crypto/bn/bntest.c b/test/bntest.c
similarity index 100%
rename from crypto/bn/bntest.c
rename to test/bntest.c
diff --git a/crypto/cast/casttest.c b/test/casttest.c
similarity index 100%
rename from crypto/cast/casttest.c
rename to test/casttest.c
diff --git a/crypto/constant_time_test.c b/test/constant_time_test.c
similarity index 100%
rename from crypto/constant_time_test.c
rename to test/constant_time_test.c
diff --git a/crypto/des/destest.c b/test/destest.c
similarity index 100%
rename from crypto/des/destest.c
rename to test/destest.c
diff --git a/crypto/dh/dhtest.c b/test/dhtest.c
similarity index 100%
rename from crypto/dh/dhtest.c
rename to test/dhtest.c
diff --git a/crypto/dsa/dsatest.c b/test/dsatest.c
similarity index 100%
rename from crypto/dsa/dsatest.c
rename to test/dsatest.c
diff --git a/crypto/ecdh/ecdhtest.c b/test/ecdhtest.c
similarity index 100%
rename from crypto/ecdh/ecdhtest.c
rename to test/ecdhtest.c
diff --git a/crypto/ecdsa/ecdsatest.c b/test/ecdsatest.c
similarity index 100%
rename from crypto/ecdsa/ecdsatest.c
rename to test/ecdsatest.c
diff --git a/crypto/ec/ectest.c b/test/ectest.c
similarity index 100%
rename from crypto/ec/ectest.c
rename to test/ectest.c
diff --git a/crypto/engine/enginetest.c b/test/enginetest.c
similarity index 100%
rename from crypto/engine/enginetest.c
rename to test/enginetest.c
diff --git a/crypto/evp/evp_extra_test.c b/test/evp_extra_test.c
similarity index 100%
rename from crypto/evp/evp_extra_test.c
rename to test/evp_extra_test.c
diff --git a/crypto/evp/evp_test.c b/test/evp_test.c
similarity index 100%
rename from crypto/evp/evp_test.c
rename to test/evp_test.c
diff --git a/crypto/evp/evptests.txt b/test/evptests.txt
similarity index 100%
rename from crypto/evp/evptests.txt
rename to test/evptests.txt
diff --git a/crypto/bn/exptest.c b/test/exptest.c
similarity index 100%
rename from crypto/bn/exptest.c
rename to test/exptest.c
diff --git a/engines/ccgost/gost2814789test.c b/test/gost2814789test.c
similarity index 100%
rename from engines/ccgost/gost2814789test.c
rename to test/gost2814789test.c
diff --git a/ssl/heartbeat_test.c b/test/heartbeat_test.c
similarity index 100%
rename from ssl/heartbeat_test.c
rename to test/heartbeat_test.c
diff --git a/crypto/hmac/hmactest.c b/test/hmactest.c
similarity index 100%
rename from crypto/hmac/hmactest.c
rename to test/hmactest.c
diff --git a/crypto/idea/ideatest.c b/test/ideatest.c
similarity index 100%
rename from crypto/idea/ideatest.c
rename to test/ideatest.c
diff --git a/crypto/jpake/jpaketest.c b/test/jpaketest.c
similarity index 100%
rename from crypto/jpake/jpaketest.c
rename to test/jpaketest.c
diff --git a/crypto/md2/md2test.c b/test/md2test.c
similarity index 100%
rename from crypto/md2/md2test.c
rename to test/md2test.c
diff --git a/crypto/md4/md4test.c b/test/md4test.c
similarity index 100%
rename from crypto/md4/md4test.c
rename to test/md4test.c
diff --git a/crypto/md5/md5test.c b/test/md5test.c
similarity index 100%
rename from crypto/md5/md5test.c
rename to test/md5test.c
diff --git a/crypto/mdc2/mdc2test.c b/test/mdc2test.c
similarity index 100%
rename from crypto/mdc2/mdc2test.c
rename to test/mdc2test.c
diff --git a/crypto/evp/p5_crpt2_test.c b/test/p5_crpt2_test.c
similarity index 100%
rename from crypto/evp/p5_crpt2_test.c
rename to test/p5_crpt2_test.c
diff --git a/crypto/rand/randtest.c b/test/randtest.c
similarity index 100%
rename from crypto/rand/randtest.c
rename to test/randtest.c
diff --git a/crypto/rc2/rc2test.c b/test/rc2test.c
similarity index 100%
rename from crypto/rc2/rc2test.c
rename to test/rc2test.c
diff --git a/crypto/rc4/rc4test.c b/test/rc4test.c
similarity index 100%
rename from crypto/rc4/rc4test.c
rename to test/rc4test.c
diff --git a/crypto/rc5/rc5test.c b/test/rc5test.c
similarity index 100%
rename from crypto/rc5/rc5test.c
rename to test/rc5test.c
diff --git a/crypto/ripemd/rmdtest.c b/test/rmdtest.c
similarity index 100%
rename from crypto/ripemd/rmdtest.c
rename to test/rmdtest.c
diff --git a/crypto/rsa/rsa_test.c b/test/rsa_test.c
similarity index 100%
rename from crypto/rsa/rsa_test.c
rename to test/rsa_test.c
diff --git a/crypto/sha/sha1test.c b/test/sha1test.c
similarity index 100%
rename from crypto/sha/sha1test.c
rename to test/sha1test.c
diff --git a/crypto/sha/sha256t.c b/test/sha256t.c
similarity index 100%
rename from crypto/sha/sha256t.c
rename to test/sha256t.c
diff --git a/crypto/sha/sha512t.c b/test/sha512t.c
similarity index 100%
rename from crypto/sha/sha512t.c
rename to test/sha512t.c
diff --git a/crypto/srp/srptest.c b/test/srptest.c
similarity index 100%
rename from crypto/srp/srptest.c
rename to test/srptest.c
diff --git a/ssl/ssltest.c b/test/ssltest.c
similarity index 100%
rename from ssl/ssltest.c
rename to test/ssltest.c
diff --git a/crypto/x509v3/v3nametest.c b/test/v3nametest.c
similarity index 100%
rename from crypto/x509v3/v3nametest.c
rename to test/v3nametest.c
diff --git a/crypto/whrlpool/wp_test.c b/test/wp_test.c
similarity index 100%
rename from crypto/whrlpool/wp_test.c
rename to test/wp_test.c
diff --git a/tools/Makefile b/tools/Makefile
index 19950d1..edd7fc5 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -12,7 +12,6 @@ MAKEFILE=	Makefile
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=
 APPS= c_rehash
 MISC_APPS= c_hash c_info c_issuer c_name
 
@@ -48,8 +47,6 @@ uninstall:
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-
 lint:
 
 tags:
diff --git a/util/bat.sh b/util/bat.sh
index 459cd9f..dee56d7 100755
--- a/util/bat.sh
+++ b/util/bat.sh
@@ -37,9 +37,6 @@ for (;;)
 		$lib =~ s/^.*\/([^\/]+)$/$1/;
 		}
 
-	if ($key eq "EXHEADER")
-		{ $exheader.=&var_add($dir,$val); }
-
 	if ($key eq "HEADER")
 		{ $header.=&var_add($dir,$val); }
 
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 3ad17f6..e0a44cc 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -396,7 +396,7 @@ for (;;)
 	if ($key eq "EX_LIBS")
 		{ $ex_libs .= " $val" if $val ne "";}
 
-	if ($key eq "TEST" && (!$fipscanisteronly || $dir =~ /^fips/ ))
+	if ($key =~ /^[A-Z0-9_]*TEST$/ && (!$fipscanisteronly || $dir =~ /^fips/ ))
 		{ $test.=&var_add($dir,$val, 0); }
 
 	if (($key eq "PROGS") || ($key eq "E_OBJ"))
@@ -414,9 +414,6 @@ for (;;)
 		$otherlibs .= " $lib";
 		}
 
-	if ($key eq "EXHEADER")
-		{ $exheader.=&var_add($dir,$val, 1); }
-
 	if ($key eq "HEADER")
 		{ $header.=&var_add($dir,$val, 1); }
 
@@ -454,7 +451,6 @@ if ($orig_platform eq 'copy')
 	{
 	# Remove opensslconf.h so it doesn't get updated if we configure a
 	# different branch.
-	$exheader =~ s/[^ ]+\/opensslconf.h//;
 	$header =~ s/[^ ]+\/opensslconf.h//;
 	}
 
@@ -568,7 +564,7 @@ if ($fipscanisteronly)
 $cp2 = $cp unless defined $cp2;
 
 $extra_install= <<"EOF";
-	\$(CP) \"\$(INCO_D)${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\"
+	\$(CP) \"include${o}openssl${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\"
 	\$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin\"
 	\$(MKDIR) \"\$(OPENSSLDIR)\"
 	\$(CP) apps${o}openssl.cnf \"\$(OPENSSLDIR)\"
@@ -581,8 +577,8 @@ if ($fipscanisteronly)
 	\$(CP) \"\$(O_FIPSCANISTER).sha1\" \"\$(INSTALLTOP)${o}lib\"
 	\$(CP2) \"fips${o}fips_premain.c\" \"\$(INSTALLTOP)${o}lib\"
 	\$(CP) \"fips${o}fips_premain.c.sha1\" \"\$(INSTALLTOP)${o}lib\"
-	\$(CP) \"\$(INCO_D)${o}fips.h\" \"\$(INSTALLTOP)${o}include${o}openssl\"
-	\$(CP) \"\$(INCO_D)${o}fips_rand.h\" \"\$(INSTALLTOP)${o}include${o}openssl\"
+	\$(CP) \"include${o}openssl${o}fips.h\" \"\$(INSTALLTOP)${o}include${o}openssl\"
+	\$(CP) \"include${o}openssl${o}fips_rand.h\" \"\$(INSTALLTOP)${o}include${o}openssl\"
 	\$(CP) "\$(BIN_D)${o}fips_standalone_sha1$exep" \"\$(INSTALLTOP)${o}bin\"
 	\$(CP) \"util${o}fipslink.pl\" \"\$(INSTALLTOP)${o}bin\"
 EOF
@@ -662,9 +658,6 @@ FIPSLINK=\$(PERL) util${o}fipslink.pl
 OUT_D=$out_dir
 # The output directory for all the temporary muck
 TMP_D=$tmp_dir
-# The output directory for the header files
-INC_D=$inc_dir
-INCO_D=$inc_dir${o}openssl
 
 PERL=$perl
 PERLASM_SCHEME=$mf_perlasm_scheme
@@ -726,7 +719,7 @@ L_LIBS= \$(L_SSL) \$(L_CRYPTO) $ex_l_libs
 # Don't touch anything below this point
 ######################################################
 
-INC=-I\$(INC_D) -I\$(INCL_D) -I\$(SRC_D)${o}crypto${o}include
+INC=-I\$(SRC_D)${o}include -I\$(INCL_D) -I\$(SRC_D)${o}crypto${o}include
 APP_CFLAGS=\$(INC) \$(CFLAG) \$(APP_CFLAG)
 LIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG)
 SHLIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG) \$(SHLIB_CFLAG)
@@ -736,7 +729,7 @@ LIBS_DEP=$libs_dep
 EOF
 
 $rules=<<"EOF";
-all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers \$(FIPS_SHA1_EXE) $build_targets
+all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) headers \$(FIPS_SHA1_EXE) $build_targets
 
 banner:
 $banner
@@ -753,18 +746,11 @@ $banner
 \$(LIB_D):
 	\$(MKDIR) \"\$(LIB_D)\"
 
-\$(INCO_D): \$(INC_D)
-	\$(MKDIR) \"\$(INCO_D)\"
-
-\$(INC_D):
-	\$(MKDIR) \"\$(INC_D)\"
-
 # This needs to be invoked once, when the makefile is first constructed, or
 # after cleaning.
-init: \$(TMP_D) \$(LIB_D) \$(INC_D) \$(INCO_D) \$(BIN_D) \$(TEST_D) headers
-	\$(PERL) \$(SRC_D)/util/copy-if-different.pl "\$(SRC_D)/crypto/opensslconf.h" "\$(INCO_D)/opensslconf.h"
+init: \$(TMP_D) \$(LIB_D) \$(BIN_D) \$(TEST_D) headers
 
-headers: \$(HEADER) \$(EXHEADER)
+headers: \$(HEADER)
 
 lib: \$(LIBS_DEP) \$(E_SHLIB)
 
@@ -790,7 +776,6 @@ reallyclean:
 	\$(RM) -rf \$(BIN_D)
 	\$(RM) -rf \$(TEST_D)
 	\$(RM) -rf \$(LIB_D)
-	\$(RM) -rf \$(INC_D)
 
 EOF
 
@@ -844,20 +829,11 @@ close(OUT);
 foreach (keys %lib_obj) { $lib_obj{$_}=&clean_up_ws($lib_obj{$_}); }
 $test=&clean_up_ws($test);
 $e_exe=&clean_up_ws($e_exe);
-$exheader=&clean_up_ws($exheader);
 $header=&clean_up_ws($header);
 
-# First we strip the exheaders from the headers list
-foreach (split(/\s+/,$exheader)){ $h{$_}=1; }
-foreach (split(/\s+/,$header))	{ $h.=$_." " unless $h{$_}; }
-chop($h); $header=$h;
-
 $defs.=&do_defs("HEADER",$header,"\$(INCL_D)","");
 $rules.=&do_copy_rule("\$(INCL_D)",$header,"");
 
-$defs.=&do_defs("EXHEADER",$exheader,"\$(INCO_D)","");
-$rules.=&do_copy_rule("\$(INCO_D)",$exheader,"");
-
 $defs.=&do_defs("T_OBJ",$test,"\$(OBJ_D)",$obj);
 $rules.=&do_compile_rule("\$(OBJ_D)",$test,"\$(APP_CFLAGS)");
 
diff --git a/util/mkdef.pl b/util/mkdef.pl
index 1d47561..7f1c093 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -257,79 +257,79 @@ $max_ssl = $max_num;
 %crypto_list=&load_numbers($crypto_num);
 $max_crypto = $max_num;
 
-my $ssl="ssl/ssl.h";
-$ssl.=" ssl/kssl.h";
-$ssl.=" ssl/tls1.h";
-$ssl.=" ssl/srtp.h";
+my $ssl="include/openssl/ssl.h";
+$ssl.=" include/openssl/kssl.h";
+$ssl.=" include/openssl/tls1.h";
+$ssl.=" include/openssl/srtp.h";
 
-my $crypto ="crypto/crypto.h";
+my $crypto ="include/openssl/crypto.h";
 $crypto.=" crypto/cryptlib.h";
 $crypto.=" crypto/o_dir.h";
 $crypto.=" crypto/o_str.h";
-$crypto.=" crypto/des/des.h" ; # unless $no_des;
-$crypto.=" crypto/idea/idea.h" ; # unless $no_idea;
-$crypto.=" crypto/rc4/rc4.h" ; # unless $no_rc4;
-$crypto.=" crypto/rc5/rc5.h" ; # unless $no_rc5;
-$crypto.=" crypto/rc2/rc2.h" ; # unless $no_rc2;
-$crypto.=" crypto/bf/blowfish.h" ; # unless $no_bf;
-$crypto.=" crypto/cast/cast.h" ; # unless $no_cast;
-$crypto.=" crypto/whrlpool/whrlpool.h" ;
-$crypto.=" crypto/md2/md2.h" ; # unless $no_md2;
-$crypto.=" crypto/md4/md4.h" ; # unless $no_md4;
-$crypto.=" crypto/md5/md5.h" ; # unless $no_md5;
-$crypto.=" crypto/mdc2/mdc2.h" ; # unless $no_mdc2;
-$crypto.=" crypto/sha/sha.h" ; # unless $no_sha;
-$crypto.=" crypto/ripemd/ripemd.h" ; # unless $no_ripemd;
-$crypto.=" crypto/aes/aes.h" ; # unless $no_aes;
-$crypto.=" crypto/camellia/camellia.h" ; # unless $no_camellia;
-$crypto.=" crypto/seed/seed.h"; # unless $no_seed;
-
-$crypto.=" crypto/bn/bn.h";
-$crypto.=" crypto/rsa/rsa.h" ; # unless $no_rsa;
-$crypto.=" crypto/dsa/dsa.h" ; # unless $no_dsa;
-$crypto.=" crypto/dh/dh.h" ; # unless $no_dh;
-$crypto.=" crypto/ec/ec.h" ; # unless $no_ec;
-$crypto.=" crypto/ecdsa/ecdsa.h" ; # unless $no_ecdsa;
-$crypto.=" crypto/ecdh/ecdh.h" ; # unless $no_ecdh;
-$crypto.=" crypto/hmac/hmac.h" ; # unless $no_hmac;
-$crypto.=" crypto/cmac/cmac.h" ;
-
-$crypto.=" crypto/engine/engine.h"; # unless $no_engine;
-$crypto.=" crypto/stack/stack.h" ; # unless $no_stack;
-$crypto.=" crypto/buffer/buffer.h" ; # unless $no_buffer;
-$crypto.=" crypto/bio/bio.h" ; # unless $no_bio;
-$crypto.=" crypto/dso/dso.h" ; # unless $no_dso;
-$crypto.=" crypto/lhash/lhash.h" ; # unless $no_lhash;
-$crypto.=" crypto/conf/conf.h";
-$crypto.=" crypto/txt_db/txt_db.h";
-
-$crypto.=" crypto/evp/evp.h" ; # unless $no_evp;
-$crypto.=" crypto/objects/objects.h";
-$crypto.=" crypto/pem/pem.h";
-#$crypto.=" crypto/meth/meth.h";
-$crypto.=" crypto/asn1/asn1.h";
-$crypto.=" crypto/asn1/asn1t.h";
-$crypto.=" crypto/asn1/asn1_mac.h";
-$crypto.=" crypto/err/err.h" ; # unless $no_err;
-$crypto.=" crypto/pkcs7/pkcs7.h";
-$crypto.=" crypto/pkcs12/pkcs12.h";
-$crypto.=" crypto/x509/x509.h";
-$crypto.=" crypto/x509/x509_vfy.h";
-$crypto.=" crypto/x509v3/x509v3.h";
-$crypto.=" crypto/ts/ts.h";
-$crypto.=" crypto/rand/rand.h";
-$crypto.=" crypto/comp/comp.h" ; # unless $no_comp;
-$crypto.=" crypto/ocsp/ocsp.h";
-$crypto.=" crypto/ui/ui.h";
-$crypto.=" crypto/krb5/krb5_asn.h";
-#$crypto.=" crypto/store/store.h";
-$crypto.=" crypto/pqueue/pqueue.h";
-$crypto.=" crypto/cms/cms.h";
-$crypto.=" crypto/jpake/jpake.h";
-$crypto.=" crypto/srp/srp.h";
-$crypto.=" crypto/modes/modes.h";
-
-my $symhacks="crypto/symhacks.h";
+$crypto.=" include/openssl/des.h" ; # unless $no_des;
+$crypto.=" include/openssl/idea.h" ; # unless $no_idea;
+$crypto.=" include/openssl/rc4.h" ; # unless $no_rc4;
+$crypto.=" include/openssl/rc5.h" ; # unless $no_rc5;
+$crypto.=" include/openssl/rc2.h" ; # unless $no_rc2;
+$crypto.=" include/openssl/blowfish.h" ; # unless $no_bf;
+$crypto.=" include/openssl/cast.h" ; # unless $no_cast;
+$crypto.=" include/openssl/whrlpool.h" ;
+$crypto.=" include/openssl/md2.h" ; # unless $no_md2;
+$crypto.=" include/openssl/md4.h" ; # unless $no_md4;
+$crypto.=" include/openssl/md5.h" ; # unless $no_md5;
+$crypto.=" include/openssl/mdc2.h" ; # unless $no_mdc2;
+$crypto.=" include/openssl/sha.h" ; # unless $no_sha;
+$crypto.=" include/openssl/ripemd.h" ; # unless $no_ripemd;
+$crypto.=" include/openssl/aes.h" ; # unless $no_aes;
+$crypto.=" include/openssl/camellia.h" ; # unless $no_camellia;
+$crypto.=" include/openssl/seed.h"; # unless $no_seed;
+
+$crypto.=" include/openssl/bn.h";
+$crypto.=" include/openssl/rsa.h" ; # unless $no_rsa;
+$crypto.=" include/openssl/dsa.h" ; # unless $no_dsa;
+$crypto.=" include/openssl/dh.h" ; # unless $no_dh;
+$crypto.=" include/openssl/ec.h" ; # unless $no_ec;
+$crypto.=" include/openssl/ecdsa.h" ; # unless $no_ecdsa;
+$crypto.=" include/openssl/ecdh.h" ; # unless $no_ecdh;
+$crypto.=" include/openssl/hmac.h" ; # unless $no_hmac;
+$crypto.=" include/openssl/cmac.h" ;
+
+$crypto.=" include/openssl/engine.h"; # unless $no_engine;
+$crypto.=" include/openssl/stack.h" ; # unless $no_stack;
+$crypto.=" include/openssl/buffer.h" ; # unless $no_buffer;
+$crypto.=" include/openssl/bio.h" ; # unless $no_bio;
+$crypto.=" include/openssl/dso.h" ; # unless $no_dso;
+$crypto.=" include/openssl/lhash.h" ; # unless $no_lhash;
+$crypto.=" include/openssl/conf.h";
+$crypto.=" include/openssl/txt_db.h";
+
+$crypto.=" include/openssl/evp.h" ; # unless $no_evp;
+$crypto.=" include/openssl/objects.h";
+$crypto.=" include/openssl/pem.h";
+#$crypto.=" include/openssl/meth.h";
+$crypto.=" include/openssl/asn1.h";
+$crypto.=" include/openssl/asn1t.h";
+$crypto.=" include/openssl/asn1_mac.h";
+$crypto.=" include/openssl/err.h" ; # unless $no_err;
+$crypto.=" include/openssl/pkcs7.h";
+$crypto.=" include/openssl/pkcs12.h";
+$crypto.=" include/openssl/x509.h";
+$crypto.=" include/openssl/x509_vfy.h";
+$crypto.=" include/openssl/x509v3.h";
+$crypto.=" include/openssl/ts.h";
+$crypto.=" include/openssl/rand.h";
+$crypto.=" include/openssl/comp.h" ; # unless $no_comp;
+$crypto.=" include/openssl/ocsp.h";
+$crypto.=" include/openssl/ui.h";
+$crypto.=" include/openssl/krb5_asn.h";
+#$crypto.=" include/openssl/store.h";
+$crypto.=" include/openssl/pqueue.h";
+$crypto.=" include/openssl/cms.h";
+$crypto.=" include/openssl/jpake.h";
+$crypto.=" include/openssl/srp.h";
+$crypto.=" include/openssl/modes.h";
+
+my $symhacks="include/openssl/symhacks.h";
 
 my @ssl_symbols = &do_defs("SSLEAY", $ssl, $symhacks);
 my @crypto_symbols = &do_defs("LIBEAY", $crypto, $symhacks);
diff --git a/util/mklink.pl b/util/mklink.pl
deleted file mode 100755
index 61db12c..0000000
--- a/util/mklink.pl
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/local/bin/perl
-
-# mklink.pl
-
-# The first command line argument is a non-empty relative path
-# specifying the "from" directory.
-# Each other argument is a file name not containing / and
-# names a file in the current directory.
-#
-# For each of these files, we create in the "from" directory a link
-# of the same name pointing to the local file.
-#
-# We assume that the directory structure is a tree, i.e. that it does
-# not contain symbolic links and that the parent of / is never referenced.
-# Apart from this, this script should be able to handle even the most
-# pathological cases.
-
-use Cwd;
-
-my $from = shift;
-my @files = @ARGV;
-
-my @from_path = split(/[\\\/]/, $from);
-my $pwd = getcwd();
-chomp($pwd);
-my @pwd_path = split(/[\\\/]/, $pwd);
-
-my @to_path = ();
-
-my $dirname;
-foreach $dirname (@from_path) {
-
-    # In this loop, @to_path always is a relative path from
-    # @pwd_path (interpreted is an absolute path) to the original pwd.
-
-    # At the end, @from_path (as a relative path from the original pwd)
-    # designates the same directory as the absolute path @pwd_path,
-    # which means that @to_path then is a path from there to the original pwd.
-
-    next if ($dirname eq "" || $dirname eq ".");
-
-    if ($dirname eq "..") {
-	@to_path = (pop(@pwd_path), @to_path);
-    } else {
-	@to_path = ("..", @to_path);
-	push(@pwd_path, $dirname);
-    }
-}
-
-my $to = join('/', @to_path);
-
-my $file;
-$symlink_exists=eval {symlink("",""); 1};
-if ($^O eq "msys") { $symlink_exists=0 };
-foreach $file (@files) {
-    my $err = "";
-    if ($symlink_exists) {
-	unlink "$from/$file";
-	symlink("$to/$file", "$from/$file") or $err = " [$!]";
-    } else {
-	unlink "$from/$file"; 
-	open (OLD, "<$file") or die "Can't open $file: $!";
-	open (NEW, ">$from/$file") or die "Can't open $from/$file: $!";
-	binmode(OLD);
-	binmode(NEW);
-	while (<OLD>) {
-	    print NEW $_;
-	}
-	close (OLD) or die "Can't close $file: $!";
-	close (NEW) or die "Can't close $from/$file: $!";
-    }
-    print $file . " => $from/$file$err\n";
-}
diff --git a/util/mkstack.pl b/util/mkstack.pl
index 6e6741f..0739027 100755
--- a/util/mkstack.pl
+++ b/util/mkstack.pl
@@ -3,7 +3,7 @@
 # Search out "DECLARE_STACK_OF()" # declarations in .h and .c files,
 # and create corresponding macro declarations for crypto/stack/safestack.h.
 
-my $safestack = "crypto/stack/safestack.h";
+my $safestack = "include/openssl/safestack.h";
 my $do_write = 0;
 
 foreach ( @ARGV ) {
@@ -15,7 +15,7 @@ my @sstacklst;
 my @asn1setlst;
 my @p12stklst;
 my @lhashlst;
-my @source = (<crypto/*.[ch]>, <crypto/*/*.[ch]>, <ssl/*.[ch]>, <apps/*.[ch]>);
+my @source = (<include/openssl/*.h>, <crypto/*.[ch]>, <crypto/*/*.[ch]>, <ssl/*.[ch]>, <apps/*.[ch]>);
 foreach $file (@source) {
     next if -l $file;
 
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 309312c..d04b98a 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -284,10 +284,6 @@ $(OBJ_D)\applink.obj:	ms\applink.c
 	$(CC) /Fo$(OBJ_D)\applink.obj $(APP_CFLAGS) -c ms\applink.c
 $(OBJ_D)\uplink.obj:	ms\uplink.c ms\applink.c
 	$(CC) /Fo$(OBJ_D)\uplink.obj $(SHLIB_CFLAGS) -c ms\uplink.c
-$(INCO_D)\applink.c:	ms\applink.c
-	$(CP) ms\applink.c $(INCO_D)\applink.c
-
-EXHEADER= $(EXHEADER) $(INCO_D)\applink.c
 
 LIBS_DEP=$(LIBS_DEP) $(OBJ_D)\applink.obj
 CRYPTOOBJ=$(OBJ_D)\uplink.obj $(CRYPTOOBJ)
diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index c4b7e8e..81a6f0b 100644
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -409,7 +409,8 @@ sub get_tests
 		 'serverinfo.pem',
 	       );
   my $copies = copy_scripts(1, 'test', @copies);
-  $copies .= copy_scripts(0, 'test', ('smcont.txt'));
+  $copies .= copy_scripts(0, 'test', ('smcont.txt', 'evptests.txt'));
+
 
   my @utils = ( 'shlib_wrap.sh',
 		'opensslwrap.sh',
@@ -422,8 +423,6 @@ sub get_tests
 	     );
   $copies .= copy_scripts(1, 'apps', @apps);
 
-  $copies .= copy_scripts(1, 'crypto/evp', ('evptests.txt'));
-
   $scripts = "test_scripts: \$(TEST_D)/CA.sh \$(TEST_D)/opensslwrap.sh \$(TEST_D)/openssl.cnf \$(TEST_D)/shlib_wrap.sh ocsp smime\n";
   $scripts .= "\nocsp:\n\tcp -R test/ocsp-tests \$(TEST_D)\n";
   $scripts .= "\smime:\n\tcp -R test/smime-certs \$(TEST_D)\n";

From steve at openssl.org  Tue Mar 31 18:19:39 2015
From: steve at openssl.org (Dr. Stephen Henson)
Date: Tue, 31 Mar 2015 18:19:39 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427825979.902638.15981.nullmailer@dev.openssl.org>

The branch master has been updated
       via  b9395187df44e630fbc90dcc530e55e37a920ed4 (commit)
      from  a72d89fda6a97e47fa65d49c50b6d4649a4965e2 (commit)


- Log -----------------------------------------------------------------
commit b9395187df44e630fbc90dcc530e55e37a920ed4
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Mar 28 13:27:11 2015 +0000

    Remove old ASN.1 code from evp_asn1.c
    
    Rewrite ASN1_TYPE_set_int_octetstring and ASN1_TYPE_get_int_octetstring
    to use the new ASN.1 code instead of the old macros.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/asn1/evp_asn1.c | 102 +++++++++++++++++--------------------------------
 1 file changed, 36 insertions(+), 66 deletions(-)

diff --git a/crypto/asn1/evp_asn1.c b/crypto/asn1/evp_asn1.c
index e6a5b5f..bf131a4 100644
--- a/crypto/asn1/evp_asn1.c
+++ b/crypto/asn1/evp_asn1.c
@@ -59,7 +59,7 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/asn1.h>
-#include <openssl/asn1_mac.h>
+#include <openssl/asn1t.h>
 
 int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len)
 {
@@ -95,100 +95,70 @@ int ASN1_TYPE_get_octetstring(ASN1_TYPE *a, unsigned char *data, int max_len)
     return (ret);
 }
 
-int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, unsigned char *data,
-                                  int len)
-{
-    int n, size;
-    ASN1_OCTET_STRING os, *osp;
-    ASN1_INTEGER in;
-    unsigned char *p;
-    unsigned char buf[32];      /* when they have 256bit longs, I'll be in
-                                 * trouble */
-    in.data = buf;
-    in.length = 32;
-    os.data = data;
-    os.type = V_ASN1_OCTET_STRING;
-    os.length = len;
-    ASN1_INTEGER_set(&in, num);
-    n = i2d_ASN1_INTEGER(&in, NULL);
-    n += i2d_ASN1_OCTET_STRING(&os, NULL);
-
-    size = ASN1_object_size(1, n, V_ASN1_SEQUENCE);
-
-    if ((osp = ASN1_STRING_new()) == NULL)
-        return (0);
-    /* Grow the 'string' */
-    if (!ASN1_STRING_set(osp, NULL, size)) {
-        ASN1_STRING_free(osp);
-        return (0);
-    }
+typedef struct {
+    long num;
+    ASN1_OCTET_STRING *oct;
+} asn1_int_oct;
 
-    ASN1_STRING_length_set(osp, size);
-    p = ASN1_STRING_data(osp);
+ASN1_SEQUENCE(asn1_int_oct) = {
+        ASN1_SIMPLE(asn1_int_oct, num, LONG),
+        ASN1_SIMPLE(asn1_int_oct, oct, ASN1_OCTET_STRING)
+} ASN1_SEQUENCE_END(asn1_int_oct)
 
-    ASN1_put_object(&p, 1, n, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL);
-    i2d_ASN1_INTEGER(&in, &p);
-    i2d_ASN1_OCTET_STRING(&os, &p);
+DECLARE_ASN1_ITEM(asn1_int_oct)
 
-    ASN1_TYPE_set(a, V_ASN1_SEQUENCE, osp);
-    return (1);
+int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, unsigned char *data,
+                                  int len)
+{
+    asn1_int_oct atmp;
+    ASN1_OCTET_STRING oct;
+
+    atmp.num = num;
+    atmp.oct = &oct;
+    oct.data = data;
+    oct.type = V_ASN1_OCTET_STRING;
+    oct.length = len;
+    oct.flags = 0;
+
+    if (ASN1_TYPE_pack_sequence(ASN1_ITEM_rptr(asn1_int_oct), &atmp, &a))
+        return 1;
+    return 0;
 }
 
 /*
- * we return the actual length..., num may be missing, in which case, set it
- * to zero
+ * we return the actual length...
  */
 /* int max_len:  for returned value    */
 int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a, long *num,
                                   unsigned char *data, int max_len)
 {
+    asn1_int_oct *atmp = NULL;
     int ret = -1, n;
-    ASN1_INTEGER *ai = NULL;
-    ASN1_OCTET_STRING *os = NULL;
-    const unsigned char *p;
-    long length;
-    ASN1_const_CTX c;
 
     if ((a->type != V_ASN1_SEQUENCE) || (a->value.sequence == NULL)) {
         goto err;
     }
-    p = ASN1_STRING_data(a->value.sequence);
-    length = ASN1_STRING_length(a->value.sequence);
 
-    c.pp = &p;
-    c.p = p;
-    c.max = p + length;
-    c.error = ASN1_R_DATA_IS_WRONG;
+    atmp = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(asn1_int_oct), a);
 
-    M_ASN1_D2I_start_sequence();
-    c.q = c.p;
-    if ((ai = d2i_ASN1_INTEGER(NULL, &c.p, c.slen)) == NULL)
-        goto err;
-    c.slen -= (c.p - c.q);
-    c.q = c.p;
-    if ((os = d2i_ASN1_OCTET_STRING(NULL, &c.p, c.slen)) == NULL)
-        goto err;
-    c.slen -= (c.p - c.q);
-    if (!M_ASN1_D2I_end_sequence())
+    if (atmp == NULL)
         goto err;
 
     if (num != NULL)
-        *num = ASN1_INTEGER_get(ai);
+        *num = atmp->num;
 
-    ret = ASN1_STRING_length(os);
+    ret = ASN1_STRING_length(atmp->oct);
     if (max_len > ret)
         n = ret;
     else
         n = max_len;
 
     if (data != NULL)
-        memcpy(data, ASN1_STRING_data(os), n);
-    if (0) {
+        memcpy(data, ASN1_STRING_data(atmp->oct), n);
+    if (ret == -1) {
  err:
         ASN1err(ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING, ASN1_R_DATA_IS_WRONG);
     }
-    ASN1_OCTET_STRING_free(os);
-    if (ai != NULL)
-        ASN1_INTEGER_free(ai);
-    return (ret);
+    M_ASN1_free_of(atmp, asn1_int_oct);
+    return ret;
 }

From levitte at openssl.org  Tue Mar 31 19:59:47 2015
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 31 Mar 2015 19:59:47 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427831987.971240.30320.nullmailer@dev.openssl.org>

The branch master has been updated
       via  5098c029cef9b81cbb7488ffc74e470bd79d0dac (commit)
      from  b9395187df44e630fbc90dcc530e55e37a920ed4 (commit)


- Log -----------------------------------------------------------------
commit 5098c029cef9b81cbb7488ffc74e470bd79d0dac
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 31 21:50:21 2015 +0200

    Remove SSL_TASK, the DECnet Based SSL Engine
    
    This engine is for VMS only, and isn't really part of the core OpenSSL
    but rather a side project of its own that just happens to have tagged
    along for a long time.  The reasons why it has remained within the
    OpenSSL source are long lost in history, and there not being any real
    reason for it to remain here, it's time for it to move out.
    
    This side project will appear as a project in its own right, the
    location of which will be announced later on.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 crypto/bio/bss_rtcp.c | 321 -----------------------------------------
 crypto/crypto-lib.com |   2 +-
 makevms.com           |  35 +----
 ssl/ssl-lib.com       | 258 +--------------------------------
 ssl/ssl_task.c        | 389 --------------------------------------------------
 5 files changed, 3 insertions(+), 1002 deletions(-)
 delete mode 100644 crypto/bio/bss_rtcp.c
 delete mode 100644 ssl/ssl_task.c

diff --git a/crypto/bio/bss_rtcp.c b/crypto/bio/bss_rtcp.c
deleted file mode 100644
index 5c98a82..0000000
--- a/crypto/bio/bss_rtcp.c
+++ /dev/null
@@ -1,321 +0,0 @@
-/* crypto/bio/bss_rtcp.c */
-/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay at cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh at cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay at cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh at cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/*-
- * Written by David L. Jones <jonesd at kcgl1.eng.ohio-state.edu>
- * Date:   22-JUL-1996
- * Revised: 25-SEP-1997         Update for 0.8.1, BIO_CTRL_SET -> BIO_C_SET_FD
- */
-/* VMS */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include "cryptlib.h"
-#include <openssl/bio.h>
-
-#include <iodef.h>              /* VMS IO$_ definitions */
-#include <starlet.h>
-
-typedef unsigned short io_channel;
-/*************************************************************************/
-struct io_status {
-    short status, count;
-    long flags;
-};
-
-/* Should have member alignment inhibited */
-struct rpc_msg {
-    /* 'A'-app data. 'R'-remote client 'G'-global */
-    char channel;
-    /* 'G'-get, 'P'-put, 'C'-confirm, 'X'-close */
-    char function;
-    /* Amount of data returned or max to return */
-    unsigned short int length;
-    /* variable data */
-    char data[4092];
-};
-#define RPC_HDR_SIZE (sizeof(struct rpc_msg) - 4092)
-
-struct rpc_ctx {
-    int filled, pos;
-    struct rpc_msg msg;
-};
-
-static int rtcp_write(BIO *h, const char *buf, int num);
-static int rtcp_read(BIO *h, char *buf, int size);
-static int rtcp_puts(BIO *h, const char *str);
-static int rtcp_gets(BIO *h, char *str, int size);
-static long rtcp_ctrl(BIO *h, int cmd, long arg1, void *arg2);
-static int rtcp_new(BIO *h);
-static int rtcp_free(BIO *data);
-
-static BIO_METHOD rtcp_method = {
-    BIO_TYPE_FD,
-    "RTCP",
-    rtcp_write,
-    rtcp_read,
-    rtcp_puts,
-    rtcp_gets,
-    rtcp_ctrl,
-    rtcp_new,
-    rtcp_free,
-    NULL,
-};
-
-BIO_METHOD *BIO_s_rtcp(void)
-{
-    return (&rtcp_method);
-}
-
-/*****************************************************************************/
-/*
- * Decnet I/O routines.
- */
-
-#ifdef __DECC
-# pragma message save
-# pragma message disable DOLLARID
-#endif
-
-static int get(io_channel chan, char *buffer, int maxlen, int *length)
-{
-    int status;
-    struct io_status iosb;
-    status = sys$qiow(0, chan, IO$_READVBLK, &iosb, 0, 0,
-                      buffer, maxlen, 0, 0, 0, 0);
-    if ((status & 1) == 1)
-        status = iosb.status;
-    if ((status & 1) == 1)
-        *length = iosb.count;
-    return status;
-}
-
-static int put(io_channel chan, char *buffer, int length)
-{
-    int status;
-    struct io_status iosb;
-    status = sys$qiow(0, chan, IO$_WRITEVBLK, &iosb, 0, 0,
-                      buffer, length, 0, 0, 0, 0);
-    if ((status & 1) == 1)
-        status = iosb.status;
-    return status;
-}
-
-#ifdef __DECC
-# pragma message restore
-#endif
-
-/***************************************************************************/
-
-static int rtcp_new(BIO *bi)
-{
-    struct rpc_ctx *ctx;
-    bi->init = 1;
-    bi->num = 0;
-    bi->flags = 0;
-    bi->ptr = OPENSSL_malloc(sizeof(struct rpc_ctx));
-    if (bi->ptr == NULL)
-        return (0);
-    ctx = (struct rpc_ctx *)bi->ptr;
-    ctx->filled = 0;
-    ctx->pos = 0;
-    return (1);
-}
-
-static int rtcp_free(BIO *a)
-{
-    if (a == NULL)
-        return (0);
-    if (a->ptr)
-        OPENSSL_free(a->ptr);
-    a->ptr = NULL;
-    return (1);
-}
-
-static int rtcp_read(BIO *b, char *out, int outl)
-{
-    int status, length;
-    struct rpc_ctx *ctx;
-    /*
-     * read data, return existing.
-     */
-    ctx = (struct rpc_ctx *)b->ptr;
-    if (ctx->pos < ctx->filled) {
-        length = ctx->filled - ctx->pos;
-        if (length > outl)
-            length = outl;
-        memmove(out, &ctx->msg.data[ctx->pos], length);
-        ctx->pos += length;
-        return length;
-    }
-    /*
-     * Requst more data from R channel.
-     */
-    ctx->msg.channel = 'R';
-    ctx->msg.function = 'G';
-    ctx->msg.length = sizeof(ctx->msg.data);
-    status = put(b->num, (char *)&ctx->msg, RPC_HDR_SIZE);
-    if ((status & 1) == 0) {
-        return -1;
-    }
-    /*
-     * Read.
-     */
-    ctx->pos = ctx->filled = 0;
-    status = get(b->num, (char *)&ctx->msg, sizeof(ctx->msg), &length);
-    if ((status & 1) == 0)
-        length = -1;
-    if (ctx->msg.channel != 'R' || ctx->msg.function != 'C') {
-        length = -1;
-    }
-    ctx->filled = length - RPC_HDR_SIZE;
-
-    if (ctx->pos < ctx->filled) {
-        length = ctx->filled - ctx->pos;
-        if (length > outl)
-            length = outl;
-        memmove(out, ctx->msg.data, length);
-        ctx->pos += length;
-        return length;
-    }
-
-    return length;
-}
-
-static int rtcp_write(BIO *b, const char *in, int inl)
-{
-    int status, i, segment, length;
-    struct rpc_ctx *ctx;
-    /*
-     * Output data, send in chunks no larger that sizeof(ctx->msg.data).
-     */
-    ctx = (struct rpc_ctx *)b->ptr;
-    for (i = 0; i < inl; i += segment) {
-        segment = inl - i;
-        if (segment > sizeof(ctx->msg.data))
-            segment = sizeof(ctx->msg.data);
-        ctx->msg.channel = 'R';
-        ctx->msg.function = 'P';
-        ctx->msg.length = segment;
-        memmove(ctx->msg.data, &in[i], segment);
-        status = put(b->num, (char *)&ctx->msg, segment + RPC_HDR_SIZE);
-        if ((status & 1) == 0) {
-            i = -1;
-            break;
-        }
-
-        status = get(b->num, (char *)&ctx->msg, sizeof(ctx->msg), &length);
-        if (((status & 1) == 0) || (length < RPC_HDR_SIZE)) {
-            i = -1;
-            break;
-        }
-        if ((ctx->msg.channel != 'R') || (ctx->msg.function != 'C')) {
-            printf("unexpected response when confirming put %c %c\n",
-                   ctx->msg.channel, ctx->msg.function);
-
-        }
-    }
-    return (i);
-}
-
-static long rtcp_ctrl(BIO *b, int cmd, long num, void *ptr)
-{
-    long ret = 1;
-
-    switch (cmd) {
-    case BIO_CTRL_RESET:
-    case BIO_CTRL_EOF:
-        ret = 1;
-        break;
-    case BIO_C_SET_FD:
-        b->num = num;
-        ret = 1;
-        break;
-    case BIO_CTRL_SET_CLOSE:
-    case BIO_CTRL_FLUSH:
-    case BIO_CTRL_DUP:
-        ret = 1;
-        break;
-    case BIO_CTRL_GET_CLOSE:
-    case BIO_CTRL_INFO:
-    case BIO_CTRL_GET:
-    case BIO_CTRL_PENDING:
-    case BIO_CTRL_WPENDING:
-    default:
-        ret = 0;
-        break;
-    }
-    return (ret);
-}
-
-static int rtcp_gets(BIO *bp, char *buf, int size)
-{
-    return (0);
-}
-
-static int rtcp_puts(BIO *bp, const char *str)
-{
-    int length;
-    if (str == NULL)
-        return (0);
-    length = strlen(str);
-    if (length == 0)
-        return (0);
-    return rtcp_write(bp, str, length);
-}
diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index 0514821..9495599 100644
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -285,7 +285,7 @@ $ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ -
 	"bf_null,bf_buff,b_print,b_dump,"+ -
 	"b_sock,bss_acpt,bf_nbio,bss_log,bss_bio,"+ -
 	"bss_dgram,"+ -
-	"bf_lbuf,bss_rtcp"	! The last two are VMS specific
+	"bf_lbuf"	! The last one is VMS specific
 $ LIB_STACK = "stack"
 $ LIB_LHASH = "lhash,lh_stats"
 $ LIB_RAND = "md_rand,randfile,rand_lib,rand_err,rand_egd,"+ -
diff --git a/makevms.com b/makevms.com
index 0f403db..fc7c0a4 100755
--- a/makevms.com
+++ b/makevms.com
@@ -26,7 +26,6 @@ $!      CRYPTO    Just build the "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" library.
 $!      CRYPTO/x  Just build the x part of the
 $!                "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" library.
 $!      SSL       Just build the "[.xxx.EXE.SSL]LIBSSL.OLB" library.
-$!      SSL_TASK  Just build the "[.xxx.EXE.SSL]SSL_TASK.EXE" program.
 $!      TEST      Just build the "[.xxx.EXE.TEST]" test programs for OpenSSL.
 $!      APPS      Just build the "[.xxx.EXE.APPS]" application programs for OpenSSL.
 $!      ENGINES   Just build the "[.xxx.EXE.ENGINES]" application programs for OpenSSL.
@@ -158,10 +157,6 @@ $!  Build The [.xxx.EXE.SSL]LIBSSL.OLB Library.
 $!
 $   GOSUB SSL
 $!
-$!  Build The [.xxx.EXE.SSL]SSL_TASK.EXE DECNet SSL Engine.
-$!
-$   GOSUB SSL_TASK
-$!
 $!  Build The [.xxx.EXE.TEST] OpenSSL Test Utilities.
 $!
 $   GOSUB TEST
@@ -920,33 +915,6 @@ $! Time To Return.
 $!
 $ RETURN
 $!
-$! Build The "[.xxx.EXE.SSL]SSL_TASK.EXE" Program.
-$!
-$ SSL_TASK:
-$!
-$! Tell The User What We Are Doing.
-$!
-$ WRITE SYS$OUTPUT ""
-$ WRITE SYS$OUTPUT -
-   "Building DECNet Based SSL Engine, [.",ARCHD,".EXE.SSL]SSL_TASK.EXE"
-$!
-$! Go To The [.SSL] Directory.
-$!
-$ SET DEFAULT SYS$DISK:[.SSL]
-$!
-$! Build The [.xxx.EXE.SSL]SSL_TASK.EXE
-$!
-$ @SSL-LIB SSL_TASK 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" -
-   "''ISSEVEN'" "''POINTER_SIZE'" "''ZLIB'"
-$!
-$! Go Back To The Main Directory.
-$!
-$ SET DEFAULT [-]
-$!
-$! That's All, Time To RETURN.
-$!
-$ RETURN
-$!
 $! Build The OpenSSL Test Programs.
 $!
 $ TEST:
@@ -1057,7 +1025,7 @@ $!
 $   IF (P1.EQS."CONFIG").OR.(P1.EQS."BUILDINF").OR.(P1.EQS."SOFTLINKS") -
        .OR.(P1.EQS."BUILDALL") -
        .OR.(P1.EQS."CRYPTO").OR.(P1.EQS."SSL") -
-       .OR.(P1.EQS."SSL_TASK").OR.(P1.EQS."TEST").OR.(P1.EQS."APPS") -
+       .OR.(P1.EQS."TEST").OR.(P1.EQS."APPS") -
        .OR.(P1.EQS."ENGINES")
 $   THEN
 $!
@@ -1087,7 +1055,6 @@ $     WRITE SYS$OUTPUT "    CRYPTO   :  To Build Just The [.xxx.EXE.CRYPTO]LIBCR
 $     WRITE SYS$OUTPUT "    CRYPTO/x :  To Build Just The x Part Of The"
 $     WRITE SYS$OUTPUT "                [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library."
 $     WRITE SYS$OUTPUT "    SSL      :  To Build Just The [.xxx.EXE.SSL]LIBSSL.OLB Library."
-$     WRITE SYS$OUTPUT "    SSL_TASK :  To Build Just The [.xxx.EXE.SSL]SSL_TASK.EXE Program."
 $     WRITE SYS$OUTPUT "    TEST     :  To Build Just The OpenSSL Test Programs."
 $     WRITE SYS$OUTPUT "    APPS     :  To Build Just The OpenSSL Application Programs."
 $     WRITE SYS$OUTPUT "    ENGINES  :  To Build Just The ENGINES"
diff --git a/ssl/ssl-lib.com b/ssl/ssl-lib.com
index b160a0a..0df80f0 100644
--- a/ssl/ssl-lib.com
+++ b/ssl/ssl-lib.com
@@ -19,7 +19,6 @@ $!  Specify the following as P1 to build just that part or ALL to just
 $!  build everything.
 $!
 $!    		LIBRARY    To just compile the [.xxx.EXE.SSL]LIBSSL.OLB Library.
-$!    		SSL_TASK   To just compile the [.xxx.EXE.SSL]SSL_TASK.EXE
 $!
 $!  Specify DEBUG or NODEBUG as P2 to compile with or without debugger
 $!  information.
@@ -162,10 +161,6 @@ $! Define The CRYPTO-LIB We Are To Use.
 $!
 $ CRYPTO_LIB := SYS$DISK:[-.'ARCHD'.EXE.CRYPTO]SSL_LIBCRYPTO'LIB32'.OLB
 $!
-$! Set up exceptional compilations.
-$!
-$ CC5_SHOWN = 0
-$!
 $! Check To See What We Are To Do.
 $!
 $ IF (BUILDALL.EQS."TRUE")
@@ -174,7 +169,6 @@ $!
 $!  Since Nothing Special Was Specified, Do Everything.
 $!
 $   GOSUB LIBRARY
-$   GOSUB SSL_TASK
 $!
 $! Else...
 $!
@@ -223,8 +217,6 @@ $ LIB_SSL = "s3_meth,  s3_srvr, s3_clnt, s3_lib, s3_enc,s3_pkt,s3_both,s3_cbc,"+
 	    "ssl_asn1,ssl_txt,ssl_algs,ssl_conf,"+ -
 	    "bio_ssl,ssl_err,kssl,t1_reneg,tls_srp,t1_trce,ssl_utst"
 $!
-$ COMPILEWITH_CC5 = ""
-$!
 $! Tell The User That We Are Compiling The Library.
 $!
 $ WRITE SYS$OUTPUT "Building The ",SSL_LIB," Library."
@@ -309,251 +301,6 @@ $!
 $! Time To RETURN.
 $!
 $ RETURN
-$ SSL_TASK:
-$!
-$! Check To See If We Have The Proper Libraries.
-$!
-$ GOSUB LIB_CHECK
-$!
-$! Check To See If We Have A Linker Option File.
-$!
-$ GOSUB CHECK_OPT_FILE
-$!
-$! Check To See If The File We Want To Compile Is Actually There.
-$!
-$ IF (F$SEARCH("SYS$DISK:[]SSL_TASK.C").EQS."")
-$ THEN
-$!
-$!  Tell The User That The File Dosen't Exist.
-$!
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "The File SSL_TASK.C Dosen't Exist."
-$   WRITE SYS$OUTPUT ""
-$!
-$!  Exit The Build.
-$!
-$   EXIT
-$!
-$! End The SSL_TASK.C File Check.
-$!
-$ ENDIF
-$!
-$ COMPILEWITH_CC5 = "" !!! ",ssl_task,"
-$!
-$! Tell The User We Are Creating The SSL_TASK.
-$!
-$! Tell The User We Are Creating The SSL_TASK.
-$!
-$ WRITE SYS$OUTPUT "Creating SSL_TASK OSU HTTP SSL Engine."	
-$!
-$!  Tell The User What File We Are Compiling.
-$!
-$ FILE_NAME = "ssl_task"
-$ WRITE SYS$OUTPUT "	",FILE_NAME,".c"
-$!
-$! Compile The File.
-$!
-$ ON ERROR THEN GOTO SSL_TASK_END
-$!
-$ FILE_NAME0 = ","+ F$ELEMENT(0,".",FILE_NAME)+ ","
-$ IF COMPILEWITH_CC5 - FILE_NAME0 .NES. COMPILEWITH_CC5
-$ THEN
-$   if (.not. CC5_SHOWN)
-$   then
-$     CC5_SHOWN = 1
-$     write sys$output "        \Using special rule (5)"
-$     x = "    "+ CC5
-$     write /symbol sys$output x
-$   endif
-$   CC5 /OBJECT='OBJ_DIR''FILE_NAME'.OBJ SYS$DISK:[]'FILE_NAME'.C
-$ ELSE
-$   CC /OBJECT='OBJ_DIR''FILE_NAME'.OBJ SYS$DISK:[]'FILE_NAME'.C
-$ ENDIF
-$!
-$! Link The Program.
-$!
-$ LINK /'DEBUGGER' /'LINKMAP' /'TRACEBACK' /EXE='EXE_DIR'SSL_TASK.EXE -
-   'OBJ_DIR'SSL_TASK.OBJ, -
-   'SSL_LIB'/LIBRARY, -
-   'CRYPTO_LIB'/LIBRARY -
-   'TCPIP_LIB' -
-   'ZLIB_LIB' -
-   ,'OPT_FILE' /OPTIONS
-$!
-$! Time To Return.
-$!
-$SSL_TASK_END:
-$ RETURN
-$!
-$! Check For The Link Option FIle.
-$!
-$ CHECK_OPT_FILE:
-$!
-$! Check To See If We Need To Make A VAX C Option File.
-$!
-$ IF (COMPILER.EQS."VAXC")
-$ THEN
-$!
-$!  Check To See If We Already Have A VAX C Linker Option File.
-$!
-$   IF (F$SEARCH(OPT_FILE).EQS."")
-$   THEN
-$!
-$!    We Need A VAX C Linker Option File.
-$!
-$     CREATE 'OPT_FILE'
-$DECK
-!
-! Default System Options File To Link Against 
-! The Sharable VAX C Runtime Library.
-!
-SYS$SHARE:VAXCRTL.EXE/SHARE
-$EOD
-$!
-$!  End The Option File Check.
-$!
-$   ENDIF
-$!
-$! End The VAXC Check.
-$!
-$ ENDIF
-$!
-$! Check To See If We Need A GNU C Option File.
-$!
-$ IF (COMPILER.EQS."GNUC")
-$ THEN
-$!
-$!  Check To See If We Already Have A GNU C Linker Option File.
-$!
-$   IF (F$SEARCH(OPT_FILE).EQS."")
-$   THEN
-$!
-$!    We Need A GNU C Linker Option File.
-$!
-$     CREATE 'OPT_FILE'
-$DECK
-!
-! Default System Options File To Link Against 
-! The Sharable C Runtime Library.
-!
-GNU_CC:[000000]GCCLIB/LIBRARY
-SYS$SHARE:VAXCRTL/SHARE
-$EOD
-$!
-$!  End The Option File Check.
-$!
-$   ENDIF
-$!
-$! End The GNU C Check.
-$!
-$ ENDIF
-$!
-$! Check To See If We Need A DEC C Option File.
-$!
-$ IF (COMPILER.EQS."DECC")
-$ THEN
-$!
-$!  Check To See If We Already Have A DEC C Linker Option File.
-$!
-$   IF (F$SEARCH(OPT_FILE).EQS."")
-$   THEN
-$!
-$!    Figure Out If We Need A non-VAX Or A VAX Linker Option File.
-$!
-$     IF (ARCH.EQS."VAX")
-$     THEN
-$!
-$!      We Need A DEC C Linker Option File For VAX.
-$!
-$       CREATE 'OPT_FILE'
-$DECK
-!
-! Default System Options File To Link Against 
-! The Sharable DEC C Runtime Library.
-!
-SYS$SHARE:DECC$SHR.EXE/SHARE
-$EOD
-$!
-$!    Else...
-$!
-$     ELSE
-$!
-$!      Create The non-VAX Linker Option File.
-$!
-$       CREATE 'OPT_FILE'
-$DECK
-!
-! Default System Options File For non-VAX To Link Against 
-! The Sharable C Runtime Library.
-!
-SYS$SHARE:CMA$OPEN_LIB_SHR/SHARE
-SYS$SHARE:CMA$OPEN_RTL/SHARE
-$EOD
-$!
-$!    End The DEC C Option File Check.
-$!
-$     ENDIF
-$!
-$!  End The Option File Search.
-$!
-$   ENDIF
-$!
-$! End The DEC C Check.
-$!
-$ ENDIF
-$!
-$!  Tell The User What Linker Option File We Are Using.
-$!
-$ WRITE SYS$OUTPUT "Using Linker Option File ",OPT_FILE,"."	
-$!
-$! Time To RETURN.
-$!
-$ RETURN
-$ LIB_CHECK:
-$!
-$! Look For The VAX Library LIBSSL.OLB.
-$!
-$ IF (F$SEARCH(SSL_LIB).EQS."")
-$ THEN
-$!
-$!  Tell The User We Can't Find The LIBSSL.OLB Library.
-$!
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "Can't Find The Library ",SSL_LIB,"."
-$   WRITE SYS$OUTPUT "We Can't Link Without It."
-$   WRITE SYS$OUTPUT ""
-$!
-$!  Since We Can't Link Without It, Exit.
-$!
-$   EXIT
-$!
-$! End The LIBSSL.OLB Library Check.
-$!
-$ ENDIF
-$!
-$! Look For The Library LIBCRYPTO.OLB.
-$!
-$ IF (F$SEARCH(CRYPTO_LIB).EQS."")
-$ THEN
-$!
-$!  Tell The User We Can't Find The LIBCRYPTO.OLB Library.
-$!
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "Can't Find The Library ",CRYPTO_LIB,"."
-$   WRITE SYS$OUTPUT "We Can't Link Without It."
-$   WRITE SYS$OUTPUT ""
-$!
-$!  Since We Can't Link Without It, Exit.
-$!
-$   EXIT
-$!
-$! End The LIBCRYPTO.OLB Library Check.
-$!
-$ ENDIF
-$!
-$! Time To Return.
-$!
-$ RETURN
 $!
 $! Check The User's Options.
 $!
@@ -574,7 +321,7 @@ $ ELSE
 $!
 $!  Else, Check To See If P1 Has A Valid Argument.
 $!
-$   IF (P1.EQS."LIBRARY").OR.(P1.EQS."SSL_TASK")
+$   IF (P1.EQS."LIBRARY")
 $   THEN
 $!
 $!    A Valid Argument.
@@ -592,7 +339,6 @@ $     WRITE SYS$OUTPUT "The Option ",P1," Is Invalid.  The Valid Options Are:"
 $     WRITE SYS$OUTPUT ""
 $     WRITE SYS$OUTPUT "    ALL      :  Just Build Everything."
 $     WRITE SYS$OUTPUT "    LIBRARY  :  To Compile Just The [.xxx.EXE.SSL]LIBSSL.OLB Library."
-$     WRITE SYS$OUTPUT "    SSL_TASK :  To Compile Just The [.xxx.EXE.SSL]SSL_TASK.EXE Program."
 $     WRITE SYS$OUTPUT ""
 $     WRITE SYS$OUTPUT " Where 'xxx' Stands For:"
 $     WRITE SYS$OUTPUT ""
@@ -1039,10 +785,8 @@ $   CC = CC + " /DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS
 $   IF COMPILER .EQS. "DECC"
 $   THEN
 $     CC4 = CC - CCDISABLEWARNINGS + CC4DISABLEWARNINGS
-$     CC5 = CC3 - CCDISABLEWARNINGS + CC4DISABLEWARNINGS
 $   ELSE
 $     CC4 = CC
-$     CC5 = CC3
 $   ENDIF
 $!
 $!  Show user the result
diff --git a/ssl/ssl_task.c b/ssl/ssl_task.c
deleted file mode 100644
index d5ca89f..0000000
--- a/ssl/ssl_task.c
+++ /dev/null
@@ -1,389 +0,0 @@
-/* ssl/ssl_task.c */
-/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay at cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh at cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay at cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh at cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* VMS */
-/*-
- * DECnet object for servicing SSL.  We accept the inbound and speak a
- * simple protocol for multiplexing the 2 data streams (application and
- * ssl data) over this logical link.
- *
- * Logical names:
- *    SSL_CIPHER        Defines a list of cipher specifications the server
- *                      will support in order of preference.
- *    SSL_SERVER_CERTIFICATE
- *                      Points to PEM (privacy enhanced mail) file that
- *                      contains the server certificate and private password.
- *    SYS$NET           Logical created by netserver.exe as hook for completing
- *                      DECnet logical link.
- *
- * Each NSP message sent over the DECnet link has the following structure:
- *    struct rpc_msg {
- *      char channel;
- *      char function;
- *      short length;
- *      char data[MAX_DATA];
- *    } msg;
- *
- * The channel field designates the virtual data stream this message applies
- * to and is one of:
- *   A - Application data (payload).
- *   R - Remote client connection that initiated the SSL connection.  Encrypted
- *       data is sent over this connection.
- *   G - General data, reserved for future use.
- *
- * The data streams are half-duplex read/write and have following functions:
- *   G - Get, requests that up to msg.length bytes of data be returned.  The
- *       data is returned in the next 'C' function response that matches the
- *       requesting channel.
- *   P - Put, requests that the first msg.length bytes of msg.data be appended
- *       to the designated stream.
- *   C - Confirms a get or put.  Every get and put will get a confirm response,
- *       you cannot initiate another function on a channel until the previous
- *       operation has been confirmed.
- *
- *  The 2 channels may interleave their operations, for example:
- *        Server msg           Client msg
- *         A, Get, 4092          ---->
- *                               <----  R, get, 4092
- *         R, Confirm, {hello}   ---->
- *                               <----  R, put, {srv hello}
- *         R, Confirm, 0         ---->
- *                               .              (SSL handshake completed)
- *                               .              (read first app data).
- *                               <----  A, confirm, {http data}
- *         A, Put, {http data}   ---->
- *                               <----  A, confirm, 0
- *
- *  The length field is not permitted to be larger that 4092 bytes.
- *
- * Author: Dave Jones
- * Date:   22-JUL-1996
- */
-#include <stdlib.h>
-#include <stdio.h>
-#include <iodef.h>              /* VMS IO$_ definitions */
-#include <descrip.h>            /* VMS string descriptors */
-extern int SYS$QIOW(), SYS$ASSIGN();
-int LIB$INIT_TIMER(), LIB$SHOW_TIMER();
-
-#include <string.h>             /* from ssltest.c */
-#include <errno.h>
-
-#include "e_os.h"
-
-#include <openssl/buffer.h>
-#include <openssl/x509.h>
-#include <openssl/err.h>
-#include "ssl_locl.h"
-
-int verify_callback(int ok, X509 *xs, X509 *xi, int depth,
-		    int error);
-BIO *bio_err = NULL;
-BIO *bio_stdout = NULL;
-BIO_METHOD *BIO_s_rtcp();
-
-static char *cipher = NULL;
-int verbose = 1;
-#ifdef FIONBIO
-static int s_nbio = 0;
-#endif
-#define TEST_SERVER_CERT "SSL_SERVER_CERTIFICATE"
-/*************************************************************************/
-/* Should have member alignment inhibited */
-struct rpc_msg {
-    /* 'A'-app data. 'R'-remote client 'G'-global */
-    char channel;
-    /* 'G'-get, 'P'-put, 'C'-confirm, 'X'-close */
-    char function;
-    /* Amount of data returned or max to return */
-    unsigned short int length;
-    /* variable data */
-    char data[4092];
-};
-#define RPC_HDR_SIZE (sizeof(struct rpc_msg) - 4092)
-
-static $DESCRIPTOR(sysnet, "SYS$NET");
-typedef unsigned short io_channel;
-
-struct io_status {
-    unsigned short status;
-    unsigned short count;
-    unsigned long stsval;
-};
-int doit(io_channel chan, SSL_CTX *s_ctx);
-/*****************************************************************************/
-/*
- * Decnet I/O routines.
- */
-static int get(io_channel chan, char *buffer, int maxlen, int *length)
-{
-    int status;
-    struct io_status iosb;
-    status = SYS$QIOW(0, chan, IO$_READVBLK, &iosb, 0, 0,
-                      buffer, maxlen, 0, 0, 0, 0);
-    if ((status & 1) == 1)
-        status = iosb.status;
-    if ((status & 1) == 1)
-        *length = iosb.count;
-    return status;
-}
-
-static int put(io_channel chan, char *buffer, int length)
-{
-    int status;
-    struct io_status iosb;
-    status = SYS$QIOW(0, chan, IO$_WRITEVBLK, &iosb, 0, 0,
-                      buffer, length, 0, 0, 0, 0);
-    if ((status & 1) == 1)
-        status = iosb.status;
-    return status;
-}
-
-/***************************************************************************/
-/*
- * Handle operations on the 'G' channel.
- */
-static int general_request(io_channel chan, struct rpc_msg *msg, int length)
-{
-    return 48;
-}
-
-/***************************************************************************/
-int main(int argc, char **argv)
-{
-    int status, length;
-    io_channel chan;
-    struct rpc_msg msg;
-
-    char *CApath = NULL, *CAfile = NULL;
-    int badop = 0;
-    int ret = 1;
-    int client_auth = 0;
-    int server_auth = 0;
-    SSL_CTX *s_ctx = NULL;
-    /*
-     * Confirm logical link with initiating client.
-     */
-    LIB$INIT_TIMER();
-    status = SYS$ASSIGN(&sysnet, &chan, 0, 0, 0);
-    printf("status of assign to SYS$NET: %d\n", status);
-    /*
-     * Initialize standard out and error files.
-     */
-    if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE);
-    if (bio_stdout == NULL)
-        if ((bio_stdout = BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_stdout, stdout, BIO_NOCLOSE);
-    /*
-     * get the preferred cipher list and other initialization
-     */
-    if (cipher == NULL)
-        cipher = getenv("SSL_CIPHER");
-    printf("cipher list: %s\n", cipher ? cipher : "{undefined}");
-
-    SSL_load_error_strings();
-    OpenSSL_add_all_algorithms();
-
-    s_ctx = SSL_CTX_new(SSLv23_server_method());
-
-    if (s_ctx == NULL)
-        goto end;
-
-    SSL_CTX_use_certificate_file(s_ctx, TEST_SERVER_CERT, SSL_FILETYPE_PEM);
-    SSL_CTX_use_RSAPrivateKey_file(s_ctx, TEST_SERVER_CERT, SSL_FILETYPE_PEM);
-    printf("Loaded server certificate: '%s'\n", TEST_SERVER_CERT);
-
-    /*
-     * Take commands from client until bad status.
-     */
-    LIB$SHOW_TIMER();
-    status = doit(chan, s_ctx);
-    LIB$SHOW_TIMER();
-    /*
-     * do final cleanup and exit.
-     */
- end:
-    if (s_ctx != NULL)
-        SSL_CTX_free(s_ctx);
-    LIB$SHOW_TIMER();
-    return 1;
-}
-
-int doit(io_channel chan, SSL_CTX *s_ctx)
-{
-    int status, length, link_state;
-    struct rpc_msg msg;
-
-    SSL *s_ssl = NULL;
-    BIO *c_to_s = NULL;
-    BIO *s_to_c = NULL;
-    BIO *c_bio = NULL;
-    BIO *s_bio = NULL;
-    int i;
-    int done = 0;
-
-    s_ssl = SSL_new(s_ctx);
-    if (s_ssl == NULL)
-        goto err;
-
-    c_to_s = BIO_new(BIO_s_rtcp());
-    s_to_c = BIO_new(BIO_s_rtcp());
-    if ((s_to_c == NULL) || (c_to_s == NULL))
-        goto err;
-/*- original, DRM 24-SEP-1997
-    BIO_set_fd ( c_to_s, "", chan );
-    BIO_set_fd ( s_to_c, "", chan );
-*/
-    BIO_set_fd(c_to_s, 0, chan);
-    BIO_set_fd(s_to_c, 0, chan);
-
-    c_bio = BIO_new(BIO_f_ssl());
-    s_bio = BIO_new(BIO_f_ssl());
-    if ((c_bio == NULL) || (s_bio == NULL))
-        goto err;
-
-    SSL_set_accept_state(s_ssl);
-    SSL_set_bio(s_ssl, c_to_s, s_to_c);
-    BIO_set_ssl(s_bio, s_ssl, BIO_CLOSE);
-
-    /* We can always do writes */
-    printf("Begin doit main loop\n");
-    /*
-     * Link states: 0-idle, 1-read pending, 2-write pending, 3-closed.
-     */
-    for (link_state = 0; link_state < 3;) {
-        /*
-         * Wait for remote end to request data action on A channel.
-         */
-        while (link_state == 0) {
-            status = get(chan, (char *)&msg, sizeof(msg), &length);
-            if ((status & 1) == 0) {
-                printf("Error in main loop get: %d\n", status);
-                link_state = 3;
-                break;
-            }
-            if (length < RPC_HDR_SIZE) {
-                printf("Error in main loop get size: %d\n", length);
-                break;
-                link_state = 3;
-            }
-            if (msg.channel != 'A') {
-                printf("Error in main loop, unexpected channel: %c\n",
-                       msg.channel);
-                break;
-                link_state = 3;
-            }
-            if (msg.function == 'G') {
-                link_state = 1;
-            } else if (msg.function == 'P') {
-                link_state = 2; /* write pending */
-            } else if (msg.function == 'X') {
-                link_state = 3;
-            } else {
-                link_state = 3;
-            }
-        }
-        if (link_state == 1) {
-            i = BIO_read(s_bio, msg.data, msg.length);
-            if (i < 0)
-                link_state = 3;
-            else {
-                msg.channel = 'A';
-                msg.function = 'C'; /* confirm */
-                msg.length = i;
-                status = put(chan, (char *)&msg, i + RPC_HDR_SIZE);
-                if ((status & 1) == 0)
-                    break;
-                link_state = 0;
-            }
-        } else if (link_state == 2) {
-            i = BIO_write(s_bio, msg.data, msg.length);
-            if (i < 0)
-                link_state = 3;
-            else {
-                msg.channel = 'A';
-                msg.function = 'C'; /* confirm */
-                msg.length = 0;
-                status = put(chan, (char *)&msg, RPC_HDR_SIZE);
-                if ((status & 1) == 0)
-                    break;
-                link_state = 0;
-            }
-        }
-    }
-    fprintf(stdout, "DONE\n");
- err:
-    /*
-     * We have to set the BIO's to NULL otherwise they will be free()ed
-     * twice.  Once when th s_ssl is SSL_free()ed and again when c_ssl is
-     * SSL_free()ed. This is a hack required because s_ssl and c_ssl are
-     * sharing the same BIO structure and SSL_set_bio() and SSL_free()
-     * automatically BIO_free non NULL entries. You should not normally do
-     * this or be required to do this
-     */
-    s_ssl->rbio = NULL;
-    s_ssl->wbio = NULL;
-
-    BIO_free(c_to_s);
-    BIO_free(s_to_c);
-    BIO_free(c_bio);
-    BIO_free(s_bio);
-    return (0);
-}

From levitte at openssl.org  Tue Mar 31 20:38:33 2015
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 31 Mar 2015 20:38:33 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1427834313.991448.3973.nullmailer@dev.openssl.org>

The branch master has been updated
       via  0f2596ac547a4c198deaa3c51ecfc565c627b7af (commit)
      from  5098c029cef9b81cbb7488ffc74e470bd79d0dac (commit)


- Log -----------------------------------------------------------------
commit 0f2596ac547a4c198deaa3c51ecfc565c627b7af
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 31 22:19:22 2015 +0200

    Remove SSL_TASK, the DECnet Based SSL Engine - addendum
    
    A bit of cleanup was forgotten.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 INSTALL.VMS         |  1 -
 ssl/install-ssl.com | 20 --------------------
 2 files changed, 21 deletions(-)

diff --git a/INSTALL.VMS b/INSTALL.VMS
index 7c530a1..132b2e7 100644
--- a/INSTALL.VMS
+++ b/INSTALL.VMS
@@ -83,7 +83,6 @@ directory.  The syntax is the following:
       RSAREF    Just build the "[.xxx.EXE.RSAREF]LIBRSAGLUE.OLB" library.
       CRYPTO    Just build the "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" library.
       SSL       Just build the "[.xxx.EXE.SSL]LIBSSL.OLB" library.
-      SSL_TASK  Just build the "[.xxx.EXE.SSL]SSL_TASK.EXE" program.
       TEST      Just build the "[.xxx.EXE.TEST]" test programs for OpenSSL.
       APPS      Just build the "[.xxx.EXE.APPS]" application programs for OpenSSL.
 
diff --git a/ssl/install-ssl.com b/ssl/install-ssl.com
index afe6967..ce26b68 100755
--- a/ssl/install-ssl.com
+++ b/ssl/install-ssl.com
@@ -61,20 +61,16 @@ $ root = root_dev + "[" + root_dir
 $!
 $ define /nolog wrk_sslroot 'root'.] /trans=conc
 $ define /nolog wrk_sslinclude wrk_sslroot:[include]
-$ define /nolog wrk_sslxexe wrk_sslroot:['archd'_exe]
 $ define /nolog wrk_sslxlib wrk_sslroot:['arch'_lib]
 $!
 $ if f$parse("wrk_sslroot:[000000]") .eqs. "" then -
    create /directory /log wrk_sslroot:[000000]
 $ if f$parse("wrk_sslinclude:") .eqs. "" then -
    create /directory /log wrk_sslinclude:
-$ if f$parse("wrk_sslxexe:") .eqs. "" then -
-   create /directory /log wrk_sslxexe:
 $ if f$parse("wrk_sslxlib:") .eqs. "" then -
    create /directory /log wrk_sslxlib:
 $!
 $ exheader := ssl.h, ssl2.h, ssl3.h, ssl23.h, tls1.h, dtls1.h, kssl.h, srtp.h
-$ e_exe := ssl_task
 $ libs := ssl_libssl
 $!
 $ xexe_dir := [-.'archd'.exe.ssl]
@@ -82,21 +78,6 @@ $!
 $ copy /protection = w:re 'exheader' wrk_sslinclude: /log
 $!
 $ i = 0
-$ loop_exe:
-$   e = f$edit( f$element( i, ",", e_exe), "trim")
-$   i = i + 1
-$   if e .eqs. "," then goto loop_exe_end
-$   set noon
-$   file = xexe_dir+ e+ ".exe"
-$   if f$search( file) .nes. ""
-$   then
-$     copy /protection = w:re 'file' wrk_sslxexe: /log
-$   endif
-$   set on
-$ goto loop_exe
-$ loop_exe_end:
-$!
-$ i = 0
 $ loop_lib: 
 $   e = f$edit(f$element(i, ",", libs),"trim")
 $   i = i + 1
@@ -122,7 +103,6 @@ $ tidy:
 $!
 $ call deass wrk_sslroot
 $ call deass wrk_sslinclude
-$ call deass wrk_sslxexe
 $ call deass wrk_sslxlib
 $!
 $ exit