summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xother/astyle/format-source5
-rw-r--r--toxencryptsave/toxencryptsave.api.h2
-rw-r--r--toxencryptsave/toxencryptsave.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/other/astyle/format-source b/other/astyle/format-source
index b702b488..c6d9982e 100755
--- a/other/astyle/format-source
+++ b/other/astyle/format-source
@@ -40,6 +40,11 @@ $APIDSL toxcore/tox.api.h > toxcore/tox.h
40$APIDSL toxav/toxav.api.h > toxav/toxav.h 40$APIDSL toxav/toxav.api.h > toxav/toxav.h
41$APIDSL toxencryptsave/toxencryptsave.api.h > toxencryptsave/toxencryptsave.h 41$APIDSL toxencryptsave/toxencryptsave.api.h > toxencryptsave/toxencryptsave.h
42 42
43if grep '<unresolved>' */*.h; then
44 echo "error: some apidsl references were unresolved"
45 exit 1
46fi
47
43SOURCES=`find . -name "*.[ch]" -and -not -name "*.api.h" -and -not -wholename "*crypto_pwhash*" -and -not -wholename "./super_donators/*"` 48SOURCES=`find . -name "*.[ch]" -and -not -name "*.api.h" -and -not -wholename "*crypto_pwhash*" -and -not -wholename "./super_donators/*"`
44 49
45$ASTYLE -n --options=other/astyle/astylerc $SOURCES 50$ASTYLE -n --options=other/astyle/astylerc $SOURCES
diff --git a/toxencryptsave/toxencryptsave.api.h b/toxencryptsave/toxencryptsave.api.h
index 20b8da06..93456235 100644
--- a/toxencryptsave/toxencryptsave.api.h
+++ b/toxencryptsave/toxencryptsave.api.h
@@ -49,7 +49,7 @@ extern "C" {
49 * prefer the advanced API and reuse pass-key objects. 49 * prefer the advanced API and reuse pass-key objects.
50 * 50 *
51 * To use the second part, first derive an encryption key from a password with 51 * To use the second part, first derive an encryption key from a password with
52 * ${pass_Key.derive}, then use the derived key to encrypt the data. 52 * ${tox.pass_Key.derive}, then use the derived key to encrypt the data.
53 * 53 *
54 * The encrypted data is prepended with a magic number, to aid validity 54 * The encrypted data is prepended with a magic number, to aid validity
55 * checking (no guarantees are made of course). Any data to be decrypted must 55 * checking (no guarantees are made of course). Any data to be decrypted must
diff --git a/toxencryptsave/toxencryptsave.h b/toxencryptsave/toxencryptsave.h
index 584efaed..de53273e 100644
--- a/toxencryptsave/toxencryptsave.h
+++ b/toxencryptsave/toxencryptsave.h
@@ -48,7 +48,7 @@ extern "C" {
48 * prefer the advanced API and reuse pass-key objects. 48 * prefer the advanced API and reuse pass-key objects.
49 * 49 *
50 * To use the second part, first derive an encryption key from a password with 50 * To use the second part, first derive an encryption key from a password with
51 * <unresolved>, then use the derived key to encrypt the data. 51 * tox_pass_key_derive, then use the derived key to encrypt the data.
52 * 52 *
53 * The encrypted data is prepended with a magic number, to aid validity 53 * The encrypted data is prepended with a magic number, to aid validity
54 * checking (no guarantees are made of course). Any data to be decrypted must 54 * checking (no guarantees are made of course). Any data to be decrypted must