Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8eee3787 authored by Jason Cooper's avatar Jason Cooper Committed by Greg Kroah-Hartman
Browse files

staging: crypto: skein: remove __cplusplus and an unneeded stddef.h 



Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent da13dfd7

drivers/staging/skein/include/skein.h

+0 −11
Original line number Diff line number Diff line
@@ -27,13 +27,6 @@ 
**                                1: return SKEIN_FAIL to flag errors

**

***************************************************************************/

#ifdef __cplusplus

extern "C"

{

#endif



#include <stddef.h>                          /* get size_t definition */



typedef unsigned int    uint_t;             /* native unsigned integer */

typedef uint8_t         u08b_t;             /*  8-bit unsigned integer */

typedef uint64_t        u64b_t;             /* 64-bit unsigned integer */
@@ -322,8 +315,4 @@ enum 
#define SKEIN1024_ROUNDS_TOTAL (8*((((SKEIN_ROUNDS    ) + 5) % 10) + 5))

#endif



#ifdef __cplusplus

}

#endif



#endif  /* ifndef _SKEIN_H_ */

drivers/staging/skein/include/skeinApi.h

+0 −9
Original line number Diff line number Diff line
@@ -81,11 +81,6 @@ OTHER DEALINGS IN THE SOFTWARE. 
#include <linux/types.h>

#include <skein.h>



#ifdef __cplusplus

extern "C"

{

#endif



    /**

     * Which Skein size to use

     */
@@ -229,10 +224,6 @@ extern "C" 
     */

    int skeinFinal(SkeinCtx_t* ctx, uint8_t* hash);



#ifdef __cplusplus

}

#endif



/**

 * @}

 */

drivers/staging/skein/include/threefishApi.h

+0 −9
Original line number Diff line number Diff line
@@ -33,11 +33,6 @@ 


#define KeyScheduleConst 0x1BD11BDAA9FC1A22L



#ifdef __cplusplus

extern "C"

{

#endif



    /**

     * Which Threefish size to use

     */
@@ -157,10 +152,6 @@ extern "C" 
    void threefishDecrypt256(ThreefishKey_t* keyCtx, uint64_t* input, uint64_t* output);

    void threefishDecrypt512(ThreefishKey_t* keyCtx, uint64_t* input, uint64_t* output);

    void threefishDecrypt1024(ThreefishKey_t* keyCtx, uint64_t* input, uint64_t* output);

#ifdef __cplusplus

}

#endif



/**

 * @}

 */