[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  388d679a4fd8a408e7c7c1867cc974cdc977ae63 (commit)
      from  f464f9c04bf3b26c22e9c386cb5d1700000c8e7e (commit)


- Log -----------------------------------------------------------------
commit 388d679a4fd8a408e7c7c1867cc974cdc977ae63
Author: Josh Soref <jsoref at users.noreply.github.com>
Date:   Sun May 14 14:53:54 2017 +0000

    mark V_ASN1_PRIMATIVE_TAG as compat
    
    This incorrectly spelled item exists for compatibility purposes
    
    CLA: Trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3460)

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

Summary of changes:
 include/openssl/asn1.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h
index 9b523f5..ea24799 100644
--- a/include/openssl/asn1.h
+++ b/include/openssl/asn1.h
@@ -40,7 +40,7 @@ extern "C" {
 
 # define V_ASN1_CONSTRUCTED              0x20
 # define V_ASN1_PRIMITIVE_TAG            0x1f
-# define V_ASN1_PRIMATIVE_TAG            0x1f
+# define V_ASN1_PRIMATIVE_TAG /*compat*/ V_ASN1_PRIMITIVE_TAG
 
 # define V_ASN1_APP_CHOOSE               -2/* let the recipient choose */
 # define V_ASN1_OTHER                    -3/* used in ASN1_TYPE */