diff options
| author | djm <> | 2010-10-01 22:59:01 +0000 |
|---|---|---|
| committer | djm <> | 2010-10-01 22:59:01 +0000 |
| commit | 8922d4bc4a8b8893d72a48deb2cdf58215f98505 (patch) | |
| tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libssl/t1_meth.c | |
| parent | 76262f7bf9262f965142b1b2b2105cb279c5c696 (diff) | |
| download | openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.gz openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.bz2 openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.zip | |
resolve conflicts, fix local changes
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/t1_meth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/t1_meth.c b/src/lib/libssl/t1_meth.c index f5d8df634e..6ce7c0bbf5 100644 --- a/src/lib/libssl/t1_meth.c +++ b/src/lib/libssl/t1_meth.c | |||
| @@ -60,8 +60,8 @@ | |||
| 60 | #include <openssl/objects.h> | 60 | #include <openssl/objects.h> |
| 61 | #include "ssl_locl.h" | 61 | #include "ssl_locl.h" |
| 62 | 62 | ||
| 63 | static SSL_METHOD *tls1_get_method(int ver); | 63 | static const SSL_METHOD *tls1_get_method(int ver); |
| 64 | static SSL_METHOD *tls1_get_method(int ver) | 64 | static const SSL_METHOD *tls1_get_method(int ver) |
| 65 | { | 65 | { |
| 66 | if (ver == TLS1_VERSION) | 66 | if (ver == TLS1_VERSION) |
| 67 | return(TLSv1_method()); | 67 | return(TLSv1_method()); |