diff options
| author | djm <> | 2008-09-06 12:17:54 +0000 |
|---|---|---|
| committer | djm <> | 2008-09-06 12:17:54 +0000 |
| commit | 38ce604e3cc97706b876b0525ddff0121115456d (patch) | |
| tree | 7ccc28afe1789ea3dbedf72365f955d5b8e105b5 /src/lib/libssl/src/demos/tunala/tunala.h | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libssl/src/demos/tunala/tunala.h')
| -rw-r--r-- | src/lib/libssl/src/demos/tunala/tunala.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/libssl/src/demos/tunala/tunala.h b/src/lib/libssl/src/demos/tunala/tunala.h index b4c8ec78d8..3a752f259a 100644 --- a/src/lib/libssl/src/demos/tunala/tunala.h +++ b/src/lib/libssl/src/demos/tunala/tunala.h | |||
| @@ -149,6 +149,7 @@ int cb_ssl_verify(int ok, X509_STORE_CTX *ctx); | |||
| 149 | void cb_ssl_verify_set_output(FILE *fp); | 149 | void cb_ssl_verify_set_output(FILE *fp); |
| 150 | void cb_ssl_verify_set_depth(unsigned int verify_depth); | 150 | void cb_ssl_verify_set_depth(unsigned int verify_depth); |
| 151 | void cb_ssl_verify_set_level(unsigned int level); | 151 | void cb_ssl_verify_set_level(unsigned int level); |
| 152 | RSA *cb_generate_tmp_rsa(SSL *s, int is_export, int keylength); | ||
| 152 | #endif /* !defined(NO_OPENSSL) */ | 153 | #endif /* !defined(NO_OPENSSL) */ |
| 153 | #endif /* !defined(OPENSSL_NO_BUFFER) */ | 154 | #endif /* !defined(OPENSSL_NO_BUFFER) */ |
| 154 | 155 | ||