From 83e0d2b6dc9f5d1e1d9da1d5fb2b3e4a1b95ed29 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 3 Nov 2011 02:34:34 +0000 Subject: openssl-1.0.0e: resolve conflicts --- lib/libcrypto/ocsp/ocsp_prn.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'lib/libcrypto/ocsp/ocsp_prn.c') diff --git a/lib/libcrypto/ocsp/ocsp_prn.c b/lib/libcrypto/ocsp/ocsp_prn.c index 1695c9c4ad5..87608ff399b 100644 --- a/lib/libcrypto/ocsp/ocsp_prn.c +++ b/lib/libcrypto/ocsp/ocsp_prn.c @@ -182,7 +182,6 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags) { int i, ret = 0; long l; - unsigned char *p; OCSP_CERTID *cid = NULL; OCSP_BASICRESP *br = NULL; OCSP_RESPID *rid = NULL; @@ -207,7 +206,6 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags) return 1; } - p = ASN1_STRING_data(rb->response); i = ASN1_STRING_length(rb->response); if (!(br = OCSP_response_get1_basic(o))) goto err; rd = br->tbsResponseData; -- cgit v1.2.3