Merge pull request #336 from raycoll/separate_init

Move s2n_{init,cleanup} to separate source file

utils/s2n_init.c

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "tls/s2n_cipher_suites.h"
+
+#include "utils/s2n_mem.h"
+#include "utils/s2n_random.h"
+#include "utils/s2n_safety.h"
+
+int s2n_init(void)
+{
+	GUARD(s2n_mem_init());
+	GUARD(s2n_rand_init());
+
+	return 0;
+}
+
+int s2n_cleanup(void)
+{
+	GUARD(s2n_rand_cleanup());
+	GUARD(s2n_mem_cleanup());
+
+	return 0;
+}

utils/s2n_init.h

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#pragma once
+
+int s2n_init(void);
+int s2n_cleanup(void);

utils/s2n_mem.c

@@ -37,6 +37,13 @@ int s2n_mem_init(void)
     return 0;
 }
 
+int s2n_mem_cleanup(void)
+{
+    page_size = 4096;
+    use_mlock = 1;
+    return 0;
+}
+
 int s2n_alloc(struct s2n_blob *b, uint32_t size)
 {
     b->data = NULL;

utils/s2n_mem.h

@@ -20,6 +20,7 @@
 #include <stdint.h>
 
 int s2n_mem_init(void);
+int s2n_mem_cleanup(void);
 int s2n_alloc(struct s2n_blob *b, uint32_t size);
 int s2n_realloc(struct s2n_blob *b, uint32_t size);
 int s2n_free(struct s2n_blob *b);

utils/s2n_random.c

@@ -226,10 +226,8 @@ RAND_METHOD s2n_openssl_rand_method = {
 };
 #endif
 
-int s2n_init(void)
+int s2n_rand_init(void)
 {
-    GUARD(s2n_mem_init());
-
   OPEN:
     entropy_fd = open(ENTROPY_SOURCE, O_RDONLY);
     if (entropy_fd == -1) {
@@ -277,7 +275,7 @@ int s2n_init(void)
     return 0;
 }
 
-int s2n_cleanup(void)
+int s2n_rand_cleanup(void)
 {
     if (entropy_fd == -1) {
         S2N_ERROR(S2N_ERR_NOT_INITIALIZED);

utils/s2n_random.h

@@ -17,6 +17,8 @@
 
 #include "utils/s2n_blob.h"
 
+extern int s2n_rand_init(void);
+extern int s2n_rand_cleanup(void);
 extern int s2n_get_public_random_data(struct s2n_blob *blob);
 extern int s2n_get_public_random_bytes_used(void);
 extern int s2n_get_private_random_data(struct s2n_blob *blob);