-rw-r--r-- | lib/secret.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/secret.cc b/lib/secret.cc index 632a2ca..d538890 100644 --- a/lib/secret.cc +++ b/lib/secret.cc | |||
@@ -11,37 +11,33 @@ namespace opkele { | |||
11 | struct bitwise_xor : public binary_function<__a1,__a2,__r> { | 11 | struct bitwise_xor : public binary_function<__a1,__a2,__r> { |
12 | __r operator() (const __a1& a1,const __a2& a2) const { | 12 | __r operator() (const __a1& a1,const __a2& a2) const { |
13 | return a1^a2; | 13 | return a1^a2; |
14 | } | 14 | } |
15 | }; | 15 | }; |
16 | 16 | ||
17 | void secret_t::enxor_to_base64(const unsigned char *key_sha1,string& rv) const { | 17 | void secret_t::enxor_to_base64(const unsigned char *key_d,string& rv) const { |
18 | if(size()!=20) | ||
19 | throw bad_input(OPKELE_CP_ "wrong secret size"); | ||
20 | vector<unsigned char> tmp; | 18 | vector<unsigned char> tmp; |
21 | transform( | 19 | transform( |
22 | begin(), end(), | 20 | begin(), end(), |
23 | key_sha1, | 21 | key_d, |
24 | back_insert_iterator<vector<unsigned char> >(tmp), | 22 | back_insert_iterator<vector<unsigned char> >(tmp), |
25 | bitwise_xor<unsigned char,unsigned char,unsigned char>() ); | 23 | bitwise_xor<unsigned char,unsigned char,unsigned char>() ); |
26 | rv = util::encode_base64(&(tmp.front()),tmp.size()); | 24 | rv = util::encode_base64(&(tmp.front()),tmp.size()); |
27 | } | 25 | } |
28 | 26 | ||
29 | void secret_t::enxor_from_base64(const unsigned char *key_sha1,const string& b64) { | 27 | void secret_t::enxor_from_base64(const unsigned char *key_d,const string& b64) { |
30 | clear(); | 28 | clear(); |
31 | util::decode_base64(b64,*this); | 29 | util::decode_base64(b64,*this); |
32 | transform( | 30 | transform( |
33 | begin(), end(), | 31 | begin(), end(), |
34 | key_sha1, | 32 | key_d, |
35 | begin(), | 33 | begin(), |
36 | bitwise_xor<unsigned char,unsigned char,unsigned char>() ); | 34 | bitwise_xor<unsigned char,unsigned char,unsigned char>() ); |
37 | } | 35 | } |
38 | 36 | ||
39 | void secret_t::to_base64(string& rv) const { | 37 | void secret_t::to_base64(string& rv) const { |
40 | if(size()!=20) | ||
41 | throw bad_input(OPKELE_CP_ "wrong secret size"); | ||
42 | rv = util::encode_base64(&(front()),size()); | 38 | rv = util::encode_base64(&(front()),size()); |
43 | } | 39 | } |
44 | 40 | ||
45 | void secret_t::from_base64(const string& b64) { | 41 | void secret_t::from_base64(const string& b64) { |
46 | util::decode_base64(b64,*this); | 42 | util::decode_base64(b64,*this); |
47 | } | 43 | } |