Some tiny changes to the source code to make future diffs smaller

[openssl.git] / ssl / ssl.h

diff --git a/ssl/ssl.h b/ssl/ssl.h
index e93debcf6ffdf4fb158906ff0ac48f568e488df1..98f64c26eca036164ee653355729e5e3070059d0 100644 (file)
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -562,6 +562,7 @@ struct ssl_st
        /* client cert? */
        /* This is used to hold the server certificate used */
        struct cert_st /* CERT */ *cert;
+       /* XXX should be struct sess_cert_st *sess_cert */
 
        /* the session_id_context is used to ensure sessions are only reused
         * in the appropriate context */
@@ -868,12 +869,12 @@ int       SSL_use_certificate(SSL *ssl, X509 *x);
 int    SSL_use_certificate_ASN1(SSL *ssl, unsigned char *d, int len);
 
 #ifndef NO_STDIO
-int    SSL_use_RSAPrivateKey_file(SSL *ssl, char *file, int type);
-int    SSL_use_PrivateKey_file(SSL *ssl, char *file, int type);
-int    SSL_use_certificate_file(SSL *ssl, char *file, int type);
-int    SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, char *file, int type);
-int    SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, char *file, int type);
-int    SSL_CTX_use_certificate_file(SSL_CTX *ctx, char *file, int type);
+int    SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type);
+int    SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type);
+int    SSL_use_certificate_file(SSL *ssl, const char *file, int type);
+int    SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type);
+int    SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type);
+int    SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type);
 int    SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file); /* PEM type */
 STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
 int    SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
@@ -1018,7 +1019,8 @@ void SSL_set_shutdown(SSL *ssl,int mode);
 int SSL_get_shutdown(SSL *ssl);
 int SSL_version(SSL *ssl);
 int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx);
-int SSL_CTX_load_verify_locations(SSL_CTX *ctx,char *CAfile,char *CApath);
+int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
+       const char *CApath);
 SSL_SESSION *SSL_get_session(SSL *ssl);
 SSL_CTX *SSL_get_SSL_CTX(SSL *ssl);
 void SSL_set_info_callback(SSL *ssl,void (*cb)());