sync with fishlim head

This commit is contained in:
Berke Viktor 2012-01-03 16:38:40 +01:00
parent 38a42ed519
commit 18404054b0
3 changed files with 4 additions and 4 deletions

View File

@ -23,7 +23,7 @@ fishlim.so: $(PLUGIN_OBJECTS)
$(CC) -shared $(OURLINKFLAGS) $(PLUGIN_OBJECTS) -o $@
test: $(TEST_OBJECTS)
$(CC) $(OURLINKFLAGS) $(TEST_OBJECTS) -o $@
$(CC) $(TEST_OBJECTS) -o $@ $(OURLINKFLAGS)
.PHONY: all clean distclean install uninstall

View File

@ -164,8 +164,8 @@ bool keystore_store_key(const char *nick, const char *key) {
encrypted = fish_encrypt(password, strlen(password), key);
if (!encrypted) goto end;
// Prepend "OK+ "
wrapped = g_strconcat("OK+ ", encrypted, NULL);
// Prepend "+OK "
wrapped = g_strconcat("+OK ", encrypted, NULL);
g_free(encrypted);
// Store encrypted in file

View File

@ -44,7 +44,7 @@
static const char plugin_name[] = "FiSHLiM";
static const char plugin_desc[] = "Encryption plugin for the FiSH protocol. Less is More!";
static const char plugin_version[] = "0.0.14";
static const char plugin_version[] = "0.0.15";
static const char usage_setkey[] = "Usage: SETKEY [<nick or #channel>] <password>, sets the key for a channel or nick";
static const char usage_delkey[] = "Usage: DELKEY <nick or #channel>, deletes the key for a channel or nick";