summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pem
diff options
context:
space:
mode:
authorbeck <>2015-02-11 03:55:42 +0000
committerbeck <>2015-02-11 03:55:42 +0000
commit4a2309d8058f17b675c178c4996662495981382e (patch)
tree903be911a9730def1b91aa1ccd23138554dc4a4c /src/lib/libcrypto/pem
parente1b5dd72bfda4606540ea14d667fab19fb18b964 (diff)
downloadopenbsd-4a2309d8058f17b675c178c4996662495981382e.tar.gz
openbsd-4a2309d8058f17b675c178c4996662495981382e.tar.bz2
openbsd-4a2309d8058f17b675c178c4996662495981382e.zip
get rid of OPENSSL_NO_CMS code we do not use.
ok miod@
Diffstat (limited to 'src/lib/libcrypto/pem')
-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 011e9e36de..9107e9c225 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.37 2015/02/11 03:19:37 doug Exp $ */ 1/* $OpenBSD: pem_lib.c,v 1.38 2015/02/11 03:55:42 beck 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 *
@@ -264,15 +264,6 @@ check_pem(const char *nm, const char *name)
264 !strcmp(name, PEM_STRING_PKCS7)) 264 !strcmp(name, PEM_STRING_PKCS7))
265 return 1; 265 return 1;
266 266
267#ifndef OPENSSL_NO_CMS
268 if (!strcmp(nm, PEM_STRING_X509) &&
269 !strcmp(name, PEM_STRING_CMS))
270 return 1;
271 /* Allow CMS to be read from PKCS#7 headers */
272 if (!strcmp(nm, PEM_STRING_PKCS7) &&
273 !strcmp(name, PEM_STRING_CMS))
274 return 1;
275#endif
276 267
277 return 0; 268 return 0;
278} 269}