diff options
| author | markm <markm@FreeBSD.org> | 2003-01-28 22:34:21 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2003-01-28 22:34:21 +0000 |
| commit | 3f245d6325bc967e32ea631b54fb87569ded160b (patch) | |
| tree | a8ee3102ea01b359830fb8c094c644e39ce479ba /crypto/openssl/ssl/s23_lib.c | |
| parent | ad7148cc98d85da1fe9f1dde3e946c8c62e2df65 (diff) | |
| download | FreeBSD-src-3f245d6325bc967e32ea631b54fb87569ded160b.zip FreeBSD-src-3f245d6325bc967e32ea631b54fb87569ded160b.tar.gz | |
Merge conflicts.
This is cunning doublespeak for "use vendor code".
Diffstat (limited to 'crypto/openssl/ssl/s23_lib.c')
| -rw-r--r-- | crypto/openssl/ssl/s23_lib.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/crypto/openssl/ssl/s23_lib.c b/crypto/openssl/ssl/s23_lib.c index fe7e2d1..b70002a 100644 --- a/crypto/openssl/ssl/s23_lib.c +++ b/crypto/openssl/ssl/s23_lib.c @@ -54,8 +54,6 @@ * derivative of this code cannot be changed. i.e. this code cannot simply be * copied and put under another distribution licence * [including the GNU Public Licence.] - * - * $FreeBSD$ */ #include <stdio.h> @@ -113,7 +111,7 @@ SSL_METHOD *sslv23_base_method(void) static int ssl23_num_ciphers(void) { return(ssl3_num_ciphers() -#ifndef NO_SSL2 +#ifndef OPENSSL_NO_SSL2 + ssl2_num_ciphers() #endif ); @@ -126,7 +124,7 @@ static SSL_CIPHER *ssl23_get_cipher(unsigned int u) if (u < uu) return(ssl3_get_cipher(u)); else -#ifndef NO_SSL2 +#ifndef OPENSSL_NO_SSL2 return(ssl2_get_cipher(u-uu)); #else return(NULL); @@ -146,7 +144,7 @@ static SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p) ((unsigned long)p[1]<<8L)|(unsigned long)p[2]; c.id=id; cp=ssl3_get_cipher_by_char(p); -#ifndef NO_SSL2 +#ifndef OPENSSL_NO_SSL2 if (cp == NULL) cp=ssl2_get_cipher_by_char(p); #endif |
