From 5f2826f6d598a4dd45a55e111a07c0086fe1e38a Mon Sep 17 00:00:00 2001 From: Zhanna Tsitkov Date: Wed, 6 Oct 2010 03:00:03 +0000 Subject: [PATCH] Minor comments related changed. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24433 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/krb/prng/fortuna/entropy.c | 28 +++++++++++++++++++ src/lib/crypto/krb/prng/fortuna/fortuna.h | 2 +- .../crypto/krb/prng/fortuna/prng_fortuna.c | 3 +- src/lib/crypto/krb/prng/nss/prng_nss.c | 2 +- src/lib/crypto/krb/prng/nss/prng_nss.h | 6 ++-- 5 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/lib/crypto/krb/prng/fortuna/entropy.c b/src/lib/crypto/krb/prng/fortuna/entropy.c index 0f9344e5b..b4dabdc3a 100644 --- a/src/lib/crypto/krb/prng/fortuna/entropy.c +++ b/src/lib/crypto/krb/prng/fortuna/entropy.c @@ -1,4 +1,32 @@ +/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* + * lib/crypto/krb/prng/fortuna/entropy.c + * + * Copyright 2010 by the Massachusetts Institute of Technology. + * All Rights Reserved. + * + * Export of this software from the United States of America may + * require a specific license from the United States Government. + * It is the responsibility of any person or organization contemplating + * export to obtain such a license before exporting. + * + * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and + * distribute this software and its documentation for any purpose and + * without fee is hereby granted, provided that the above copyright + * notice appear in all copies and that both that copyright notice and + * this permission notice appear in supporting documentation, and that + * the name of M.I.T. not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. Furthermore if you modify this software you must label + * your software as modified software and not distribute it in such a + * fashion that it might be confused with the original M.I.T. software. + * M.I.T. makes no representations about the suitability of + * this software for any purpose. It is provided "as is" without express + * or implied warranty. + */ + /* various methods to collect entropy */ + #include "prng.h" #include "fortuna.h" diff --git a/src/lib/crypto/krb/prng/fortuna/fortuna.h b/src/lib/crypto/krb/prng/fortuna/fortuna.h index 34fde09e1..c98b85820 100644 --- a/src/lib/crypto/krb/prng/fortuna/fortuna.h +++ b/src/lib/crypto/krb/prng/fortuna/fortuna.h @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ /* - * lib/crypto/krb/prng/fortuna.h + * lib/crypto/krb/prng/fortuna/fortuna.h * * Copyright 2010 by the Massachusetts Institute of Technology. * All Rights Reserved. diff --git a/src/lib/crypto/krb/prng/fortuna/prng_fortuna.c b/src/lib/crypto/krb/prng/fortuna/prng_fortuna.c index 07a52a928..4bca84489 100644 --- a/src/lib/crypto/krb/prng/fortuna/prng_fortuna.c +++ b/src/lib/crypto/krb/prng/fortuna/prng_fortuna.c @@ -1,7 +1,8 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ /* prng_fortuna.c */ /* - * fortuna.c + * prng_fortuna.c + * * Fortuna-like PRNG. * * Copyright (c) 2005 Marko Kreen diff --git a/src/lib/crypto/krb/prng/nss/prng_nss.c b/src/lib/crypto/krb/prng/nss/prng_nss.c index c42e63ac3..7d3088591 100644 --- a/src/lib/crypto/krb/prng/nss/prng_nss.c +++ b/src/lib/crypto/krb/prng/nss/prng_nss.c @@ -2,7 +2,7 @@ /* * prng_nss.c * - * Copyright (C) 2008, 2010 by the Massachusetts Institute of Technology. + * Copyright (C) 2010 by the Massachusetts Institute of Technology. * All rights reserved. * * diff --git a/src/lib/crypto/krb/prng/nss/prng_nss.h b/src/lib/crypto/krb/prng/nss/prng_nss.h index 5bfed3ef2..3a23be5a1 100644 --- a/src/lib/crypto/krb/prng/nss/prng_nss.h +++ b/src/lib/crypto/krb/prng/nss/prng_nss.h @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ /* - * lib/crypto/krb/prng/fortuna.h + * lib/crypto/krb/prng/nss/prng_nss.h * * Copyright 2010 by the Massachusetts Institute of Technology. * All Rights Reserved. @@ -25,8 +25,8 @@ * or implied warranty. */ -#ifndef FORTUNA_H -#define FORTUNA_H +#ifndef PRNG_NSS_H +#define PRNG_NSS_H #include "k5-int.h" #include "prng.h" -- 2.26.2