Put the core schannel functions to parse_prs.c. They are also used by

schannel clients.

Volker

diff --git a/source/rpc_parse/parse_prs.c b/source/rpc_parse/parse_prs.c
index aeaa42ac92b5228056a517b1ee31fd4393c5f971..a22ae1bacdaaa15631a7ec36f7a97b3e0854749f 100644 (file)
--- a/source/rpc_parse/parse_prs.c
+++ b/source/rpc_parse/parse_prs.c
@@ -1330,3 +1330,185 @@ BOOL prs_hash1(prs_struct *ps, uint32 offset, uint8 sess_key[16])
 
        return True;
 }
+
+static void netsechash(uchar * key, uchar * data, int data_len)
+{
+       uchar hash[256];
+       uchar index_i = 0;
+       uchar index_j = 0;
+       uchar j = 0;
+       int ind;
+
+       for (ind = 0; ind < 256; ind++)
+       {
+               hash[ind] = (uchar) ind;
+       }
+
+       for (ind = 0; ind < 256; ind++)
+       {
+               uchar tc;
+
+               j += (hash[ind] + key[ind % 16]);
+
+               tc = hash[ind];
+               hash[ind] = hash[j];
+               hash[j] = tc;
+       }
+
+       for (ind = 0; ind < data_len; ind++)
+       {
+               uchar tc;
+               uchar t;
+
+               index_i++;
+               index_j += hash[index_i];
+
+               tc = hash[index_i];
+               hash[index_i] = hash[index_j];
+               hash[index_j] = tc;
+
+               t = hash[index_i] + hash[index_j];
+               data[ind] ^= hash[t];
+       }
+}
+
+void dump_data_pw(const char *msg, const uchar * data, size_t len)
+{
+#ifdef DEBUG_PASSWORD
+       DEBUG(11, ("%s", msg));
+       if (data != NULL && len > 0)
+       {
+               dump_data(11, data, len);
+       }
+#endif
+}
+
+void netsec_encode(struct netsec_auth_struct *a,
+                  RPC_AUTH_NETSEC_CHK * verf, char *data, size_t data_len)
+{
+       uchar dataN[4];
+       uchar digest1[16];
+       struct MD5Context ctx3;
+       uchar sess_kf0[16];
+       int i;
+
+       /* store the sequence number */
+       SIVAL(dataN, 0, a->seq_num);
+
+       for (i = 0; i < sizeof(sess_kf0); i++)
+       {
+               sess_kf0[i] = a->sess_key[i] ^ 0xf0;
+       }
+
+       dump_data_pw("a->sess_key:\n", a->sess_key, sizeof(a->sess_key));
+       dump_data_pw("a->seq_num :\n", dataN, sizeof(dataN));
+
+       MD5Init(&ctx3);
+       MD5Update(&ctx3, dataN, 0x4);
+       MD5Update(&ctx3, verf->sig, 8);
+
+       MD5Update(&ctx3, verf->data8, 8);
+
+       dump_data_pw("verf->data8:\n", verf->data8, sizeof(verf->data8));
+       dump_data_pw("sess_kf0:\n", sess_kf0, sizeof(sess_kf0));
+
+       hmac_md5(sess_kf0, dataN, 0x4, digest1);
+       dump_data_pw("digest1 (ebp-8):\n", digest1, sizeof(digest1));
+       hmac_md5(digest1, verf->data3, 8, digest1);
+       dump_data_pw("netsechashkey:\n", digest1, sizeof(digest1));
+       netsechash(digest1, verf->data8, 8);
+
+       dump_data_pw("verf->data8:\n", verf->data8, sizeof(verf->data8));
+
+       dump_data_pw("data   :\n", data, data_len);
+       MD5Update(&ctx3, data, data_len);
+
+       {
+               char digest_tmp[16];
+               char digest2[16];
+               MD5Final(digest_tmp, &ctx3);
+               hmac_md5(a->sess_key, digest_tmp, 16, digest2);
+               dump_data_pw("digest_tmp:\n", digest_tmp, sizeof(digest_tmp));
+               dump_data_pw("digest:\n", digest2, sizeof(digest2));
+               memcpy(verf->data1, digest2, sizeof(verf->data1));
+       }
+
+       netsechash(digest1, data, data_len);
+       dump_data_pw("data:\n", data, data_len);
+
+       hmac_md5(a->sess_key, dataN, 0x4, digest1);
+       dump_data_pw("ctx:\n", digest1, sizeof(digest1));
+
+       hmac_md5(digest1, verf->data1, 8, digest1);
+
+       dump_data_pw("netsechashkey:\n", digest1, sizeof(digest1));
+
+       dump_data_pw("verf->data3:\n", verf->data3, sizeof(verf->data3));
+       netsechash(digest1, verf->data3, 8);
+       dump_data_pw("verf->data3:\n", verf->data3, sizeof(verf->data3));
+
+       return;
+}
+
+BOOL netsec_decode(struct netsec_auth_struct *a,
+                  RPC_AUTH_NETSEC_CHK * verf, char *data, size_t data_len)
+{
+       uchar dataN[4];
+       uchar digest1[16];
+       struct MD5Context ctx3;
+       uchar sess_kf0[16];
+       int i;
+
+       /* store the sequence number */
+       SIVAL(dataN, 0, a->seq_num);
+
+       for (i = 0; i < sizeof(sess_kf0); i++)
+       {
+               sess_kf0[i] = a->sess_key[i] ^ 0xf0;
+       }
+
+       dump_data_pw("a->sess_key:\n", a->sess_key, sizeof(a->sess_key));
+       dump_data_pw("a->seq_num :\n", dataN, sizeof(dataN));
+       hmac_md5(a->sess_key, dataN, 0x4, digest1);
+       dump_data_pw("ctx:\n", digest1, sizeof(digest1));
+
+       hmac_md5(digest1, verf->data1, 8, digest1);
+
+       dump_data_pw("netsechashkey:\n", digest1, sizeof(digest1));
+       dump_data_pw("verf->data3:\n", verf->data3, sizeof(verf->data3));
+       netsechash(digest1, verf->data3, 8);
+       dump_data_pw("verf->data3_dec:\n", verf->data3, sizeof(verf->data3));
+
+       MD5Init(&ctx3);
+       MD5Update(&ctx3, dataN, 0x4);
+       MD5Update(&ctx3, verf->sig, 8);
+
+       dump_data_pw("sess_kf0:\n", sess_kf0, sizeof(sess_kf0));
+
+       hmac_md5(sess_kf0, dataN, 0x4, digest1);
+       dump_data_pw("digest1 (ebp-8):\n", digest1, sizeof(digest1));
+       hmac_md5(digest1, verf->data3, 8, digest1);
+       dump_data_pw("netsechashkey:\n", digest1, sizeof(digest1));
+
+       dump_data_pw("verf->data8:\n", verf->data8, sizeof(verf->data8));
+       netsechash(digest1, verf->data8, 8);
+       dump_data_pw("verf->data8_dec:\n", verf->data8, sizeof(verf->data8));
+       MD5Update(&ctx3, verf->data8, 8);
+
+       dump_data_pw("data   :\n", data, data_len);
+       netsechash(digest1, data, data_len);
+       dump_data_pw("datadec:\n", data, data_len);
+
+       MD5Update(&ctx3, data, data_len);
+       {
+               uchar digest_tmp[16];
+               MD5Final(digest_tmp, &ctx3);
+               hmac_md5(a->sess_key, digest_tmp, 16, digest1);
+               dump_data_pw("digest_tmp:\n", digest_tmp, sizeof(digest_tmp));
+       }
+
+       dump_data_pw("digest:\n", digest1, sizeof(digest1));
+       dump_data_pw("verf->data1:\n", verf->data1, sizeof(verf->data1));
+
+       return memcmp(digest1, verf->data1, sizeof(verf->data1)) == 0;
+}

diff --git a/source/rpc_server/srv_pipe.c b/source/rpc_server/srv_pipe.c
index 9425ccbe4d5bb09753d43bc42c58aae67f6a917a..43fbb4edaacec9a436e8d01706ff0afbeba57dda 100644 (file)
--- a/source/rpc_server/srv_pipe.c
+++ b/source/rpc_server/srv_pipe.c
@@ -284,13 +284,10 @@ BOOL create_next_pdu(pipes_struct *p)
 
                init_rpc_auth_netsec_chk(&verf, netsec_sig, nullbytes, sign, nullbytes);
 
-               if (!netsec_encode(&p->netsec_auth, &verf, data, data_len)) {
-                       DEBUG(0,("create_next_pdu: failed encode data.\n"));
-                       prs_mem_free(&outgoing_pdu);
-                       return False;
-               }
+               netsec_encode(&p->netsec_auth, &verf, data, data_len);
 
                smb_io_rpc_auth_netsec_chk("", &verf, &outgoing_pdu, 0);
+
                p->netsec_auth.seq_num++;
        }
 
@@ -1269,188 +1266,6 @@ BOOL api_pipe_auth_process(pipes_struct *p, prs_struct *rpc_in)
        return True;
 }
 
-static void netsechash(uchar * key, uchar * data, int data_len)
-{
-       uchar hash[256];
-       uchar index_i = 0;
-       uchar index_j = 0;
-       uchar j = 0;
-       int ind;
-
-       for (ind = 0; ind < 256; ind++)
-       {
-               hash[ind] = (uchar) ind;
-       }
-
-       for (ind = 0; ind < 256; ind++)
-       {
-               uchar tc;
-
-               j += (hash[ind] + key[ind % 16]);
-
-               tc = hash[ind];
-               hash[ind] = hash[j];
-               hash[j] = tc;
-       }
-
-       for (ind = 0; ind < data_len; ind++)
-       {
-               uchar tc;
-               uchar t;
-
-               index_i++;
-               index_j += hash[index_i];
-
-               tc = hash[index_i];
-               hash[index_i] = hash[index_j];
-               hash[index_j] = tc;
-
-               t = hash[index_i] + hash[index_j];
-               data[ind] ^= hash[t];
-       }
-}
-
-void dump_data_pw(const char *msg, const uchar * data, size_t len)
-{
-#ifdef DEBUG_PASSWORD
-       DEBUG(11, ("%s", msg));
-       if (data != NULL && len > 0)
-       {
-               dump_data(11, data, len);
-       }
-#endif
-}
-
-BOOL netsec_encode(struct netsec_auth_struct *a,
-                  RPC_AUTH_NETSEC_CHK * verf, char *data, size_t data_len)
-{
-       uchar dataN[4];
-       uchar digest1[16];
-       struct MD5Context ctx3;
-       uchar sess_kf0[16];
-       int i;
-
-       /* store the sequence number */
-       SIVAL(dataN, 0, a->seq_num);
-
-       for (i = 0; i < sizeof(sess_kf0); i++)
-       {
-               sess_kf0[i] = a->sess_key[i] ^ 0xf0;
-       }
-
-       dump_data_pw("a->sess_key:\n", a->sess_key, sizeof(a->sess_key));
-       dump_data_pw("a->seq_num :\n", dataN, sizeof(dataN));
-
-       MD5Init(&ctx3);
-       MD5Update(&ctx3, dataN, 0x4);
-       MD5Update(&ctx3, verf->sig, 8);
-
-       MD5Update(&ctx3, verf->data8, 8);
-
-       dump_data_pw("verf->data8:\n", verf->data8, sizeof(verf->data8));
-       dump_data_pw("sess_kf0:\n", sess_kf0, sizeof(sess_kf0));
-
-       hmac_md5(sess_kf0, dataN, 0x4, digest1);
-       dump_data_pw("digest1 (ebp-8):\n", digest1, sizeof(digest1));
-       hmac_md5(digest1, verf->data3, 8, digest1);
-       dump_data_pw("netsechashkey:\n", digest1, sizeof(digest1));
-       netsechash(digest1, verf->data8, 8);
-
-       dump_data_pw("verf->data8:\n", verf->data8, sizeof(verf->data8));
-
-       dump_data_pw("data   :\n", data, data_len);
-       MD5Update(&ctx3, data, data_len);
-
-       {
-               char digest_tmp[16];
-               char digest2[16];
-               MD5Final(digest_tmp, &ctx3);
-               hmac_md5(a->sess_key, digest_tmp, 16, digest2);
-               dump_data_pw("digest_tmp:\n", digest_tmp, sizeof(digest_tmp));
-               dump_data_pw("digest:\n", digest2, sizeof(digest2));
-               memcpy(verf->data1, digest2, sizeof(verf->data1));
-       }
-
-       netsechash(digest1, data, data_len);
-       dump_data_pw("data:\n", data, data_len);
-
-       hmac_md5(a->sess_key, dataN, 0x4, digest1);
-       dump_data_pw("ctx:\n", digest1, sizeof(digest1));
-
-       hmac_md5(digest1, verf->data1, 8, digest1);
-
-       dump_data_pw("netsechashkey:\n", digest1, sizeof(digest1));
-
-       dump_data_pw("verf->data3:\n", verf->data3, sizeof(verf->data3));
-       netsechash(digest1, verf->data3, 8);
-       dump_data_pw("verf->data3:\n", verf->data3, sizeof(verf->data3));
-
-       return True;
-}
-
-BOOL netsec_decode(struct netsec_auth_struct *a,
-                  RPC_AUTH_NETSEC_CHK * verf, char *data, size_t data_len)
-{
-       uchar dataN[4];
-       uchar digest1[16];
-       struct MD5Context ctx3;
-       uchar sess_kf0[16];
-       int i;
-
-       /* store the sequence number */
-       SIVAL(dataN, 0, a->seq_num);
-
-       for (i = 0; i < sizeof(sess_kf0); i++)
-       {
-               sess_kf0[i] = a->sess_key[i] ^ 0xf0;
-       }
-
-       dump_data_pw("a->sess_key:\n", a->sess_key, sizeof(a->sess_key));
-       dump_data_pw("a->seq_num :\n", dataN, sizeof(dataN));
-       hmac_md5(a->sess_key, dataN, 0x4, digest1);
-       dump_data_pw("ctx:\n", digest1, sizeof(digest1));
-
-       hmac_md5(digest1, verf->data1, 8, digest1);
-
-       dump_data_pw("netsechashkey:\n", digest1, sizeof(digest1));
-       dump_data_pw("verf->data3:\n", verf->data3, sizeof(verf->data3));
-       netsechash(digest1, verf->data3, 8);
-       dump_data_pw("verf->data3_dec:\n", verf->data3, sizeof(verf->data3));
-
-       MD5Init(&ctx3);
-       MD5Update(&ctx3, dataN, 0x4);
-       MD5Update(&ctx3, verf->sig, 8);
-
-       dump_data_pw("sess_kf0:\n", sess_kf0, sizeof(sess_kf0));
-
-       hmac_md5(sess_kf0, dataN, 0x4, digest1);
-       dump_data_pw("digest1 (ebp-8):\n", digest1, sizeof(digest1));
-       hmac_md5(digest1, verf->data3, 8, digest1);
-       dump_data_pw("netsechashkey:\n", digest1, sizeof(digest1));
-
-       dump_data_pw("verf->data8:\n", verf->data8, sizeof(verf->data8));
-       netsechash(digest1, verf->data8, 8);
-       dump_data_pw("verf->data8_dec:\n", verf->data8, sizeof(verf->data8));
-       MD5Update(&ctx3, verf->data8, 8);
-
-       dump_data_pw("data   :\n", data, data_len);
-       netsechash(digest1, data, data_len);
-       dump_data_pw("datadec:\n", data, data_len);
-
-       MD5Update(&ctx3, data, data_len);
-       {
-               uchar digest_tmp[16];
-               MD5Final(digest_tmp, &ctx3);
-               hmac_md5(a->sess_key, digest_tmp, 16, digest1);
-               dump_data_pw("digest_tmp:\n", digest_tmp, sizeof(digest_tmp));
-       }
-
-       dump_data_pw("digest:\n", digest1, sizeof(digest1));
-       dump_data_pw("verf->data1:\n", verf->data1, sizeof(verf->data1));
-
-       return memcmp(digest1, verf->data1, sizeof(verf->data1)) == 0;
-}
-
 /****************************************************************************
  Deal with schannel processing on an RPC request.
 ****************************************************************************/