1 files changed, 11 insertions, 1 deletions

diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c
index 6661a222f0..f0126790e9 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.48 2018/08/24 19:48:39 tb Exp $ */
+/* $OpenBSD: pem_lib.c,v 1.49 2019/09/06 17:41:05 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -263,6 +263,16 @@ 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) == 0 &&
+            strcmp(name, PEM_STRING_CMS) == 0)
+                return 1;
+
+        /* Allow CMS to be read from PKCS#7 headers */
+        if (strcmp(nm, PEM_STRING_PKCS7) == 0 &&
+            strcmp(name, PEM_STRING_CMS) == 0)
+                return 1;
+#endif
 
         return 0;
 }