diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2013-11-21 17:33:57 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2013-11-21 17:33:57 +0000 |
| commit | dafebafde584d49edaa75282d5a30e7a1728b713 (patch) | |
| tree | 061fff1e77afb266a53baf847bc54ab220599b55 /cups/http.h | |
| parent | 0042c0d7c26edc0ffc6019df7d3c449b5f4bfe3a (diff) | |
| download | cups-dafebafde584d49edaa75282d5a30e7a1728b713.tar.gz | |
Save work on TLS stuff (does not compile)
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11436 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/http.h')
| -rw-r--r-- | cups/http.h | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/cups/http.h b/cups/http.h index 4015abf63..abc0f9104 100644 --- a/cups/http.h +++ b/cups/http.h @@ -613,12 +613,9 @@ extern http_state_t httpWriteResponse(http_t *http, /* New in CUPS 2.0 */ extern int httpAddrClose(http_addr_t *addr, int fd) _CUPS_API_2_0; extern int httpAddrFamily(http_addr_t *addr) _CUPS_API_2_0; -extern int httpCompareCredentials(cups_array_t *cred1, - cups_array_t *cred2) - _CUPS_API_2_0; -extern size_t httpCredentialsString(cups_array_t *credentials, - char *buffer, size_t bufsize) - _CUPS_API_2_0; +extern int httpCompareCredentials(cups_array_t *cred1, cups_array_t *cred2) _CUPS_API_2_0; +extern time_t httpCredentialsExpiration(cups_array_t *credentials) _CUPS_API_2_0; +extern size_t httpCredentialsString(cups_array_t *credentials, char *buffer, size_t bufsize) _CUPS_API_2_0; extern http_field_t httpFieldValue(const char *name) _CUPS_API_2_0; extern time_t httpGetActivity(http_t *http) _CUPS_API_2_0; extern http_addr_t *httpGetAddress(http_t *http) _CUPS_API_2_0; @@ -629,17 +626,12 @@ extern size_t httpGetReady(http_t *http) _CUPS_API_2_0; extern size_t httpGetRemaining(http_t *http) _CUPS_API_2_0; extern int httpIsChunked(http_t *http) _CUPS_API_2_0; extern int httpIsEncrypted(http_t *http) _CUPS_API_2_0; -extern int httpLoadCredentials(const char *path, - cups_array_t **credentials, - const char *common_name) - _CUPS_API_2_0; -extern int httpMakeCredentials(cups_array_t **credentials, const char *common_name) _CUPS_API_2_0; +extern int httpLoadCredentials(const char *path, cups_array_t **credentials, const char *common_name) _CUPS_API_2_0; +extern int httpMakeServerCredentials(const char *path, const char *common_name, int num_alt_names, const char **alt_names, time_t expiration_date) _CUPS_API_2_0; extern const char *httpResolveHostname(http_t *http, char *buffer, size_t bufsize) _CUPS_API_2_0; -extern int httpSaveCredentials(const char *path, - cups_array_t *credentials, - const char *common_name) - _CUPS_API_2_0; +extern int httpSaveCredentials(const char *path, cups_array_t *credentials, const char *common_name) _CUPS_API_2_0; extern void httpSetKeepAlive(http_t *http, http_keepalive_t keep_alive) _CUPS_API_2_0; +extern int httpSetServerCredentials(http_t *http, const char *path, const char *common_name) _CUPS_API_2_0; extern void httpShutdown(http_t *http) _CUPS_API_2_0; extern const char *httpStateString(http_state_t state); |