Add support for CHAP using SHA1
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
Ronnie Sahlberg
@@ -72,7 +72,7 @@ struct iscsi_in_pdu {
|
||||
void iscsi_free_iscsi_in_pdu(struct iscsi_context *iscsi, struct iscsi_in_pdu *in);
|
||||
|
||||
/* size of chap response field */
|
||||
#define CHAP_R_SIZE 16
|
||||
#define MAX_CHAP_R_SIZE 20 /* md5:16 sha1:20 */
|
||||
|
||||
/* max length of chap challange */
|
||||
#define MAX_CHAP_C_LENGTH 2048
|
||||
@@ -90,14 +90,15 @@ struct iscsi_context {
|
||||
char alias[MAX_STRING_SIZE+1];
|
||||
char bind_interfaces[MAX_STRING_SIZE+1];
|
||||
|
||||
enum iscsi_chap_auth chap_auth;
|
||||
char user[MAX_STRING_SIZE+1];
|
||||
char passwd[MAX_STRING_SIZE+1];
|
||||
char chap_c[MAX_CHAP_C_LENGTH+1];
|
||||
|
||||
char target_user[MAX_STRING_SIZE+1];
|
||||
char target_passwd[MAX_STRING_SIZE+1];
|
||||
uint32_t target_chap_i;
|
||||
unsigned char target_chap_r[CHAP_R_SIZE];
|
||||
int target_chap_i;
|
||||
char target_chap_r[MAX_CHAP_R_SIZE];
|
||||
|
||||
char error_string[MAX_STRING_SIZE+1];
|
||||
|
||||
|
||||
@@ -183,6 +183,21 @@ EXTERN int
|
||||
iscsi_set_initial_r2t(struct iscsi_context *iscsi, enum iscsi_initial_r2t initial_r2t);
|
||||
|
||||
|
||||
enum iscsi_chap_auth {
|
||||
ISCSI_CHAP_MD5 = 5,
|
||||
ISCSI_CHAP_SHA_1 = 6,
|
||||
#if 0
|
||||
ISCSI_CHAP_SHA_256 = 7,
|
||||
ISCSI_CHAP_SHA3_256 = 8,
|
||||
#endif
|
||||
};
|
||||
|
||||
EXTERN enum iscsi_chap_auth
|
||||
iscsi_get_auth(struct iscsi_context *iscsi);
|
||||
|
||||
EXTERN void
|
||||
iscsi_set_auth(struct iscsi_context *iscsi, enum iscsi_chap_auth auth);
|
||||
|
||||
/*
|
||||
* This function is used to parse an iSCSI URL into a iscsi_url structure.
|
||||
* iSCSI URL format :
|
||||
|
||||
28
include/sha-private.h
Normal file
28
include/sha-private.h
Normal file
@@ -0,0 +1,28 @@
|
||||
/*************************** sha-private.h ***************************/
|
||||
/********************** See RFC 4634 for details *********************/
|
||||
#ifndef _SHA_PRIVATE__H
|
||||
#define _SHA_PRIVATE__H
|
||||
/*
|
||||
* These definitions are defined in FIPS-180-2, section 4.1.
|
||||
* Ch() and Maj() are defined identically in sections 4.1.1,
|
||||
* 4.1.2 and 4.1.3.
|
||||
*
|
||||
* The definitions used in FIPS-180-2 are as follows:
|
||||
*/
|
||||
|
||||
#ifndef USE_MODIFIED_MACROS
|
||||
#define SHA_Ch(x,y,z) (((x) & (y)) ^ ((~(x)) & (z)))
|
||||
#define SHA_Maj(x,y,z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
|
||||
|
||||
#else /* USE_MODIFIED_MACROS */
|
||||
/*
|
||||
* The following definitions are equivalent and potentially faster.
|
||||
*/
|
||||
|
||||
#define SHA_Ch(x, y, z) (((x) & ((y) ^ (z))) ^ (z))
|
||||
#define SHA_Maj(x, y, z) (((x) & ((y) | (z))) | ((y) & (z)))
|
||||
#endif /* USE_MODIFIED_MACROS */
|
||||
|
||||
#define SHA_Parity(x, y, z) ((x) ^ (y) ^ (z))
|
||||
|
||||
#endif /* _SHA_PRIVATE__H */
|
||||
334
include/sha.h
Normal file
334
include/sha.h
Normal file
@@ -0,0 +1,334 @@
|
||||
/**************************** sha.h ****************************/
|
||||
/******************* See RFC 4634 for details ******************/
|
||||
#ifndef _SHA_H_
|
||||
#define _SHA_H_
|
||||
|
||||
#ifndef USE_SHA1
|
||||
#define USE_SHA1 1
|
||||
#endif
|
||||
|
||||
#ifndef USE_SHA224
|
||||
#define USE_SHA224 0
|
||||
#endif
|
||||
|
||||
#ifndef USE_SHA384_SHA512
|
||||
#define USE_SHA384_SHA512 1
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Description:
|
||||
* This file implements the Secure Hash Signature Standard
|
||||
* algorithms as defined in the National Institute of Standards
|
||||
* and Technology Federal Information Processing Standards
|
||||
* Publication (FIPS PUB) 180-1 published on April 17, 1995, 180-2
|
||||
* published on August 1, 2002, and the FIPS PUB 180-2 Change
|
||||
* Notice published on February 28, 2004.
|
||||
*
|
||||
* A combined document showing all algorithms is available at
|
||||
* http://csrc.nist.gov/publications/fips/
|
||||
* fips180-2/fips180-2withchangenotice.pdf
|
||||
*
|
||||
* The five hashes are defined in these sizes:
|
||||
* SHA-1 20 byte / 160 bit
|
||||
* SHA-224 28 byte / 224 bit
|
||||
* SHA-256 32 byte / 256 bit
|
||||
* SHA-384 48 byte / 384 bit
|
||||
* SHA-512 64 byte / 512 bit
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STDINT_H
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STDLIB_H
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
* If you do not have the ISO standard stdint.h header file, then you
|
||||
* must typedef the following:
|
||||
* name meaning
|
||||
* uint64_t unsigned 64 bit integer
|
||||
* uint32_t unsigned 32 bit integer
|
||||
* uint8_t unsigned 8 bit integer (i.e., unsigned char)
|
||||
* int_least16_t integer of >= 16 bits
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _SHA_enum_
|
||||
#define _SHA_enum_
|
||||
/*
|
||||
* All SHA functions return one of these values.
|
||||
*/
|
||||
enum
|
||||
{
|
||||
shaSuccess = 0,
|
||||
shaNull, /* Null pointer parameter */
|
||||
shaInputTooLong, /* input data too long */
|
||||
shaStateError, /* called Input after FinalBits or Result */
|
||||
shaBadParam /* passed a bad parameter */
|
||||
};
|
||||
#endif /* _SHA_enum_ */
|
||||
|
||||
/*
|
||||
* These constants hold size information for each of the SHA
|
||||
* hashing operations
|
||||
*/
|
||||
enum
|
||||
{
|
||||
#if defined(USE_SHA1) && USE_SHA1
|
||||
SHA1_Message_Block_Size = 64,
|
||||
SHA1HashSize = 20,
|
||||
SHA1HashSizeBits = 160,
|
||||
#endif
|
||||
#if defined(USE_SHA224) && USE_SHA224
|
||||
SHA224_Message_Block_Size = 64,
|
||||
SHA224HashSize = 28,
|
||||
SHA224HashSizeBits = 224,
|
||||
#endif
|
||||
#if defined(USE_SHA384_SHA512) && USE_SHA384_SHA512
|
||||
SHA384_Message_Block_Size = 128,
|
||||
SHA384HashSize = 48,
|
||||
SHA384HashSizeBits = 384,
|
||||
#endif
|
||||
SHA256_Message_Block_Size = 64,
|
||||
SHA512_Message_Block_Size = 128,
|
||||
USHA_Max_Message_Block_Size = SHA512_Message_Block_Size,
|
||||
|
||||
SHA256HashSize = 32,
|
||||
SHA512HashSize = 64,
|
||||
USHAMaxHashSize = SHA512HashSize,
|
||||
|
||||
SHA256HashSizeBits = 256,
|
||||
SHA512HashSizeBits = 512, USHAMaxHashSizeBits = SHA512HashSizeBits
|
||||
};
|
||||
|
||||
/*
|
||||
* These constants are used in the USHA (unified sha) functions.
|
||||
*/
|
||||
typedef enum SHAversion
|
||||
{
|
||||
#if defined(USE_SHA1) && USE_SHA1
|
||||
SHA1,
|
||||
#endif
|
||||
#if defined(USE_SHA224) && USE_SHA224
|
||||
SHA224,
|
||||
#endif
|
||||
#if defined(USE_SHA384_SHA512) && USE_SHA384_SHA512
|
||||
SHA384,
|
||||
SHA512,
|
||||
#endif
|
||||
SHA256
|
||||
} SHAversion;
|
||||
|
||||
#if defined(USE_SHA1) && USE_SHA1
|
||||
/*
|
||||
* This structure will hold context information for the SHA-1
|
||||
* hashing operation.
|
||||
*/
|
||||
typedef struct SHA1Context
|
||||
{
|
||||
uint32_t Intermediate_Hash[SHA1HashSize / 4]; /* Message Digest */
|
||||
|
||||
uint32_t Length_Low; /* Message length in bits */
|
||||
uint32_t Length_High; /* Message length in bits */
|
||||
|
||||
int_least16_t Message_Block_Index; /* Message_Block array index */
|
||||
/* 512-bit message blocks */
|
||||
uint8_t Message_Block[SHA1_Message_Block_Size];
|
||||
|
||||
int Computed; /* Is the digest computed? */
|
||||
int Corrupted; /* Is the digest corrupted? */
|
||||
} SHA1Context;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* This structure will hold context information for the SHA-256
|
||||
* hashing operation.
|
||||
*/
|
||||
typedef struct SHA256Context
|
||||
{
|
||||
uint32_t Intermediate_Hash[SHA256HashSize / 4]; /* Message Digest */
|
||||
|
||||
uint32_t Length_Low; /* Message length in bits */
|
||||
uint32_t Length_High; /* Message length in bits */
|
||||
|
||||
int_least16_t Message_Block_Index; /* Message_Block array index */
|
||||
/* 512-bit message blocks */
|
||||
uint8_t Message_Block[SHA256_Message_Block_Size];
|
||||
|
||||
int Computed; /* Is the digest computed? */
|
||||
int Corrupted; /* Is the digest corrupted? */
|
||||
} SHA256Context;
|
||||
|
||||
/*
|
||||
* This structure will hold context information for the SHA-512
|
||||
* hashing operation.
|
||||
*/
|
||||
typedef struct SHA512Context
|
||||
{
|
||||
#ifdef USE_32BIT_ONLY
|
||||
uint32_t Intermediate_Hash[SHA512HashSize / 4]; /* Message Digest */
|
||||
uint32_t Length[4]; /* Message length in bits */
|
||||
#else /* !USE_32BIT_ONLY */
|
||||
uint64_t Intermediate_Hash[SHA512HashSize / 8]; /* Message Digest */
|
||||
uint64_t Length_Low, Length_High; /* Message length in bits */
|
||||
#endif /* USE_32BIT_ONLY */
|
||||
int_least16_t Message_Block_Index; /* Message_Block array index */
|
||||
/* 1024-bit message blocks */
|
||||
uint8_t Message_Block[SHA512_Message_Block_Size];
|
||||
|
||||
int Computed; /* Is the digest computed? */
|
||||
int Corrupted; /* Is the digest corrupted? */
|
||||
} SHA512Context;
|
||||
|
||||
#if defined(USE_SHA224) && USE_SHA224
|
||||
/*
|
||||
* This structure will hold context information for the SHA-224
|
||||
* hashing operation. It uses the SHA-256 structure for computation.
|
||||
*/
|
||||
typedef struct SHA256Context SHA224Context;
|
||||
#endif
|
||||
|
||||
#if defined(USE_SHA384_SHA512) && USE_SHA384_SHA512
|
||||
/*
|
||||
* This structure will hold context information for the SHA-384
|
||||
* hashing operation. It uses the SHA-512 structure for computation.
|
||||
*/
|
||||
typedef struct SHA512Context SHA384Context;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* This structure holds context information for all SHA
|
||||
* hashing operations.
|
||||
*/
|
||||
typedef struct USHAContext
|
||||
{
|
||||
SHAversion whichSha; /* which SHA is being used */
|
||||
union
|
||||
{
|
||||
#if defined(USE_SHA1) && USE_SHA1
|
||||
SHA1Context sha1Context;
|
||||
#endif
|
||||
#if defined(USE_SHA224) && USE_SHA224
|
||||
SHA224Context sha224Context;
|
||||
#endif
|
||||
SHA256Context sha256Context;
|
||||
#if defined(USE_SHA384_SHA512) && USE_SHA384_SHA512
|
||||
SHA384Context sha384Context;
|
||||
SHA512Context sha512Context;
|
||||
#endif
|
||||
} ctx;
|
||||
} USHAContext;
|
||||
|
||||
/*
|
||||
* This structure will hold context information for the HMAC
|
||||
* keyed hashing operation.
|
||||
*/
|
||||
typedef struct HMACContext
|
||||
{
|
||||
SHAversion whichSha; /* which SHA is being used */
|
||||
int hashSize; /* hash size of SHA being used */
|
||||
int blockSize; /* block size of SHA being used */
|
||||
USHAContext shaContext; /* SHA context */
|
||||
unsigned char k_opad[USHA_Max_Message_Block_Size];
|
||||
/* outer padding - key XORd with opad */
|
||||
} HMACContext;
|
||||
|
||||
/*
|
||||
* Function Prototypes
|
||||
*/
|
||||
|
||||
#if defined(USE_SHA1) && USE_SHA1
|
||||
/* SHA-1 */
|
||||
extern int SHA1Reset (SHA1Context *);
|
||||
extern int SHA1Input (SHA1Context *, const uint8_t * bytes,
|
||||
size_t bytecount);
|
||||
extern int SHA1FinalBits (SHA1Context *, const uint8_t bits,
|
||||
size_t bitcount);
|
||||
extern int SHA1Result (SHA1Context *, uint8_t Message_Digest[SHA1HashSize]);
|
||||
#endif
|
||||
|
||||
#if defined(USE_SHA224) && USE_SHA224
|
||||
/* SHA-224 */
|
||||
extern int SHA224Reset (SHA224Context *);
|
||||
extern int SHA224Input (SHA224Context *, const uint8_t * bytes,
|
||||
size_t bytecount);
|
||||
extern int SHA224FinalBits (SHA224Context *, const uint8_t bits,
|
||||
size_t bitcount);
|
||||
extern int SHA224Result (SHA224Context *,
|
||||
uint8_t Message_Digest[SHA224HashSize]);
|
||||
#endif
|
||||
|
||||
/* SHA-256 */
|
||||
extern int SHA256Reset (SHA256Context *);
|
||||
extern int SHA256Input (SHA256Context *, const uint8_t * bytes,
|
||||
size_t bytecount);
|
||||
extern int SHA256FinalBits (SHA256Context *, const uint8_t bits,
|
||||
size_t bitcount);
|
||||
extern int SHA256Result (SHA256Context *,
|
||||
uint8_t Message_Digest[SHA256HashSize]);
|
||||
|
||||
#if defined(USE_SHA384_SHA512) && USE_SHA384_SHA512
|
||||
/* SHA-384 */
|
||||
extern int SHA384Reset (SHA384Context *);
|
||||
extern int SHA384Input (SHA384Context *, const uint8_t * bytes,
|
||||
size_t bytecount);
|
||||
extern int SHA384FinalBits (SHA384Context *, const uint8_t bits,
|
||||
size_t bitcount);
|
||||
extern int SHA384Result (SHA384Context *,
|
||||
uint8_t Message_Digest[SHA384HashSize]);
|
||||
|
||||
/* SHA-512 */
|
||||
extern int SHA512Reset (SHA512Context *);
|
||||
extern int SHA512Input (SHA512Context *, const uint8_t * bytes,
|
||||
size_t bytecount);
|
||||
extern int SHA512FinalBits (SHA512Context *, const uint8_t bits,
|
||||
size_t bitcount);
|
||||
extern int SHA512Result (SHA512Context *,
|
||||
uint8_t Message_Digest[SHA512HashSize]);
|
||||
#endif
|
||||
|
||||
/* Unified SHA functions, chosen by whichSha */
|
||||
extern int USHAReset (USHAContext *, SHAversion whichSha);
|
||||
extern int USHAInput (USHAContext *,
|
||||
const uint8_t * bytes, size_t bytecount);
|
||||
extern int USHAFinalBits (USHAContext *,
|
||||
const uint8_t bits, size_t bitcount);
|
||||
extern int USHAResult (USHAContext *,
|
||||
uint8_t Message_Digest[USHAMaxHashSize]);
|
||||
extern int USHABlockSize (enum SHAversion whichSha);
|
||||
extern int USHAHashSize (enum SHAversion whichSha);
|
||||
extern int USHAHashSizeBits (enum SHAversion whichSha);
|
||||
|
||||
/*
|
||||
* HMAC Keyed-Hashing for Message Authentication, RFC2104,
|
||||
* for all SHAs.
|
||||
* This interface allows a fixed-length text input to be used.
|
||||
*/
|
||||
extern int hmac (SHAversion whichSha, /* which SHA algorithm to use */
|
||||
const unsigned char *text, /* pointer to data stream */
|
||||
size_t text_len, /* length of data stream */
|
||||
const unsigned char *key, /* pointer to authentication key */
|
||||
size_t key_len, /* length of authentication key */
|
||||
uint8_t digest[USHAMaxHashSize]); /* caller digest to fill in */
|
||||
|
||||
/*
|
||||
* HMAC Keyed-Hashing for Message Authentication, RFC2104,
|
||||
* for all SHAs.
|
||||
* This interface allows any length of text input to be used.
|
||||
*/
|
||||
extern int hmacReset (HMACContext * ctx, enum SHAversion whichSha,
|
||||
const unsigned char *key, size_t key_len);
|
||||
extern int hmacInput (HMACContext * ctx, const unsigned char *text,
|
||||
size_t text_len);
|
||||
|
||||
extern int hmacFinalBits (HMACContext * ctx, const uint8_t bits,
|
||||
size_t bitcount);
|
||||
extern int hmacResult (HMACContext * ctx, uint8_t *digest);
|
||||
|
||||
#endif /* _SHA_H_ */
|
||||
Reference in New Issue
Block a user