diff options
| author | kris <kris@FreeBSD.org> | 2001-05-20 03:17:35 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2001-05-20 03:17:35 +0000 |
| commit | 445c7928a166ddd374f98189e149d7e27092573e (patch) | |
| tree | 4127aa35b669d1fef973314beb69f8303022eb16 /crypto/openssl/ssl/s2_pkt.c | |
| parent | 8acf08a7904cd7fbf506f79a905bb8e29164019a (diff) | |
| download | FreeBSD-src-445c7928a166ddd374f98189e149d7e27092573e.zip FreeBSD-src-445c7928a166ddd374f98189e149d7e27092573e.tar.gz | |
Resolve conflicts
Diffstat (limited to 'crypto/openssl/ssl/s2_pkt.c')
| -rw-r--r-- | crypto/openssl/ssl/s2_pkt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/s2_pkt.c b/crypto/openssl/ssl/s2_pkt.c index 4e752a2..6e37903 100644 --- a/crypto/openssl/ssl/s2_pkt.c +++ b/crypto/openssl/ssl/s2_pkt.c @@ -301,7 +301,7 @@ int ssl2_read(SSL *s, void *buf, int len) return ssl2_read_internal(s, buf, len, 0); } -int ssl2_peek(SSL *s, char *buf, int len) +int ssl2_peek(SSL *s, void *buf, int len) { return ssl2_read_internal(s, buf, len, 1); } |
