diff options
Diffstat (limited to 'kio/misc/kntlm/des.cpp')
| -rw-r--r-- | kio/misc/kntlm/des.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kio/misc/kntlm/des.cpp b/kio/misc/kntlm/des.cpp index e1029a4ca..b6683ac34 100644 --- a/kio/misc/kntlm/des.cpp +++ b/kio/misc/kntlm/des.cpp @@ -25,7 +25,7 @@ static void permute_fp (unsigned char *inblock, DES_KEY * key, unsigned char *ou static void perminit_ip (DES_KEY * key); static void spinit (DES_KEY * key); static void perminit_fp (DES_KEY * key); -static TQ_UINT32 f (DES_KEY * key, TQ_UINT32 r, char *subkey); +static Q_UINT32 f (DES_KEY * key, Q_UINT32 r, char *subkey); /* Tables defined in the Data Encryption Standard documents */ @@ -211,8 +211,8 @@ ntlm_des_set_key (DES_KEY * dkey, char *user_key, int /*len*/) for (j = 0; j < 56; j++) { /* convert pc1 to bits of key */ l = pc1[j] - 1; /* integer bit location */ - m = l & 07; /* tqfind bit */ - pc1m[j] = (user_key[l >> 3] & /* tqfind which key byte l is in */ + m = l & 07; /* find bit */ + pc1m[j] = (user_key[l >> 3] & /* find which key byte l is in */ bytebit[m]) /* and which bit of that byte */ ? 1 : 0; /* and store 1-bit result */ @@ -227,7 +227,7 @@ ntlm_des_set_key (DES_KEY * dkey, char *user_key, int /*len*/) /* check bit that goes to kn[j] */ if (pcr[pc2[j] - 1]) { - /* tqmask it in if it's there */ + /* mask it in if it's there */ l = j % 6; dkey->kn[i][j / 6] |= bytebit[l] >> 2; } @@ -240,9 +240,9 @@ ntlm_des_set_key (DES_KEY * dkey, char *user_key, int /*len*/) static void ntlm_des_encrypt (DES_KEY * key, unsigned char *block) { - TQ_UINT32 left, right; + Q_UINT32 left, right; char *knp; - TQ_UINT32 work[2]; /* Working data storage */ + Q_UINT32 work[2]; /* Working data storage */ permute_ip (block, key, (unsigned char *) work); /* Initial Permutation */ left = KFromToBigEndian(work[0]); @@ -310,7 +310,7 @@ permute_ip (unsigned char *inblock, DES_KEY * key, unsigned char *outblock) ob = outblock; p = key->iperm[j][(*ib >> 4) & 0xf]; q = key->iperm[j + 1][*ib & 0xf]; - /* and each output byte, OR the tqmasks together */ + /* and each output byte, OR the masks together */ *ob++ |= *p++ | *q++; *ob++ |= *p++ | *q++; *ob++ |= *p++ | *q++; @@ -339,7 +339,7 @@ permute_fp (unsigned char *inblock, DES_KEY * key, unsigned char *outblock) ob = outblock; p = key->fperm[j][(*ib >> 4) & 0xf]; q = key->fperm[j + 1][*ib & 0xf]; - /* and each output byte, OR the tqmasks together */ + /* and each output byte, OR the masks together */ *ob++ |= *p++ | *q++; *ob++ |= *p++ | *q++; *ob++ |= *p++ | *q++; @@ -352,11 +352,11 @@ permute_fp (unsigned char *inblock, DES_KEY * key, unsigned char *outblock) } /* The nonlinear function f(r,k), the heart of DES */ -static TQ_UINT32 -f (DES_KEY * key, TQ_UINT32 r, char *subkey) +static Q_UINT32 +f (DES_KEY * key, Q_UINT32 r, char *subkey) { - TQ_UINT32 *spp; - TQ_UINT32 rval, rt; + Q_UINT32 *spp; + Q_UINT32 rval, rt; int er; #ifdef TRACE @@ -377,7 +377,7 @@ f (DES_KEY * key, TQ_UINT32 r, char *subkey) spp = &key->sp[7][0]; rval = spp[(er ^ *subkey--) & 0x3f]; spp -= 64; - rt = (TQ_UINT32) r >> 3; + rt = (Q_UINT32) r >> 3; rval |= spp[((int) rt ^ *subkey--) & 0x3f]; spp -= 64; rt >>= 4; @@ -457,7 +457,7 @@ spinit (DES_KEY * key) { char pbox[32]; int p, i, s, j, rowcol; - TQ_UINT32 val; + Q_UINT32 val; /* Compute pbox, the inverse of p32i. * This is easier to work with |