git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PDKIM: Upgrade PolarSSL files to upstream version 0.12.1. Thanks to Andreas Metzler...
[exim.git]
/
src
/
src
/
pdkim
/
sha1.h
diff --git
a/src/src/pdkim/sha1.h
b/src/src/pdkim/sha1.h
index 0349be5d2d6b2e84b8b163c7615c357c98affefc..677e5418f37f3afbcce48732c283687c5cc0ec0b 100644
(file)
--- a/
src/src/pdkim/sha1.h
+++ b/
src/src/pdkim/sha1.h
@@
-1,9
+1,10
@@
/**
* \file sha1.h
*
/**
* \file sha1.h
*
- * Based on XySSL: Copyright (C) 2006-2008 Christophe Devine
+ * Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ * All rights reserved.
*
*
- *
Copyright (C) 2009 Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
Joined copyright on original XySSL code with: Christophe Devine
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-20,7
+21,7
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-/* $Cambridge: exim/src/src/pdkim/sha1.h,v 1.
2 2009/06/10 07:34:05
tom Exp $ */
+/* $Cambridge: exim/src/src/pdkim/sha1.h,v 1.
3 2009/12/07 13:05:07
tom Exp $ */
#ifndef POLARSSL_SHA1_H
#define POLARSSL_SHA1_H
#ifndef POLARSSL_SHA1_H
#define POLARSSL_SHA1_H
@@
-28,6
+29,7
@@
/**
* \brief SHA-1 context structure
*/
/**
* \brief SHA-1 context structure
*/
+
#ifndef HAVE_SHA1_CONTEXT
#define HAVE_SHA1_CONTEXT
typedef struct sha1_context sha1_context;
#ifndef HAVE_SHA1_CONTEXT
#define HAVE_SHA1_CONTEXT
typedef struct sha1_context sha1_context;
@@
-43,6
+45,7
@@
struct sha1_context
unsigned char opad[64]; /*!< HMAC: outer padding */
};
unsigned char opad[64]; /*!< HMAC: outer padding */
};
+
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
extern "C" {
#endif
@@
-78,7
+81,7
@@
void sha1_finish( sha1_context *ctx, unsigned char output[20] );
* \param ilen length of the input data
* \param output SHA-1 checksum result
*/
* \param ilen length of the input data
* \param output SHA-1 checksum result
*/
-void sha1
_oneshot
( unsigned char *input, int ilen, unsigned char output[20] );
+void sha1( unsigned char *input, int ilen, unsigned char output[20] );
/**
* \brief Output = SHA-1( file contents )
/**
* \brief Output = SHA-1( file contents )