diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2016-10-19 16:49:12 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2016-10-19 16:49:12 +0000 |
| commit | 927cb23e2f1580bb6493f244e45dec863e4780f7 (patch) | |
| tree | f7fd9abbbab1584e988492102e46055e6e955e02 /lib/libcrypto/pem | |
| parent | fb88faf27bb085140dcb6f7dbcc04672aefa7195 (diff) | |
unifdef OPENSSL_NO_CMS
Diffstat (limited to 'lib/libcrypto/pem')
| -rw-r--r-- | lib/libcrypto/pem/pem_lib.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/libcrypto/pem/pem_lib.c b/lib/libcrypto/pem/pem_lib.c index 852b0eaf866..7178c8744f2 100644 --- a/lib/libcrypto/pem/pem_lib.c +++ b/lib/libcrypto/pem/pem_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pem_lib.c,v 1.42 2015/09/10 15:56:25 jsing Exp $ */ +/* $OpenBSD: pem_lib.c,v 1.43 2016/10/19 16:49:11 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -265,15 +265,6 @@ 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; } |