diff options
| author | djm <> | 2005-04-29 05:39:33 +0000 |
|---|---|---|
| committer | djm <> | 2005-04-29 05:39:33 +0000 |
| commit | 68edd00d9258df93b1366c71ac124e0cadf7bc08 (patch) | |
| tree | 3ce4ae2a9747bbc11aed1f95f9bbea92c41f8683 /src/lib/libssl/s23_lib.c | |
| parent | f396ed0f5ce0af56bfde2e75e15cf1f52924c779 (diff) | |
| download | openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.gz openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.bz2 openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libssl/s23_lib.c')
| -rw-r--r-- | src/lib/libssl/s23_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libssl/s23_lib.c b/src/lib/libssl/s23_lib.c index b70002a647..8d7dbcf569 100644 --- a/src/lib/libssl/s23_lib.c +++ b/src/lib/libssl/s23_lib.c | |||
| @@ -87,7 +87,7 @@ static SSL_METHOD SSLv23_data= { | |||
| 87 | ssl3_ctx_ctrl, | 87 | ssl3_ctx_ctrl, |
| 88 | ssl23_get_cipher_by_char, | 88 | ssl23_get_cipher_by_char, |
| 89 | ssl23_put_cipher_by_char, | 89 | ssl23_put_cipher_by_char, |
| 90 | ssl_undefined_function, | 90 | ssl_undefined_const_function, |
| 91 | ssl23_num_ciphers, | 91 | ssl23_num_ciphers, |
| 92 | ssl23_get_cipher, | 92 | ssl23_get_cipher, |
| 93 | ssl_bad_method, | 93 | ssl_bad_method, |