More DES library cleanups: remove references to srand/rand

[openssl.git] / ssl / s3_both.c

diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index d5f8c464ba4449c31a293ae352ca19f888c50dcb..f3f27715d571729349f469f259a62df30901909d 100644 (file)
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -57,18 +57,13 @@
  */
 
 #include <stdio.h>
-#include "buffer.h"
-#include "rand.h"
-#include "objects.h"
-#include "evp.h"
-#include "x509.h"
+#include <openssl/buffer.h>
+#include <openssl/rand.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
 #include "ssl_locl.h"
 
-#define BREAK  break
-
-/* SSL3err(SSL_F_SSL3_GET_FINISHED,SSL_R_EXCESSIVE_MESSAGE_SIZE);
- */
-
 int ssl3_send_finished(SSL *s, int a, int b, unsigned char *sender,
             int slen)
        {
@@ -284,9 +279,8 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
 
        if (s->state == st1)
                {
-               i=ssl3_read_bytes(s,SSL3_RT_HANDSHAKE,
-                       (char *)&(p[s->init_num]),
-                       4-s->init_num);
+               i=ssl3_read_bytes(s,SSL3_RT_HANDSHAKE,&p[s->init_num],
+                                 4-s->init_num);
                if (i < (4-s->init_num))
                        {
                        *ok=0;
@@ -324,8 +318,7 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
        n=s->s3->tmp.message_size;
        if (n > 0)
                {
-               i=ssl3_read_bytes(s,SSL3_RT_HANDSHAKE,
-                       (char *)&(p[s->init_num]),(int)n);
+               i=ssl3_read_bytes(s,SSL3_RT_HANDSHAKE,&p[s->init_num],n);
                if (i != (int)n)
                        {
                        *ok=0;