projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* doc/headers/assert.texi (assert.h): Document assert module use.
[gnulib.git]
/
lib
/
gc-gnulib.c
diff --git
a/lib/gc-gnulib.c
b/lib/gc-gnulib.c
index
adfa0ac
..
7f8d790
100644
(file)
--- a/
lib/gc-gnulib.c
+++ b/
lib/gc-gnulib.c
@@
-1,5
+1,5
@@
/* gc-gnulib.c --- Common gnulib internal crypto interface functions
/* gc-gnulib.c --- Common gnulib internal crypto interface functions
- * Copyright (C) 2002, 2003, 2004, 2005, 2006 Simon Josefsson
+ * Copyright (C) 2002, 2003, 2004, 2005, 2006
, 2007
Simon Josefsson
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published
@@
-29,7
+29,7
@@
#include <string.h>
/* For randomize. */
#include <string.h>
/* For randomize. */
-#ifdef G
C_USE
_RANDOM
+#ifdef G
NULIB_GC
_RANDOM
# include <unistd.h>
# include <sys/types.h>
# include <sys/stat.h>
# include <unistd.h>
# include <sys/types.h>
# include <sys/stat.h>
@@
-38,36
+38,41
@@
#endif
/* Hashes. */
#endif
/* Hashes. */
-#ifdef G
C_USE
_MD2
+#ifdef G
NULIB_GC
_MD2
# include "md2.h"
#endif
# include "md2.h"
#endif
-#ifdef G
C_USE
_MD4
+#ifdef G
NULIB_GC
_MD4
# include "md4.h"
#endif
# include "md4.h"
#endif
-#ifdef G
C_USE
_MD5
+#ifdef G
NULIB_GC
_MD5
# include "md5.h"
#endif
# include "md5.h"
#endif
-#ifdef G
C_USE
_SHA1
+#ifdef G
NULIB_GC
_SHA1
# include "sha1.h"
#endif
# include "sha1.h"
#endif
-#if defined(G
C_USE_HMAC_MD5) || defined(GC_USE
_HMAC_SHA1)
+#if defined(G
NULIB_GC_HMAC_MD5) || defined(GNULIB_GC
_HMAC_SHA1)
# include "hmac.h"
#endif
/* Ciphers. */
# include "hmac.h"
#endif
/* Ciphers. */
-#ifdef G
C_USE
_ARCFOUR
+#ifdef G
NULIB_GC
_ARCFOUR
# include "arcfour.h"
#endif
# include "arcfour.h"
#endif
-#ifdef G
C_USE
_ARCTWO
+#ifdef G
NULIB_GC
_ARCTWO
# include "arctwo.h"
#endif
# include "arctwo.h"
#endif
-#ifdef G
C_USE
_DES
+#ifdef G
NULIB_GC
_DES
# include "des.h"
#endif
# include "des.h"
#endif
-#ifdef G
C_USE
_RIJNDAEL
+#ifdef G
NULIB_GC
_RIJNDAEL
# include "rijndael-api-fst.h"
#endif
# include "rijndael-api-fst.h"
#endif
+/* The results of open() in this file are not used with fchdir,
+ therefore save some unnecessary work in fchdir.c. */
+#undef open
+#undef close
+
Gc_rc
gc_init (void)
{
Gc_rc
gc_init (void)
{
@@
-80,7
+85,7
@@
gc_done (void)
return;
}
return;
}
-#ifdef G
C_USE
_RANDOM
+#ifdef G
NULIB_GC
_RANDOM
/* Randomness. */
/* Randomness. */
@@
-174,17
+179,17
@@
gc_set_allocators (gc_malloc_t func_malloc,
typedef struct _gc_cipher_ctx {
Gc_cipher alg;
Gc_cipher_mode mode;
typedef struct _gc_cipher_ctx {
Gc_cipher alg;
Gc_cipher_mode mode;
-#ifdef G
C_USE
_ARCTWO
+#ifdef G
NULIB_GC
_ARCTWO
arctwo_context arctwoContext;
char arctwoIV[ARCTWO_BLOCK_SIZE];
#endif
arctwo_context arctwoContext;
char arctwoIV[ARCTWO_BLOCK_SIZE];
#endif
-#ifdef G
C_USE
_ARCFOUR
+#ifdef G
NULIB_GC
_ARCFOUR
arcfour_context arcfourContext;
#endif
arcfour_context arcfourContext;
#endif
-#ifdef G
C_USE
_DES
- des_ctx desContext;
+#ifdef G
NULIB_GC
_DES
+
gl_
des_ctx desContext;
#endif
#endif
-#ifdef G
C_USE
_RIJNDAEL
+#ifdef G
NULIB_GC
_RIJNDAEL
rijndaelKeyInstance aesEncKey;
rijndaelKeyInstance aesDecKey;
rijndaelCipherInstance aesContext;
rijndaelKeyInstance aesEncKey;
rijndaelKeyInstance aesDecKey;
rijndaelCipherInstance aesContext;
@@
-207,7
+212,7
@@
gc_cipher_open (Gc_cipher alg, Gc_cipher_mode mode,
switch (alg)
{
switch (alg)
{
-#ifdef G
C_USE
_ARCTWO
+#ifdef G
NULIB_GC
_ARCTWO
case GC_ARCTWO40:
switch (mode)
{
case GC_ARCTWO40:
switch (mode)
{
@@
-221,7
+226,7
@@
gc_cipher_open (Gc_cipher alg, Gc_cipher_mode mode,
break;
#endif
break;
#endif
-#ifdef G
C_USE
_ARCFOUR
+#ifdef G
NULIB_GC
_ARCFOUR
case GC_ARCFOUR128:
case GC_ARCFOUR40:
switch (mode)
case GC_ARCFOUR128:
case GC_ARCFOUR40:
switch (mode)
@@
-235,7
+240,7
@@
gc_cipher_open (Gc_cipher alg, Gc_cipher_mode mode,
break;
#endif
break;
#endif
-#ifdef G
C_USE
_DES
+#ifdef G
NULIB_GC
_DES
case GC_DES:
switch (mode)
{
case GC_DES:
switch (mode)
{
@@
-248,7
+253,7
@@
gc_cipher_open (Gc_cipher alg, Gc_cipher_mode mode,
break;
#endif
break;
#endif
-#ifdef G
C_USE
_RIJNDAEL
+#ifdef G
NULIB_GC
_RIJNDAEL
case GC_AES128:
case GC_AES192:
case GC_AES256:
case GC_AES128:
case GC_AES192:
case GC_AES256:
@@
-283,28
+288,28
@@
gc_cipher_setkey (gc_cipher_handle handle, size_t keylen, const char *key)
switch (ctx->alg)
{
switch (ctx->alg)
{
-#ifdef G
C_USE
_ARCTWO
+#ifdef G
NULIB_GC
_ARCTWO
case GC_ARCTWO40:
arctwo_setkey (&ctx->arctwoContext, keylen, key);
break;
#endif
case GC_ARCTWO40:
arctwo_setkey (&ctx->arctwoContext, keylen, key);
break;
#endif
-#ifdef G
C_USE
_ARCFOUR
+#ifdef G
NULIB_GC
_ARCFOUR
case GC_ARCFOUR128:
case GC_ARCFOUR40:
arcfour_setkey (&ctx->arcfourContext, key, keylen);
break;
#endif
case GC_ARCFOUR128:
case GC_ARCFOUR40:
arcfour_setkey (&ctx->arcfourContext, key, keylen);
break;
#endif
-#ifdef G
C_USE
_DES
+#ifdef G
NULIB_GC
_DES
case GC_DES:
if (keylen != 8)
return GC_INVALID_CIPHER;
case GC_DES:
if (keylen != 8)
return GC_INVALID_CIPHER;
- des_setkey (&ctx->desContext, key);
+
gl_
des_setkey (&ctx->desContext, key);
break;
#endif
break;
#endif
-#ifdef G
C_USE
_RIJNDAEL
+#ifdef G
NULIB_GC
_RIJNDAEL
case GC_AES128:
case GC_AES192:
case GC_AES256:
case GC_AES128:
case GC_AES192:
case GC_AES256:
@@
-347,7
+352,7
@@
gc_cipher_setiv (gc_cipher_handle handle, size_t ivlen, const char *iv)
switch (ctx->alg)
{
switch (ctx->alg)
{
-#ifdef G
C_USE
_ARCTWO
+#ifdef G
NULIB_GC
_ARCTWO
case GC_ARCTWO40:
if (ivlen != ARCTWO_BLOCK_SIZE)
return GC_INVALID_CIPHER;
case GC_ARCTWO40:
if (ivlen != ARCTWO_BLOCK_SIZE)
return GC_INVALID_CIPHER;
@@
-355,7
+360,7
@@
gc_cipher_setiv (gc_cipher_handle handle, size_t ivlen, const char *iv)
break;
#endif
break;
#endif
-#ifdef G
C_USE
_RIJNDAEL
+#ifdef G
NULIB_GC
_RIJNDAEL
case GC_AES128:
case GC_AES192:
case GC_AES256:
case GC_AES128:
case GC_AES192:
case GC_AES256:
@@
-401,7
+406,7
@@
gc_cipher_encrypt_inline (gc_cipher_handle handle, size_t len, char *data)
switch (ctx->alg)
{
switch (ctx->alg)
{
-#ifdef G
C_USE
_ARCTWO
+#ifdef G
NULIB_GC
_ARCTWO
case GC_ARCTWO40:
switch (ctx->mode)
{
case GC_ARCTWO40:
switch (ctx->mode)
{
@@
-428,21
+433,21
@@
gc_cipher_encrypt_inline (gc_cipher_handle handle, size_t len, char *data)
break;
#endif
break;
#endif
-#ifdef G
C_USE
_ARCFOUR
+#ifdef G
NULIB_GC
_ARCFOUR
case GC_ARCFOUR128:
case GC_ARCFOUR40:
arcfour_stream (&ctx->arcfourContext, data, data, len);
break;
#endif
case GC_ARCFOUR128:
case GC_ARCFOUR40:
arcfour_stream (&ctx->arcfourContext, data, data, len);
break;
#endif
-#ifdef G
C_USE
_DES
+#ifdef G
NULIB_GC
_DES
case GC_DES:
for (; len >= 8; len -= 8, data += 8)
case GC_DES:
for (; len >= 8; len -= 8, data += 8)
- des_ecb_encrypt (&ctx->desContext, data, data);
+
gl_
des_ecb_encrypt (&ctx->desContext, data, data);
break;
#endif
break;
#endif
-#ifdef G
C_USE
_RIJNDAEL
+#ifdef G
NULIB_GC
_RIJNDAEL
case GC_AES128:
case GC_AES192:
case GC_AES256:
case GC_AES128:
case GC_AES192:
case GC_AES256:
@@
-471,7
+476,7
@@
gc_cipher_decrypt_inline (gc_cipher_handle handle, size_t len, char *data)
switch (ctx->alg)
{
switch (ctx->alg)
{
-#ifdef G
C_USE
_ARCTWO
+#ifdef G
NULIB_GC
_ARCTWO
case GC_ARCTWO40:
switch (ctx->mode)
{
case GC_ARCTWO40:
switch (ctx->mode)
{
@@
-500,21
+505,21
@@
gc_cipher_decrypt_inline (gc_cipher_handle handle, size_t len, char *data)
break;
#endif
break;
#endif
-#ifdef G
C_USE
_ARCFOUR
+#ifdef G
NULIB_GC
_ARCFOUR
case GC_ARCFOUR128:
case GC_ARCFOUR40:
arcfour_stream (&ctx->arcfourContext, data, data, len);
break;
#endif
case GC_ARCFOUR128:
case GC_ARCFOUR40:
arcfour_stream (&ctx->arcfourContext, data, data, len);
break;
#endif
-#ifdef G
C_USE
_DES
+#ifdef G
NULIB_GC
_DES
case GC_DES:
for (; len >= 8; len -= 8, data += 8)
case GC_DES:
for (; len >= 8; len -= 8, data += 8)
- des_ecb_decrypt (&ctx->desContext, data, data);
+
gl_
des_ecb_decrypt (&ctx->desContext, data, data);
break;
#endif
break;
#endif
-#ifdef G
C_USE
_RIJNDAEL
+#ifdef G
NULIB_GC
_RIJNDAEL
case GC_AES128:
case GC_AES192:
case GC_AES256:
case GC_AES128:
case GC_AES192:
case GC_AES256:
@@
-555,16
+560,16
@@
typedef struct _gc_hash_ctx {
Gc_hash alg;
Gc_hash_mode mode;
char hash[MAX_DIGEST_SIZE];
Gc_hash alg;
Gc_hash_mode mode;
char hash[MAX_DIGEST_SIZE];
-#ifdef G
C_USE
_MD2
+#ifdef G
NULIB_GC
_MD2
struct md2_ctx md2Context;
#endif
struct md2_ctx md2Context;
#endif
-#ifdef G
C_USE
_MD4
+#ifdef G
NULIB_GC
_MD4
struct md4_ctx md4Context;
#endif
struct md4_ctx md4Context;
#endif
-#ifdef G
C_USE
_MD5
+#ifdef G
NULIB_GC
_MD5
struct md5_ctx md5Context;
#endif
struct md5_ctx md5Context;
#endif
-#ifdef G
C_USE
_SHA1
+#ifdef G
NULIB_GC
_SHA1
struct sha1_ctx sha1Context;
#endif
} _gc_hash_ctx;
struct sha1_ctx sha1Context;
#endif
} _gc_hash_ctx;
@@
-582,25
+587,25
@@
gc_hash_open (Gc_hash hash, Gc_hash_mode mode, gc_hash_handle * outhandle)
switch (hash)
{
switch (hash)
{
-#ifdef G
C_USE
_MD2
+#ifdef G
NULIB_GC
_MD2
case GC_MD2:
md2_init_ctx (&ctx->md2Context);
break;
#endif
case GC_MD2:
md2_init_ctx (&ctx->md2Context);
break;
#endif
-#ifdef G
C_USE
_MD4
+#ifdef G
NULIB_GC
_MD4
case GC_MD4:
md4_init_ctx (&ctx->md4Context);
break;
#endif
case GC_MD4:
md4_init_ctx (&ctx->md4Context);
break;
#endif
-#ifdef G
C_USE
_MD5
+#ifdef G
NULIB_GC
_MD5
case GC_MD5:
md5_init_ctx (&ctx->md5Context);
break;
#endif
case GC_MD5:
md5_init_ctx (&ctx->md5Context);
break;
#endif
-#ifdef G
C_USE
_SHA1
+#ifdef G
NULIB_GC
_SHA1
case GC_SHA1:
sha1_init_ctx (&ctx->sha1Context);
break;
case GC_SHA1:
sha1_init_ctx (&ctx->sha1Context);
break;
@@
-685,25
+690,25
@@
gc_hash_write (gc_hash_handle handle, size_t len, const char *data)
switch (ctx->alg)
{
switch (ctx->alg)
{
-#ifdef G
C_USE
_MD2
+#ifdef G
NULIB_GC
_MD2
case GC_MD2:
md2_process_bytes (data, len, &ctx->md2Context);
break;
#endif
case GC_MD2:
md2_process_bytes (data, len, &ctx->md2Context);
break;
#endif
-#ifdef G
C_USE
_MD4
+#ifdef G
NULIB_GC
_MD4
case GC_MD4:
md4_process_bytes (data, len, &ctx->md4Context);
break;
#endif
case GC_MD4:
md4_process_bytes (data, len, &ctx->md4Context);
break;
#endif
-#ifdef G
C_USE
_MD5
+#ifdef G
NULIB_GC
_MD5
case GC_MD5:
md5_process_bytes (data, len, &ctx->md5Context);
break;
#endif
case GC_MD5:
md5_process_bytes (data, len, &ctx->md5Context);
break;
#endif
-#ifdef G
C_USE
_SHA1
+#ifdef G
NULIB_GC
_SHA1
case GC_SHA1:
sha1_process_bytes (data, len, &ctx->sha1Context);
break;
case GC_SHA1:
sha1_process_bytes (data, len, &ctx->sha1Context);
break;
@@
-722,28
+727,28
@@
gc_hash_read (gc_hash_handle handle)
switch (ctx->alg)
{
switch (ctx->alg)
{
-#ifdef G
C_USE
_MD2
+#ifdef G
NULIB_GC
_MD2
case GC_MD2:
md2_finish_ctx (&ctx->md2Context, ctx->hash);
ret = ctx->hash;
break;
#endif
case GC_MD2:
md2_finish_ctx (&ctx->md2Context, ctx->hash);
ret = ctx->hash;
break;
#endif
-#ifdef G
C_USE
_MD4
+#ifdef G
NULIB_GC
_MD4
case GC_MD4:
md4_finish_ctx (&ctx->md4Context, ctx->hash);
ret = ctx->hash;
break;
#endif
case GC_MD4:
md4_finish_ctx (&ctx->md4Context, ctx->hash);
ret = ctx->hash;
break;
#endif
-#ifdef G
C_USE
_MD5
+#ifdef G
NULIB_GC
_MD5
case GC_MD5:
md5_finish_ctx (&ctx->md5Context, ctx->hash);
ret = ctx->hash;
break;
#endif
case GC_MD5:
md5_finish_ctx (&ctx->md5Context, ctx->hash);
ret = ctx->hash;
break;
#endif
-#ifdef G
C_USE
_SHA1
+#ifdef G
NULIB_GC
_SHA1
case GC_SHA1:
sha1_finish_ctx (&ctx->sha1Context, ctx->hash);
ret = ctx->hash;
case GC_SHA1:
sha1_finish_ctx (&ctx->sha1Context, ctx->hash);
ret = ctx->hash;
@@
-770,25
+775,25
@@
gc_hash_buffer (Gc_hash hash, const void *in, size_t inlen, char *resbuf)
{
switch (hash)
{
{
switch (hash)
{
-#ifdef G
C_USE
_MD2
+#ifdef G
NULIB_GC
_MD2
case GC_MD2:
md2_buffer (in, inlen, resbuf);
break;
#endif
case GC_MD2:
md2_buffer (in, inlen, resbuf);
break;
#endif
-#ifdef G
C_USE
_MD4
+#ifdef G
NULIB_GC
_MD4
case GC_MD4:
md4_buffer (in, inlen, resbuf);
break;
#endif
case GC_MD4:
md4_buffer (in, inlen, resbuf);
break;
#endif
-#ifdef G
C_USE
_MD5
+#ifdef G
NULIB_GC
_MD5
case GC_MD5:
md5_buffer (in, inlen, resbuf);
break;
#endif
case GC_MD5:
md5_buffer (in, inlen, resbuf);
break;
#endif
-#ifdef G
C_USE
_SHA1
+#ifdef G
NULIB_GC
_SHA1
case GC_SHA1:
sha1_buffer (in, inlen, resbuf);
break;
case GC_SHA1:
sha1_buffer (in, inlen, resbuf);
break;
@@
-801,7
+806,7
@@
gc_hash_buffer (Gc_hash hash, const void *in, size_t inlen, char *resbuf)
return GC_OK;
}
return GC_OK;
}
-#ifdef G
C_USE
_MD2
+#ifdef G
NULIB_GC
_MD2
Gc_rc
gc_md2 (const void *in, size_t inlen, void *resbuf)
{
Gc_rc
gc_md2 (const void *in, size_t inlen, void *resbuf)
{
@@
-810,7
+815,7
@@
gc_md2 (const void *in, size_t inlen, void *resbuf)
}
#endif
}
#endif
-#ifdef G
C_USE
_MD4
+#ifdef G
NULIB_GC
_MD4
Gc_rc
gc_md4 (const void *in, size_t inlen, void *resbuf)
{
Gc_rc
gc_md4 (const void *in, size_t inlen, void *resbuf)
{
@@
-819,7
+824,7
@@
gc_md4 (const void *in, size_t inlen, void *resbuf)
}
#endif
}
#endif
-#ifdef G
C_USE
_MD5
+#ifdef G
NULIB_GC
_MD5
Gc_rc
gc_md5 (const void *in, size_t inlen, void *resbuf)
{
Gc_rc
gc_md5 (const void *in, size_t inlen, void *resbuf)
{
@@
-828,7
+833,7
@@
gc_md5 (const void *in, size_t inlen, void *resbuf)
}
#endif
}
#endif
-#ifdef G
C_USE
_SHA1
+#ifdef G
NULIB_GC
_SHA1
Gc_rc
gc_sha1 (const void *in, size_t inlen, void *resbuf)
{
Gc_rc
gc_sha1 (const void *in, size_t inlen, void *resbuf)
{
@@
-837,7
+842,7
@@
gc_sha1 (const void *in, size_t inlen, void *resbuf)
}
#endif
}
#endif
-#ifdef G
C_USE
_HMAC_MD5
+#ifdef G
NULIB_GC
_HMAC_MD5
Gc_rc
gc_hmac_md5 (const void *key, size_t keylen,
const void *in, size_t inlen, char *resbuf)
Gc_rc
gc_hmac_md5 (const void *key, size_t keylen,
const void *in, size_t inlen, char *resbuf)
@@
-847,7
+852,7
@@
gc_hmac_md5 (const void *key, size_t keylen,
}
#endif
}
#endif
-#ifdef G
C_USE
_HMAC_SHA1
+#ifdef G
NULIB_GC
_HMAC_SHA1
Gc_rc
gc_hmac_sha1 (const void *key, size_t keylen,
const void *in, size_t inlen, char *resbuf)
Gc_rc
gc_hmac_sha1 (const void *key, size_t keylen,
const void *in, size_t inlen, char *resbuf)