author | Michael Krelin <hacker@klever.net> | 2009-04-06 20:27:39 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2009-04-06 20:27:39 (UTC) |
commit | 51d8a8a4ac6ef6096c393fd602df34c6bf8f6366 (patch) (unidiff) | |
tree | 8126f60fac6562b14c965e41d19983d81312638a /src/eyetil.h | |
parent | de964540e5a58b3a9195c642ef7a0745ee3b2344 (diff) | |
download | iii-51d8a8a4ac6ef6096c393fd602df34c6bf8f6366.zip iii-51d8a8a4ac6ef6096c393fd602df34c6bf8f6366.tar.gz iii-51d8a8a4ac6ef6096c393fd602df34c6bf8f6366.tar.bz2 |
better nonce generation and session credentials verification
based on the patch from Chris Davies
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | src/eyetil.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/eyetil.h b/src/eyetil.h index 378f703..d946e71 100644 --- a/src/eyetil.h +++ b/src/eyetil.h | |||
@@ -1,51 +1,52 @@ | |||
1 | #ifndef __EYETIL_H | 1 | #ifndef __EYETIL_H |
2 | #define __EYETIL_H | 2 | #define __EYETIL_H |
3 | 3 | ||
4 | #include <vector> | 4 | #include <vector> |
5 | #include <string> | 5 | #include <string> |
6 | #include <archive.h> | 6 | #include <archive.h> |
7 | #include <archive_entry.h> | 7 | #include <archive_entry.h> |
8 | 8 | ||
9 | class binary_t : public std::vector<unsigned char> { | 9 | class binary_t : public std::vector<unsigned char> { |
10 | public: | 10 | public: |
11 | binary_t() { } | 11 | binary_t() { } |
12 | binary_t(size_type n) : std::vector<unsigned char>(n) { } | 12 | binary_t(size_type n) : std::vector<unsigned char>(n) { } |
13 | binary_t(const std::string& h) { from_hex(h); } | 13 | binary_t(const std::string& h) { from_hex(h); } |
14 | binary_t(const void *d,size_t s) { from_data(d,s); } | 14 | binary_t(const void *d,size_t s) { from_data(d,s); } |
15 | 15 | ||
16 | binary_t& from_hex(const std::string& h); | 16 | binary_t& from_hex(const std::string& h); |
17 | binary_t& from_data(const void *d,size_t s); | 17 | binary_t& from_data(const void *d,size_t s); |
18 | binary_t& make_nonce(); | ||
18 | 19 | ||
19 | std::string hex() const; | 20 | std::string hex() const; |
20 | binary_t md5() const; | 21 | binary_t md5() const; |
21 | }; | 22 | }; |
22 | 23 | ||
23 | class tmpdir_t { | 24 | class tmpdir_t { |
24 | public: | 25 | public: |
25 | std::string dir; | 26 | std::string dir; |
26 | 27 | ||
27 | tmpdir_t(const std::string& dt); | 28 | tmpdir_t(const std::string& dt); |
28 | ~tmpdir_t(); | 29 | ~tmpdir_t(); |
29 | 30 | ||
30 | std::string get_file(const std::string& f); | 31 | std::string get_file(const std::string& f); |
31 | }; | 32 | }; |
32 | 33 | ||
33 | class tarchive_t { | 34 | class tarchive_t { |
34 | public: | 35 | public: |
35 | struct archive *a; | 36 | struct archive *a; |
36 | struct archive_entry *e; | 37 | struct archive_entry *e; |
37 | 38 | ||
38 | tarchive_t(void *p,size_t s); | 39 | tarchive_t(void *p,size_t s); |
39 | ~tarchive_t(); | 40 | ~tarchive_t(); |
40 | 41 | ||
41 | bool read_next_header(); | 42 | bool read_next_header(); |
42 | 43 | ||
43 | std::string entry_pathname(); | 44 | std::string entry_pathname(); |
44 | 45 | ||
45 | bool read_data_into_fd(int fd); | 46 | bool read_data_into_fd(int fd); |
46 | }; | 47 | }; |
47 | 48 | ||
48 | binary_t integrity_digest(const void *ptr,size_t size, | 49 | binary_t integrity_digest(const void *ptr,size_t size, |
49 | const std::string& ukey); | 50 | const std::string& ukey); |
50 | 51 | ||
51 | #endif /* __EYETIL_H */ | 52 | #endif /* __EYETIL_H */ |