aboutsummaryrefslogtreecommitdiff
path: root/openssl/ssl/s23_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'openssl/ssl/s23_lib.c')
-rw-r--r--openssl/ssl/s23_lib.c211
1 files changed, 101 insertions, 110 deletions
diff --git a/openssl/ssl/s23_lib.c b/openssl/ssl/s23_lib.c
index f3c29d1dd..9056d39e8 100644
--- a/openssl/ssl/s23_lib.c
+++ b/openssl/ssl/s23_lib.c
@@ -5,21 +5,21 @@
* This package is an SSL implementation written
* by Eric Young (eay@cryptsoft.com).
* The implementation was written so as to conform with Netscapes SSL.
- *
+ *
* This library is free for commercial and non-commercial use as long as
* the following conditions are aheared to. The following conditions
* apply to all code found in this distribution, be it the RC4, RSA,
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
* included with this distribution is covered by the same copyright terms
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
+ *
* Copyright remains Eric Young's, and as such any Copyright notices in
* the code are not to be removed.
* If this package is used in a product, Eric Young should be given attribution
* as the author of the parts of the library used.
* This can be in the form of a textual message at program startup or
* in documentation (online or textual) provided with the package.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -34,10 +34,10 @@
* Eric Young (eay@cryptsoft.com)"
* The word 'cryptographic' can be left out if the rouines from the library
* being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
+ * 4. If you include any Windows specific code (or a derivative thereof) from
* the apps directory (application code) you must include an acknowledgement:
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
+ *
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
+ *
* The licence and distribution terms for any publically available version or
* derivative of this code cannot be changed. i.e. this code cannot simply be
* copied and put under another distribution licence
@@ -61,134 +61,125 @@
#include "ssl_locl.h"
long ssl23_default_timeout(void)
- {
- return(300);
- }
+{
+ return (300);
+}
int ssl23_num_ciphers(void)
- {
- return(ssl3_num_ciphers()
+{
+ return (ssl3_num_ciphers()
#ifndef OPENSSL_NO_SSL2
- + ssl2_num_ciphers()
+ + ssl2_num_ciphers()
#endif
- );
- }
+ );
+}
const SSL_CIPHER *ssl23_get_cipher(unsigned int u)
- {
- unsigned int uu=ssl3_num_ciphers();
+{
+ unsigned int uu = ssl3_num_ciphers();
- if (u < uu)
- return(ssl3_get_cipher(u));
- else
+ if (u < uu)
+ return (ssl3_get_cipher(u));
+ else
#ifndef OPENSSL_NO_SSL2
- return(ssl2_get_cipher(u-uu));
+ return (ssl2_get_cipher(u - uu));
#else
- return(NULL);
+ return (NULL);
#endif
- }
+}
-/* This function needs to check if the ciphers required are actually
- * available */
+/*
+ * This function needs to check if the ciphers required are actually
+ * available
+ */
const SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p)
- {
- const SSL_CIPHER *cp;
+{
+ const SSL_CIPHER *cp;
- cp=ssl3_get_cipher_by_char(p);
+ cp = ssl3_get_cipher_by_char(p);
#ifndef OPENSSL_NO_SSL2
- if (cp == NULL)
- cp=ssl2_get_cipher_by_char(p);
+ if (cp == NULL)
+ cp = ssl2_get_cipher_by_char(p);
#endif
- return(cp);
- }
+ return (cp);
+}
int ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p)
- {
- long l;
+{
+ long l;
- /* We can write SSLv2 and SSLv3 ciphers */
- /* but no ECC ciphers */
- if (c->algorithm_mkey == SSL_kECDHr ||
- c->algorithm_mkey == SSL_kECDHe ||
- c->algorithm_mkey == SSL_kEECDH ||
- c->algorithm_auth == SSL_aECDH ||
- c->algorithm_auth == SSL_aECDSA)
- return 0;
- if (p != NULL)
- {
- l=c->id;
- p[0]=((unsigned char)(l>>16L))&0xFF;
- p[1]=((unsigned char)(l>> 8L))&0xFF;
- p[2]=((unsigned char)(l ))&0xFF;
- }
- return(3);
- }
+ /* We can write SSLv2 and SSLv3 ciphers */
+ /* but no ECC ciphers */
+ if (c->algorithm_mkey == SSL_kECDHr ||
+ c->algorithm_mkey == SSL_kECDHe ||
+ c->algorithm_mkey == SSL_kEECDH ||
+ c->algorithm_auth == SSL_aECDH || c->algorithm_auth == SSL_aECDSA)
+ return 0;
+ if (p != NULL) {
+ l = c->id;
+ p[0] = ((unsigned char)(l >> 16L)) & 0xFF;
+ p[1] = ((unsigned char)(l >> 8L)) & 0xFF;
+ p[2] = ((unsigned char)(l)) & 0xFF;
+ }
+ return (3);
+}
int ssl23_read(SSL *s, void *buf, int len)
- {
- int n;
+{
+ int n;
- clear_sys_error();
- if (SSL_in_init(s) && (!s->in_handshake))
- {
- n=s->handshake_func(s);
- if (n < 0) return(n);
- if (n == 0)
- {
- SSLerr(SSL_F_SSL23_READ,SSL_R_SSL_HANDSHAKE_FAILURE);
- return(-1);
- }
- return(SSL_read(s,buf,len));
- }
- else
- {
- ssl_undefined_function(s);
- return(-1);
- }
- }
+ clear_sys_error();
+ if (SSL_in_init(s) && (!s->in_handshake)) {
+ n = s->handshake_func(s);
+ if (n < 0)
+ return (n);
+ if (n == 0) {
+ SSLerr(SSL_F_SSL23_READ, SSL_R_SSL_HANDSHAKE_FAILURE);
+ return (-1);
+ }
+ return (SSL_read(s, buf, len));
+ } else {
+ ssl_undefined_function(s);
+ return (-1);
+ }
+}
int ssl23_peek(SSL *s, void *buf, int len)
- {
- int n;
+{
+ int n;
- clear_sys_error();
- if (SSL_in_init(s) && (!s->in_handshake))
- {
- n=s->handshake_func(s);
- if (n < 0) return(n);
- if (n == 0)
- {
- SSLerr(SSL_F_SSL23_PEEK,SSL_R_SSL_HANDSHAKE_FAILURE);
- return(-1);
- }
- return(SSL_peek(s,buf,len));
- }
- else
- {
- ssl_undefined_function(s);
- return(-1);
- }
- }
+ clear_sys_error();
+ if (SSL_in_init(s) && (!s->in_handshake)) {
+ n = s->handshake_func(s);
+ if (n < 0)
+ return (n);
+ if (n == 0) {
+ SSLerr(SSL_F_SSL23_PEEK, SSL_R_SSL_HANDSHAKE_FAILURE);
+ return (-1);
+ }
+ return (SSL_peek(s, buf, len));
+ } else {
+ ssl_undefined_function(s);
+ return (-1);
+ }
+}
int ssl23_write(SSL *s, const void *buf, int len)
- {
- int n;
+{
+ int n;
- clear_sys_error();
- if (SSL_in_init(s) && (!s->in_handshake))
- {
- n=s->handshake_func(s);
- if (n < 0) return(n);
- if (n == 0)
- {
- SSLerr(SSL_F_SSL23_WRITE,SSL_R_SSL_HANDSHAKE_FAILURE);
- return(-1);
- }
- return(SSL_write(s,buf,len));
- }
- else
- {
- ssl_undefined_function(s);
- return(-1);
- }
- }
+ clear_sys_error();
+ if (SSL_in_init(s) && (!s->in_handshake)) {
+ n = s->handshake_func(s);
+ if (n < 0)
+ return (n);
+ if (n == 0) {
+ SSLerr(SSL_F_SSL23_WRITE, SSL_R_SSL_HANDSHAKE_FAILURE);
+ return (-1);
+ }
+ return (SSL_write(s, buf, len));
+ } else {
+ ssl_undefined_function(s);
+ return (-1);
+ }
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 14:26:10 +0000