[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  be4ba1b06c9532996f57246d5f46bc7c8711732d (commit)
      from  b8c51459aa5b5b6b78cce56a7b898944f5314550 (commit)


- Log -----------------------------------------------------------------
commit be4ba1b06c9532996f57246d5f46bc7c8711732d
Author: Rich Salz <rsalz at openssl.org>
Date:   Fri Apr 29 12:42:22 2016 -0400

    Add asn1_mac
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 .../include/internal/dso_conf.h.in => include/openssl/asn1_mac.h   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
 copy crypto/include/internal/dso_conf.h.in => include/openssl/asn1_mac.h (66%)

diff --git a/crypto/include/internal/dso_conf.h.in b/include/openssl/asn1_mac.h
similarity index 66%
copy from crypto/include/internal/dso_conf.h.in
copy to include/openssl/asn1_mac.h
index daa5e24..9221917 100644
--- a/crypto/include/internal/dso_conf.h.in
+++ b/include/openssl/asn1_mac.h
@@ -1,4 +1,3 @@
-{- join("\n",map { "/* $_ */" } @autowarntext) -}
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -8,8 +7,4 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
-
-# define DSO_EXTENSION "{- $target{dso_extension} -}"
-#endif
+#error "This file is obsolete; please update your software."