diff options
| author | Adriaan de Jong <dejong@fox-it.com> | 2011-07-01 14:39:13 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2011-10-22 11:44:36 +0200 |
| commit | fceecbab9ddd58ccec28aeafa7be39c65f313458 (patch) | |
| tree | e8f261d594931caa3587f77d122e6be547f27326 /ssl_backend.h | |
| parent | a4da1fe776b774670948f00898d370da614960f5 (diff) | |
| download | openvpn-fceecbab9ddd58ccec28aeafa7be39c65f313458.tar.gz openvpn-fceecbab9ddd58ccec28aeafa7be39c65f313458.tar.xz openvpn-fceecbab9ddd58ccec28aeafa7be39c65f313458.zip | |
Final cleanup before PolarSSL addition:
- Remove stray X509 entries
- Remove unnecessary USE_OPENSSL ifdefs
- Normalised x509_get_sha1_hash to look similar to x509_get_* functions
Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: James Yonan <james@openvpn.net>
Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'ssl_backend.h')
| -rw-r--r-- | ssl_backend.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ssl_backend.h b/ssl_backend.h index b0c9a6d..324fc33 100644 --- a/ssl_backend.h +++ b/ssl_backend.h @@ -173,6 +173,8 @@ void tls_ctx_load_cryptoapi(struct tls_root_ctx *ctx, const char *cryptoapi_cert * Load certificate file into the given TLS context. If the given certificate * file contains a certificate chain, load the whole chain. * + * If the x509 parameter is not NULL, the certificate will be returned in it. + * * @param ctx TLS context to use * @param cert_file The file name to load the certificate from, or * "[[INLINE]]" in the case of inline files. @@ -186,7 +188,7 @@ void tls_ctx_load_cert_file (struct tls_root_ctx *ctx, const char *cert_file, #if ENABLE_INLINE_FILES const char *cert_file_inline, #endif - X509 **x509 + x509_cert_t **x509 ); /** @@ -219,7 +221,7 @@ int tls_ctx_load_priv_file (struct tls_root_ctx *ctx, const char *priv_key_file * @return 1 if an error occurred, 0 if parsing was * successful. */ -int tls_ctx_use_external_private_key (struct tls_root_ctx *ctx, X509 *cert); +int tls_ctx_use_external_private_key (struct tls_root_ctx *ctx, x509_cert_t *cert); #endif |