From 3fb89787679dd239a55ca0a4e366ad4e2051fe84 Mon Sep 17 00:00:00 2001
From: beck <>
Date: Wed, 11 Feb 2015 04:05:14 +0000
Subject: Guenther has plans for OPENSSL_NO_CMS, so revert this for the moment.

---
 src/lib/libcrypto/pem/pem_lib.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/lib/libcrypto/pem')

diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c
index 9107e9c225..48768a4467 100644
--- a/src/lib/libcrypto/pem/pem_lib.c
+++ b/src/lib/libcrypto/pem/pem_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_lib.c,v 1.38 2015/02/11 03:55:42 beck Exp $ */
+/* $OpenBSD: pem_lib.c,v 1.39 2015/02/11 04:05:14 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -264,6 +264,15 @@ check_pem(const char *nm, const char *name)
 	    !strcmp(name, PEM_STRING_PKCS7))
 		return 1;
 
+#ifndef OPENSSL_NO_CMS
+	if (!strcmp(nm, PEM_STRING_X509) &&
+	    !strcmp(name, PEM_STRING_CMS))
+		return 1;
+	/* Allow CMS to be read from PKCS#7 headers */
+	if (!strcmp(nm, PEM_STRING_PKCS7) &&
+	    !strcmp(name, PEM_STRING_CMS))
+		return 1;
+#endif
 
 	return 0;
 }
-- 
cgit v1.2.3-55-g6feb