Before that, calls to 'HashSink::currentHash()' would eventually lead to
a segfault because the underlying gcrypt handle has been closed.  (Note
that this method is only used via 'importPaths' and 'exportPath', though.)
* nix/libutil/gcrypt-hash.hh (struct guix_hash_context): Add a
  constructor and a copy constructor; move out of 'extern "C"'.
* nix/libutil/gcrypt-hash.cc (guix_hash_final): Clear 'md_handle' upon
  exit.
* nix/sync-with-upstream (top_srcdir): Change hash.{cc,hh} to read
  'struct Ctx' instead of 'union Ctx'.
		
	
			
		
			
				
	
	
		
			51 lines
		
	
	
	
		
			1.4 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			51 lines
		
	
	
	
		
			1.4 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
/* GNU Guix --- Functional package management for GNU
 | 
						|
   Copyright (C) 2012, 2013  Ludovic Courtès <ludo@gnu.org>
 | 
						|
 | 
						|
   This file is part of GNU Guix.
 | 
						|
 | 
						|
   GNU Guix is free software; you can redistribute it and/or modify it
 | 
						|
   under the terms of the GNU General Public License as published by
 | 
						|
   the Free Software Foundation; either version 3 of the License, or (at
 | 
						|
   your option) any later version.
 | 
						|
 | 
						|
   GNU Guix is distributed in the hope that it will be useful, but
 | 
						|
   WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
   GNU General Public License for more details.
 | 
						|
 | 
						|
   You should have received a copy of the GNU General Public License
 | 
						|
   along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.  */
 | 
						|
 | 
						|
#include <config.h>
 | 
						|
 | 
						|
#include <gcrypt-hash.hh>
 | 
						|
#include <assert.h>
 | 
						|
 | 
						|
extern "C" {
 | 
						|
 | 
						|
void
 | 
						|
guix_hash_init (struct guix_hash_context *ctx, int algo)
 | 
						|
{
 | 
						|
  gcry_error_t err;
 | 
						|
 | 
						|
  err = gcry_md_open (&ctx->md_handle, algo, 0);
 | 
						|
  assert (err == GPG_ERR_NO_ERROR);
 | 
						|
}
 | 
						|
 | 
						|
void
 | 
						|
guix_hash_update (struct guix_hash_context *ctx, const void *buffer, size_t len)
 | 
						|
{
 | 
						|
  gcry_md_write (ctx->md_handle, buffer, len);
 | 
						|
}
 | 
						|
 | 
						|
void
 | 
						|
guix_hash_final (void *resbuf, struct guix_hash_context *ctx,
 | 
						|
		 int algo)
 | 
						|
{
 | 
						|
  memcpy (resbuf, gcry_md_read (ctx->md_handle, algo),
 | 
						|
	  gcry_md_get_algo_dlen (algo));
 | 
						|
  gcry_md_close (ctx->md_handle);
 | 
						|
  ctx->md_handle = NULL;
 | 
						|
}
 | 
						|
 | 
						|
}
 |