Use network byte order for ESA SPIs
authorAdrian-Ken Rueegsegger <ken@codelabs.ch>
Mon, 4 Mar 2013 10:23:22 +0000 (11:23 +0100)
committerTobias Brunner <tobias@strongswan.org>
Tue, 19 Mar 2013 14:23:51 +0000 (15:23 +0100)
src/charon-tkm/src/tkm/tkm_kernel_ipsec.c

index 734bec7..7d14ba7 100644 (file)
@@ -149,8 +149,8 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
         */
        if (nonce_loc_id == 0 && esa.dh_id == 0)
        {
-               if (ike_esa_create_first(esa_id, esa.isa_id, reqid, 1, ntohl(spi_loc),
-                                                                ntohl(spi_rem)) != TKM_OK)
+               if (ike_esa_create_first(esa_id, esa.isa_id, reqid, 1, spi_loc, spi_rem)
+                       != TKM_OK)
                {
                        DBG1(DBG_KNL, "child SA (%llu, first) creation failed", esa_id);
                        goto failure;
@@ -162,8 +162,8 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
                nonce_type nc_rem;
                chunk_to_sequence(nonce_rem, &nc_rem, sizeof(nonce_type));
                if (ike_esa_create_no_pfs(esa_id, esa.isa_id, reqid, 1, nonce_loc_id,
-                                                                 nc_rem, initiator, ntohl(spi_loc),
-                                                                 ntohl(spi_rem)) != TKM_OK)
+                                                                 nc_rem, initiator, spi_loc, spi_rem)
+                       != TKM_OK)
                {
                        DBG1(DBG_KNL, "child SA (%llu, no PFS) creation failed", esa_id);
                        goto failure;
@@ -176,8 +176,7 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
                nonce_type nc_rem;
                chunk_to_sequence(nonce_rem, &nc_rem, sizeof(nonce_type));
                if (ike_esa_create(esa_id, esa.isa_id, reqid, 1, esa.dh_id, nonce_loc_id,
-                                                  nc_rem, initiator, ntohl(spi_loc),
-                                                  ntohl(spi_rem)) != TKM_OK)
+                                                  nc_rem, initiator, spi_loc, spi_rem) != TKM_OK)
                {
                        DBG1(DBG_KNL, "child SA (%llu) creation failed", esa_id);
                        goto failure;