#ifdef UAM_DHX2
+#include <atalk/standards.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <pwd.h>
-
-#ifdef NETBSD
-#define _XOPEN_SOURCE 500 /* for crypt() */
-#endif
-#ifdef FREEBSD
-#define _XOPEN_SOURCE /* for crypt() */
-#endif
-
-#ifdef HAVE_UNISTD_H
+#include <arpa/inet.h>
#include <unistd.h>
-#endif
#ifdef HAVE_CRYPT_H
#include <crypt.h>
#endif
-#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
-#endif
-
-#ifdef HAVE_TIME_H
#include <time.h>
-#endif
#ifdef SHADOWPW
#include <shadow.h>
#define PRIMEBITS 1024
/* hash a number to a 16-bit quantity */
-#define dhxhash(a) ((((unsigned long) (a) >> 8) ^ \
+#define dhxhash(a) ((((unsigned long) (a) >> 8) ^ \
(unsigned long) (a)) & 0xffff)
/* Some parameters need be maintained across calls */
static gcry_mpi_t serverNonce;
static char *K_MD5hash = NULL;
static int K_hash_len;
-static u_int16_t ID;
+static uint16_t ID;
/* The initialization vectors for CAST128 are fixed by Apple. */
static unsigned char dhx_c2siv[] = { 'L', 'W', 'a', 'l', 'l', 'a', 'c', 'e' };
/*********************************************************
* Crypto helper func to generate p and g for use in DH.
* libgcrypt doesn't provide one directly.
- * Algorithm taken from GNUTLS:gnutls_dh_primes.c
+ * Algorithm taken from GNUTLS:gnutls_dh_primes.c
*********************************************************/
/**
}
if (bits < 256)
- qbits = bits / 2;
+ qbits = bits / 2;
else
- qbits = (bits / 40) + 105;
+ qbits = (bits / 40) + 105;
if (qbits & 1) /* better have an even number */
- qbits++;
+ qbits++;
/* find a prime number of size bits. */
do {
- if (times) {
- gcry_mpi_release (prime);
- gcry_prime_release_factors (factors);
- }
- err = gcry_prime_generate (&prime, bits, qbits, &factors, NULL, NULL,
- GCRY_STRONG_RANDOM, GCRY_PRIME_FLAG_SPECIAL_FACTOR);
- if (err != 0) {
- result = AFPERR_MISC;
- goto error;
- }
- err = gcry_prime_check (prime, 0);
- times++;
+ if (times) {
+ gcry_mpi_release (prime);
+ gcry_prime_release_factors (factors);
+ }
+ err = gcry_prime_generate (&prime, bits, qbits, &factors, NULL, NULL,
+ GCRY_STRONG_RANDOM, GCRY_PRIME_FLAG_SPECIAL_FACTOR);
+ if (err != 0) {
+ result = AFPERR_MISC;
+ goto error;
+ }
+ err = gcry_prime_check (prime, 0);
+ times++;
} while (err != 0 && times < 10);
-
+
if (err != 0) {
- result = AFPERR_MISC;
- goto error;
+ result = AFPERR_MISC;
+ goto error;
}
/* generate the group generator. */
err = gcry_prime_group_generator (&g, prime, factors, NULL);
if (err != 0) {
- result = AFPERR_MISC;
- goto error;
+ result = AFPERR_MISC;
+ goto error;
}
-
+
gcry_prime_release_factors (factors);
factors = NULL;
-
+
if (ret_g)
- *ret_g = g;
+ *ret_g = g;
else
- gcry_mpi_release (g);
+ gcry_mpi_release (g);
if (ret_p)
- *ret_p = prime;
+ *ret_p = prime;
else
- gcry_mpi_release (prime);
-
+ gcry_mpi_release (prime);
+
return 0;
error:
}
static int dhx2_setup(void *obj, char *ibuf _U_, size_t ibuflen _U_,
- char *rbuf, size_t *rbuflen)
+ char *rbuf, size_t *rbuflen)
{
int ret;
size_t nwritten;
#endif /* SHADOWPW */
if (!dhxpwd->pw_passwd)
- return AFPERR_NOTAUTH;
+ return AFPERR_NOTAUTH;
/* Initialize DH params */
/* Generate p and g for DH */
ret = dh_params_generate( &p, &g, PRIMEBITS);
if (ret != 0) {
- LOG(log_info, logtype_uams, "DHX2: Couldn't generate p and g");
- ret = AFPERR_MISC;
- goto error;
+ LOG(log_info, logtype_uams, "DHX2: Couldn't generate p and g");
+ ret = AFPERR_MISC;
+ goto error;
}
/* Generate our random number Ra. */
Ra_binary = calloc(1, PRIMEBITS/8);
if (Ra_binary == NULL) {
- ret = AFPERR_MISC;
- goto error;
+ ret = AFPERR_MISC;
+ goto error;
}
gcry_randomize(Ra_binary, PRIMEBITS/8, GCRY_STRONG_RANDOM);
gcry_mpi_scan(&Ra, GCRYMPI_FMT_USG, Ra_binary, PRIMEBITS/8, NULL);
/* Session ID first */
ID = dhxhash(obj);
- *(u_int16_t *)rbuf = htons(ID);
+ *(uint16_t *)rbuf = htons(ID);
rbuf += 2;
*rbuflen += 2;
/* g is next */
gcry_mpi_print( GCRYMPI_FMT_USG, (unsigned char *)rbuf, 4, &nwritten, g);
if (nwritten < 4) {
- memmove( rbuf+4-nwritten, rbuf, nwritten);
- memset( rbuf, 0, 4-nwritten);
+ memmove( rbuf+4-nwritten, rbuf, nwritten);
+ memset( rbuf, 0, 4-nwritten);
}
rbuf += 4;
*rbuflen += 4;
/* len = length of p = PRIMEBITS/8 */
- *(u_int16_t *)rbuf = htons((u_int16_t) PRIMEBITS/8);
+ *(uint16_t *)rbuf = htons((uint16_t) PRIMEBITS/8);
rbuf += 2;
*rbuflen += 2;
/* Ma */
gcry_mpi_print( GCRYMPI_FMT_USG, (unsigned char *)rbuf, PRIMEBITS/8, &nwritten, Ma);
if (nwritten < PRIMEBITS/8) {
- memmove(rbuf + (PRIMEBITS/8) - nwritten, rbuf, nwritten);
- memset(rbuf, 0, (PRIMEBITS/8) - nwritten);
+ memmove(rbuf + (PRIMEBITS/8) - nwritten, rbuf, nwritten);
+ memset(rbuf, 0, (PRIMEBITS/8) - nwritten);
}
rbuf += PRIMEBITS/8;
*rbuflen += PRIMEBITS/8;
ret = AFPERR_AUTHCONT;
-error: /* We exit here anyway */
+error: /* We exit here anyway */
/* We will only need p and Ra later, but mustn't forget to release it ! */
gcry_mpi_release(g);
gcry_mpi_release(Ma);
/* dhx login: things are done in a slightly bizarre order to avoid
* having to clean things up if there's an error. */
static int passwd_login(void *obj, struct passwd **uam_pwd,
- char *ibuf, size_t ibuflen,
- char *rbuf, size_t *rbuflen)
+ char *ibuf, size_t ibuflen,
+ char *rbuf, size_t *rbuflen)
{
char *username;
size_t len, ulen;
/* ----------------------------- */
static int passwd_login_ext(void *obj, char *uname, struct passwd **uam_pwd,
- char *ibuf, size_t ibuflen,
- char *rbuf, size_t *rbuflen)
+ char *ibuf, size_t ibuflen,
+ char *rbuf, size_t *rbuflen)
{
char *username;
size_t len, ulen;
- u_int16_t temp16;
+ uint16_t temp16;
*rbuflen = 0;
/* -------------------------------- */
static int logincont1(void *obj _U_, struct passwd **uam_pwd _U_,
- char *ibuf, size_t ibuflen,
- char *rbuf, size_t *rbuflen)
+ char *ibuf, size_t ibuflen,
+ char *rbuf, size_t *rbuflen)
{
size_t nwritten;
int ret;
/* Packet size should be: Session ID + Ma + Encrypted client nonce */
if (ibuflen != 2 + PRIMEBITS/8 + 16) {
- LOG(log_error, logtype_uams, "DHX2: Paket length not correct");
+ LOG(log_error, logtype_uams, "DHX2: Paket length not correct");
ret = AFPERR_PARAM;
- goto error_noctx;
+ goto error_noctx;
}
/* Skip session id */
/* We need K in binary form in order to ... */
K_bin = calloc(1, PRIMEBITS/8);
if (K_bin == NULL) {
- ret = AFPERR_MISC;
- goto error_noctx;
+ ret = AFPERR_MISC;
+ goto error_noctx;
}
gcry_mpi_print(GCRYMPI_FMT_USG, K_bin, PRIMEBITS/8, &nwritten, K);
if (nwritten < PRIMEBITS/8) {
- memmove(K_bin + PRIMEBITS/8 - nwritten, K_bin, nwritten);
- memset(K_bin, 0, PRIMEBITS/8 - nwritten);
+ memmove(K_bin + PRIMEBITS/8 - nwritten, K_bin, nwritten);
+ memset(K_bin, 0, PRIMEBITS/8 - nwritten);
}
/* ... generate the MD5 hash of K. K_MD5hash is what we actually use ! */
K_MD5hash = calloc(1, K_hash_len = gcry_md_get_algo_dlen(GCRY_MD_MD5));
if (K_MD5hash == NULL) {
- ret = AFPERR_MISC;
- goto error_noctx;
+ ret = AFPERR_MISC;
+ free(K_bin);
+ K_bin = NULL;
+ goto error_noctx;
}
gcry_md_hash_buffer(GCRY_MD_MD5, K_MD5hash, K_bin, PRIMEBITS/8);
- free(K_bin);
- K_bin = NULL;
+ free(K_bin);
+ K_bin = NULL;
/* FIXME: To support the Reconnect UAM, we need to store this key somewhere */
/* Set up our encryption context. */
ctxerror = gcry_cipher_open( &ctx, GCRY_CIPHER_CAST5, GCRY_CIPHER_MODE_CBC, 0);
if (gcry_err_code(ctxerror) != GPG_ERR_NO_ERROR) {
- ret = AFPERR_MISC;
+ ret = AFPERR_MISC;
goto error_ctx;
}
/* Set key */
ctxerror = gcry_cipher_setkey(ctx, K_MD5hash, K_hash_len);
if (gcry_err_code(ctxerror) != GPG_ERR_NO_ERROR) {
- ret = AFPERR_MISC;
+ ret = AFPERR_MISC;
goto error_ctx;
}
/* Set the initialization vector for client->server transfer. */
ctxerror = gcry_cipher_setiv(ctx, dhx_c2siv, sizeof(dhx_c2siv));
if (gcry_err_code(ctxerror) != GPG_ERR_NO_ERROR) {
- ret = AFPERR_MISC;
+ ret = AFPERR_MISC;
goto error_ctx;
}
/* Finally: decrypt client's md5_K(client nonce, C2SIV) inplace */
ctxerror = gcry_cipher_decrypt(ctx, ibuf, 16, NULL, 0);
if (gcry_err_code(ctxerror) != GPG_ERR_NO_ERROR) {
- ret = AFPERR_MISC;
+ ret = AFPERR_MISC;
goto error_ctx;
}
/* Pull out clients nonce */
/* ---- Start building reply packet ---- */
/* Session ID + 1 first */
- *(u_int16_t *)rbuf = htons(ID+1);
+ *(uint16_t *)rbuf = htons(ID+1);
rbuf += 2;
*rbuflen += 2;
/* Set the initialization vector for server->client transfer. */
ctxerror = gcry_cipher_setiv(ctx, dhx_s2civ, sizeof(dhx_s2civ));
if (gcry_err_code(ctxerror) != GPG_ERR_NO_ERROR) {
- ret = AFPERR_MISC;
+ ret = AFPERR_MISC;
goto error_ctx;
}
/* Encrypt md5_K(clientNonce+1, serverNonce) inplace */
ctxerror = gcry_cipher_encrypt(ctx, rbuf, 32, NULL, 0);
if (gcry_err_code(ctxerror) != GPG_ERR_NO_ERROR) {
- ret = AFPERR_MISC;
- goto error_ctx;
+ ret = AFPERR_MISC;
+ goto error_ctx;
}
rbuf += 32;
*rbuflen += 32;
}
static int logincont2(void *obj _U_, struct passwd **uam_pwd,
- char *ibuf, size_t ibuflen,
- char *rbuf _U_, size_t *rbuflen)
+ char *ibuf, size_t ibuflen,
+ char *rbuf _U_, size_t *rbuflen)
{
#ifdef SHADOWPW
struct spwd *sp;
gcry_error_t ctxerror;
*rbuflen = 0;
+ retServerNonce = gcry_mpi_new(0);
+
/* Packet size should be: Session ID + ServerNonce + Passwd buffer (evantually +10 extra bytes, see Apples Docs)*/
if ((ibuflen != 2 + 16 + 256) && (ibuflen != 2 + 16 + 256 + 10)) {
LOG(log_error, logtype_uams, "DHX2: Paket length not correct: %d. Should be 274 or 284.", ibuflen);
goto error_noctx;
}
- retServerNonce = gcry_mpi_new(0);
-
/* Set up our encryption context. */
ctxerror = gcry_cipher_open( &ctx, GCRY_CIPHER_CAST5, GCRY_CIPHER_MODE_CBC, 0);
if (gcry_err_code(ctxerror) != GPG_ERR_NO_ERROR) {
gcry_mpi_scan(&retServerNonce, GCRYMPI_FMT_USG, ibuf, 16, NULL);
gcry_mpi_sub_ui(retServerNonce, retServerNonce, 1);
if ( gcry_mpi_cmp( serverNonce, retServerNonce) != 0) {
- /* We're hacked! */
+ /* We're hacked! */
ret = AFPERR_NOTAUTH;
goto error_ctx;
}
- ibuf += 16; /* ibuf now point to passwd in cleartext */
+ ibuf += 16; /* ibuf now point to passwd in cleartext */
/* ---- Start authentication --- */
ret = AFPERR_NOTAUTH;
p = crypt( ibuf, dhxpwd->pw_passwd );
memset(ibuf, 0, 255);
if ( strcmp( p, dhxpwd->pw_passwd ) == 0 ) {
- *uam_pwd = dhxpwd;
- ret = AFP_OK;
+ *uam_pwd = dhxpwd;
+ ret = AFP_OK;
}
#ifdef SHADOWPW
if (( sp = getspnam( dhxpwd->pw_name )) == NULL ) {
LOG(log_info, logtype_uams, "no shadow passwd entry for %s", dhxpwd->pw_name);
ret = AFPERR_NOTAUTH;
- goto exit;
+ goto exit;
}
/* check for expired password */
time_t now = time(NULL) / (60*60*24);
int32_t expire_days = sp->sp_lstchg - now + sp->sp_max;
if ( expire_days < 0 ) {
- LOG(log_info, logtype_uams, "password for user %s expired", dhxpwd->pw_name);
- ret = AFPERR_PWDEXPR;
- goto exit;
+ LOG(log_info, logtype_uams, "password for user %s expired", dhxpwd->pw_name);
+ ret = AFPERR_PWDEXPR;
+ goto exit;
}
}
#endif /* SHADOWPW */
}
static int passwd_logincont(void *obj, struct passwd **uam_pwd,
- char *ibuf, size_t ibuflen,
- char *rbuf, size_t *rbuflen)
+ char *ibuf, size_t ibuflen,
+ char *rbuf, size_t *rbuflen)
{
- u_int16_t retID;
+ uint16_t retID;
int ret;
/* check for session id */
- retID = ntohs(*(u_int16_t *)ibuf);
+ retID = ntohs(*(uint16_t *)ibuf);
if (retID == ID)
ret = logincont1(obj, uam_pwd, ibuf, ibuflen, rbuf, rbuflen);
else if (retID == ID+1)
projects / netatalk.git / blobdiff