Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(474)

Side by Side Diff: openssl/ssl/ssl.h

Issue 35493002: Update Channel ID API to use a callback. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/openssl.git@master
Patch Set: Fix key ownsership Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « openssl/ssl/s3_clnt.c ('k') | openssl/ssl/ssl_sess.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* ssl/ssl.h */ 1 /* ssl/ssl.h */
2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
5 * This package is an SSL implementation written 5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com). 6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL. 7 * The implementation was written so as to conform with Netscapes SSL.
8 * 8 *
9 * This library is free for commercial and non-commercial use as long as 9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions 10 * the following conditions are aheared to. The following conditions
(...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 841
842 /* Default password callback. */ 842 /* Default password callback. */
843 pem_password_cb *default_passwd_callback; 843 pem_password_cb *default_passwd_callback;
844 844
845 /* Default password callback user data. */ 845 /* Default password callback user data. */
846 void *default_passwd_callback_userdata; 846 void *default_passwd_callback_userdata;
847 847
848 /* get client cert callback */ 848 /* get client cert callback */
849 int (*client_cert_cb)(SSL *ssl, X509 **x509, EVP_PKEY **pkey); 849 int (*client_cert_cb)(SSL *ssl, X509 **x509, EVP_PKEY **pkey);
850 850
851 /* get channel id callback */
852 void (*channel_id_cb)(SSL *ssl, EVP_PKEY **pkey);
853
851 /* cookie generate callback */ 854 /* cookie generate callback */
852 int (*app_gen_cookie_cb)(SSL *ssl, unsigned char *cookie, 855 int (*app_gen_cookie_cb)(SSL *ssl, unsigned char *cookie,
853 unsigned int *cookie_len); 856 unsigned int *cookie_len);
854 857
855 /* verify cookie callback */ 858 /* verify cookie callback */
856 int (*app_verify_cookie_cb)(SSL *ssl, unsigned char *cookie, 859 int (*app_verify_cookie_cb)(SSL *ssl, unsigned char *cookie,
857 unsigned int cookie_len); 860 unsigned int cookie_len);
858 861
859 CRYPTO_EX_DATA ex_data; 862 CRYPTO_EX_DATA ex_data;
860 863
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
1036 void SSL_CTX_sess_set_new_cb(SSL_CTX *ctx, int (*new_session_cb)(struct ssl_st * ssl,SSL_SESSION *sess)); 1039 void SSL_CTX_sess_set_new_cb(SSL_CTX *ctx, int (*new_session_cb)(struct ssl_st * ssl,SSL_SESSION *sess));
1037 int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx))(struct ssl_st *ssl, SSL_SESSION *se ss); 1040 int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx))(struct ssl_st *ssl, SSL_SESSION *se ss);
1038 void SSL_CTX_sess_set_remove_cb(SSL_CTX *ctx, void (*remove_session_cb)(struct s sl_ctx_st *ctx,SSL_SESSION *sess)); 1041 void SSL_CTX_sess_set_remove_cb(SSL_CTX *ctx, void (*remove_session_cb)(struct s sl_ctx_st *ctx,SSL_SESSION *sess));
1039 void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx))(struct ssl_ctx_st *ctx, SSL_SES SION *sess); 1042 void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx))(struct ssl_ctx_st *ctx, SSL_SES SION *sess);
1040 void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx, SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl, unsigned char *data,int len,int *copy)); 1043 void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx, SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl, unsigned char *data,int len,int *copy));
1041 SSL_SESSION *(*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx))(struct ssl_st *ssl, unsign ed char *Data, int len, int *copy); 1044 SSL_SESSION *(*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx))(struct ssl_st *ssl, unsign ed char *Data, int len, int *copy);
1042 void SSL_CTX_set_info_callback(SSL_CTX *ctx, void (*cb)(const SSL *ssl,int type, int val)); 1045 void SSL_CTX_set_info_callback(SSL_CTX *ctx, void (*cb)(const SSL *ssl,int type, int val));
1043 void (*SSL_CTX_get_info_callback(SSL_CTX *ctx))(const SSL *ssl,int type,int val) ; 1046 void (*SSL_CTX_get_info_callback(SSL_CTX *ctx))(const SSL *ssl,int type,int val) ;
1044 void SSL_CTX_set_client_cert_cb(SSL_CTX *ctx, int (*client_cert_cb)(SSL *ssl, X5 09 **x509, EVP_PKEY **pkey)); 1047 void SSL_CTX_set_client_cert_cb(SSL_CTX *ctx, int (*client_cert_cb)(SSL *ssl, X5 09 **x509, EVP_PKEY **pkey));
1045 int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx))(SSL *ssl, X509 **x509, EVP_PKEY **pkey); 1048 int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx))(SSL *ssl, X509 **x509, EVP_PKEY **pkey);
1049 void SSL_CTX_set_channel_id_cb(SSL_CTX *ctx, void (*channel_id_cb)(SSL *ssl, EVP _PKEY **pkey));
1050 void (*SSL_CTX_get_channel_id_cb(SSL_CTX *ctx))(SSL *ssl, EVP_PKEY **pkey);
1046 #ifndef OPENSSL_NO_ENGINE 1051 #ifndef OPENSSL_NO_ENGINE
1047 int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e); 1052 int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e);
1048 #endif 1053 #endif
1049 void SSL_CTX_set_cookie_generate_cb(SSL_CTX *ctx, int (*app_gen_cookie_cb)(SSL * ssl, unsigned char *cookie, unsigned int *cookie_len)); 1054 void SSL_CTX_set_cookie_generate_cb(SSL_CTX *ctx, int (*app_gen_cookie_cb)(SSL * ssl, unsigned char *cookie, unsigned int *cookie_len));
1050 void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx, int (*app_verify_cookie_cb)(SSL *ssl, unsigned char *cookie, unsigned int cookie_len)); 1055 void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx, int (*app_verify_cookie_cb)(SSL *ssl, unsigned char *cookie, unsigned int cookie_len));
1051 #ifndef OPENSSL_NO_NEXTPROTONEG 1056 #ifndef OPENSSL_NO_NEXTPROTONEG
1052 void SSL_CTX_set_next_protos_advertised_cb(SSL_CTX *s, 1057 void SSL_CTX_set_next_protos_advertised_cb(SSL_CTX *s,
1053 int (*cb) (SSL *ssl, 1058 int (*cb) (SSL *ssl,
1054 const unsigned char **out, 1059 const unsigned char **out,
1055 unsigned int *outlen, 1060 unsigned int *outlen,
(...skipping 1586 matching lines...) Expand 10 before | Expand all | Expand 10 after
2642 #define SSL_R_WRONG_SIGNATURE_TYPE 370 2647 #define SSL_R_WRONG_SIGNATURE_TYPE 370
2643 #define SSL_R_WRONG_SSL_VERSION 266 2648 #define SSL_R_WRONG_SSL_VERSION 266
2644 #define SSL_R_WRONG_VERSION_NUMBER 267 2649 #define SSL_R_WRONG_VERSION_NUMBER 267
2645 #define SSL_R_X509_LIB 268 2650 #define SSL_R_X509_LIB 268
2646 #define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS 269 2651 #define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS 269
2647 2652
2648 #ifdef __cplusplus 2653 #ifdef __cplusplus
2649 } 2654 }
2650 #endif 2655 #endif
2651 #endif 2656 #endif
OLDNEW
« no previous file with comments | « openssl/ssl/s3_clnt.c ('k') | openssl/ssl/ssl_sess.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698