commit 865b3ebf8498cf4124c2ca68d5a27db5237da969
author Janos Follath <janos.follath@arm.com> Mon Dec 16 11:46:15 2019 +0000
committer Janos Follath <janos.follath@arm.com> Mon Dec 16 15:15:16 2019 +0000
tree 6995f56c53d8679b29623c5a99e430f7e8f4d3cd
parent 2d20567122e4c1e7295ac7aba77df33d46d04993

Initialize return values to an error

Initializing the return values to an error is best practice and makes
the library more robust against programmer errors.

library/x509write_csr.c

diff --git a/library/x509write_csr.c b/library/x509write_csr.c
index 23e3f78..c93e4b4 100644
--- a/library/x509write_csr.c
+++ b/library/x509write_csr.c
@@ -30,6 +30,8 @@
 #include MBEDTLS_CONFIG_FILE
 #endif
 
+#include "mbedtls/error.h"
+
 #if defined(MBEDTLS_X509_CSR_WRITE_C)
 
 #include "mbedtls/x509_csr.h"
@@ -90,7 +92,7 @@
 {
     unsigned char buf[4];
     unsigned char *c;
-    int ret;
+    int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
 
     c = buf + 4;
 
@@ -112,7 +114,7 @@
 {
     unsigned char buf[4];
     unsigned char *c;
-    int ret;
+    int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
 
     c = buf + 4;
 
@@ -133,7 +135,7 @@
                        int (*f_rng)(void *, unsigned char *, size_t),
                        void *p_rng )
 {
-    int ret;
+    int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
     const char *sig_oid;
     size_t sig_oid_len = 0;
     unsigned char *c, *c2;
@@ -263,7 +265,7 @@
                        int (*f_rng)(void *, unsigned char *, size_t),
                        void *p_rng )
 {
-    int ret;
+    int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
     size_t olen = 0;
 
     if( ( ret = mbedtls_x509write_csr_der( ctx, buf, size,