[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  5727582cf51e98e5e0faa435e7da2c8929533c0d (commit)
       via  9cca7be11d62298b2af0722f94345012c86eaed4 (commit)
      from  36f038f1041f9f31878f75b567959ceae08eb34e (commit)


- Log -----------------------------------------------------------------
commit 5727582cf51e98e5e0faa435e7da2c8929533c0d
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Jul 6 14:17:49 2015 +0100

    document -2 return value
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 9cca7be11d62298b2af0722f94345012c86eaed4
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Jun 9 23:17:06 2015 +0100

    Relax CCM tag check.
    
    In CCM mode don't require a tag before initialising decrypt: this allows
    the tag length to be set without requiring the tag.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/evp/e_aes.c                        | 2 +-
 doc/crypto/X509_NAME_get_index_by_NID.pod | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 895e8ee..f8365a2 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -1866,7 +1866,7 @@ static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
     case EVP_CTRL_AEAD_SET_TAG:
         if ((arg & 1) || arg < 4 || arg > 16)
             return 0;
-        if ((c->encrypt && ptr) || (!c->encrypt && !ptr))
+        if (c->encrypt && ptr)
             return 0;
         if (ptr) {
             cctx->tag_set = 1;
diff --git a/doc/crypto/X509_NAME_get_index_by_NID.pod b/doc/crypto/X509_NAME_get_index_by_NID.pod
index 84fc180..380356e 100644
--- a/doc/crypto/X509_NAME_get_index_by_NID.pod
+++ b/doc/crypto/X509_NAME_get_index_by_NID.pod
@@ -29,6 +29,7 @@ and issuer names.
 X509_NAME_get_index_by_NID() and X509_NAME_get_index_by_OBJ() retrieve
 the next index matching B<nid> or B<obj> after B<lastpos>. B<lastpos>
 should initially be set to -1. If there are no more entries -1 is returned.
+If B<nid> is invalid (doesn't correspond to a valid OID) then -2 is returned.
 
 X509_NAME_entry_count() returns the total number of entries in B<name>.
 
@@ -63,6 +64,10 @@ The list of all relevant B<NID_*> and B<OBJ_* codes> can be found in
 the source code header files E<lt>openssl/obj_mac.hE<gt> and/or
 E<lt>openssl/objects.hE<gt>.
 
+Applications which could pass invalid NIDs to X509_NAME_get_index_by_NID()
+should check for the return value of -2. Alternatively the NID validity
+can be determined first by checking OBJ_nid2obj(nid) is not NULL.
+
 =head1 EXAMPLES
 
 Process all entries:
@@ -95,6 +100,8 @@ Process all commonName entries:
 
 X509_NAME_get_index_by_NID() and X509_NAME_get_index_by_OBJ()
 return the index of the next matching entry or -1 if not found.
+X509_NAME_get_index_by_NID() can also return -2 if the supplied
+NID is invalid.
 
 X509_NAME_entry_count() returns the total number of entries.