PERFORCE change 1198405 for review

[John-Mark Gurney]

http://p4web.freebsd.org/@@1198405?ac=10

Change 1198405 by jmg at jmg_carbon2 on 2014/08/05 22:04:26

	remove second copy of this header...
	
	Sponsored by:	FreeBSD Foundation

Affected files ...

... //depot/projects/opencrypto/sys/opencrypto/gmac.h#2 edit

Differences ...

==== //depot/projects/opencrypto/sys/opencrypto/gmac.h#2 (text+ko) ====

@@ -51,51 +51,3 @@
 __END_DECLS
 
 #endif /* _GMAC_H_ */
-/*	$OpenBSD: gmac.h,v 1.2 2012/12/05 23:20:15 deraadt Exp $	*/
-
-/*
- * Copyright (c) 2010 Mike Belopuhov <mike at vantronix.net>
- *
- * 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 _GMAC_H_
-#define _GMAC_H_
-
-#include <crypto/rijndael/rijndael.h>
-
-#define GMAC_BLOCK_LEN		16
-#define GMAC_DIGEST_LEN		16
-
-typedef struct _GHASH_CTX {
-	uint8_t		H[GMAC_BLOCK_LEN];		/* hash subkey */
-	uint8_t		S[GMAC_BLOCK_LEN];		/* state */
-	uint8_t		Z[GMAC_BLOCK_LEN];		/* initial state */
-} GHASH_CTX;
-
-typedef struct _AES_GMAC_CTX {
-	GHASH_CTX	ghash;
-	uint32_t	K[4*(RIJNDAEL_MAXNR + 1)];
-	uint8_t		J[GMAC_BLOCK_LEN];		/* counter block */
-	int		rounds;
-} AES_GMAC_CTX;
-
-__BEGIN_DECLS
-void	AES_GMAC_Init(AES_GMAC_CTX *);
-void	AES_GMAC_Setkey(AES_GMAC_CTX *, const uint8_t *, uint16_t);
-void	AES_GMAC_Reinit(AES_GMAC_CTX *, const uint8_t *, uint16_t);
-int	AES_GMAC_Update(AES_GMAC_CTX *, const uint8_t *, uint16_t);
-void	AES_GMAC_Final(uint8_t [GMAC_DIGEST_LEN], AES_GMAC_CTX *);
-__END_DECLS
-
-#endif /* _GMAC_H_ */