2013-11-04 17:43:22 +01:00
|
|
|
/*
|
|
|
|
|
This file is part of Pretty Curved Privacy (pcp1).
|
|
|
|
|
|
2016-05-09 22:24:13 +02:00
|
|
|
Copyright (C) 2013-2016 T.v.Dein.
|
2013-11-04 17:43:22 +01:00
|
|
|
|
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
You can contact me by mail: <tlinden AT cpan DOT org>.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
2013-10-28 22:50:05 +01:00
|
|
|
#include "mem.h"
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void *ucmalloc(size_t s) {
|
2013-11-17 16:53:20 +01:00
|
|
|
if (s == 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2014-02-25 11:09:58 +01:00
|
|
|
size_t size = s * sizeof(byte);
|
2013-10-28 22:50:05 +01:00
|
|
|
void *value = malloc (size);
|
|
|
|
|
|
|
|
|
|
if (value == NULL) {
|
2013-11-17 16:53:20 +01:00
|
|
|
err(errno, "Cannot allocate %d bytes of memory", (int)s);
|
2013-10-28 22:50:05 +01:00
|
|
|
exit(-1);
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-13 13:07:32 +01:00
|
|
|
sodium_memzero(value, size);
|
2013-10-28 22:50:05 +01:00
|
|
|
|
2014-08-07 21:33:52 +02:00
|
|
|
/* printf("allocated %ld bytes at %p\n", size, value); */
|
2013-10-28 22:50:05 +01:00
|
|
|
|
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-13 13:07:32 +01:00
|
|
|
void *smalloc(size_t s) {
|
|
|
|
|
if (s == 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
size_t size = s * sizeof(byte);
|
|
|
|
|
void *value = sodium_malloc (size);
|
|
|
|
|
|
|
|
|
|
if (value == NULL) {
|
|
|
|
|
err(errno, "Cannot allocate %d bytes of memory", (int)s);
|
|
|
|
|
exit(-1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
2013-10-28 22:50:05 +01:00
|
|
|
void *urmalloc(size_t s) {
|
|
|
|
|
void *value = ucmalloc (s);
|
|
|
|
|
|
|
|
|
|
arc4random_buf(value, s);
|
|
|
|
|
|
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-13 13:07:32 +01:00
|
|
|
void *srmalloc(size_t s) {
|
|
|
|
|
void *value = sodium_malloc (s);
|
|
|
|
|
|
|
|
|
|
arc4random_buf(value, s);
|
|
|
|
|
|
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
2013-10-28 22:50:05 +01:00
|
|
|
|
2014-02-07 16:55:56 +01:00
|
|
|
void *ucrealloc(void *d, size_t oldlen, size_t newlen) {
|
2014-02-25 11:09:58 +01:00
|
|
|
newlen = newlen * sizeof(byte);
|
2014-02-12 16:47:24 +01:00
|
|
|
|
|
|
|
|
/* we're using a 1 byte sized pointer, so that we can
|
|
|
|
|
memset(zero) it after resizing */
|
2014-02-25 11:09:58 +01:00
|
|
|
byte *value = realloc (d, newlen);
|
2014-02-07 16:55:56 +01:00
|
|
|
|
|
|
|
|
if (value == NULL) {
|
2016-01-21 13:13:21 +01:00
|
|
|
err(errno, "Cannot reallocate %"FMT_SIZE_T" bytes of memory", (SIZE_T_CAST)newlen);
|
2014-02-07 16:55:56 +01:00
|
|
|
exit(-1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
memset (&value[oldlen], 0, newlen-oldlen);
|
|
|
|
|
|
2014-02-12 16:47:24 +01:00
|
|
|
return (void *)value;
|
2014-02-07 16:55:56 +01:00
|
|
|
}
|
2014-02-10 11:36:50 +01:00
|
|
|
|
|
|
|
|
void ucfree(void *d, size_t len) {
|
|
|
|
|
if(d != NULL) {
|
|
|
|
|
memset(d, 0, len);
|
|
|
|
|
free(d);
|
|
|
|
|
}
|
|
|
|
|
}
|
2015-01-13 13:07:32 +01:00
|
|
|
|
|
|
|
|
void sfree(void *d) {
|
|
|
|
|
sodium_free(d);
|
|
|
|
|
}
|