diff options
author | djm <> | 2010-10-01 22:59:01 +0000 |
---|---|---|
committer | djm <> | 2010-10-01 22:59:01 +0000 |
commit | fe047d8b632246cb2db3234a0a4f32e5c318857b (patch) | |
tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/x509/x_all.c | |
parent | 2ea67f4aa254b09ded62e6e14fc893bbe6381579 (diff) | |
download | openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.gz openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.bz2 openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.zip |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libcrypto/x509/x_all.c')
-rw-r--r-- | src/lib/libcrypto/x509/x_all.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/lib/libcrypto/x509/x_all.c b/src/lib/libcrypto/x509/x_all.c index 9039caad60..ebae30b701 100644 --- a/src/lib/libcrypto/x509/x_all.c +++ b/src/lib/libcrypto/x509/x_all.c | |||
@@ -57,7 +57,6 @@ | |||
57 | */ | 57 | */ |
58 | 58 | ||
59 | #include <stdio.h> | 59 | #include <stdio.h> |
60 | #undef SSLEAY_MACROS | ||
61 | #include <openssl/stack.h> | 60 | #include <openssl/stack.h> |
62 | #include "cryptlib.h" | 61 | #include "cryptlib.h" |
63 | #include <openssl/buffer.h> | 62 | #include <openssl/buffer.h> |
@@ -83,12 +82,6 @@ int X509_REQ_verify(X509_REQ *a, EVP_PKEY *r) | |||
83 | a->sig_alg,a->signature,a->req_info,r)); | 82 | a->sig_alg,a->signature,a->req_info,r)); |
84 | } | 83 | } |
85 | 84 | ||
86 | int X509_CRL_verify(X509_CRL *a, EVP_PKEY *r) | ||
87 | { | ||
88 | return(ASN1_item_verify(ASN1_ITEM_rptr(X509_CRL_INFO), | ||
89 | a->sig_alg, a->signature,a->crl,r)); | ||
90 | } | ||
91 | |||
92 | int NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r) | 85 | int NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r) |
93 | { | 86 | { |
94 | return(ASN1_item_verify(ASN1_ITEM_rptr(NETSCAPE_SPKAC), | 87 | return(ASN1_item_verify(ASN1_ITEM_rptr(NETSCAPE_SPKAC), |