diff options
| -rw-r--r-- | include/modules.h | 3 | ||||
| -rw-r--r-- | src/core/enc_md5.c | 6 | ||||
| -rw-r--r-- | src/core/enc_none.c | 2 | ||||
| -rw-r--r-- | src/core/enc_old.c | 6 | ||||
| -rw-r--r-- | src/encrypt.c | 10 |
5 files changed, 13 insertions, 14 deletions
diff --git a/include/modules.h b/include/modules.h index a75edac56..79436e063 100644 --- a/include/modules.h +++ b/include/modules.h @@ -47,8 +47,7 @@ enum EventReturn { EVENT_STOP, EVENT_CONTINUE, - EVENT_ALLOW, - EVENT_ERROR + EVENT_ALLOW }; diff --git a/src/core/enc_md5.c b/src/core/enc_md5.c index d24a0bbad..c7c7ccff7 100644 --- a/src/core/enc_md5.c +++ b/src/core/enc_md5.c @@ -351,7 +351,7 @@ class EMD5 : public Module char tmp[33]; if (size < 16) - return EVENT_ERROR; + return EVENT_STOP; MD5Init(&context); MD5Update(&context, (unsigned char *)src, len); @@ -398,8 +398,8 @@ class EMD5 : public Module { char buf[BUFSIZE]; - if (OnEncrypt(plaintext, strlen(plaintext), buf, sizeof(buf)) == EVENT_ERROR) - return EVENT_ERROR; + if (OnEncrypt(plaintext, strlen(plaintext), buf, sizeof(buf)) == EVENT_STOP) + return EVENT_STOP; if (memcmp(buf, password, 16) == 0) { return EVENT_ALLOW; diff --git a/src/core/enc_none.c b/src/core/enc_none.c index faebe3641..25f2fe216 100644 --- a/src/core/enc_none.c +++ b/src/core/enc_none.c @@ -34,7 +34,7 @@ class ENone : public Module dest[len] = '\0'; return EVENT_STOP; } - return EVENT_ERROR; + return EVENT_STOP; } EventReturn OnEncryptInPlace(char *buf, int size) diff --git a/src/core/enc_old.c b/src/core/enc_old.c index e2169faac..399caa584 100644 --- a/src/core/enc_old.c +++ b/src/core/enc_old.c @@ -356,7 +356,7 @@ class EOld : public Module int i; if (size < 16) - return EVENT_ERROR; + return EVENT_STOP; memset(&context, 0, sizeof(context)); memset(&digest, 0, sizeof(digest)); @@ -399,8 +399,8 @@ class EOld : public Module { char buf[BUFSIZE]; - if (OnEncrypt(plaintext, strlen(plaintext), buf, sizeof(buf)) == EVENT_ERROR) - return EVENT_ERROR; + if (OnEncrypt(plaintext, strlen(plaintext), buf, sizeof(buf)) == EVENT_STOP) + return EVENT_STOP; if (memcmp(buf, password, 16) == 0) { return EVENT_ALLOW; diff --git a/src/encrypt.c b/src/encrypt.c index 8650963e1..071aa2d8b 100644 --- a/src/encrypt.c +++ b/src/encrypt.c @@ -27,7 +27,7 @@ int enc_encrypt(const char *src, int len, char *dest, int size) FOREACH_RESULT(I_OnEncrypt, OnEncrypt(src, len, dest, size)); if (MOD_RESULT == EVENT_ALLOW) return 1; - if (MOD_RESULT == EVENT_ERROR) + if (MOD_RESULT == EVENT_STOP) return -1; return 0; } @@ -43,7 +43,7 @@ int enc_encrypt_in_place(char *buf, int size) FOREACH_RESULT(I_OnEncryptInPlace, OnEncryptInPlace(buf, size)); if (MOD_RESULT == EVENT_ALLOW) return 1; - if (MOD_RESULT == EVENT_ERROR) + if (MOD_RESULT == EVENT_STOP) return -1; return 0; @@ -63,7 +63,7 @@ int enc_encrypt_check_len(int passlen, int bufsize) FOREACH_RESULT(I_OnEncryptCheckLen, OnEncryptCheckLen(passlen, bufsize)); if (MOD_RESULT == EVENT_ALLOW) return 1; - if (MOD_RESULT == EVENT_ERROR) + if (MOD_RESULT == EVENT_STOP) return -1; return 0; } @@ -80,7 +80,7 @@ int enc_decrypt(const char *src, char *dest, int size) FOREACH_RESULT(I_OnDecrypt, OnDecrypt(src, dest, size)); if (MOD_RESULT == EVENT_ALLOW) return 1; - if (MOD_RESULT == EVENT_ERROR) + if (MOD_RESULT == EVENT_STOP) return -1; return 0; } @@ -98,7 +98,7 @@ int enc_check_password(const char *plaintext, const char *password) FOREACH_RESULT(I_OnCheckPassword, OnCheckPassword(plaintext, password)); if (MOD_RESULT == EVENT_ALLOW) return 1; - if (MOD_RESULT == EVENT_ERROR) + if (MOD_RESULT == EVENT_STOP) return -1; return 0; } |