diff options
| author | nectar <nectar@FreeBSD.org> | 2004-03-17 17:44:39 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2004-03-17 17:44:39 +0000 |
| commit | 2283471bb53a546e9d7dfb662c8db5ca06907c85 (patch) | |
| tree | 2f72c65a69a9678c0d95fcb2a67a3e7b1c592424 /crypto/openssl/ssl/s2_enc.c | |
| parent | c7c23f8cb0c95f4e18f44ca080df2d2ecb97eb3c (diff) | |
| download | FreeBSD-src-2283471bb53a546e9d7dfb662c8db5ca06907c85.zip FreeBSD-src-2283471bb53a546e9d7dfb662c8db5ca06907c85.tar.gz | |
Resolve conflicts after import of OpenSSL 0.9.7d.
Diffstat (limited to 'crypto/openssl/ssl/s2_enc.c')
| -rw-r--r-- | crypto/openssl/ssl/s2_enc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/s2_enc.c b/crypto/openssl/ssl/s2_enc.c index d3b144f..21a06f7 100644 --- a/crypto/openssl/ssl/s2_enc.c +++ b/crypto/openssl/ssl/s2_enc.c @@ -59,7 +59,6 @@ #include "ssl_locl.h" #ifndef OPENSSL_NO_SSL2 #include <stdio.h> -#include "cryptlib.h" int ssl2_enc_init(SSL *s, int client) { |
