diff options
Diffstat (limited to 'src/lib/libssl/ssl_ciph.c')
| -rw-r--r-- | src/lib/libssl/ssl_ciph.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index 140a00ceca..7d2ea6c481 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c | |||
| @@ -1295,8 +1295,8 @@ const SSL_CIPHER **ca_list) | |||
| 1295 | return (retval); | 1295 | return (retval); |
| 1296 | } | 1296 | } |
| 1297 | 1297 | ||
| 1298 | STACK_OF(SSL_CIPHER) | 1298 | STACK_OF(SSL_CIPHER) * |
| 1299 | *ssl_create_cipher_list(const SSL_METHOD *ssl_method, | 1299 | ssl_create_cipher_list(const SSL_METHOD *ssl_method, |
| 1300 | STACK_OF(SSL_CIPHER) **cipher_list, | 1300 | STACK_OF(SSL_CIPHER) **cipher_list, |
| 1301 | STACK_OF(SSL_CIPHER) **cipher_list_by_id, | 1301 | STACK_OF(SSL_CIPHER) **cipher_list_by_id, |
| 1302 | const char *rule_str) | 1302 | const char *rule_str) |
| @@ -1466,8 +1466,8 @@ STACK_OF(SSL_CIPHER) | |||
| 1466 | return (cipherstack); | 1466 | return (cipherstack); |
| 1467 | } | 1467 | } |
| 1468 | 1468 | ||
| 1469 | char | 1469 | char * |
| 1470 | *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len) | 1470 | SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len) |
| 1471 | { | 1471 | { |
| 1472 | int is_export, pkl, kl, l; | 1472 | int is_export, pkl, kl, l; |
| 1473 | const char *ver, *exp_str; | 1473 | const char *ver, *exp_str; |
| @@ -1652,8 +1652,8 @@ char | |||
| 1652 | return (buf); | 1652 | return (buf); |
| 1653 | } | 1653 | } |
| 1654 | 1654 | ||
| 1655 | char | 1655 | char * |
| 1656 | *SSL_CIPHER_get_version(const SSL_CIPHER *c) | 1656 | SSL_CIPHER_get_version(const SSL_CIPHER *c) |
| 1657 | { | 1657 | { |
| 1658 | int i; | 1658 | int i; |
| 1659 | 1659 | ||
| @@ -1669,8 +1669,8 @@ char | |||
| 1669 | } | 1669 | } |
| 1670 | 1670 | ||
| 1671 | /* return the actual cipher being used */ | 1671 | /* return the actual cipher being used */ |
| 1672 | const char | 1672 | const char * |
| 1673 | *SSL_CIPHER_get_name(const SSL_CIPHER *c) | 1673 | SSL_CIPHER_get_name(const SSL_CIPHER *c) |
| 1674 | { | 1674 | { |
| 1675 | if (c != NULL) | 1675 | if (c != NULL) |
| 1676 | return (c->name); | 1676 | return (c->name); |
| @@ -1697,8 +1697,8 @@ SSL_CIPHER_get_id(const SSL_CIPHER *c) | |||
| 1697 | return c->id; | 1697 | return c->id; |
| 1698 | } | 1698 | } |
| 1699 | 1699 | ||
| 1700 | SSL_COMP | 1700 | SSL_COMP * |
| 1701 | *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n) | 1701 | ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n) |
| 1702 | { | 1702 | { |
| 1703 | SSL_COMP *ctmp; | 1703 | SSL_COMP *ctmp; |
| 1704 | int i, nn; | 1704 | int i, nn; |
| @@ -1715,8 +1715,8 @@ SSL_COMP | |||
| 1715 | } | 1715 | } |
| 1716 | 1716 | ||
| 1717 | #ifdef OPENSSL_NO_COMP | 1717 | #ifdef OPENSSL_NO_COMP |
| 1718 | void | 1718 | void * |
| 1719 | *SSL_COMP_get_compression_methods(void) | 1719 | SSL_COMP_get_compression_methods(void) |
| 1720 | { | 1720 | { |
| 1721 | return NULL; | 1721 | return NULL; |
| 1722 | } | 1722 | } |
| @@ -1727,14 +1727,14 @@ SSL_COMP_add_compression_method(int id, void *cm) | |||
| 1727 | return 1; | 1727 | return 1; |
| 1728 | } | 1728 | } |
| 1729 | 1729 | ||
| 1730 | const char | 1730 | const char * |
| 1731 | *SSL_COMP_get_name(const void *comp) | 1731 | SSL_COMP_get_name(const void *comp) |
| 1732 | { | 1732 | { |
| 1733 | return NULL; | 1733 | return NULL; |
| 1734 | } | 1734 | } |
| 1735 | #else | 1735 | #else |
| 1736 | STACK_OF(SSL_COMP) | 1736 | STACK_OF(SSL_COMP) * |
| 1737 | *SSL_COMP_get_compression_methods(void) | 1737 | SSL_COMP_get_compression_methods(void) |
| 1738 | { | 1738 | { |
| 1739 | load_builtin_compressions(); | 1739 | load_builtin_compressions(); |
| 1740 | return (ssl_comp_methods); | 1740 | return (ssl_comp_methods); |
| @@ -1782,8 +1782,8 @@ SSL_COMP_add_compression_method(int id, COMP_METHOD *cm) | |||
| 1782 | } | 1782 | } |
| 1783 | } | 1783 | } |
| 1784 | 1784 | ||
| 1785 | const char | 1785 | const char * |
| 1786 | *SSL_COMP_get_name(const COMP_METHOD *comp) | 1786 | SSL_COMP_get_name(const COMP_METHOD *comp) |
| 1787 | { | 1787 | { |
| 1788 | if (comp) | 1788 | if (comp) |
| 1789 | return comp->name; | 1789 | return comp->name; |
