From 327002a6cbfcc17d896f815d2becd3e814de55dc Mon Sep 17 00:00:00 2001
From: Ismael Gomez <ismael@softwareradiosystems.com>
Date: Sat, 28 Jul 2018 10:16:01 +0200
Subject: [PATCH] Fix NCC=1 HO in second round

---
 srsue/hdr/upper/usim.h  |  1 +
 srsue/src/upper/usim.cc | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/srsue/hdr/upper/usim.h b/srsue/hdr/upper/usim.h
index ce42e3022..f436f47a6 100644
--- a/srsue/hdr/upper/usim.h
+++ b/srsue/hdr/upper/usim.h
@@ -132,6 +132,7 @@ private:
   uint8_t     k_enb_star[32];
 
   uint32_t    current_ncc;
+  bool        is_first_ncc;
 
   bool initiated;
 
diff --git a/srsue/src/upper/usim.cc b/srsue/src/upper/usim.cc
index f13469517..18df7527e 100644
--- a/srsue/src/upper/usim.cc
+++ b/srsue/src/upper/usim.cc
@@ -271,7 +271,8 @@ void usim::generate_as_keys(uint8_t *k_asme,
                           k_up_enc,
                           k_up_int);
 
-  current_ncc = 0;
+  current_ncc  = 0;
+  is_first_ncc = true;
 }
 
 void usim::generate_as_keys_ho(uint32_t pci,
@@ -293,10 +294,11 @@ void usim::generate_as_keys_ho(uint32_t pci,
   // Generate successive NH
   while(current_ncc != (uint32_t) ncc) {
     uint8_t *sync = NULL;
-    if (current_ncc) {
-      sync = nh;
-    } else {
+    if (is_first_ncc) {
       sync = k_enb_initial;
+      is_first_ncc = false;
+    } else {
+      sync = nh;
     }
     // Generate NH
     security_generate_nh(k_asme,