mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-03-14 10:27:03 +00:00
Code Releases Activity

MD5: change interface of md5_final()

Browse Source 
originally:
  void md5_final(unsigned char digest[16], struct md5_context *ctx);

newly:
  byte * md5_final(md5_context *ctx);
This commit is contained in:
Pavel Tvrdík 2015-05-13 10:55:02 +02:00
parent 0a8abdf6a0
commit aa75e6dfe1
7 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/conf.h
View File

@ -9,6 +9,8 @@
#ifndef _BIRD_CONF_H_
#define _BIRD_CONF_H_
#include "sysdep/config.h"
#include "lib/ip.h"
#include "lib/resource.h"
#include "lib/timer.h"

16
lib/md5.c
View File

@ -38,7 +38,7 @@ void byteReverse(unsigned char *buf, unsigned longs)
* Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
* initialization constants.
*/
void md5_init(struct md5_context *ctx)
void md5_init(md5_context *ctx)
{
ctx->buf[0] = 0x67452301;
ctx->buf[1] = 0xefcdab89;
@ -53,7 +53,7 @@ void md5_init(struct md5_context *ctx)
* Update context to reflect the concatenation of another buffer full
* of bytes.
*/
void md5_update(struct md5_context *ctx, unsigned char const *buf, unsigned len)
void md5_update(md5_context *ctx, unsigned char const *buf, unsigned len)
{
u32 t;
@ -101,7 +101,7 @@ void md5_update(struct md5_context *ctx, unsigned char const *buf, unsigned len)
* Final wrapup - pad to 64-byte boundary with the bit pattern
* 1 0* (64-bit count of bits processed, MSB-first)
*/
void md5_final(unsigned char digest[16], struct md5_context *ctx)
byte *md5_final(md5_context *ctx)
{
unsigned count;
unsigned char *p;
@ -138,8 +138,14 @@ void md5_final(unsigned char digest[16], struct md5_context *ctx)
md5_transform(ctx->buf, (u32 *) ctx->in);
byteReverse((unsigned char *) ctx->buf, 4);
memcpy(digest, ctx->buf, 16);
memset((char *) ctx, 0, sizeof(ctx)); /* In case it's sensitive */
return (byte*) ctx->buf;
}
/* I am a hard paranoid */
void md5_erase_ctx(md5_context *ctx)
{
memset((char *) ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
}
/* The four core functions - F1 is optimized somewhat */

10
lib/md5.h
View File

@ -15,15 +15,17 @@
#define MD5_HEX_SIZE 33
#define MD5_BLOCK_SIZE 64
struct md5_context {
typedef struct
{
u32 buf[4];
u32 bits[2];
unsigned char in[64];
} md5_context;
void md5_init(struct md5_context *context);
void md5_update(struct md5_context *context, unsigned char const *buf, unsigned len);
void md5_final(unsigned char digest[16], struct md5_context *context);
void md5_init(md5_context *context);
void md5_update(md5_context *context, unsigned char const *buf, unsigned len);
byte *md5_final(md5_context *context);
void md5_transform(u32 buf[4], u32 const in[16]);

5
lib/md5_test.c
View File

@ -16,12 +16,11 @@
static void
get_md5(const char *str, char (*out_hash)[MD5_HEX_SIZE])
{
unsigned char hash[MD5_SIZE];
struct md5_context ctxt;
md5_context ctxt;
md5_init(&ctxt);
md5_update(&ctxt, str, strlen(str));
md5_final(hash, &ctxt);
byte *hash = md5_final(&ctxt);
int i;
for(i = 0; i < MD5_SIZE; i++)

1
lib/resource.h
View File

@ -9,6 +9,7 @@
#ifndef _BIRD_RESOURCE_H_
#define _BIRD_RESOURCE_H_
#include <stddef.h>
#include "lib/lists.h"
/* Resource */

9
proto/ospf/packet.c
View File

@ -11,6 +11,7 @@
#include "ospf.h"
#include "nest/password.h"
#include "lib/md5.h"
#include "lib/socket.h"
void
ospf_pkt_fill_hdr(struct ospf_iface *ifa, void *buf, u8 h_type)
@ -108,11 +109,11 @@ ospf_pkt_finalize(struct ospf_iface *ifa, struct ospf_packet *pkt)
char password[OSPF_AUTH_CRYPT_SIZE];
strncpy(password, passwd->password, sizeof(password));
struct md5_context ctxt;
md5_context ctxt;
md5_init(&ctxt);
md5_update(&ctxt, (char *) pkt, plen);
md5_update(&ctxt, password, OSPF_AUTH_CRYPT_SIZE);
md5_final(tail, &ctxt);
memcpy((byte *) tail, md5_final(&ctxt), MD5_SIZE);
break;
default:
@ -180,11 +181,11 @@ ospf_pkt_checkauth(struct ospf_neighbor *n, struct ospf_iface *ifa, struct ospf_
strncpy(passwd, pass->password, OSPF_AUTH_CRYPT_SIZE);
struct md5_context ctxt;
md5_context ctxt;
md5_init(&ctxt);
md5_update(&ctxt, (char *) pkt, plen);
md5_update(&ctxt, passwd, OSPF_AUTH_CRYPT_SIZE);
md5_final(md5sum, &ctxt);
memcpy(md5sum, md5_final(&ctxt), MD5_SIZE);
if (memcmp(md5sum, tail, OSPF_AUTH_CRYPT_SIZE))
DROP("wrong MD5 digest", pass->id);

10
proto/rip/auth.c
View File

@ -57,9 +57,9 @@ rip_incoming_authentication( struct proto *p, struct rip_block_auth *block, stru
{
struct password_item *pass = NULL, *ptmp;
struct rip_md5_tail *tail;
struct md5_context ctxt;
md5_context ctxt;
char md5sum_packet[16];
char md5sum_computed[16];
char *md5sum_computed;
struct neighbor *neigh = neigh_find(p, &whotoldme, 0);
list *l = P_CF->passwords;
@ -99,7 +99,7 @@ rip_incoming_authentication( struct proto *p, struct rip_block_auth *block, stru
md5_init(&ctxt);
md5_update(&ctxt, (char *) packet, ntohs(block->packetlen) + sizeof(struct rip_block_auth) );
md5_final(md5sum_computed, &ctxt);
md5sum_computed = md5_final(&ctxt);
if (memcmp(md5sum_packet, md5sum_computed, 16))
return 1;
}
@ -136,7 +136,7 @@ rip_outgoing_authentication( struct proto *p, struct rip_block_auth *block, stru
case AT_MD5:
{
struct rip_md5_tail *tail;
struct md5_context ctxt;
md5_context ctxt;
static u32 sequence = 0;
if (num > PACKET_MD5_MAX)
@ -159,7 +159,7 @@ rip_outgoing_authentication( struct proto *p, struct rip_block_auth *block, stru
strncpy(tail->md5, passwd->password, 16);
md5_init(&ctxt);
md5_update(&ctxt, (char *) packet, PACKETLEN(num) + sizeof(struct rip_md5_tail));
md5_final(tail->md5, &ctxt);
memcpy(tail->md5, md5_final(&ctxt), MD5_SIZE);
return PACKETLEN(num) + block->authlen;
}
default: