Fix some CA lengths etc., and it accepts our cert!

diff --git a/mcs.c b/mcs.c
index 25361e8807c9bcf565dff4b05781050754f2fc8b..7888d8be18fa8641124bdd3063f228ae081ad345 100644 (file)
--- a/mcs.c
+++ b/mcs.c
@@ -321,7 +321,7 @@ mcs_send_connect_response()
        out_uint8(s, 0x44);
        out_uint8(s, 0x6e);
 
        out_uint8(s, 0x44);
        out_uint8(s, 0x6e);
 

-       length = 106 + sizeof(cacert) + sizeof(server_cert);
+       length = 108 + sizeof(cacert) + sizeof(server_cert);

        
        // two bytes of length
        out_uint8(s, 0x80 | (length >> 8));
        
        // two bytes of length
        out_uint8(s, 0x80 | (length >> 8));


@@ -346,12 +346,12 @@ mcs_send_connect_response()
        // crypto info
        out_uint16_le(s, SEC_TAG_SRV_CRYPT);
        out_uint16_le(s, 84 + sizeof(cacert) + sizeof(server_cert)); // length
        // crypto info
        out_uint16_le(s, SEC_TAG_SRV_CRYPT);
        out_uint16_le(s, 84 + sizeof(cacert) + sizeof(server_cert)); // length

-       out_uint32_le(s, 2); // 128-bit
-       out_uint32_le(s, 3); // high
+       out_uint32_le(s, 8); // 128-bit
+       out_uint32_le(s, 2); // medium

 
        out_uint32_le(s, SEC_RANDOM_SIZE); // random_len
        out_uint32_le(s, 32 + sizeof(cacert) + sizeof(server_cert));             // rsa_info_len
 
        out_uint32_le(s, SEC_RANDOM_SIZE); // random_len
        out_uint32_le(s, 32 + sizeof(cacert) + sizeof(server_cert));             // rsa_info_len

-       out_uint8s(s, SEC_RANDOM_SIZE);    // server_random
+       out_uint8p(s, cacert, SEC_RANDOM_SIZE);    // server_"random"

        out_uint32_le(s, 0x80000002);      // X.509
        out_uint32_le(s, 2);               // number of certificates
 
        out_uint32_le(s, 0x80000002);      // X.509
        out_uint32_le(s, 2);               // number of certificates