Commit 725d9af9 authored by Toke Høiland-Jørgensen's avatar Toke Høiland-Jørgensen Committed by Ondrej Zajicek (work)
Browse files

Lib: Add Blake2s and Blake2b hash functions 

The Babel MAC authentication RFC recommends implementing Blake2s as one of
the supported algorithms. In order to achieve do this, add the blake2b and
blake2s hash functions for MAC authentication. The hashing function
implementations are the reference implementations from blake2.net.

The Blake2 algorithms allow specifying an arbitrary output size, and the
Babel MAC spec says to implement Blake2s with 128-bit output. To satisfy
this, we add two different variants of each of the algorithms, one using
the default size (256 bits for Blake2s, 512 bits for Blake2b), and one
using half the default output size.

Update to BIRD coding style done by committer.
parent e5724f71

doc/bird.sgml

+1 −1
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ agreement"). 
	<tag><label id="proto-pass-to">to "<m/time/"</tag>

	Shorthand for setting both <cf/generate to/ and <cf/accept to/.



	<tag><label id="proto-pass-algorithm">algorithm ( keyed md5 | keyed sha1 | hmac sha1 | hmac sha256 | hmac sha384 | hmac sha512 )</tag>

	<tag><label id="proto-pass-algorithm">algorithm ( keyed md5 | keyed sha1 | hmac sha1 | hmac sha256 | hmac sha384 | hmac sha512 | blake2s128 | blake2s256 | blake2b256 | blake2b512 )</tag>

	The message authentication algorithm for the password when cryptographic

	authentication is enabled. The default value depends on the protocol.

	For RIP and OSPFv2 it is Keyed-MD5 (for compatibility), for OSPFv3

lib/Makefile

+1 −1
Original line number Diff line number Diff line 
src := bitmap.c bitops.c checksum.c event.c flowspec.c idm.c ip.c lists.c mac.c md5.c mempool.c net.c patmatch.c printf.c resource.c sha1.c sha256.c sha512.c slab.c slists.c strtoul.c tbf.c timer.c xmalloc.c

src := bitmap.c bitops.c blake2s.c blake2b.c checksum.c event.c flowspec.c idm.c ip.c lists.c mac.c md5.c mempool.c net.c patmatch.c printf.c resource.c sha1.c sha256.c sha512.c slab.c slists.c strtoul.c tbf.c timer.c xmalloc.c

obj := $(src-o-files)

$(all-daemon)

lib/birdlib.h

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ static inline int u64_cmp(u64 i1, u64 i2) 
#define PACKED __attribute__((packed))

#define NONNULL(...) __attribute__((nonnull((__VA_ARGS__))))



#define STATIC_ASSERT(...) _Static_assert(__VA_ARGS__)



#ifndef HAVE_THREAD_LOCAL

#define _Thread_local

#endif

lib/blake2-impl.h

0 → 100644
+153 −0
Original line number Diff line number Diff line 
/*

 *	BIRD Library -- BLAKE2 Support Code

 *

 *	Based on the code from BLAKE2 reference source code package

 *

 *	Copyright 2012, Samuel Neves <sneves@dei.uc.pt>

 *

 *	You may use this under the terms of the CC0, the OpenSSL Licence, or the

 *	Apache Public License 2.0, at your option.  The terms of these licenses

 *	can be found at:

 *

 *	- CC0 1.0 Universal : https://creativecommons.org/publicdomain/zero/1.0

 *	- OpenSSL license   : https://www.openssl.org/source/license.html

 *	- Apache 2.0        : https://www.apache.org/licenses/LICENSE-2.0

 *

 *  	More information about the BLAKE2 hash function can be found at

 *	https://blake2.net/ web.

 */



#ifndef _BIRD_BLAKE2_IMPL_H_

#define _BIRD_BLAKE2_IMPL_H_



#include "nest/bird.h"





static inline u32 load32(const void *src)

{

#if !defined(CPU_BIG_ENDIAN)

  u32 w;

  memcpy(&w, src, sizeof w);

  return w;

#else

  const u8 *p = (const u8 *) src;

  return ((u32) (p[0]) <<  0) |

         ((u32) (p[1]) <<  8) |

         ((u32) (p[2]) << 16) |

         ((u32) (p[3]) << 24) ;

#endif

}



static inline u64 load64(const void *src)

{

#if !defined(CPU_BIG_ENDIAN)

  u64 w;

  memcpy(&w, src, sizeof w);

  return w;

#else

  const u8 *p = (const u8 *) src;

  return ((u64) (p[0]) <<  0) |

         ((u64) (p[1]) <<  8) |

         ((u64) (p[2]) << 16) |

         ((u64) (p[3]) << 24) |

         ((u64) (p[4]) << 32) |

         ((u64) (p[5]) << 40) |

         ((u64) (p[6]) << 48) |

         ((u64) (p[7]) << 56) ;

#endif

}



static inline u16 load16(const void *src)

{

#if !defined(CPU_BIG_ENDIAN)

  u16 w;

  memcpy(&w, src, sizeof w);

  return w;

#else

  const u8 *p = (const u8 *) src;

  return (u16) (((u32) (p[0]) <<  0) |

                      ((u32) (p[1]) <<  8));

#endif

}



static inline void store16(void *dst, u16 w)

{

#if !defined(CPU_BIG_ENDIAN)

  memcpy(dst, &w, sizeof w);

#else

  u8 *p = (u8 *) dst;

  *p++ = (u8)w; w >>= 8;

  *p++ = (u8)w;

#endif

}



static inline void store32(void *dst, u32 w)

{

#if !defined(CPU_BIG_ENDIAN)

  memcpy(dst, &w, sizeof w);

#else

  u8 *p = (u8 *)dst;

  p[0] = (u8) (w >>  0);

  p[1] = (u8) (w >>  8);

  p[2] = (u8) (w >> 16);

  p[3] = (u8) (w >> 24);

#endif

}



static inline void store64(void *dst, u64 w)

{

#if !defined(CPU_BIG_ENDIAN)

  memcpy(dst, &w, sizeof w);

#else

  u8 *p = (u8 *) dst;

  p[0] = (u8) (w >>  0);

  p[1] = (u8) (w >>  8);

  p[2] = (u8) (w >> 16);

  p[3] = (u8) (w >> 24);

  p[4] = (u8) (w >> 32);

  p[5] = (u8) (w >> 40);

  p[6] = (u8) (w >> 48);

  p[7] = (u8) (w >> 56);

#endif

}



static inline u64 load48(const void *src)

{

  const u8 *p = (const u8 *) src;

  return ((u64) (p[0]) <<  0) |

         ((u64) (p[1]) <<  8) |

         ((u64) (p[2]) << 16) |

         ((u64) (p[3]) << 24) |

         ((u64) (p[4]) << 32) |

         ((u64) (p[5]) << 40) ;

}



static inline void store48(void *dst, u64 w)

{

  u8 *p = (u8 *) dst;

  p[0] = (u8) (w >>  0);

  p[1] = (u8) (w >>  8);

  p[2] = (u8) (w >> 16);

  p[3] = (u8) (w >> 24);

  p[4] = (u8) (w >> 32);

  p[5] = (u8) (w >> 40);

}



static inline u32 rotr32(const u32 w, const uint c)

{

  return (w >> c) | (w << (32 - c));

}



static inline u64 rotr64(const u64 w, const uint c)

{

  return (w >> c) | (w << (64 - c));

}



/* prevents compiler optimizing out memset() */

static inline void secure_zero_memory(void *v, size_t n)

{

  static void *(*const volatile memset_v)(void *, int, size_t) = &memset;

  memset_v(v, 0, n);

}



#endif

lib/blake2.h

0 → 100644
+148 −0
Original line number Diff line number Diff line 
/*

 *	BIRD Library -- BLAKE2 Hash Functions

 *

 *	Based on the code from BLAKE2 reference source code package

 *

 *	Copyright 2012, Samuel Neves <sneves@dei.uc.pt>

 *

 *	You may use this under the terms of the CC0, the OpenSSL Licence, or the

 *	Apache Public License 2.0, at your option.  The terms of these licenses

 *	can be found at:

 *

 *	- CC0 1.0 Universal : https://creativecommons.org/publicdomain/zero/1.0

 *	- OpenSSL license   : https://www.openssl.org/source/license.html

 *	- Apache 2.0        : https://www.apache.org/licenses/LICENSE-2.0

 *

 *  	More information about the BLAKE2 hash function can be found at

 *	https://blake2.net/ web.

 */



#ifndef _BIRD_BLAKE2_H_

#define _BIRD_BLAKE2_H_



#include "nest/bird.h"





enum blake2s_constant

{

  BLAKE2S_BLOCKBYTES		= 64,

  BLAKE2S_OUTBYTES		= 32,

  BLAKE2S_KEYBYTES		= 32,

  BLAKE2S_SALTBYTES		=  8,

  BLAKE2S_PERSONALBYTES		=  8,

};



enum blake2b_constant

{

  BLAKE2B_BLOCKBYTES		= 128,

  BLAKE2B_OUTBYTES		=  64,

  BLAKE2B_KEYBYTES		=  64,

  BLAKE2B_SALTBYTES		=  16,

  BLAKE2B_PERSONALBYTES		=  16,

};



#define BLAKE2S_SIZE		32  // BLAKE2S_OUTBYTES

#define BLAKE2S_BLOCK_SIZE	64  // BLAKE2S_BLOCKBYTES

#define BLAKE2S_256_SIZE	32



#define BLAKE2B_SIZE		64  // BLAKE2B_OUTBYTES

#define BLAKE2B_BLOCK_SIZE	128 // BLAKE2B_BLOCKBYTES

#define BLAKE2B_512_SIZE	64





struct blake2s_state

{

  u32 h[8];

  u32 t[2];

  u32 f[2];

  byte buf[BLAKE2S_BLOCK_SIZE];

  uint buflen;

  uint outlen;

  u8 last_node;

};



struct blake2b_state

{

  u64 h[8];

  u64 t[2];

  u64 f[2];

  byte buf[BLAKE2B_BLOCK_SIZE];

  uint buflen;

  uint outlen;

  u8 last_node;

};



struct blake2s_param

{

  u8  digest_length;	/* 1 */

  u8  key_length;	/* 2 */

  u8  fanout;		/* 3 */

  u8  depth;		/* 4 */

  u32 leaf_length;	/* 8 */

  u32 node_offset;	/* 12 */

  u16 xof_length;	/* 14 */

  u8  node_depth;	/* 15 */

  u8  inner_length;	/* 16 */

  /* byte  reserved[0]; */

  byte salt[BLAKE2S_SALTBYTES];		/* 24 */

  byte personal[BLAKE2S_PERSONALBYTES];	/* 32 */

} PACKED;



struct blake2b_param

{

  u8  digest_length;	/* 1 */

  u8  key_length;	/* 2 */

  u8  fanout;		/* 3 */

  u8  depth;		/* 4 */

  u32 leaf_length;	/* 8 */

  u32 node_offset;	/* 12 */

  u32 xof_length;	/* 16 */

  u8  node_depth;	/* 17 */

  u8  inner_length;	/* 18 */

  byte reserved[14];	/* 32 */

  byte salt[BLAKE2B_SALTBYTES];		/* 48 */

  byte personal[BLAKE2B_PERSONALBYTES];	/* 64 */

} PACKED;





/* Streaming API */

int blake2s_init(struct blake2s_state *s, size_t outlen);

int blake2s_init_key(struct blake2s_state *s, size_t outlen, const void *key, size_t keylen);

int blake2s_init_param(struct blake2s_state *s, const struct blake2s_param *p);

int blake2s_update(struct blake2s_state *s, const void *in, size_t inlen);

int blake2s_final(struct blake2s_state *s, void *out, size_t outlen);



int blake2b_init(struct blake2b_state *s, size_t outlen);

int blake2b_init_key(struct blake2b_state *s, size_t outlen, const void *key, size_t keylen);

int blake2b_init_param(struct blake2b_state *s, const struct blake2b_param *p);

int blake2b_update(struct blake2b_state *s, const void *in, size_t inlen);

int blake2b_final(struct blake2b_state *s, void *out, size_t outlen);





/* Wrapper functions for MAC class */



struct mac_desc;

struct mac_context;



struct blake2s_context {

  const struct mac_desc *type;

  struct blake2s_state state;

  byte buf[BLAKE2S_SIZE];

};



struct blake2b_context {

  const struct mac_desc *type;

  struct blake2b_state state;

  byte buf[BLAKE2B_SIZE];

};





void blake2s_mac_init(struct mac_context *ctx, const byte *key, uint keylen);

void blake2s_mac_update(struct mac_context *ctx, const byte *data, uint datalen);

byte *blake2s_mac_final(struct mac_context *ctx);



void blake2b_mac_init(struct mac_context *ctx, const byte *key, uint keylen);

void blake2b_mac_update(struct mac_context *ctx, const byte *data, uint datalen);

byte *blake2b_mac_final(struct mac_context *ctx);



#endif /* _BIRD_BLAKE2_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE