archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Code refactoring: move MD5 out of imbuf into blenlib.

Browse Source
This commit is contained in:
Brecht Van Lommel
2011-12-21 13:48:51 +00:00
parent 34909c64e5
commit 1dd72692cd
6 changed files with 130 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
source/blender/blenlib/BLI_md5.h Normal file
View File

@@ -0,0 +1,45 @@
/*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* 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 the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program 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 this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef BLI_MD5_H
#define BLI_MD5_H
/** \file BLI_md5.h
* \ingroup bli
*/
#include <stdio.h>
#include <stdlib.h>
/* Compute MD5 message digest for LEN bytes beginning at BUFFER. The
result is always in little endian byte order, so that a byte-wise
output yields to the wanted ASCII representation of the message
digest. */
void *md5_buffer(const char *buffer, size_t len, void *resblock);
/* Compute MD5 message digest for bytes read from STREAM. The
resulting message digest number will be written into the 16 bytes
beginning at RESBLOCK. */
int md5_stream(FILE *stream, void *resblock);
#endif

2
source/blender/blenlib/CMakeLists.txt
View File

@@ -71,6 +71,7 @@ set(SRC
intern/math_rotation.c intern/math_rotation.c
intern/math_vector.c intern/math_vector.c
intern/math_vector_inline.c intern/math_vector_inline.c
intern/md5.c
intern/noise.c intern/noise.c
intern/path_util.c intern/path_util.c
intern/pbvh.c intern/pbvh.c
@@ -117,6 +118,7 @@ set(SRC
BLI_math_matrix.h BLI_math_matrix.h
BLI_math_rotation.h BLI_math_rotation.h
BLI_math_vector.h BLI_math_vector.h
BLI_md5.h
BLI_memarena.h BLI_memarena.h
BLI_mempool.h BLI_mempool.h
BLI_noise.h BLI_noise.h

102
source/blender/imbuf/intern/md5.c → source/blender/blenlib/intern/md5.c
View File

@@ -21,12 +21,82 @@
/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>. */ /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>. */
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
# include <stdlib.h> #if defined HAVE_LIMITS_H || defined _LIBC
# include <string.h> # include <limits.h>
#endif
/* The following contortions are an attempt to use the C preprocessor
to determine an unsigned integral type that is 32 bits wide. An
alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
doing that would require that the configure script compile and *run*
the resulting executable. Locally running cross-compiled executables
is usually not possible. */
#if defined __STDC__ && __STDC__
# define UINT_MAX_32_BITS 4294967295U
#else
# define UINT_MAX_32_BITS 0xFFFFFFFF
#endif
/* If UINT_MAX isn't defined, assume it's a 32-bit type.
This should be valid for all systems GNU cares about because
that doesn't include 16-bit systems, and only modern systems
(that certainly have <limits.h>) have 64+-bit integral types. */
#ifndef UINT_MAX
# define UINT_MAX UINT_MAX_32_BITS
#endif
#if UINT_MAX == UINT_MAX_32_BITS
typedef unsigned int md5_uint32;
#else
# if USHRT_MAX == UINT_MAX_32_BITS
typedef unsigned short md5_uint32;
# else
# if ULONG_MAX == UINT_MAX_32_BITS
typedef unsigned long md5_uint32;
# else
/* The following line is intended to evoke an error.
Using #error is not portable enough. */
"Cannot determine unsigned 32-bit data type."
# endif
# endif
#endif
/* Structure to save state of computation between the single steps. */
struct md5_ctx
{
md5_uint32 A;
md5_uint32 B;
md5_uint32 C;
md5_uint32 D;
};
/*
* The following three functions are build up the low level used in
* the functions `md5_stream' and `md5_buffer'.
*/
/* Initialize structure containing state of computation.
(RFC 1321, 3.3: Step 3) */
static void md5_init_ctx(struct md5_ctx *ctx);
/* Starting with the result of former calls of this function (or the
initialzation function update the context for the next LEN bytes
starting at BUFFER.
It is necessary that LEN is a multiple of 64!!! */
static void md5_process_block(const void *buffer, size_t len, struct md5_ctx *ctx);
/* Put result from CTX in first 16 bytes following RESBUF. The result is
always in little endian byte order, so that a byte-wise output yields
to the wanted ASCII representation of the message digest. */
static void *md5_read_ctx(const struct md5_ctx *ctx, void *resbuf);
#include "md5.h"
#ifdef __BIG_ENDIAN__ #ifdef __BIG_ENDIAN__
# define SWAP(n) \ # define SWAP(n) \
@@ -43,9 +113,7 @@ static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ... */ };
/* Initialize structure containing state of computation. /* Initialize structure containing state of computation.
(RFC 1321, 3.3: Step 3) */ (RFC 1321, 3.3: Step 3) */
void static void md5_init_ctx(struct md5_ctx *ctx)
md5_init_ctx (ctx)
struct md5_ctx *ctx;
{ {
ctx->A = 0x67452301; ctx->A = 0x67452301;
ctx->B = 0xefcdab89; ctx->B = 0xefcdab89;
@@ -55,10 +123,7 @@ md5_init_ctx (ctx)
/* Put result from CTX in first 16 bytes following RESBUF. The result must /* Put result from CTX in first 16 bytes following RESBUF. The result must
be in little endian byte order. */ be in little endian byte order. */
void * static void *md5_read_ctx(const struct md5_ctx *ctx, void *resbuf)
md5_read_ctx (ctx, resbuf)
const struct md5_ctx *ctx;
void *resbuf;
{ {
((md5_uint32 *) resbuf)[0] = SWAP (ctx->A); ((md5_uint32 *) resbuf)[0] = SWAP (ctx->A);
((md5_uint32 *) resbuf)[1] = SWAP (ctx->B); ((md5_uint32 *) resbuf)[1] = SWAP (ctx->B);
@@ -71,10 +136,7 @@ md5_read_ctx (ctx, resbuf)
/* Compute MD5 message digest for bytes read from STREAM. The /* Compute MD5 message digest for bytes read from STREAM. The
resulting message digest number will be written into the 16 bytes resulting message digest number will be written into the 16 bytes
beginning at RESBLOCK. */ beginning at RESBLOCK. */
int int md5_stream(FILE *stream, void *resblock)
md5_stream (stream, resblock)
FILE *stream;
void *resblock;
{ {
/* Important: BLOCKSIZE must be a multiple of 64. */ /* Important: BLOCKSIZE must be a multiple of 64. */
#define BLOCKSIZE 4096 #define BLOCKSIZE 4096
@@ -154,11 +216,7 @@ md5_stream (stream, resblock)
result is always in little endian byte order, so that a byte-wise result is always in little endian byte order, so that a byte-wise
output yields to the wanted ASCII representation of the message output yields to the wanted ASCII representation of the message
digest. */ digest. */
void * void *md5_buffer(const char *buffer, size_t len, void *resblock)
md5_buffer (buffer, len, resblock)
const char *buffer;
size_t len;
void *resblock;
{ {
struct md5_ctx ctx; struct md5_ctx ctx;
char restbuf[64 + 72]; char restbuf[64 + 72];
@@ -207,11 +265,7 @@ md5_buffer (buffer, len, resblock)
/* Process LEN bytes of BUFFER, accumulating context into CTX. /* Process LEN bytes of BUFFER, accumulating context into CTX.
It is assumed that LEN % 64 == 0. */ It is assumed that LEN % 64 == 0. */
void void md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
md5_process_block (buffer, len, ctx)
const void *buffer;
size_t len;
struct md5_ctx *ctx;
{ {
md5_uint32 correct_words[16]; md5_uint32 correct_words[16];
const md5_uint32 *words = buffer; const md5_uint32 *words = buffer;

2
source/blender/imbuf/CMakeLists.txt
View File

@@ -53,7 +53,6 @@ set(SRC
intern/indexer_dv.c intern/indexer_dv.c
intern/iris.c intern/iris.c
intern/jpeg.c intern/jpeg.c
intern/md5.c
intern/metadata.c intern/metadata.c
intern/module.c intern/module.c
intern/moviecache.c intern/moviecache.c
@@ -96,7 +95,6 @@ set(SRC
intern/dds/Stream.h intern/dds/Stream.h
intern/dds/dds_api.h intern/dds/dds_api.h
intern/imbuf.h intern/imbuf.h
intern/md5.h
intern/openexr/openexr_api.h intern/openexr/openexr_api.h
intern/openexr/openexr_multi.h intern/openexr/openexr_multi.h

119
source/blender/imbuf/intern/md5.h
View File

@@ -1,119 +0,0 @@
/** \file blender/imbuf/intern/md5.h
* \ingroup imbuf
*/
/* md5.h - Declaration of functions and data types used for MD5 sum
computing library functions.
Copyright (C) 1995 Free Software Foundation, Inc.
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
the Free Software Foundation; either version 2, or (at your option)
any later version.
This program 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 this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef _MD5_H
#define _MD5_H
#include <stdio.h>
#if defined HAVE_LIMITS_H || defined _LIBC
# include <limits.h>
#endif
/* The following contortions are an attempt to use the C preprocessor
to determine an unsigned integral type that is 32 bits wide. An
alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
doing that would require that the configure script compile and *run*
the resulting executable. Locally running cross-compiled executables
is usually not possible. */
#if defined __STDC__ && __STDC__
# define UINT_MAX_32_BITS 4294967295U
#else
# define UINT_MAX_32_BITS 0xFFFFFFFF
#endif
/* If UINT_MAX isn't defined, assume it's a 32-bit type.
This should be valid for all systems GNU cares about because
that doesn't include 16-bit systems, and only modern systems
(that certainly have <limits.h>) have 64+-bit integral types. */
#ifndef UINT_MAX
# define UINT_MAX UINT_MAX_32_BITS
#endif
#if UINT_MAX == UINT_MAX_32_BITS
typedef unsigned int md5_uint32;
#else
# if USHRT_MAX == UINT_MAX_32_BITS
typedef unsigned short md5_uint32;
# else
# if ULONG_MAX == UINT_MAX_32_BITS
typedef unsigned long md5_uint32;
# else
/* The following line is intended to evoke an error.
Using #error is not portable enough. */
"Cannot determine unsigned 32-bit data type."
# endif
# endif
#endif
#undef __P
#if defined (__STDC__) && __STDC__
#define __P(x) x
#else
#define __P(x) ()
#endif
/* Structure to save state of computation between the single steps. */
struct md5_ctx
{
md5_uint32 A;
md5_uint32 B;
md5_uint32 C;
md5_uint32 D;
};
/*
* The following three functions are build up the low level used in
* the functions `md5_stream' and `md5_buffer'.
*/
/* Initialize structure containing state of computation.
(RFC 1321, 3.3: Step 3) */
void md5_init_ctx __P ((struct md5_ctx *ctx));
/* Starting with the result of former calls of this function (or the
initialzation function update the context for the next LEN bytes
starting at BUFFER.
It is necessary that LEN is a multiple of 64!!! */
void md5_process_block __P ((const void *buffer, size_t len,
struct md5_ctx *ctx));
/* Put result from CTX in first 16 bytes following RESBUF. The result is
always in little endian byte order, so that a byte-wise output yields
to the wanted ASCII representation of the message digest. */
void *md5_read_ctx __P ((const struct md5_ctx *ctx, void *resbuf));
/* Compute MD5 message digest for bytes read from STREAM. The
resulting message digest number will be written into the 16 bytes
beginning at RESBLOCK. */
int md5_stream __P ((FILE *stream, void *resblock));
/* Compute MD5 message digest for LEN bytes beginning at BUFFER. The
result is always in little endian byte order, so that a byte-wise
output yields to the wanted ASCII representation of the message
digest. */
void *md5_buffer __P ((const char *buffer, size_t len, void *resblock));
#endif

9
source/blender/imbuf/intern/thumbs.c
View File

@@ -32,17 +32,18 @@
#include <stdio.h> #include <stdio.h>
#include "BKE_utildefines.h"
#include "BLI_blenlib.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "BLI_blenlib.h"
#include "BLI_md5.h"
#include "BKE_utildefines.h"
#include "IMB_imbuf_types.h" #include "IMB_imbuf_types.h"
#include "IMB_imbuf.h" #include "IMB_imbuf.h"
#include "IMB_thumbs.h" #include "IMB_thumbs.h"
#include "IMB_metadata.h" #include "IMB_metadata.h"
#include "md5.h"
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>