CCM Authentication optimization

CCM   is now optimized. Instead of being computed twice,
libtomcrypt code has been optimized so that classical ccm_init, ccm_process,...
can be used incrementally (when the whole stream is not available when
starting the authentication).
CCM way of proceeding is now very closed to GCM authentication.
Right, I create this file.
Should I set the STMicro licence header (BSD-2), even if I copied lots of code fom ccm_memory.c ?
Or should I set both "Tom StDenis" + "STMicro" ? I think both is the best. Something like:

    /*
     * Copyright (c) 2001-2007, Tom St Denis
     * Copyright (c) 2014, STMicroelectronics International N.V.
     * All rights reserved.
    ...

Anyway, this BSD-2 license header will disappear when proposing it to libtomcrypt github. Only the following part will remain:

    /* LibTomCrypt, modular cryptographic library -- Tom St Denis
     *
     * LibTomCrypt is a library that provides various cryptographic
     * algorithms in a highly modular and flexible manner.
     *
     * The library is free for all purposes without any express
     * guarantee it works.
     *
     * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
     */

(and same for the other added files)