diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-02-15 13:58:52 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-02-15 13:58:52 +0000 |
commit | bdeb59bc30331d6fd9f05d56d44a30f281b46195 (patch) | |
tree | 4ed1830fec733e90ac15323b4e4851f704a35c64 /src/fs/fs_api.h | |
parent | 140fdac7581295bd7d9dd90ead81bf31f8473cbf (diff) | |
download | gnunet-bdeb59bc30331d6fd9f05d56d44a30f281b46195.tar.gz gnunet-bdeb59bc30331d6fd9f05d56d44a30f281b46195.zip |
-fixes to make stream tests pass with ecc in core
Diffstat (limited to 'src/fs/fs_api.h')
-rw-r--r-- | src/fs/fs_api.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/fs/fs_api.h b/src/fs/fs_api.h index 12d4ae44b..61a568fa0 100644 --- a/src/fs/fs_api.h +++ b/src/fs/fs_api.h | |||
@@ -125,7 +125,7 @@ struct Location | |||
125 | /** | 125 | /** |
126 | * Identity of the peer sharing the file. | 126 | * Identity of the peer sharing the file. |
127 | */ | 127 | */ |
128 | struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded peer; | 128 | struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded peer; |
129 | 129 | ||
130 | /** | 130 | /** |
131 | * Time when this location URI expires. | 131 | * Time when this location URI expires. |
@@ -136,36 +136,37 @@ struct Location | |||
136 | * RSA signature over the GNUNET_EC_FileIdentifier, | 136 | * RSA signature over the GNUNET_EC_FileIdentifier, |
137 | * GNUNET_hash of the peer and expiration time. | 137 | * GNUNET_hash of the peer and expiration time. |
138 | */ | 138 | */ |
139 | struct GNUNET_CRYPTO_RsaSignature contentSignature; | 139 | struct GNUNET_CRYPTO_EccSignature contentSignature; |
140 | 140 | ||
141 | }; | 141 | }; |
142 | 142 | ||
143 | /** | 143 | /** |
144 | * Types of URIs. | 144 | * Types of URIs. |
145 | */ | 145 | */ |
146 | enum uri_types | 146 | enum GNUNET_FS_UriType |
147 | { | 147 | { |
148 | /** | 148 | /** |
149 | * Content-hash-key (simple file). | 149 | * Content-hash-key (simple file). |
150 | */ | 150 | */ |
151 | chk, | 151 | GNUNET_FS_URI_CHK, |
152 | 152 | ||
153 | /** | 153 | /** |
154 | * Signed key space (file in namespace). | 154 | * Signed key space (file in namespace). |
155 | */ | 155 | */ |
156 | sks, | 156 | GNUNET_FS_URI_SKS, |
157 | 157 | ||
158 | /** | 158 | /** |
159 | * Keyword search key (query with keywords). | 159 | * Keyword search key (query with keywords). |
160 | */ | 160 | */ |
161 | ksk, | 161 | GNUNET_FS_URI_KSK, |
162 | 162 | ||
163 | /** | 163 | /** |
164 | * Location (chk with identity of hosting peer). | 164 | * Location (chk with identity of hosting peer). |
165 | */ | 165 | */ |
166 | loc | 166 | GNUNET_FS_URI_LOC |
167 | }; | 167 | }; |
168 | 168 | ||
169 | |||
169 | /** | 170 | /** |
170 | * A Universal Resource Identifier (URI), opaque. | 171 | * A Universal Resource Identifier (URI), opaque. |
171 | */ | 172 | */ |
@@ -174,7 +175,7 @@ struct GNUNET_FS_Uri | |||
174 | /** | 175 | /** |
175 | * Type of the URI. | 176 | * Type of the URI. |
176 | */ | 177 | */ |
177 | enum uri_types type; | 178 | enum GNUNET_FS_UriType type; |
178 | 179 | ||
179 | union | 180 | union |
180 | { | 181 | { |