use utility functions instead of memcpy()

diff --git a/src/lib/eap_aka_sim/decode.c b/src/lib/eap_aka_sim/decode.c
index be77a3eb1da9793b9f1e1584a87e10b2e8e7bf78..44d1df5b17e196737fb786409baf8955ab6f87b5 100644 (file)
--- a/src/lib/eap_aka_sim/decode.c
+++ b/src/lib/eap_aka_sim/decode.c
@@ -802,18 +802,15 @@ static ssize_t sim_decode_pair_value(TALLOC_CTX *ctx, fr_pair_list_t *out, fr_di
                break;
 
        case FR_TYPE_UINT16:
-               memcpy(&vp->vp_uint16, p, sizeof(vp->vp_uint16));
-               vp->vp_uint16 = ntohs(vp->vp_uint32);
+               vp->vp_uint16 = fr_nbo_to_uint16(p);
                break;
 
        case FR_TYPE_UINT32:
-               memcpy(&vp->vp_uint32, p, sizeof(vp->vp_uint32));
-               vp->vp_uint32 = ntohl(vp->vp_uint32);
+               vp->vp_uint32 = fr_nbo_to_uint32(p);
                break;
 
        case FR_TYPE_UINT64:
-               memcpy(&vp->vp_uint64, p, sizeof(vp->vp_uint64));
-               vp->vp_uint64 = ntohll(vp->vp_uint64);
+               vp->vp_uint64 = fr_nbo_to_uint64(p);
                break;
 
        default:

diff --git a/src/protocols/vmps/vmps.c b/src/protocols/vmps/vmps.c
index c7008dbfa569b492b8db58a603311b626311bfc8..b0246b6575498c372e423fca8a564323f0675afd 100644 (file)
--- a/src/protocols/vmps/vmps.c
+++ b/src/protocols/vmps/vmps.c
@@ -170,8 +170,7 @@ int fr_vmps_decode(TALLOC_CTX *ctx, fr_pair_list_t *out, uint8_t const *data, si
        vp = fr_pair_afrom_da(ctx, attr_sequence_number);
        if (!vp) goto oom;
 
-       memcpy(&vp->vp_uint32, data + 4, 4);
-       vp->vp_uint32 = ntohl(vp->vp_uint32);
+       vp->vp_uint32 = fr_nbo_to_uint32(data + 4);
        vp->vp_tainted = true;
        DEBUG2("&%pP", vp);
        fr_pair_append(out, vp);