Solution proposal for issue #1647.

[openssl.git] / test / bad_dtls_test.c

diff --git a/test/bad_dtls_test.c b/test/bad_dtls_test.c
index 5d0c6712c060812f6575a00111c0ae28ab01ad02..1408a1354e08feaa65115af09d03011dbefdd92c 100644 (file)
--- a/test/bad_dtls_test.c
+++ b/test/bad_dtls_test.c
@@ -38,8 +38,8 @@
 #include <openssl/rand.h>
 #include <openssl/kdf.h>
 
-#include "ssl/packet_locl.h"
-#include "e_os.h" /* for OSSL_NELEM() */
+#include "../ssl/packet_locl.h"
+#include "../e_os.h" /* for OSSL_NELEM() */
 
 /* For DTLS1_BAD_VER packets the MAC doesn't include the handshake header */
 #define MAC_OFFSET (DTLS1_RT_HEADER_LENGTH + DTLS1_HM_HEADER_LENGTH)
@@ -111,25 +111,10 @@ static SSL_SESSION *client_session(void)
     return d2i_SSL_SESSION(NULL, &p, sizeof(session_asn1));
 }
 
-/* PACKET_equal() doesn't quite do what we need. Provide a version that
- * does, in a form that can easily be moved to ssl_locl.h if anyone else
- * cares to come up with a better name and use it too... */
-__owur static ossl_inline int PACKET_starts(PACKET *pkt, const void *ptr,
-                                            size_t num)
-{
-    if (PACKET_remaining(pkt) < num)
-        return 0;
-    if (CRYPTO_memcmp(pkt->curr, ptr, num) != 0)
-        return 0;
-
-    packet_forward(pkt, num);
-    return 1;
-}
-
 /* Returns 1 for initial ClientHello, 2 for ClientHello with cookie */
 static int validate_client_hello(BIO *wbio)
 {
-    PACKET pkt;
+    PACKET pkt, pkt2;
     long len;
     unsigned char *data;
     int cookie_found = 0;
@@ -165,16 +150,15 @@ static int validate_client_hello(BIO *wbio)
         return 0;
 
     /* Check session id length and content */
-    if (!PACKET_get_1(&pkt, &u))
-        return 0;
-    if (u != sizeof(session_id) || !PACKET_starts(&pkt, session_id, u))
+    if (!PACKET_get_length_prefixed_1(&pkt, &pkt2) ||
+        !PACKET_equal(&pkt2, session_id, sizeof(session_id)))
         return 0;
 
     /* Check cookie */
-    if (!PACKET_get_1(&pkt, &u))
+    if (!PACKET_get_length_prefixed_1(&pkt, &pkt2))
         return 0;
-    if (u) {
-        if (u != sizeof(cookie) || !PACKET_starts(&pkt, cookie, u))
+    if (PACKET_remaining(&pkt2)) {
+        if (!PACKET_equal(&pkt2, cookie, sizeof(cookie)))
             return 0;
         cookie_found = 1;
     }
@@ -467,6 +451,7 @@ int main(int argc, char *argv[])
     BIO *rbio;
     BIO *wbio;
     BIO *err;
+    time_t now = 0;
     int testresult = 0;
     int ret;
     int i;
@@ -480,7 +465,9 @@ int main(int argc, char *argv[])
     RAND_bytes(master_secret, sizeof(master_secret));
     RAND_bytes(cookie, sizeof(cookie));
     RAND_bytes(server_random + 4, sizeof(server_random) - 4);
-    time((void *)server_random);
+
+    now = time(NULL);
+    memcpy(server_random, &now, sizeof(now));
 
     sess = client_session();
     if (sess == NULL) {