[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  5ff73fb230f2ffa2d00564572b3be1c42f90ed40 (commit)
      from  4a8e9c22f42065e603ecdac7fd4691e6c3c06b72 (commit)


- Log -----------------------------------------------------------------
commit 5ff73fb230f2ffa2d00564572b3be1c42f90ed40
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu May 5 22:44:44 2016 +0100

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

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

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

diff --git a/crypto/cms/cms_enc.c b/crypto/cms/cms_enc.c
index 7d75f4b..4c4c9f2 100644
--- a/crypto/cms/cms_enc.c
+++ b/crypto/cms/cms_enc.c
@@ -186,7 +186,7 @@ BIO *cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec)
                CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR);
         goto err;
     }
-    /* If paremeter type not set omit parameter */
+    /* If parameter type not set omit parameter */
     if (calg->parameter->type == V_ASN1_UNDEF) {
         ASN1_TYPE_free(calg->parameter);
         calg->parameter = NULL;