diff options
author | simon <simon@FreeBSD.org> | 2007-03-15 20:07:27 +0000 |
---|---|---|
committer | simon <simon@FreeBSD.org> | 2007-03-15 20:07:27 +0000 |
commit | 394ba190a3f3c2ec13e67e830b6faeb2dd3e651c (patch) | |
tree | d788253de8c917bbf6257b56dbda264342f8095e /crypto/openssl/ssl/s2_lib.c | |
parent | 699a8581f98495705b6c4fa8f75d5b9e815d63aa (diff) | |
download | FreeBSD-src-394ba190a3f3c2ec13e67e830b6faeb2dd3e651c.zip FreeBSD-src-394ba190a3f3c2ec13e67e830b6faeb2dd3e651c.tar.gz |
Resolve conflicts after import of OpenSSL 0.9.8e.
Diffstat (limited to 'crypto/openssl/ssl/s2_lib.c')
-rw-r--r-- | crypto/openssl/ssl/s2_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/s2_lib.c b/crypto/openssl/ssl/s2_lib.c index def3a6e..10751b2 100644 --- a/crypto/openssl/ssl/s2_lib.c +++ b/crypto/openssl/ssl/s2_lib.c @@ -63,7 +63,7 @@ #include <openssl/evp.h> #include <openssl/md5.h> -const char *ssl2_version_str="SSLv2" OPENSSL_VERSION_PTEXT; +const char ssl2_version_str[]="SSLv2" OPENSSL_VERSION_PTEXT; #define SSL2_NUM_CIPHERS (sizeof(ssl2_ciphers)/sizeof(SSL_CIPHER)) |