mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 11:20:07 +00:00
f8afba91cf
* Versions.def: Add GLIBC_2.1.1 to libpthread. * iconvdata/Makefile (modules): Add KOI8-U. (distribute): Add koi8-u.c. (gen-8bit-gap-modules): Add koi8-u. * iconvdata/gconv-modules: Add KOI8-U entries. * iconvdata/koi8-u.c: New file. 1999-04-13 Thorsten Kukuk <kukuk@suse.de> * sunrpc/auth_des.c: 64bit fixes, security fixes. * sunrpc/auth_none.c: Pretty print. * sunrpc/auth_unix.c: Likewise. * sunrpc/authdes_prot.c: Likewise. * sunrpc/authuxprot.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/clnt_gen.c: Likewise. * sunrpc/rpc/xdr.h: Likewise. * sunrpc/rpc/auth_des.h: Add rpc_timeval struct. * sunrpc/rpc_cmsg.c: Don't use *long pointers. * sunrpc/rtime.c: Use new rpc_timeval. * sunrpc/svc_authux.c: Don't use *long pointers. * sunrpc/svcauth_des.c: Likewise + security fixes. * sunrpc/xdr_mem.c: Don't use *long pointers. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_sizeof.c: Likewise. * sunrpc/xdr_stdio.c: Likewise. 1999-04-15 Ulrich Drepper <drepper@cygnus.com>
459 lines
12 KiB
C
459 lines
12 KiB
C
/*
|
|
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
|
|
* unrestricted use provided that this legend is included on all tape
|
|
* media and as a part of the software program in whole or part. Users
|
|
* may copy or modify Sun RPC without charge, but are not authorized
|
|
* to license or distribute it to anyone else except as part of a product or
|
|
* program developed by the user.
|
|
*
|
|
* SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
|
|
* WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
|
|
* PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
|
|
*
|
|
* Sun RPC is provided with no support and without any obligation on the
|
|
* part of Sun Microsystems, Inc. to assist in its use, correction,
|
|
* modification or enhancement.
|
|
*
|
|
* SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
|
|
* INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
|
|
* OR ANY PART THEREOF.
|
|
*
|
|
* In no event will Sun Microsystems, Inc. be liable for any lost revenue
|
|
* or profits or other special, indirect and consequential damages, even if
|
|
* Sun has been advised of the possibility of such damages.
|
|
*
|
|
* Sun Microsystems, Inc.
|
|
* 2550 Garcia Avenue
|
|
* Mountain View, California 94043
|
|
*/
|
|
/*
|
|
* Copyright (c) 1988 by Sun Microsystems, Inc.
|
|
*/
|
|
/*
|
|
* auth_des.c, client-side implementation of DES authentication
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <rpc/des_crypt.h>
|
|
#include <rpc/types.h>
|
|
#include <rpc/auth.h>
|
|
#include <rpc/auth_des.h>
|
|
#include <rpc/xdr.h>
|
|
#include <netinet/in.h> /* XXX: just to get htonl() and ntohl() */
|
|
#include <sys/socket.h>
|
|
|
|
#define MILLION 1000000L
|
|
#define RTIME_TIMEOUT 5 /* seconds to wait for sync */
|
|
|
|
#define AUTH_PRIVATE(auth) (struct ad_private *) auth->ah_private
|
|
#define ALLOC(object_type) (object_type *) mem_alloc(sizeof(object_type))
|
|
#define FREE(ptr, size) mem_free((char *)(ptr), (int) size)
|
|
#define ATTEMPT(xdr_op) if (!(xdr_op)) return (FALSE)
|
|
|
|
#define debug(msg) /* printf("%s\n", msg) */
|
|
|
|
extern bool_t xdr_authdes_cred (XDR *, struct authdes_cred *);
|
|
extern bool_t xdr_authdes_verf (XDR *, struct authdes_verf *);
|
|
|
|
/*
|
|
* DES authenticator operations vector
|
|
*/
|
|
static void authdes_nextverf (AUTH *);
|
|
static bool_t authdes_marshal (AUTH *, XDR *);
|
|
static bool_t authdes_validate (AUTH *, struct opaque_auth *);
|
|
static bool_t authdes_refresh (AUTH *);
|
|
static void authdes_destroy (AUTH *);
|
|
static bool_t synchronize (struct sockaddr *, struct rpc_timeval *)
|
|
internal_function;
|
|
|
|
static struct auth_ops authdes_ops = {
|
|
authdes_nextverf,
|
|
authdes_marshal,
|
|
authdes_validate,
|
|
authdes_refresh,
|
|
authdes_destroy
|
|
};
|
|
|
|
|
|
/*
|
|
* This struct is pointed to by the ah_private field of an "AUTH *"
|
|
*/
|
|
struct ad_private {
|
|
char *ad_fullname; /* client's full name */
|
|
u_int ad_fullnamelen; /* length of name, rounded up */
|
|
char *ad_servername; /* server's full name */
|
|
u_int ad_servernamelen; /* length of name, rounded up */
|
|
uint32_t ad_window; /* client specified window */
|
|
bool_t ad_dosync; /* synchronize? */
|
|
struct sockaddr ad_syncaddr; /* remote host to synch with */
|
|
struct rpc_timeval ad_timediff; /* server's time - client's time */
|
|
uint32_t ad_nickname; /* server's nickname for client */
|
|
struct authdes_cred ad_cred; /* storage for credential */
|
|
struct authdes_verf ad_verf; /* storage for verifier */
|
|
struct rpc_timeval ad_timestamp; /* timestamp sent */
|
|
des_block ad_xkey; /* encrypted conversation key */
|
|
u_char ad_pkey[1024]; /* Servers actual public key */
|
|
};
|
|
|
|
|
|
/*
|
|
* Create the client des authentication object
|
|
*/
|
|
AUTH *
|
|
authdes_create (const char *servername, u_int window,
|
|
struct sockaddr *syncaddr, des_block *ckey)
|
|
/* servername - network name of server */
|
|
/* window - time to live */
|
|
/* syncaddr - optional addr of host to sync with */
|
|
/* ckey - optional conversation key to use */
|
|
{
|
|
u_char pkey_data[1024];
|
|
netobj pkey;
|
|
|
|
if (!getpublickey (servername, pkey_data))
|
|
return NULL;
|
|
|
|
pkey.n_bytes = (char *) pkey_data;
|
|
pkey.n_len = strlen ((char *) pkey_data) + 1;
|
|
return authdes_pk_create (servername, &pkey, window, syncaddr, ckey);
|
|
}
|
|
|
|
AUTH *
|
|
authdes_pk_create (const char *servername, netobj *pkey, u_int window,
|
|
struct sockaddr *syncaddr, des_block *ckey)
|
|
{
|
|
AUTH *auth;
|
|
struct ad_private *ad;
|
|
char namebuf[MAXNETNAMELEN + 1];
|
|
|
|
/*
|
|
* Allocate everything now
|
|
*/
|
|
auth = ALLOC (AUTH);
|
|
ad = ALLOC (struct ad_private);
|
|
|
|
if (auth == NULL || ad == NULL)
|
|
{
|
|
debug ("authdes_create: out of memory");
|
|
goto failed;
|
|
}
|
|
|
|
memset (ad, 0, sizeof (struct ad_private));
|
|
memcpy (ad->ad_pkey, pkey->n_bytes, pkey->n_len);
|
|
if (!getnetname (namebuf))
|
|
goto failed;
|
|
ad->ad_fullnamelen = RNDUP (strlen (namebuf));
|
|
ad->ad_fullname = mem_alloc (ad->ad_fullnamelen + 1);
|
|
|
|
ad->ad_servernamelen = strlen (servername);
|
|
ad->ad_servername = mem_alloc (ad->ad_servernamelen + 1);
|
|
|
|
if (ad->ad_fullname == NULL || ad->ad_servername == NULL)
|
|
{
|
|
debug ("authdes_create: out of memory");
|
|
goto failed;
|
|
}
|
|
|
|
/*
|
|
* Set up private data
|
|
*/
|
|
memcpy (ad->ad_fullname, namebuf, ad->ad_fullnamelen + 1);
|
|
memcpy (ad->ad_servername, servername, ad->ad_servernamelen + 1);
|
|
ad->ad_timediff.tv_sec = ad->ad_timediff.tv_usec = 0;
|
|
if (syncaddr != NULL)
|
|
{
|
|
ad->ad_syncaddr = *syncaddr;
|
|
ad->ad_dosync = TRUE;
|
|
}
|
|
else
|
|
ad->ad_dosync = FALSE;
|
|
|
|
ad->ad_window = window;
|
|
if (ckey == NULL)
|
|
{
|
|
if (key_gendes (&auth->ah_key) < 0)
|
|
{
|
|
debug ("authdes_create: unable to gen conversation key");
|
|
return NULL;
|
|
}
|
|
}
|
|
else
|
|
auth->ah_key = *ckey;
|
|
|
|
/*
|
|
* Set up auth handle
|
|
*/
|
|
auth->ah_cred.oa_flavor = AUTH_DES;
|
|
auth->ah_verf.oa_flavor = AUTH_DES;
|
|
auth->ah_ops = &authdes_ops;
|
|
auth->ah_private = (caddr_t) ad;
|
|
|
|
if (!authdes_refresh (auth))
|
|
goto failed;
|
|
|
|
return auth;
|
|
|
|
failed:
|
|
if (auth != NULL)
|
|
FREE (auth, sizeof (AUTH));
|
|
if (ad != NULL)
|
|
{
|
|
if (ad->ad_fullname != NULL)
|
|
FREE (ad->ad_fullname, ad->ad_fullnamelen + 1);
|
|
if (ad->ad_servername != NULL)
|
|
FREE (ad->ad_servername, ad->ad_servernamelen + 1);
|
|
FREE (ad, sizeof (struct ad_private));
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* Implement the five authentication operations
|
|
*/
|
|
|
|
|
|
/*
|
|
* 1. Next Verifier
|
|
*/
|
|
/*ARGSUSED */
|
|
static void
|
|
authdes_nextverf (AUTH *auth)
|
|
{
|
|
/* what the heck am I supposed to do??? */
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
* 2. Marshal
|
|
*/
|
|
static bool_t
|
|
authdes_marshal (AUTH *auth, XDR *xdrs)
|
|
{
|
|
struct ad_private *ad = AUTH_PRIVATE (auth);
|
|
struct authdes_cred *cred = &ad->ad_cred;
|
|
struct authdes_verf *verf = &ad->ad_verf;
|
|
des_block cryptbuf[2];
|
|
des_block ivec;
|
|
int status;
|
|
unsigned int len;
|
|
register int32_t *ixdr;
|
|
struct timeval tval;
|
|
|
|
/*
|
|
* Figure out the "time", accounting for any time difference
|
|
* with the server if necessary.
|
|
*/
|
|
__gettimeofday (&tval, (struct timezone *) NULL);
|
|
ad->ad_timestamp.tv_sec = tval.tv_sec + ad->ad_timediff.tv_sec;
|
|
ad->ad_timestamp.tv_usec = tval.tv_usec + ad->ad_timediff.tv_usec;
|
|
if (ad->ad_timestamp.tv_usec >= MILLION)
|
|
{
|
|
ad->ad_timestamp.tv_usec -= MILLION;
|
|
ad->ad_timestamp.tv_sec += 1;
|
|
}
|
|
|
|
/*
|
|
* XDR the timestamp and possibly some other things, then
|
|
* encrypt them.
|
|
* XXX We have a real Year 2038 problem here.
|
|
*/
|
|
ixdr = (int32_t *) cryptbuf;
|
|
IXDR_PUT_INT32 (ixdr, ad->ad_timestamp.tv_sec);
|
|
IXDR_PUT_INT32 (ixdr, ad->ad_timestamp.tv_usec);
|
|
if (ad->ad_cred.adc_namekind == ADN_FULLNAME)
|
|
{
|
|
IXDR_PUT_U_INT32 (ixdr, ad->ad_window);
|
|
IXDR_PUT_U_INT32 (ixdr, ad->ad_window - 1);
|
|
ivec.key.high = ivec.key.low = 0;
|
|
status = cbc_crypt ((char *) &auth->ah_key, (char *) cryptbuf,
|
|
2 * sizeof (des_block), DES_ENCRYPT | DES_HW, (char *) &ivec);
|
|
}
|
|
else
|
|
status = ecb_crypt ((char *) &auth->ah_key, (char *) cryptbuf,
|
|
sizeof (des_block), DES_ENCRYPT | DES_HW);
|
|
|
|
if (DES_FAILED (status))
|
|
{
|
|
debug ("authdes_marshal: DES encryption failure");
|
|
return FALSE;
|
|
}
|
|
ad->ad_verf.adv_xtimestamp = cryptbuf[0];
|
|
if (ad->ad_cred.adc_namekind == ADN_FULLNAME)
|
|
{
|
|
ad->ad_cred.adc_fullname.window = cryptbuf[1].key.high;
|
|
ad->ad_verf.adv_winverf = cryptbuf[1].key.low;
|
|
}
|
|
else
|
|
{
|
|
ad->ad_cred.adc_nickname = ad->ad_nickname;
|
|
ad->ad_verf.adv_winverf = 0;
|
|
}
|
|
|
|
/*
|
|
* Serialize the credential and verifier into opaque
|
|
* authentication data.
|
|
*/
|
|
if (ad->ad_cred.adc_namekind == ADN_FULLNAME)
|
|
len = ((1 + 1 + 2 + 1) * BYTES_PER_XDR_UNIT + ad->ad_fullnamelen);
|
|
else
|
|
len = (1 + 1) * BYTES_PER_XDR_UNIT;
|
|
|
|
if ((ixdr = xdr_inline (xdrs, 2 * BYTES_PER_XDR_UNIT)) != NULL)
|
|
{
|
|
IXDR_PUT_INT32 (ixdr, AUTH_DES);
|
|
IXDR_PUT_U_INT32 (ixdr, len);
|
|
}
|
|
else
|
|
{
|
|
ATTEMPT (xdr_putint32 (xdrs, &auth->ah_cred.oa_flavor));
|
|
ATTEMPT (xdr_putint32 (xdrs, &len));
|
|
}
|
|
ATTEMPT (xdr_authdes_cred (xdrs, cred));
|
|
|
|
len = (2 + 1) * BYTES_PER_XDR_UNIT;
|
|
if ((ixdr = xdr_inline (xdrs, 2 * BYTES_PER_XDR_UNIT)) != NULL)
|
|
{
|
|
IXDR_PUT_INT32 (ixdr, AUTH_DES);
|
|
IXDR_PUT_U_INT32 (ixdr, len);
|
|
}
|
|
else
|
|
{
|
|
ATTEMPT (xdr_putint32 (xdrs, &auth->ah_verf.oa_flavor));
|
|
ATTEMPT (xdr_putint32 (xdrs, &len));
|
|
}
|
|
ATTEMPT (xdr_authdes_verf (xdrs, verf));
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
/*
|
|
* 3. Validate
|
|
*/
|
|
static bool_t
|
|
authdes_validate (AUTH *auth, struct opaque_auth *rverf)
|
|
{
|
|
struct ad_private *ad = AUTH_PRIVATE (auth);
|
|
struct authdes_verf verf;
|
|
int status;
|
|
register uint32_t *ixdr;
|
|
|
|
if (rverf->oa_length != (2 + 1) * BYTES_PER_XDR_UNIT)
|
|
return FALSE;
|
|
|
|
ixdr = (uint32_t *) rverf->oa_base;
|
|
verf.adv_xtimestamp.key.high = *ixdr++;
|
|
verf.adv_xtimestamp.key.low = *ixdr++;
|
|
verf.adv_int_u = *ixdr++; /* nickname not XDR'd ! */
|
|
|
|
/*
|
|
* Decrypt the timestamp
|
|
*/
|
|
status = ecb_crypt ((char *) &auth->ah_key, (char *) &verf.adv_xtimestamp,
|
|
sizeof (des_block), DES_DECRYPT | DES_HW);
|
|
|
|
if (DES_FAILED (status))
|
|
{
|
|
debug ("authdes_validate: DES decryption failure");
|
|
return FALSE;
|
|
}
|
|
|
|
/*
|
|
* xdr the decrypted timestamp
|
|
*/
|
|
ixdr = (uint32_t *) verf.adv_xtimestamp.c;
|
|
verf.adv_timestamp.tv_sec = IXDR_GET_U_INT32 (ixdr) + 1;
|
|
verf.adv_timestamp.tv_usec = IXDR_GET_U_INT32 (ixdr);
|
|
|
|
/*
|
|
* validate
|
|
*/
|
|
if (memcmp ((char *) &ad->ad_timestamp, (char *) &verf.adv_timestamp,
|
|
sizeof (struct rpc_timeval)) != 0)
|
|
{
|
|
debug ("authdes_validate: verifier mismatch\n");
|
|
return FALSE;
|
|
}
|
|
|
|
/*
|
|
* We have a nickname now, let's use it
|
|
*/
|
|
ad->ad_nickname = verf.adv_nickname;
|
|
ad->ad_cred.adc_namekind = ADN_NICKNAME;
|
|
return TRUE;
|
|
}
|
|
|
|
/*
|
|
* 4. Refresh
|
|
*/
|
|
static bool_t
|
|
authdes_refresh (AUTH *auth)
|
|
{
|
|
netobj pkey;
|
|
struct ad_private *ad = AUTH_PRIVATE (auth);
|
|
struct authdes_cred *cred = &ad->ad_cred;
|
|
|
|
if (ad->ad_dosync && !synchronize (&ad->ad_syncaddr, &ad->ad_timediff))
|
|
{
|
|
/*
|
|
* Hope the clocks are synced!
|
|
*/
|
|
ad->ad_timediff.tv_sec = ad->ad_timediff.tv_usec = 0;
|
|
debug ("authdes_refresh: unable to synchronize with server");
|
|
}
|
|
ad->ad_xkey = auth->ah_key;
|
|
pkey.n_bytes = (char *) (ad->ad_pkey);
|
|
pkey.n_len = strlen ((char *) ad->ad_pkey) + 1;
|
|
if (key_encryptsession_pk (ad->ad_servername, &pkey, &ad->ad_xkey) < 0)
|
|
{
|
|
debug ("authdes_create: unable to encrypt conversation key");
|
|
return FALSE;
|
|
}
|
|
cred->adc_fullname.key = ad->ad_xkey;
|
|
cred->adc_namekind = ADN_FULLNAME;
|
|
cred->adc_fullname.name = ad->ad_fullname;
|
|
return TRUE;
|
|
}
|
|
|
|
/*
|
|
* 5. Destroy
|
|
*/
|
|
static void
|
|
authdes_destroy (AUTH *auth)
|
|
{
|
|
struct ad_private *ad = AUTH_PRIVATE (auth);
|
|
|
|
FREE (ad->ad_fullname, ad->ad_fullnamelen + 1);
|
|
FREE (ad->ad_servername, ad->ad_servernamelen + 1);
|
|
FREE (ad, sizeof (struct ad_private));
|
|
FREE (auth, sizeof (AUTH));
|
|
}
|
|
|
|
/*
|
|
* Synchronize with the server at the given address, that is,
|
|
* adjust timep to reflect the delta between our clocks
|
|
*/
|
|
static bool_t
|
|
internal_function
|
|
synchronize (struct sockaddr *syncaddr, struct rpc_timeval *timep)
|
|
{
|
|
struct timeval mytime;
|
|
struct rpc_timeval timeout;
|
|
|
|
timeout.tv_sec = RTIME_TIMEOUT;
|
|
timeout.tv_usec = 0;
|
|
if (rtime ((struct sockaddr_in *) syncaddr, timep, &timeout) < 0)
|
|
return FALSE;
|
|
|
|
__gettimeofday (&mytime, (struct timezone *) NULL);
|
|
timep->tv_sec -= mytime.tv_sec;
|
|
if (mytime.tv_usec > timep->tv_usec)
|
|
{
|
|
timep->tv_sec -= 1;
|
|
timep->tv_usec += MILLION;
|
|
}
|
|
timep->tv_usec -= mytime.tv_usec;
|
|
return TRUE;
|
|
}
|