Redo OCSP response printing. Remove duplicate or

obsolete code. Delete some redundant files.

1 files changed, 3 insertions, 35 deletions

diff --git a/crypto/ocsp/ocsp.h b/crypto/ocsp/ocsp.h
index cd591313ba..e6022bf83c 100644
--- a/crypto/ocsp/ocsp.h
+++ b/crypto/ocsp/ocsp.h
@@ -445,104 +445,72 @@ X509_EXTENSION *OCSP_archive_cutoff_new(char* tim);
 X509_EXTENSION *OCSP_url_svcloc_new(X509_NAME* issuer, char **urls);
 
 DECLARE_ASN1_FUNCTIONS(OCSP_SINGLERESP)
-int i2a_OCSP_SINGLERESP(BIO *bp, OCSP_SINGLERESP* a);
 
 OCSP_CERTSTATUS *OCSP_CERTSTATUS_new(void);
 void OCSP_CERTSTATUS_free(OCSP_CERTSTATUS *a);
 int i2d_OCSP_CERTSTATUS(OCSP_CERTSTATUS *a, unsigned char **pp);
 OCSP_CERTSTATUS *d2i_OCSP_CERTSTATUS(OCSP_CERTSTATUS **a, unsigned char **pp, long length);
-int i2a_OCSP_CERTSTATUS(BIO *bp, OCSP_CERTSTATUS* a);
 
 OCSP_REVOKEDINFO *OCSP_REVOKEDINFO_new(void);
 void OCSP_REVOKEDINFO_free(OCSP_REVOKEDINFO *a);
 int i2d_OCSP_REVOKEDINFO(OCSP_REVOKEDINFO *a, unsigned char **pp);
 OCSP_REVOKEDINFO *d2i_OCSP_REVOKEDINFO(OCSP_REVOKEDINFO **a, unsigned char **pp, long length);
-int i2a_OCSP_REVOKEDINFO(BIO *bp, OCSP_REVOKEDINFO* a);
 
 OCSP_BASICRESP *OCSP_BASICRESP_new(void);
 void OCSP_BASICRESP_free(OCSP_BASICRESP *a);
 int i2d_OCSP_BASICRESP(OCSP_BASICRESP *a, unsigned char **pp);
 OCSP_BASICRESP *d2i_OCSP_BASICRESP(OCSP_BASICRESP **a, unsigned char **pp, long length);
-int i2a_OCSP_BASICRESP(BIO *bp, OCSP_BASICRESP* a);
 
 OCSP_RESPDATA *OCSP_RESPDATA_new(void);
 void OCSP_RESPDATA_free(OCSP_RESPDATA *a);
 int i2d_OCSP_RESPDATA(OCSP_RESPDATA *a, unsigned char **pp);
 OCSP_RESPDATA *d2i_OCSP_RESPDATA(OCSP_RESPDATA **a, unsigned char **pp, long length);
-int i2a_OCSP_RESPDATA(BIO *bp, OCSP_RESPDATA* a);
 
 OCSP_RESPID *OCSP_RESPID_new(void);
 void OCSP_RESPID_free(OCSP_RESPID *a);
 int i2d_OCSP_RESPID(OCSP_RESPID *a, unsigned char **pp);
 OCSP_RESPID *d2i_OCSP_RESPID(OCSP_RESPID **a, unsigned char **pp, long length);
-int i2a_OCSP_RESPID(BIO *bp, OCSP_RESPID* a);
 
 OCSP_RESPONSE *OCSP_RESPONSE_new(void);
 void OCSP_RESPONSE_free(OCSP_RESPONSE *a);
 int i2d_OCSP_RESPONSE(OCSP_RESPONSE *a, unsigned char **pp);
 OCSP_RESPONSE *d2i_OCSP_RESPONSE(OCSP_RESPONSE **a, unsigned char **pp, long length);
-int i2a_OCSP_RESPONSE(BIO *bp, OCSP_RESPONSE* a);
-int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* a);
+int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* a, unsigned long flags);
 
 OCSP_RESPBYTES *OCSP_RESPBYTES_new(void);
 void OCSP_RESPBYTES_free(OCSP_RESPBYTES *a);
 int i2d_OCSP_RESPBYTES(OCSP_RESPBYTES *a, unsigned char **pp);
 OCSP_RESPBYTES *d2i_OCSP_RESPBYTES(OCSP_RESPBYTES **a, unsigned char **pp, long length);
-int i2a_OCSP_RESPBYTES(BIO *bp, OCSP_RESPBYTES* a);
 
 OCSP_ONEREQ *OCSP_ONEREQ_new(void);
 void OCSP_ONEREQ_free(OCSP_ONEREQ *a);
 int i2d_OCSP_ONEREQ(OCSP_ONEREQ *a, unsigned char **pp);
 OCSP_ONEREQ *d2i_OCSP_ONEREQ(OCSP_ONEREQ **a, unsigned char **pp, long length);
-int i2a_OCSP_ONEREQ(BIO *bp, OCSP_ONEREQ* a);
 
 OCSP_CERTID *OCSP_CERTID_new(void);
 void OCSP_CERTID_free(OCSP_CERTID *a);
 int i2d_OCSP_CERTID(OCSP_CERTID *a, unsigned char **pp);
 OCSP_CERTID *d2i_OCSP_CERTID(OCSP_CERTID **a, unsigned char **pp, long length);
-int i2a_OCSP_CERTID(BIO *bp, OCSP_CERTID* a);
 
 OCSP_REQUEST *OCSP_REQUEST_new(void);
 void OCSP_REQUEST_free(OCSP_REQUEST *a);
 int i2d_OCSP_REQUEST(OCSP_REQUEST *a, unsigned char **pp);
 OCSP_REQUEST *d2i_OCSP_REQUEST(OCSP_REQUEST **a, unsigned char **pp, long length);
-int i2a_OCSP_REQUEST(BIO *bp, OCSP_REQUEST* a);
+
 int OCSP_REQUEST_print(BIO *bp, OCSP_REQUEST* a, unsigned long flags);
 
 OCSP_SIGNATURE *OCSP_SIGNATURE_new(void);
 void OCSP_SIGNATURE_free(OCSP_SIGNATURE *a);
 int i2d_OCSP_SIGNATURE(OCSP_SIGNATURE *a, unsigned char **pp);
 OCSP_SIGNATURE *d2i_OCSP_SIGNATURE(OCSP_SIGNATURE **a, unsigned char **pp, long length);
-int i2a_OCSP_SIGNATURE(BIO *bp, OCSP_SIGNATURE* a);
 
-DECLARE_ASN1_FUNCTIONS(OCSP_REQINFO)
-int i2a_OCSP_REQINFO(BIO *bp, OCSP_REQINFO* a);
 
+DECLARE_ASN1_FUNCTIONS(OCSP_REQINFO)
 DECLARE_ASN1_FUNCTIONS(OCSP_CRLID)
-int i2a_OCSP_CRLID(BIO *bp, OCSP_CRLID* a);
-int OCSP_CRLID_print(BIO *bp, OCSP_CRLID *a, int ind);
-
 DECLARE_ASN1_FUNCTIONS(OCSP_SERVICELOC)
-int i2a_OCSP_SERVICELOC(BIO *bp, OCSP_SERVICELOC* a);
-int OCSP_SERVICELOC_print(BIO *bp, OCSP_SERVICELOC* a, int ind);
-
-int OCSP_extensions_print(BIO *bp, STACK_OF(X509_EXTENSION) *sk, char *title);
-int OCSP_extension_print(BIO *bp, X509_EXTENSION *x, int ind);
 
 void ERR_load_OCSP_strings(void);
 
-#if 0 /* Not yet implemented */
-X509_EXTENSION *OCSP_nochain_new(void);
-#endif
-
-char* ocspResponseStatus2string(long s);
-char* ocspCertStatus2string(long s);
-char * cRLReason2string(long s);
-
-#if 0 /* Not yet implemented */
-void OCSP_add_standard_extension(void);
-#endif
-
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.