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
Bugzilla #1097: PDKIM: Update embedded PolarSSL code to 0.14.2, thanks to Andreas...
[exim.git]
/
src
/
src
/
pdkim
/
sha1.h
diff --git
a/src/src/pdkim/sha1.h
b/src/src/pdkim/sha1.h
index 677e5418f37f3afbcce48732c283687c5cc0ec0b..b13afd3a19a187d09877c737b4fd41fe10f357d4 100644
(file)
--- a/
src/src/pdkim/sha1.h
+++ b/
src/src/pdkim/sha1.h
@@
-1,10
+1,12
@@
/**
* \file sha1.h
*
/**
* \file sha1.h
*
- * Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
- * All rights reserved.
+ * Copyright (C) 2006-2010, Brainspark B.V.
+ *
+ * This file is part of PolarSSL (http://www.polarssl.org)
+ * Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
*
- *
Joined copyright on original XySSL code with: Christophe Devine
+ *
All rights reserved.
*
* 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
@@
-29,7
+31,6
@@
/**
* \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;
@@
-45,7
+46,6
@@
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
@@
-64,7
+64,7
@@
void sha1_starts( sha1_context *ctx );
* \param input buffer holding the data
* \param ilen length of the input data
*/
* \param input buffer holding the data
* \param ilen length of the input data
*/
-void sha1_update( sha1_context *ctx, unsigned char *input, int ilen );
+void sha1_update( sha1_context *ctx,
const
unsigned char *input, int ilen );
/**
* \brief SHA-1 final digest
/**
* \brief SHA-1 final digest
@@
-81,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( unsigned char *input, int ilen, unsigned char output[20] );
+void sha1(
const
unsigned char *input, int ilen, unsigned char output[20] );
/**
* \brief Output = SHA-1( file contents )
/**
* \brief Output = SHA-1( file contents )
@@
-92,7
+92,7
@@
void sha1( unsigned char *input, int ilen, unsigned char output[20] );
* \return 0 if successful, 1 if fopen failed,
* or 2 if fread failed
*/
* \return 0 if successful, 1 if fopen failed,
* or 2 if fread failed
*/
-int sha1_file( char *path, unsigned char output[20] );
+int sha1_file( c
onst c
har *path, unsigned char output[20] );
/**
* \brief SHA-1 HMAC context setup
/**
* \brief SHA-1 HMAC context setup
@@
-101,7
+101,7
@@
int sha1_file( char *path, unsigned char output[20] );
* \param key HMAC secret key
* \param keylen length of the HMAC key
*/
* \param key HMAC secret key
* \param keylen length of the HMAC key
*/
-void sha1_hmac_starts( sha1_context *ctx, unsigned char *key, int keylen );
+void sha1_hmac_starts( sha1_context *ctx,
const
unsigned char *key, int keylen );
/**
* \brief SHA-1 HMAC process buffer
/**
* \brief SHA-1 HMAC process buffer
@@
-110,7
+110,7
@@
void sha1_hmac_starts( sha1_context *ctx, unsigned char *key, int keylen );
* \param input buffer holding the data
* \param ilen length of the input data
*/
* \param input buffer holding the data
* \param ilen length of the input data
*/
-void sha1_hmac_update( sha1_context *ctx, unsigned char *input, int ilen );
+void sha1_hmac_update( sha1_context *ctx,
const
unsigned char *input, int ilen );
/**
* \brief SHA-1 HMAC final digest
/**
* \brief SHA-1 HMAC final digest
@@
-120,6
+120,13
@@
void sha1_hmac_update( sha1_context *ctx, unsigned char *input, int ilen );
*/
void sha1_hmac_finish( sha1_context *ctx, unsigned char output[20] );
*/
void sha1_hmac_finish( sha1_context *ctx, unsigned char output[20] );
+/**
+ * \brief SHA-1 HMAC context reset
+ *
+ * \param ctx HMAC context to be reset
+ */
+void sha1_hmac_reset( sha1_context *ctx );
+
/**
* \brief Output = HMAC-SHA-1( hmac key, input buffer )
*
/**
* \brief Output = HMAC-SHA-1( hmac key, input buffer )
*
@@
-129,8
+136,8
@@
void sha1_hmac_finish( sha1_context *ctx, unsigned char output[20] );
* \param ilen length of the input data
* \param output HMAC-SHA-1 result
*/
* \param ilen length of the input data
* \param output HMAC-SHA-1 result
*/
-void sha1_hmac( unsigned char *key, int keylen,
- unsigned char *input, int ilen,
+void sha1_hmac(
const
unsigned char *key, int keylen,
+
const
unsigned char *input, int ilen,
unsigned char output[20] );
#ifdef __cplusplus
unsigned char output[20] );
#ifdef __cplusplus