projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix security hole.
[oweals/openssl.git]
/
crypto
/
pem
/
pem.org
diff --git
a/crypto/pem/pem.org
b/crypto/pem/pem.org
index 37d19021e16db2132ca315c3c94427803bfd7c95..14df71e906c874f0fbc3e92041e80cd2e6d96966 100644
(file)
--- a/
crypto/pem/pem.org
+++ b/
crypto/pem/pem.org
@@
-73,6
+73,7
@@
extern "C" {
#include "evp.h"
#include "x509.h"
#include "evp.h"
#include "x509.h"
+#include "pem2.h"
#define PEM_OBJ_UNDEF 0
#define PEM_OBJ_X509 1
#define PEM_OBJ_UNDEF 0
#define PEM_OBJ_X509 1
@@
-397,8
+398,6
@@
void PEM_SignUpdate(EVP_MD_CTX *ctx,unsigned char *d,unsigned int cnt);
int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
unsigned int *siglen, EVP_PKEY *pkey);
int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
unsigned int *siglen, EVP_PKEY *pkey);
-void ERR_load_PEM_strings(void);
-
void PEM_proc_type(char *buf, int type);
void PEM_dek_info(char *buf, char *type, int len, char *str);
void PEM_proc_type(char *buf, int type);
void PEM_dek_info(char *buf, char *type, int len, char *str);
@@
-483,6
+482,8
@@
int PEM_ASN1_write_bio();
int PEM_SealInit();
void PEM_SealUpdate();
int PEM_SealFinal();
int PEM_SealInit();
void PEM_SealUpdate();
int PEM_SealFinal();
+void PEM_SignInit();
+void PEM_SignUpdate();
int PEM_SignFinal();
void ERR_load_PEM_strings();
int PEM_SignFinal();
void ERR_load_PEM_strings();
@@
-502,6
+503,7
@@
EVP_PKEY *PEM_read_PrivateKey();
PKCS7 *PEM_read_PKCS7();
DH *PEM_read_DHparams();
DSA *PEM_read_DSAparams();
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_X509();
int PEM_write_X509_REQ();
int PEM_write_X509_CRL();
@@
-512,6
+514,7
@@
int PEM_write_PrivateKey();
int PEM_write_PKCS7();
int PEM_write_DHparams();
int PEM_write_DSAparams();
int PEM_write_PKCS7();
int PEM_write_DHparams();
int PEM_write_DSAparams();
+int PEM_write_NETSCAPE_CERT_SEQUENCE();
#endif
X509 *PEM_read_bio_X509();
#endif
X509 *PEM_read_bio_X509();
@@
-524,6
+527,7
@@
EVP_PKEY *PEM_read_bio_PrivateKey();
PKCS7 *PEM_read_bio_PKCS7();
DH *PEM_read_bio_DHparams();
DSA *PEM_read_bio_DSAparams();
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_X509();
int PEM_write_bio_X509_REQ();
int PEM_write_bio_X509_CRL();
@@
-534,6
+538,7
@@
int PEM_write_bio_PrivateKey();
int PEM_write_bio_PKCS7();
int PEM_write_bio_DHparams();
int PEM_write_bio_DSAparams();
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 /* SSLEAY_MACROS */