>
> Hi Akhil,
>
>
> [Hemant] There is a merge error. I see that you have already applied it.
> Can you remove following line from the patch.
> >>> start here.
> > + if (session->dir == DIR_ENC) {
> > + /* todo CCM salt length is 3 bytes, left shift 8 bits */
> > + memcpy(session->encap_pdb.ccm.salt,
> > + (uint8_t *)&(ipsec_xform->salt), 4);
> > + } else {
> > + memcpy(session->decap_pdb.ccm.salt,
> > + (uint8_t *)&(ipsec_xform->salt), 4);
> > + }
> > + session->aead_key.algmode = OP_ALG_AAI_CCM;
> > + session->aead_alg = RTE_CRYPTO_AEAD_AES_CCM;
> > + break;
> >>> end here.
>
done
