diff options
author | Ulf Möller <ulf@openssl.org> | 1999-04-26 16:43:10 +0000 |
---|---|---|
committer | Ulf Möller <ulf@openssl.org> | 1999-04-26 16:43:10 +0000 |
commit | a9be3af5ad4836f7e50f0546311ca90c717b861e (patch) | |
tree | f44f7f8c4497d85da4c5cbd08067479bb20ced95 /crypto/pkcs7 | |
parent | 47339f6179fbefafc793c10b0411ed0365497d65 (diff) | |
download | openssl-a9be3af5ad4836f7e50f0546311ca90c717b861e.tar.gz |
Remove NOPROTO definitions and error code comments.
Diffstat (limited to 'crypto/pkcs7')
-rw-r--r-- | crypto/pkcs7/bio_ber.c | 11 | ||||
-rw-r--r-- | crypto/pkcs7/pkcs7.h | 92 |
2 files changed, 0 insertions, 103 deletions
diff --git a/crypto/pkcs7/bio_ber.c b/crypto/pkcs7/bio_ber.c index e4b9db03cf..2f17723e98 100644 --- a/crypto/pkcs7/bio_ber.c +++ b/crypto/pkcs7/bio_ber.c @@ -62,7 +62,6 @@ #include <openssl/buffer.h> #include <openssl/evp.h> -#ifndef NOPROTO static int ber_write(BIO *h,char *buf,int num); static int ber_read(BIO *h,char *buf,int size); /*static int ber_puts(BIO *h,char *str); */ @@ -70,16 +69,6 @@ static int ber_read(BIO *h,char *buf,int size); static long ber_ctrl(BIO *h,int cmd,long arg1,char *arg2); static int ber_new(BIO *h); static int ber_free(BIO *data); -#else -static int ber_write(); -static int ber_read(); -/*static int ber_puts(); */ -/*static int ber_gets(); */ -static long ber_ctrl(); -static int ber_new(); -static int ber_free(); -#endif - #define BER_BUF_SIZE (32) /* This is used to hold the state of the BER objects being read. */ diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h index f21cbe884f..8541fdc89d 100644 --- a/crypto/pkcs7/pkcs7.h +++ b/crypto/pkcs7/pkcs7.h @@ -221,7 +221,6 @@ typedef struct pkcs7_st #endif -#ifndef NOPROTO PKCS7_ISSUER_AND_SERIAL *PKCS7_ISSUER_AND_SERIAL_new(void ); void PKCS7_ISSUER_AND_SERIAL_free( PKCS7_ISSUER_AND_SERIAL *a); @@ -350,97 +349,6 @@ int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si, STACK *sk); int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si, STACK *sk); -#else - -PKCS7_ISSUER_AND_SERIAL *PKCS7_ISSUER_AND_SERIAL_new(); -void PKCS7_ISSUER_AND_SERIAL_free(); -int i2d_PKCS7_ISSUER_AND_SERIAL(); -PKCS7_ISSUER_AND_SERIAL *d2i_PKCS7_ISSUER_AND_SERIAL(); - -#ifndef SSLEAY_MACROS -int PKCS7_ISSUER_AND_SERIAL_digest(); -#ifndef NO_FP_API -PKCS7 *d2i_PKCS7_fp(); -int i2d_PKCS7_fp(); -#endif -PKCS7 *PKCS7_dup(); -PKCS7 *d2i_PKCS7_bio(); -int i2d_PKCS7_bio(); - -#endif - -PKCS7_SIGNER_INFO *PKCS7_SIGNER_INFO_new(); -void PKCS7_SIGNER_INFO_free(); -int i2d_PKCS7_SIGNER_INFO(); -PKCS7_SIGNER_INFO *d2i_PKCS7_SIGNER_INFO(); -PKCS7_RECIP_INFO *PKCS7_RECIP_INFO_new(); -void PKCS7_RECIP_INFO_free(); -int i2d_PKCS7_RECIP_INFO(); -PKCS7_RECIP_INFO *d2i_PKCS7_RECIP_INFO(); -PKCS7_SIGNED *PKCS7_SIGNED_new(); -void PKCS7_SIGNED_free(); -int i2d_PKCS7_SIGNED(); -PKCS7_SIGNED *d2i_PKCS7_SIGNED(); -PKCS7_ENC_CONTENT *PKCS7_ENC_CONTENT_new(); -void PKCS7_ENC_CONTENT_free(); -int i2d_PKCS7_ENC_CONTENT(); -PKCS7_ENC_CONTENT *d2i_PKCS7_ENC_CONTENT(); -PKCS7_ENVELOPE *PKCS7_ENVELOPE_new(); -void PKCS7_ENVELOPE_free(); -int i2d_PKCS7_ENVELOPE(); -PKCS7_ENVELOPE *d2i_PKCS7_ENVELOPE(); -PKCS7_SIGN_ENVELOPE *PKCS7_SIGN_ENVELOPE_new(); -void PKCS7_SIGN_ENVELOPE_free(); -int i2d_PKCS7_SIGN_ENVELOPE(); -PKCS7_SIGN_ENVELOPE *d2i_PKCS7_SIGN_ENVELOPE(); -PKCS7_DIGEST *PKCS7_DIGEST_new(); -void PKCS7_DIGEST_free(); -int i2d_PKCS7_DIGEST(); -PKCS7_DIGEST *d2i_PKCS7_DIGEST(); -PKCS7_ENCRYPT *PKCS7_ENCRYPT_new(); -void PKCS7_ENCRYPT_free(); -int i2d_PKCS7_ENCRYPT(); -PKCS7_ENCRYPT *d2i_PKCS7_ENCRYPT(); -PKCS7 *PKCS7_new(); -void PKCS7_free(); -void PKCS7_content_free(); -int i2d_PKCS7(); -PKCS7 *d2i_PKCS7(); - -void ERR_load_PKCS7_strings(); - -long PKCS7_ctrl(); -int PKCS7_set_type(); -int PKCS7_set_content(); -int PKCS7_SIGNER_INFO_set(); -int PKCS7_add_signer(); -int PKCS7_add_certificate(); -int PKCS7_add_crl(); -int PKCS7_content_new(); -int PKCS7_dataVerify(); -BIO *PKCS7_dataInit(); -int PKCS7_dataFinal(); -BIO *PKCS7_dataDecode(); -PKCS7_SIGNER_INFO *PKCS7_add_signature(); -X509 *PKCS7_cert_from_signer_info(); -STACK *PKCS7_get_signer_info(); - -PKCS7_RECIP_INFO *PKCS7_add_recipient(); -int PKCS7_add_recipient_info(); -int PKCS7_RECIP_INFO_set(); -int PKCS7_set_cipher(); - -PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(); -ASN1_OCTET_STRING *PKCS7_digest_from_attributes(); -int PKCS7_add_signed_attribute(); -int PKCS7_add_attribute(); -ASN1_TYPE *PKCS7_get_attribute(); -ASN1_TYPE *PKCS7_get_signed_attribute(); -void PKCS7_set_signed_attributes(); -void PKCS7_set_attributes(); - -#endif - /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes |