pike.git/ src/ post_modules/ Nettle/ hash.cmod

2010-06-21

2010-06-21 12:35:35 by Martin Stjernholm <mast@lysator.liu.se>

• d51d794b87a400a33faa5dc43c3bd244412879c2 (9 lines) (+5/-4) ^{[ Show | Annotate ]}
  Branch: 7.9

Somewhat less brute thread safety fix.

Can probably still be improved a bit. Also fixed similar problem in
hash() for stream objects.

Rev: src/post_modules/Nettle/hash.cmod:1.35

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: hash.cmod,v 1.34 2010/06/21 12:23:15 mast Exp $ + || $Id: hash.cmod,v 1.35 2010/06/21 12:35:35 mast Exp $   */      #include "global.h"
128:    if(!ctx)    SIMPLE_OUT_OF_MEMORY_ERROR("hash", meta->context_size);    -  /* THREADS_ALLOW(); */ +  THREADS_ALLOW();    meta->init(ctx);    meta->update(ctx, in->len, (const uint8_t *)in->str); -  +  THREADS_DISALLOW();       digest_length = meta->digest_size;    out = begin_shared_string(digest_length);    meta->digest(ctx, digest_length, (uint8_t *)out->str); -  /* THREADS_DISALLOW(); */ +        pop_n_elems(args);    push_string(end_shared_string(out));
235:       free(read_buffer);    +  THREADS_DISALLOW();    out = begin_shared_string(meta->digest_size);    meta->digest(ctx, meta->digest_size, (uint8_t *)out->str); -  THREADS_DISALLOW(); +        pop_n_elems(args);    push_string(end_shared_string(out));