From bd1eea47d54444e525088dcf91c72f48503ea6a2 Mon Sep 17 00:00:00 2001
From: ArunaMaurya221B <aruna.maurya12@gmail.com>
Date: Tue, 12 Dec 2017 15:49:38 +0530
Subject: [PATCH] node_has_curve25519_onion_key is refactored and duplicate code removed.

Indentation error fixed

Bug-23966 node_has_curve25519_onion_key() refactored and duplicate code removed
---
 src/or/nodelist.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 9f01a33..457c720 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1628,23 +1628,18 @@ microdesc_has_curve25519_onion_key(const microdesc_t *md)
 int
 node_has_curve25519_onion_key(const node_t *node)
 {
-  if(!node_get_curve25519_onion_key(node)){
-  if (node->ri)
-    return routerinfo_has_curve25519_onion_key(node->ri);
-  else if (node->md)
-    return microdesc_has_curve25519_onion_key(node->md);
-}
-  else
-    return 0;
+  return (node_get_curve25519_onion_key(node)!=NULL);
 }
 
 /** Return the curve25519 key of <b>node</b>, or NULL if none. */
 const curve25519_public_key_t *
 node_get_curve25519_onion_key(const node_t *node)
 {
-  if (node->ri)
+  if(!node)
+    return NULL;
+  if (routerinfo_has_curve25519_onion_key(node->ri))
     return node->ri->onion_curve25519_pkey;
-  else if (node->md)
+  else if (microdesc_has_curve25519_onion_key(node->md))
     return node->md->onion_curve25519_pkey;
   else
     return NULL;
-- 
2.7.4