[BACK]Return to dh.h CVS log [TXT][DIR] Up to [local] / src / sbin / isakmpd

File: [local] / src / sbin / isakmpd / dh.h (download)

Revision 1.10, Wed Nov 8 13:33:49 2017 UTC (6 years, 7 months ago) by patrick
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6, OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3, HEAD
Changes since 1.9: +3 -1 lines

In the final RFC 5903 the computation for the DH shared secret changed.
Instead of the full point, only the X point is included.

The member g_xy is always the shared secret but so far its buffer has
been allocated using the size of the public points.  Since this is a
different size now, as the shared secret for EC Groups should only store
the x point, we need another member to specify the length of g_xy.

Since this is a backwards incompatible change older isakmpds won't be
able to negotiate if you use EC groups.  Bump the version of our own
vendor tag so peers can try to keep compatibility based on the presen-
ted tag.  This could be used to implement backwards compatibility to
older isakmpds.

Prompted by and ok mpi@

/*	$OpenBSD: dh.h,v 1.10 2017/11/08 13:33:49 patrick Exp $	*/

/*
 * Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
 * copyright notice and this permission notice appear in all copies.
 *
 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

#ifndef _DH_H_
#define _DH_H_

enum group_type {
	GROUP_MODP	= 0,
	GROUP_EC2N	= 1,
	GROUP_ECP	= 2
};

struct group_id {
	enum group_type	 type;
	u_int		 id;
	int		 bits;
	char		*prime;
	char		*generator;
	int		 nid;
};

struct group {
	int		 id;
	struct group_id	*spec;

	void		*dh;
	void		*ec;

	int		(*init)(struct group *);
	int		(*getlen)(struct group *);
	int		(*secretlen)(struct group *);
	int		(*exchange)(struct group *, u_int8_t *);
	int		(*shared)(struct group *, u_int8_t *, u_int8_t *);
};

#define DH_MAXSZ	1024	/* 8192 bits */

void             group_init(void);
void             group_free(struct group *);
struct group	*group_get(u_int32_t);

int		 dh_getlen(struct group *);
int		 dh_secretlen(struct group *);
int		 dh_create_exchange(struct group *, u_int8_t *);
int		 dh_create_shared(struct group *, u_int8_t *, u_int8_t *);

#endif /* _DH_H_ */