X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fssli_polarssl.c;h=f5eef213dc107afe45867589e5ce35c964626337;hb=a1a0ba19a94a1bfe3c40629aa9c5f3a4b23db3ee;hp=b553f796cee0e2c73f6451838268eb54cf4af3c0;hpb=d2aea1784608f6723e0296d0c663669f02603a05;p=umurmur.git

diff --git a/src/ssli_polarssl.c b/src/ssli_polarssl.c
index b553f79..f5eef21 100644
--- a/src/ssli_polarssl.c
+++ b/src/ssli_polarssl.c
@@ -28,17 +28,13 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include <string.h>
-#include <stdlib.h>
-#include <fcntl.h>
-
 #include "conf.h"
 #include "log.h"
+#include "memory.h"
 #include "ssl.h"
 
-/*
- * PolarSSL interface
- */
+#include <stdlib.h>
+#include <fcntl.h>
 
 #include <polarssl/config.h>
 #include <polarssl/havege.h>
@@ -230,8 +226,12 @@ void SSLi_init(void)
 	    Log_fatal("Cannot open /dev/urandom");
 #endif
 
+#ifdef POLARSSL_VERSION_FEATURES
     version_get_string(verstring);
     Log_info("PolarSSL library version %s initialized", verstring);
+#else
+    Log_info("PolarSSL library initialized");
+#endif
 }
 
 void SSLi_deinit(void)
@@ -270,12 +270,8 @@ SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready)
 	ssl_session *ssn;
 	int rc;
 
-	ssl = malloc(sizeof(ssl_context));
-	ssn = malloc(sizeof(ssl_session));
-	if (!ssl || !ssn)
-		Log_fatal("Out of memory");
-	memset(ssl, 0, sizeof(ssl_context));
-	memset(ssn, 0, sizeof(ssl_session));
+	ssl = Memory_safeCalloc(1, sizeof(ssl_context));
+	ssn = Memory_safeCalloc(1, sizeof(ssl_session));
 
 	rc = ssl_init(ssl);
 	if (rc != 0 )