diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2013-01-02 14:18:20 +0100 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2013-01-02 14:18:20 +0100 |
| commit | 2ea5b8ab2fa64487af984af2162039596a06015a (patch) | |
| tree | 58f9a4372d6007b33b1fca63ab18b53aa34b090d /src/medsrv/controller | |
| parent | 4e331141b8693e5214b82fdd6c3c6f4fa65eafca (diff) | |
| parent | c1343b3278cdf99533b7902744d15969f9d6fdc1 (diff) | |
| download | vyos-strongswan-2ea5b8ab2fa64487af984af2162039596a06015a.tar.gz vyos-strongswan-2ea5b8ab2fa64487af984af2162039596a06015a.zip | |
Merge tag 'upstream/5.0.1'
Upstream version 5.0.1
Diffstat (limited to 'src/medsrv/controller')
| -rw-r--r--[-rwxr-xr-x] | src/medsrv/controller/peer_controller.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/medsrv/controller/peer_controller.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/medsrv/controller/user_controller.c | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/medsrv/controller/user_controller.h | 0 |
4 files changed, 5 insertions, 1 deletions
diff --git a/src/medsrv/controller/peer_controller.c b/src/medsrv/controller/peer_controller.c index edcf653b2..edcf653b2 100755..100644 --- a/src/medsrv/controller/peer_controller.c +++ b/src/medsrv/controller/peer_controller.c diff --git a/src/medsrv/controller/peer_controller.h b/src/medsrv/controller/peer_controller.h index f25c30281..f25c30281 100755..100644 --- a/src/medsrv/controller/peer_controller.h +++ b/src/medsrv/controller/peer_controller.h diff --git a/src/medsrv/controller/user_controller.c b/src/medsrv/controller/user_controller.c index 12bd938fe..35c9d90c8 100755..100644 --- a/src/medsrv/controller/user_controller.c +++ b/src/medsrv/controller/user_controller.c @@ -64,7 +64,11 @@ static chunk_t hash_password(char *login, char *password) } data = chunk_cata("cc", chunk_create(login, strlen(login)), chunk_create(password, strlen(password))); - hasher->allocate_hash(hasher, data, &hash); + if (!hasher->allocate_hash(hasher, data, &hash)) + { + hasher->destroy(hasher); + return chunk_empty; + } hasher->destroy(hasher); return hash; } diff --git a/src/medsrv/controller/user_controller.h b/src/medsrv/controller/user_controller.h index 9d23795d7..9d23795d7 100755..100644 --- a/src/medsrv/controller/user_controller.h +++ b/src/medsrv/controller/user_controller.h |