diff options
author | jsing <> | 2015-09-12 16:46:43 +0000 |
---|---|---|
committer | jsing <> | 2015-09-12 16:46:43 +0000 |
commit | 66c831b7faf8826cdffcd5faaa8cb12c5ccd5060 (patch) | |
tree | d2c3ef39dbe6e3c9e7c49068ab81431217691bc8 | |
parent | 913cc548a379f5f2408e621a6c02c786392dab9d (diff) | |
download | openbsd-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.h | 12 |
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); | |||
76 | void tls_config_verify_client(struct tls_config *_config); | 76 | void tls_config_verify_client(struct tls_config *_config); |
77 | void tls_config_verify_client_optional(struct tls_config *_config); | 77 | void tls_config_verify_client_optional(struct tls_config *_config); |
78 | 78 | ||
79 | int tls_peer_cert_provided(struct tls *ctx); | ||
80 | int tls_peer_cert_contains_name(struct tls *ctx, const char *name); | ||
81 | int tls_peer_cert_issuer(struct tls *ctx, char **name); | ||
82 | int tls_peer_cert_subject(struct tls *ctx, char **subject); | ||
83 | |||
84 | void tls_config_clear_keys(struct tls_config *_config); | 79 | void tls_config_clear_keys(struct tls_config *_config); |
85 | int tls_config_parse_protocols(uint32_t *_protocols, const char *_protostr); | 80 | int 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); | |||
104 | ssize_t tls_write(struct tls *_ctx, const void *_buf, size_t _buflen); | 99 | ssize_t tls_write(struct tls *_ctx, const void *_buf, size_t _buflen); |
105 | int tls_close(struct tls *_ctx); | 100 | int tls_close(struct tls *_ctx); |
106 | 101 | ||
102 | int tls_peer_cert_provided(struct tls *ctx); | ||
103 | int tls_peer_cert_contains_name(struct tls *ctx, const char *name); | ||
104 | |||
107 | int tls_peer_cert_hash(struct tls *_ctx, char **_hash); | 105 | int tls_peer_cert_hash(struct tls *_ctx, char **_hash); |
106 | int tls_peer_cert_issuer(struct tls *ctx, char **name); | ||
107 | int tls_peer_cert_subject(struct tls *ctx, char **subject); | ||
108 | 108 | ||
109 | uint8_t *tls_load_file(const char *_file, size_t *_len, char *_password); | 109 | uint8_t *tls_load_file(const char *_file, size_t *_len, char *_password); |
110 | 110 | ||