-rw-r--r-- | lib/secret.cc | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/lib/secret.cc b/lib/secret.cc index ae8a3c5..632a2ca 100644 --- a/lib/secret.cc +++ b/lib/secret.cc | |||
@@ -3,5 +3,5 @@ | |||
3 | #include <opkele/types.h> | 3 | #include <opkele/types.h> |
4 | #include <opkele/exception.h> | 4 | #include <opkele/exception.h> |
5 | #include <mimetic/mimetic.h> | 5 | #include <opkele/util.h> |
6 | 6 | ||
7 | namespace opkele { | 7 | namespace opkele { |
@@ -24,16 +24,10 @@ namespace opkele { | |||
24 | back_insert_iterator<vector<unsigned char> >(tmp), | 24 | back_insert_iterator<vector<unsigned char> >(tmp), |
25 | bitwise_xor<unsigned char,unsigned char,unsigned char>() ); | 25 | bitwise_xor<unsigned char,unsigned char,unsigned char>() ); |
26 | mimetic::Base64::Encoder b(0); | 26 | rv = util::encode_base64(&(tmp.front()),tmp.size()); |
27 | mimetic::encode( | ||
28 | tmp.begin(),tmp.end(), b, | ||
29 | back_insert_iterator<string>(rv) ); | ||
30 | } | 27 | } |
31 | 28 | ||
32 | void secret_t::enxor_from_base64(const unsigned char *key_sha1,const string& b64) { | 29 | void secret_t::enxor_from_base64(const unsigned char *key_sha1,const string& b64) { |
33 | mimetic::Base64::Decoder b; | ||
34 | clear(); | 30 | clear(); |
35 | mimetic::decode( | 31 | util::decode_base64(b64,*this); |
36 | b64.begin(),b64.end(), b, | ||
37 | back_insert_iterator<secret_t>(*this) ); | ||
38 | transform( | 32 | transform( |
39 | begin(), end(), | 33 | begin(), end(), |
@@ -46,15 +40,9 @@ namespace opkele { | |||
46 | if(size()!=20) | 40 | if(size()!=20) |
47 | throw bad_input(OPKELE_CP_ "wrong secret size"); | 41 | throw bad_input(OPKELE_CP_ "wrong secret size"); |
48 | mimetic::Base64::Encoder b(0); | 42 | rv = util::encode_base64(&(front()),size()); |
49 | mimetic::encode( | ||
50 | begin(),end(), b, | ||
51 | back_insert_iterator<string>(rv) ); | ||
52 | } | 43 | } |
53 | 44 | ||
54 | void secret_t::from_base64(const string& b64) { | 45 | void secret_t::from_base64(const string& b64) { |
55 | mimetic::Base64::Decoder b; | 46 | util::decode_base64(b64,*this); |
56 | mimetic::decode( | ||
57 | b64.begin(),b64.end(), b, | ||
58 | back_insert_iterator<secret_t>(*this) ); | ||
59 | } | 47 | } |
60 | 48 | ||