summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pem/pem_lib.c
diff options
context:
space:
mode:
authorjsing <>2016-10-19 16:49:11 +0000
committerjsing <>2016-10-19 16:49:11 +0000
commit32993d77e030496e89e508d70d0fb7a85cd0787f (patch)
tree3232d4e14c244b635cf7b2be923782ede6e3f4b0 /src/lib/libcrypto/pem/pem_lib.c
parentbf2e4fbd312b229ea2846ec4cb8bc0c0222e4850 (diff)
downloadopenbsd-32993d77e030496e89e508d70d0fb7a85cd0787f.tar.gz
openbsd-32993d77e030496e89e508d70d0fb7a85cd0787f.tar.bz2
openbsd-32993d77e030496e89e508d70d0fb7a85cd0787f.zip
unifdef OPENSSL_NO_CMS
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/pem/pem_lib.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c
index 852b0eaf86..7178c8744f 100644
--- a/src/lib/libcrypto/pem/pem_lib.c
+++ b/src/lib/libcrypto/pem/pem_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pem_lib.c,v 1.42 2015/09/10 15:56:25 jsing Exp $ */ 1/* $OpenBSD: pem_lib.c,v 1.43 2016/10/19 16:49:11 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -265,15 +265,6 @@ check_pem(const char *nm, const char *name)
265 !strcmp(name, PEM_STRING_PKCS7)) 265 !strcmp(name, PEM_STRING_PKCS7))
266 return 1; 266 return 1;
267 267
268#ifndef OPENSSL_NO_CMS
269 if (!strcmp(nm, PEM_STRING_X509) &&
270 !strcmp(name, PEM_STRING_CMS))
271 return 1;
272 /* Allow CMS to be read from PKCS#7 headers */
273 if (!strcmp(nm, PEM_STRING_PKCS7) &&
274 !strcmp(name, PEM_STRING_CMS))
275 return 1;
276#endif
277 268
278 return 0; 269 return 0;
279} 270}