infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use more crypto constants

bug/bundler_fix
jvazquez-r7 2014-12-22 12:13:23 -06:00
parent b96d172ccc
commit f3b263f57d
14 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/msf/kerberos/client/tgs_request.rb
View File

@ -259,7 +259,7 @@ module Msf
# @see Rex::Proto::Kerberos::Model::Checksum
def build_tgs_body_checksum(opts = {})
body = opts[:body] || build_tgs_request_body(opts)
checksum_body = body.checksum(7)
checksum_body = body.checksum(Rex::Proto::Kerberos::Crypto::RSA_MD5)
checksum = Rex::Proto::Kerberos::Model::Checksum.new(
type: 7,
checksum: checksum_body

6
spec/lib/msf/kerberos/client/tgs_request_spec.rb
View File

@ -79,7 +79,7 @@ describe Msf::Kerberos::Client::TgsRequest do
it "creates a RSA-MD5 checksum" do
body = mod.build_tgs_request_body(body_opts)
expect(mod.build_tgs_body_checksum(:body => body).type).to eq(7)
expect(mod.build_tgs_body_checksum(:body => body).type).to eq(Rex::Proto::Kerberos::Crypto::RSA_MD5)
end
it "calculates and stores the checksum" do
@ -96,7 +96,7 @@ describe Msf::Kerberos::Client::TgsRequest do
it "creates a RSA-MD5 checksum" do
body = mod.build_tgs_request_body(body_opts)
expect(mod.build_tgs_body_checksum(:body => body).type).to eq(7)
expect(mod.build_tgs_body_checksum(:body => body).type).to eq(Rex::Proto::Kerberos::Crypto::RSA_MD5)
end
it "calculates and stores the checksum" do
@ -113,7 +113,7 @@ describe Msf::Kerberos::Client::TgsRequest do
end
it "creates a RC4-HMAC key" do
expect(mod.build_subkey.type).to eq(23)
expect(mod.build_subkey.type).to eq(Rex::Proto::Kerberos::Crypto::RC4_HMAC)
end
it "creates a key" do

2
spec/lib/rex/proto/kerberos/credential_cache/cache_spec.rb
View File

@ -39,7 +39,7 @@ describe Rex::Proto::Kerberos::CredentialCache::Cache do
)
key = Rex::Proto::Kerberos::CredentialCache::KeyBlock.new(
key_type: 23,
key_type: Rex::Proto::Kerberos::Crypto::RC4_HMAC,
e_type: 0,
key_value: "\xf5\x39\xcf\x42\x8a\x03\x2d\x97\x5b\x85\x04\x6e\xe7\xce\x67\x55"
)

2
spec/lib/rex/proto/kerberos/credential_cache/credential_spec.rb
View File

@ -36,7 +36,7 @@ describe Rex::Proto::Kerberos::CredentialCache::Credential do
)
key = Rex::Proto::Kerberos::CredentialCache::KeyBlock.new(
key_type: 23,
key_type: Rex::Proto::Kerberos::Crypto::RC4_HMAC,
e_type: 0,
key_value: "\xf5\x39\xcf\x42\x8a\x03\x2d\x97\x5b\x85\x04\x6e\xe7\xce\x67\x55"
)

2
spec/lib/rex/proto/kerberos/credential_cache/key_block.rb
View File

@ -18,7 +18,7 @@ describe Rex::Proto::Kerberos::CredentialCache::KeyBlock do
describe "#encode" do
it "encodes Rex::Proto::Kerberos::CredentialCache::KeyBlock correctly" do
key_block.e_type = 0
key_block.key_type = 23
key_block.key_type = Rex::Proto::Kerberos::Crypto::RC4_HMAC
key_block.key_value = "\xf5\x39\xcf\x42\x8a\x03\x2d\x97\x5b\x85\x04\x6e\xe7\xce\x67\x55"
expect(key_block.encode).to eq(sample)

2
spec/lib/rex/proto/kerberos/model/ap_req_spec.rb
View File

@ -409,7 +409,7 @@ describe Rex::Proto::Kerberos::Model::ApReq do
ticket = Rex::Proto::Kerberos::Model::Ticket.decode(ticket_der)
authenticator = Rex::Proto::Kerberos::Model::EncryptedData.new(
etype: 23,
etype: Rex::Proto::Kerberos::Crypto::RC4_HMAC,
cipher: cipher
)

4
spec/lib/rex/proto/kerberos/model/authenticator_spec.rb
View File

@ -9,7 +9,7 @@ describe Rex::Proto::Kerberos::Model::Authenticator do
described_class.new
end
let(:rsa_md5) { 7 }
let(:rsa_md5) { Rex::Proto::Kerberos::Crypto::RSA_MD5 }
let(:sample) do
"\x62\x7c\x30\x7a\xa0\x03\x02\x01\x05\xa1\x0c\x1b\x0a\x44\x45\x4d\x4f\x2e\x4c\x4f" +
@ -34,7 +34,7 @@ describe Rex::Proto::Kerberos::Model::Authenticator do
)
enc_key = Rex::Proto::Kerberos::Model::EncryptionKey.new(
type: 23,
type: Rex::Proto::Kerberos::Crypto::RC4_HMAC,
value: "\x7d\x63\xdd\x79\x73\x67\xce\x86\xbb\x5f\x2b\x8a\xba\x58\xfd\x6e"
)

2
spec/lib/rex/proto/kerberos/model/checksum_spec.rb
View File

@ -14,7 +14,7 @@ describe Rex::Proto::Kerberos::Model::Checksum do
"\xe5\x16\x02\x32\xb1\xc3\x4e\xad\x83\x1d\x43"
end
let(:rsa_md5) { 7 }
let(:rsa_md5) { Rex::Proto::Kerberos::Crypto::RSA_MD5 }
describe "#encode" do
it "encodes Rex::Proto::Kerberos::Model::Checksum correctly" do

2
spec/lib/rex/proto/kerberos/model/enc_kdc_response_spec.rb
View File

@ -253,7 +253,7 @@ describe Rex::Proto::Kerberos::Model::EncKdcResponse do
it "decodes the key correctly" do
enc_kdc_response.decode(enc_as_resp)
expect(enc_kdc_response.key.type).to eq(23)
expect(enc_kdc_response.key.type).to eq(Rex::Proto::Kerberos::Crypto::RC4_HMAC)
end
it "decodes the last_req correctly" do

2
spec/lib/rex/proto/kerberos/model/encrypted_data_spec.rb
View File

@ -140,7 +140,7 @@ describe Rex::Proto::Kerberos::Model::EncryptedData do
it "decodes etype correctly" do
encrypted_data.decode(sample_enc_data)
expect(encrypted_data.etype).to eq(23)
expect(encrypted_data.etype).to eq(Rex::Proto::Kerberos::Crypto::RC4_HMAC)
end
it "decodes cipher correctly" do

4
spec/lib/rex/proto/kerberos/model/kdc_request_body_spec.rb
View File

@ -479,7 +479,7 @@ describe Rex::Proto::Kerberos::Model::KdcRequestBody do
it "decodes etype" do
kdc_request_body.decode(sample_as_req)
expect(kdc_request_body.etype).to eq([23])
expect(kdc_request_body.etype).to eq([Rex::Proto::Kerberos::Crypto::RC4_HMAC])
end
it "doesn't decode enc_auth_data" do
@ -536,7 +536,7 @@ describe Rex::Proto::Kerberos::Model::KdcRequestBody do
it "decodes etype" do
kdc_request_body.decode(sample_tgs_req)
expect(kdc_request_body.etype).to eq([23])
expect(kdc_request_body.etype).to eq([Rex::Proto::Kerberos::Crypto::RC4_HMAC])
end
it "decodes enc_auth_data" do

2
spec/lib/rex/proto/kerberos/model/pre_auth_enc_time_stamp_spec.rb
View File

@ -48,7 +48,7 @@ describe Rex::Proto::Kerberos::Model::PreAuthEncTimeStamp do
let(:msg_type) { 1 }
let(:password) { 'juan' }
let(:enc_type) { 23 }
let(:enc_type) { Rex::Proto::Kerberos::Crypto::RC4_HMAC }
describe "#decode" do
it "returns the decoded Rex::Proto::Kerberos::Model::PreAuthEncTimeStamp" do

2
spec/lib/rex/proto/kerberos/pac/priv_srv_checksum_spec.rb
View File

@ -9,7 +9,7 @@ describe Rex::Proto::Kerberos::Pac::PrivSvrChecksum do
described_class.new
end
let(:rsa_md5) { 7 }
let(:rsa_md5) { Rex::Proto::Kerberos::Crypto::RSA_MD5 }
let(:rsa_md5_sample) do
"\x07\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"

2
spec/lib/rex/proto/kerberos/pac/server_checksum_spec.rb
View File

@ -9,7 +9,7 @@ describe Rex::Proto::Kerberos::Pac::ServerChecksum do
described_class.new
end
let(:rsa_md5) { 7 }
let(:rsa_md5) { Rex::Proto::Kerberos::Crypto::RSA_MD5 }
let(:rsa_md5_sample) do
"\x07\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"