diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-01-12 14:05:40 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-01-12 14:05:40 -0800 |
| commit | 7991a7c50a11e90ed74de0c94a5be9add7cd38d6 (patch) | |
| tree | 8b4c4e3abcb993099d3483bacfa176e4da5d36a8 /node/Identity.hpp | |
| parent | e91322bd100b6e02ad2856dda42713b21823df60 (diff) | |
| parent | 4e4fd511173c9f79df1baed4d0c764649262960b (diff) | |
| download | infinitytier-7991a7c50a11e90ed74de0c94a5be9add7cd38d6.tar.gz infinitytier-7991a7c50a11e90ed74de0c94a5be9add7cd38d6.zip | |
Merge branch 'dev' into edge
Diffstat (limited to 'node/Identity.hpp')
| -rw-r--r-- | node/Identity.hpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/node/Identity.hpp b/node/Identity.hpp index 6c33e74f..e19c4980 100644 --- a/node/Identity.hpp +++ b/node/Identity.hpp @@ -1,6 +1,6 @@ /* * ZeroTier One - Network Virtualization Everywhere - * Copyright (C) 2011-2015 ZeroTier, Inc. + * Copyright (C) 2011-2016 ZeroTier, Inc. https://www.zerotier.com/ * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,15 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - * -- - * - * ZeroTier may be used and distributed under the terms of the GPLv3, which - * are available at: http://www.gnu.org/licenses/gpl-3.0.html - * - * If you would like to embed ZeroTier into a commercial application or - * redistribute it in a modified binary form, please contact ZeroTier Networks - * LLC. Start here: http://www.zerotier.com/ */ #ifndef ZT_IDENTITY_HPP @@ -226,7 +217,7 @@ public: /** * Serialize this identity (binary) - * + * * @param b Destination buffer to append to * @param includePrivate If true, include private key component (if present) (default: false) * @throws std::out_of_range Buffer too small @@ -297,7 +288,7 @@ public: * * Note: validation is for the format only. The locallyValidate() method * must be used to check signature and address/key correspondence. - * + * * @param str String to deserialize * @return True if deserialization appears successful */ |