diff options
author | jbj <devnull@localhost> | 2001-10-08 14:48:22 +0000 |
---|---|---|
committer | jbj <devnull@localhost> | 2001-10-08 14:48:22 +0000 |
commit | 4c15c4d2740d44d437648b17ef89a34b366bc654 (patch) | |
tree | 5d5c37b0202820813612ff744c17438a9abc0bab /beecrypt/sha256.h | |
parent | d14c5439529865c90d2a7e31c0dba5f5c9ff1765 (diff) | |
download | librpm-tizen-4c15c4d2740d44d437648b17ef89a34b366bc654.tar.gz librpm-tizen-4c15c4d2740d44d437648b17ef89a34b366bc654.tar.bz2 librpm-tizen-4c15c4d2740d44d437648b17ef89a34b366bc654.zip |
Resolve conflicts.
CVS patchset: 5100
CVS date: 2001/10/08 14:48:22
Diffstat (limited to 'beecrypt/sha256.h')
-rw-r--r-- | beecrypt/sha256.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/beecrypt/sha256.h b/beecrypt/sha256.h index 7e8626261..a57bd3ae6 100644 --- a/beecrypt/sha256.h +++ b/beecrypt/sha256.h @@ -46,32 +46,32 @@ extern "C" { /** \ingroup HASH_sha256_m */ -/*@observer@*/ /*@checkedstrict@*/ extern BEEDLLAPI const hashFunction sha256; +/*@observer@*/ /*@checkedstrict@*/ extern BEECRYPTAPI const hashFunction sha256; /*@-exportlocal@*/ /** \ingroup HASH_sha256_m */ -BEEDLLAPI +BEECRYPTAPI void sha256Process(sha256Param* p) /*@globals internalState @*/ /*@modifies p, internalState @*/; /** \ingroup HASH_sha256_m */ -BEEDLLAPI +BEECRYPTAPI int sha256Reset (sha256Param* p) /*@modifies p @*/; /** \ingroup HASH_sha256_m */ -BEEDLLAPI +BEECRYPTAPI int sha256Update (sha256Param* p, const byte* data, int size) /*@globals internalState @*/ /*@modifies p, internalState @*/; /** \ingroup HASH_sha256_m */ -BEEDLLAPI +BEECRYPTAPI int sha256Digest (sha256Param* p, /*@out@*/ uint32* data) /*@globals internalState @*/ /*@modifies p, data, internalState @*/; |