Skip to content

Commit

Permalink
move validate function to hash.c, db2hash.c is the DB2 wrapper
Browse files Browse the repository at this point in the history
  • Loading branch information
@tessus
tessus committed May 4, 2017
1 parent 8a157de commit 6477a9c
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 97 deletions.
84 changes: 2 additions & 82 deletions db2hash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,9 +495,6 @@ SQL_API_RC SQL_API_FN validate( SQLUDF_CHAR *password,
SQLUDF_SMALLINT *outNullInd,
SQLUDF_TRAIL_ARGS)
{
apr_status_t status;
char *tmphash, *result;

*out = -1;
*outNullInd = -1;

Expand All @@ -515,91 +512,14 @@ SQL_API_RC SQL_API_FN validate( SQLUDF_CHAR *password,
return(0);
}

if( !strncmp( hash, APR_SHA256PW_ID, APR_SHA256PW_IDLEN ) )
{
tmphash = mk_hash( ALG_APSHA256, password, NULL );

if( apr_strnatcmp( hash, tmphash ) == 0 )
{
*out = 1;
}
else
{
*out = 0;
}

free(tmphash);

*outNullInd = 0;
return(0);
}

if( strlen(hash) == 32 && (hash[0] != '$') )
{
tmphash = mk_hash( ALG_PHPMD5, password, NULL );

if( apr_strnatcmp( hash, tmphash ) == 0 )
{
*out = 1;
}
else
{
*out = 0;
}

free(tmphash);

*outNullInd = 0;
return(0);
}

if( strlen(hash) == 64 && (hash[0] != '$') )
{
tmphash = mk_hash( ALG_SHA256HEX, password, NULL );

if( apr_strnatcmp( hash, tmphash ) == 0 )
{
*out = 1;
}
else
{
*out = 0;
}

free(tmphash);

*outNullInd = 0;
return(0);
}

status = apr_password_validate( password, hash );

if( status == APR_SUCCESS )
if( validate_hash(password, hash) )
{
*out = 1;
}
#ifndef WIN32
else
{
// maybe a different encrypted password (glibc2 crypt)?
result = crypt( password, hash );
if( result != NULL )
{
if( strcmp( hash, result ) == 0 )
{
*out = 1;
}
else
{
*out = 0;
}
}
else
{
*out = 0;
}
*out = 0;
}
#endif

*outNullInd = 0;
return(0);
Expand Down
113 changes: 98 additions & 15 deletions hash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,13 @@ void sha256_base64(const char *clear, int len, char *out)
SHA256_CTX context;
apr_byte_t digest[SHA256_DIGEST_LENGTH];

apr__SHA256_Init( &context );
apr__SHA256_Update( &context, (const unsigned char *)clear, len );
apr__SHA256_Final( digest, &context );
apr__SHA256_Init(&context);
apr__SHA256_Update(&context, (const unsigned char *)clear, len);
apr__SHA256_Final(digest, &context);

apr_cpystrn( out, APR_SHA256PW_ID, APR_SHA256PW_IDLEN + 1 );
apr_cpystrn(out, APR_SHA256PW_ID, APR_SHA256PW_IDLEN + 1);

l = apr_base64_encode_binary( out + APR_SHA256PW_IDLEN, digest, sizeof(digest) );
l = apr_base64_encode_binary(out + APR_SHA256PW_IDLEN, digest, sizeof(digest));
out[l + APR_SHA256PW_IDLEN] = '\0';
}

Expand Down Expand Up @@ -218,12 +218,12 @@ char* mk_hash(int alg, const char *passwd, const char *mysalt)
case ALG_PHPMD5:
md5str[0] = '\0';

apr_md5_init( &context );
apr_md5_update( &context, passwd, strlen(passwd) );
apr_md5_final( digest, &context );
for( i = 0, r = md5str; i < APR_MD5_DIGESTSIZE; i++, r += 2 )
apr_md5_init(&context);
apr_md5_update(&context, passwd, strlen(passwd));
apr_md5_final(digest, &context);
for (i = 0, r = md5str; i < APR_MD5_DIGESTSIZE; i++, r += 2)
{
sprintf( r, "%02x", digest[i] );
sprintf(r, "%02x", digest[i]);
}
*r = '\0';

Expand All @@ -234,12 +234,12 @@ char* mk_hash(int alg, const char *passwd, const char *mysalt)
case ALG_SHA256HEX:
sha256str[0] = '\0';

apr__SHA256_Init( &context256 );
apr__SHA256_Update( &context256, passwd, strlen(passwd) );
apr__SHA256_Final( digest256, &context256 );
for( i = 0, r = sha256str; i < SHA256_DIGEST_LENGTH; i++, r += 2 )
apr__SHA256_Init(&context256);
apr__SHA256_Update(&context256, passwd, strlen(passwd));
apr__SHA256_Final(digest256, &context256);
for (i = 0, r = sha256str; i < SHA256_DIGEST_LENGTH; i++, r += 2)
{
sprintf( r, "%02x", digest256[i] );
sprintf(r, "%02x", digest256[i]);
}
*r = '\0';

Expand All @@ -254,3 +254,86 @@ char* mk_hash(int alg, const char *passwd, const char *mysalt)

return result;
}

int validate_hash(const char *password, const char *hash)
{
apr_status_t status;
char *tmphash, *result;

if (!strncmp(hash, APR_SHA256PW_ID, APR_SHA256PW_IDLEN))
{
tmphash = mk_hash(ALG_APSHA256, password, NULL);

if (apr_strnatcmp(hash, tmphash) == 0)
{
free(tmphash);
return TRUE;
}
else
{
free(tmphash);
return FALSE;
}
}

if (strlen(hash) == 32 && (hash[0] != '$'))
{
tmphash = mk_hash(ALG_PHPMD5, password, NULL);

if (apr_strnatcmp(hash, tmphash) == 0)
{
free(tmphash);
return TRUE;
}
else
{
free(tmphash);
return FALSE;
}
}

if (strlen(hash) == 64 && (hash[0] != '$'))
{
tmphash = mk_hash(ALG_SHA256HEX, password, NULL);

if (apr_strnatcmp(hash, tmphash) == 0)
{
free(tmphash);
return TRUE;
}
else
{
free(tmphash);
return FALSE;
}
}

status = apr_password_validate(password, hash);

if (status == APR_SUCCESS)
{
return TRUE;
}
#ifndef WIN32
else
{
// maybe a different encrypted password (glibc2 crypt)?
result = crypt(password, hash);
if (result != NULL)
{
if (strcmp(hash, result) == 0)
{
return TRUE;
}
else
{
return FALSE;
}
}
else
{
return FALSE;
}
}
#endif
}
1 change: 1 addition & 0 deletions hash.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,6 @@ int is_valid_salt(const char *salt);
int supported(int alg);
void sha256_base64(const char *clear, int len, char *out);
char* mk_hash(int alg, const char *passwd, const char *mysalt);
int validate_hash(const char *password, const char *hash);

#endif

0 comments on commit 6477a9c

Please sign in to comment.