summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2015-09-12 16:46:43 +0000
committerjsing <>2015-09-12 16:46:43 +0000
commit66c831b7faf8826cdffcd5faaa8cb12c5ccd5060 (patch)
treed2c3ef39dbe6e3c9e7c49068ab81431217691bc8
parent913cc548a379f5f2408e621a6c02c786392dab9d (diff)
downloadopenbsd-66c831b7faf8826cdffcd5faaa8cb12c5ccd5060.tar.gz
openbsd-66c831b7faf8826cdffcd5faaa8cb12c5ccd5060.tar.bz2
openbsd-66c831b7faf8826cdffcd5faaa8cb12c5ccd5060.zip
Put tls_peer_cert* functions in the same place.
-rw-r--r--src/lib/libtls/tls.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libtls/tls.h b/src/lib/libtls/tls.h
index 3d1682e2b6..1a6cb47544 100644
--- a/src/lib/libtls/tls.h
+++ b/src/lib/libtls/tls.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls.h,v 1.20 2015/09/11 12:56:55 beck Exp $ */ 1/* $OpenBSD: tls.h,v 1.21 2015/09/12 16:46:43 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -76,11 +76,6 @@ void tls_config_verify(struct tls_config *_config);
76void tls_config_verify_client(struct tls_config *_config); 76void tls_config_verify_client(struct tls_config *_config);
77void tls_config_verify_client_optional(struct tls_config *_config); 77void tls_config_verify_client_optional(struct tls_config *_config);
78 78
79int tls_peer_cert_provided(struct tls *ctx);
80int tls_peer_cert_contains_name(struct tls *ctx, const char *name);
81int tls_peer_cert_issuer(struct tls *ctx, char **name);
82int tls_peer_cert_subject(struct tls *ctx, char **subject);
83
84void tls_config_clear_keys(struct tls_config *_config); 79void tls_config_clear_keys(struct tls_config *_config);
85int tls_config_parse_protocols(uint32_t *_protocols, const char *_protostr); 80int tls_config_parse_protocols(uint32_t *_protocols, const char *_protostr);
86 81
@@ -104,7 +99,12 @@ ssize_t tls_read(struct tls *_ctx, void *_buf, size_t _buflen);
104ssize_t tls_write(struct tls *_ctx, const void *_buf, size_t _buflen); 99ssize_t tls_write(struct tls *_ctx, const void *_buf, size_t _buflen);
105int tls_close(struct tls *_ctx); 100int tls_close(struct tls *_ctx);
106 101
102int tls_peer_cert_provided(struct tls *ctx);
103int tls_peer_cert_contains_name(struct tls *ctx, const char *name);
104
107int tls_peer_cert_hash(struct tls *_ctx, char **_hash); 105int tls_peer_cert_hash(struct tls *_ctx, char **_hash);
106int tls_peer_cert_issuer(struct tls *ctx, char **name);
107int tls_peer_cert_subject(struct tls *ctx, char **subject);
108 108
109uint8_t *tls_load_file(const char *_file, size_t *_len, char *_password); 109uint8_t *tls_load_file(const char *_file, size_t *_len, char *_password);
110 110