projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for 1.1.1-pre10-dev
[openssl.git]
/
include
/
openssl
/
pem.h
diff --git
a/include/openssl/pem.h
b/include/openssl/pem.h
index 314d374de96e3097525f7bde2931966c38445f4b..2ef5b5d04c6e30d742b3ac541d6891fc96a99c11 100644
(file)
--- a/
include/openssl/pem.h
+++ b/
include/openssl/pem.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 1995-201
6
The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-201
8
The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@
-12,10
+12,9
@@
# include <openssl/e_os2.h>
# include <openssl/bio.h>
# include <openssl/e_os2.h>
# include <openssl/bio.h>
-# include <openssl/stack.h>
+# include <openssl/s
afes
tack.h>
# include <openssl/evp.h>
# include <openssl/x509.h>
# include <openssl/evp.h>
# include <openssl/x509.h>
-# include <openssl/pem2.h>
# include <openssl/pemerr.h>
#ifdef __cplusplus
# include <openssl/pemerr.h>
#ifdef __cplusplus
@@
-281,7
+280,8
@@
int 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);
-int PEM_def_callback(char *buf, int num, int w, void *key);
+/* The default pem_password_cb that's used internally */
+int PEM_def_callback(char *buf, int num, int rwflag, void *userdata);
void PEM_proc_type(char *buf, int type);
void PEM_dek_info(char *buf, const char *type, int len, char *str);
void PEM_proc_type(char *buf, int type);
void PEM_dek_info(char *buf, const char *type, int len, char *str);
@@
-372,7
+372,6
@@
int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel,
# endif
# endif
# endif
# endif
-int ERR_load_PEM_strings(void);
# ifdef __cplusplus
}
# endif
# ifdef __cplusplus
}
# endif