Correct a bug in BN_kronecker.

[openssl.git] / ssl / s3_lib.c

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 9b664ab4cb76df7916561fb289d7249959efa5b9..b8ffbed64685a73a48e5fe06e75722a35b378775 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -638,10 +638,10 @@ SSL_CIPHER *ssl3_get_cipher(unsigned int u)
                return(NULL);
        }
 
-/* The problem is that it may not be the correct record type */
 int ssl3_pending(SSL *s)
        {
-       return(s->s3->rrec.length);
+       /* The problem is that it may not be the correct record type */
+       return(s->s3->rrec.length); /* FIXME */
        }
 
 int ssl3_new(SSL *s)
@@ -1041,7 +1041,7 @@ SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p)
        cpp=(SSL_CIPHER **)OBJ_bsearch((char *)&cp,
                (char *)sorted,
                SSL3_NUM_CIPHERS,sizeof(SSL_CIPHER *),
-               (int (*)())ssl_cipher_ptr_id_cmp);
+               FP_ICC ssl_cipher_ptr_id_cmp);
        if ((cpp == NULL) || !(*cpp)->valid)
                return(NULL);
        else
@@ -1280,6 +1280,10 @@ int ssl3_read(SSL *s, void *buf, int len)
 
 int ssl3_peek(SSL *s, char *buf, int len)
        {
+#if 1
+       SSLerr(SSL_F_SSL3_PEEK, SSL_R_FIXME); /* function is totally broken */
+       return -1;
+#else  
        SSL3_RECORD *rr;
        int n;
 
@@ -1298,6 +1302,7 @@ int ssl3_peek(SSL *s, char *buf, int len)
                n=len;
        memcpy(buf,&(rr->data[rr->off]),(unsigned int)n);
        return(n);
+#endif
        }
 
 int ssl3_renegotiate(SSL *s)