Remove NOPROTO definitions and error code comments.
This commit is contained in:
@@ -317,7 +317,6 @@ typedef struct pem_ctx_st
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef NOPROTO
|
||||
int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher);
|
||||
int PEM_do_header (EVP_CIPHER_INFO *cipher, unsigned char *data,long *len,
|
||||
int (*callback)());
|
||||
@@ -429,88 +428,6 @@ int PEM_write_bio_NETSCAPE_CERT_SEQUENCE(BIO *bp,NETSCAPE_CERT_SEQUENCE *x);
|
||||
#endif /* SSLEAY_MACROS */
|
||||
|
||||
|
||||
#else
|
||||
|
||||
int PEM_get_EVP_CIPHER_INFO();
|
||||
int PEM_do_header();
|
||||
int PEM_read_bio();
|
||||
int PEM_write_bio();
|
||||
#ifndef WIN16
|
||||
int PEM_read();
|
||||
int PEM_write();
|
||||
STACK * PEM_X509_INFO_read();
|
||||
char * PEM_ASN1_read();
|
||||
int PEM_ASN1_write();
|
||||
#endif
|
||||
STACK * PEM_X509_INFO_read_bio();
|
||||
int PEM_X509_INFO_write_bio();
|
||||
char * PEM_ASN1_read_bio();
|
||||
int PEM_ASN1_write_bio();
|
||||
int PEM_SealInit();
|
||||
void PEM_SealUpdate();
|
||||
int PEM_SealFinal();
|
||||
void PEM_SignInit();
|
||||
void PEM_SignUpdate();
|
||||
int PEM_SignFinal();
|
||||
|
||||
void ERR_load_PEM_strings();
|
||||
|
||||
void PEM_proc_type();
|
||||
void PEM_dek_info();
|
||||
|
||||
#ifndef SSLEAY_MACROS
|
||||
#ifndef WIN16
|
||||
X509 *PEM_read_X509();
|
||||
X509_REQ *PEM_read_X509_REQ();
|
||||
X509_CRL *PEM_read_X509_CRL();
|
||||
RSA *PEM_read_RSAPrivateKey();
|
||||
RSA *PEM_read_RSAPublicKey();
|
||||
DSA *PEM_read_DSAPrivateKey();
|
||||
EVP_PKEY *PEM_read_PrivateKey();
|
||||
PKCS7 *PEM_read_PKCS7();
|
||||
DH *PEM_read_DHparams();
|
||||
DSA *PEM_read_DSAparams();
|
||||
NETSCAPE_CERT_SEQUENCE *PEM_read_NETSCAPE_CERT_SEQUENCE();
|
||||
int PEM_write_X509();
|
||||
int PEM_write_X509_REQ();
|
||||
int PEM_write_X509_CRL();
|
||||
int PEM_write_RSAPrivateKey();
|
||||
int PEM_write_RSAPublicKey();
|
||||
int PEM_write_DSAPrivateKey();
|
||||
int PEM_write_PrivateKey();
|
||||
int PEM_write_PKCS7();
|
||||
int PEM_write_DHparams();
|
||||
int PEM_write_DSAparams();
|
||||
int PEM_write_NETSCAPE_CERT_SEQUENCE();
|
||||
#endif
|
||||
|
||||
X509 *PEM_read_bio_X509();
|
||||
X509_REQ *PEM_read_bio_X509_REQ();
|
||||
X509_CRL *PEM_read_bio_X509_CRL();
|
||||
RSA *PEM_read_bio_RSAPrivateKey();
|
||||
RSA *PEM_read_bio_RSAPublicKey();
|
||||
DSA *PEM_read_bio_DSAPrivateKey();
|
||||
EVP_PKEY *PEM_read_bio_PrivateKey();
|
||||
PKCS7 *PEM_read_bio_PKCS7();
|
||||
DH *PEM_read_bio_DHparams();
|
||||
DSA *PEM_read_bio_DSAparams();
|
||||
NETSCAPE_CERT_SEQUENCE *PEM_read_bio_NETSCAPE_CERT_SEQUENCE();
|
||||
int PEM_write_bio_X509();
|
||||
int PEM_write_bio_X509_REQ();
|
||||
int PEM_write_bio_X509_CRL();
|
||||
int PEM_write_bio_RSAPrivateKey();
|
||||
int PEM_write_bio_RSAPublicKey();
|
||||
int PEM_write_bio_DSAPrivateKey();
|
||||
int PEM_write_bio_PrivateKey();
|
||||
int PEM_write_bio_PKCS7();
|
||||
int PEM_write_bio_DHparams();
|
||||
int PEM_write_bio_DSAparams();
|
||||
int PEM_write_bio_NETSCAPE_CERT_SEQUENCE();
|
||||
|
||||
#endif /* SSLEAY_MACROS */
|
||||
|
||||
#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.
|
||||
|
||||
@@ -72,18 +72,8 @@ const char *PEM_version="PEM" OPENSSL_VERSION_PTEXT;
|
||||
|
||||
#define MIN_LENGTH 4
|
||||
|
||||
/* PEMerr(PEM_F_PEM_WRITE_BIO,ERR_R_MALLOC_FAILURE);
|
||||
* PEMerr(PEM_F_PEM_READ_BIO,ERR_R_MALLOC_FAILURE);
|
||||
*/
|
||||
|
||||
#ifndef NOPROTO
|
||||
static int def_callback(char *buf, int num, int w);
|
||||
static int load_iv(unsigned char **fromp,unsigned char *to, int num);
|
||||
#else
|
||||
static int def_callback();
|
||||
static int load_iv();
|
||||
#endif
|
||||
|
||||
static int def_callback(char *buf, int num, int w)
|
||||
{
|
||||
#ifdef NO_FP_API
|
||||
|
||||
Reference in New Issue
Block a user