Date: Sat, 30 Aug 1997 10:40:10 +0200 From: Andreas Klemm <andreas@klemm.gtn.com> To: Dmitrij Tejblum <dima@tejblum.dnttm.rssi.ru> Cc: current@FreeBSD.ORG Subject: CVS checkout doesn't do it's job [ was Re: /usr/obj/usr/src/tmp/usr/include/sys/md5.h:40: previous declaration of `MD5File' ] Message-ID: <19970830104010.46522@klemm.gtn.com> In-Reply-To: <199708272119.BAA02834@tejblum.dnttm.rssi.ru>; from Dmitrij Tejblum on Thu, Aug 28, 1997 at 01:19:15AM %2B0400 References: <19970827225701.47966@klemm.gtn.com> <199708272119.BAA02834@tejblum.dnttm.rssi.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
--zYM0uCDKw75PZbzx
Content-Type: text/plain; charset=us-ascii
On Thu, Aug 28, 1997 at 01:19:15AM +0400, Dmitrij Tejblum wrote:
> Andreas Klemm wrote:
> > I removed my complete /usr/obj after recursively doing a chflags -R noschg.
> > Did a make world and the compile failure still exists.
>
> Is /usr/src/sys/sys/md5.h
> * $Id: md5.h,v 1.9 1997/08/25 05:24:31 joerg Exp $
> and /usr/src/lib/libmd/mdXhl.c
> * $Id: mdXhl.c,v 1.11 1997/08/25 05:24:25 joerg Exp $
> ?
Strange ... You're right ... In my /usr/src tree I have the old
version of md5.h (1.8). In my CVS repository I have the cvs file
with the new version 1.9.
If I do an cvs update -P in /usr/src/sys/sys, nothing happens !!!
The file md5.h with the old version won't be updated ...
Can't understand this behaviour ....
Ok, now I remove everything in /usr/src/sys/sys and do a
cvs update -P ... let's see ... Well, believe me or not,
I only get the md5.h file with release 1.8 not with version
1.9 from the repository ...
Question: is my cvs repository ill ? Or freefall's or does
cvsup not behave as it should ???
I' attaching both now, my rcs file and the checkout file
Here the output of sum ...
58535 2 /usr/src/sys/sys/md5.h
37645 6 /cvs/src/sys/sys/md5.h,v
--
Andreas Klemm | klemm.gtn.com - powered by
Symmetric MultiProcessor FreeBSD
http://www.freebsd.org/~fsmp/SMP/SMP.html
http://www.freebsd.org/~fsmp/SMP/benches.html
--zYM0uCDKw75PZbzx
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="md5.h"
/* MD5.H - header file for MD5C.C
* $Id: md5.h,v 1.8 1997/02/22 09:45:33 peter Exp $
*/
/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
rights reserved.
License to copy and use this software is granted provided that it
is identified as the "RSA Data Security, Inc. MD5 Message-Digest
Algorithm" in all material mentioning or referencing this software
or this function.
License is also granted to make and use derivative works provided
that such works are identified as "derived from the RSA Data
Security, Inc. MD5 Message-Digest Algorithm" in all material
mentioning or referencing the derived work.
RSA Data Security, Inc. makes no representations concerning either
the merchantability of this software or the suitability of this
software for any particular purpose. It is provided "as is"
without express or implied warranty of any kind.
These notices must be retained in any copies of any part of this
documentation and/or software.
*/
#ifndef _SYS_MD5_H_
#define _SYS_MD5_H_
/* MD5 context. */
typedef struct MD5Context {
u_int32_t state[4]; /* state (ABCD) */
u_int32_t count[2]; /* number of bits, modulo 2^64 (lsb first) */
unsigned char buffer[64]; /* input buffer */
} MD5_CTX;
void MD5Init (MD5_CTX *);
void MD5Update (MD5_CTX *, const unsigned char *, unsigned int);
void MD5Final (unsigned char [16], MD5_CTX *);
char * MD5End(MD5_CTX *, char *);
char * MD5File(char *, char *);
char * MD5Data(const unsigned char *, unsigned int, char *);
#endif /* _SYS_MD5_H_ */
--zYM0uCDKw75PZbzx
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="md5.h,v"
head 1.9;
access;
symbols
WOLLMAN_MBUF:1.8.0.2
BP_WOLLMAN_MBUF:1.8
RELENG_2_2_2_RELEASE:1.6
post_smp_merge:1.8
pre_smp_merge:1.8
RELENG_2_2_1_RELEASE:1.6
RELENG_2_2_0_RELEASE:1.6
RELENG_2_2:1.6.0.2
phk:1.1.1.1
ORIG:1.1.1;
locks; strict;
comment @ * @;
1.9
date 97.08.25.05.24.31; author joerg; state Exp;
branches;
next 1.8;
1.8
date 97.02.22.09.45.33; author peter; state Exp;
branches;
next 1.7;
1.7
date 97.01.14.06.55.16; author jkh; state Exp;
branches;
next 1.6;
1.6
date 96.12.22.10.31.34; author phk; state Exp;
branches;
next 1.5;
1.5
date 96.10.22.16.27.46; author phk; state Exp;
branches;
next 1.4;
1.4
date 95.12.11.02.18.22; author peter; state Exp;
branches;
next 1.3;
1.3
date 95.07.12.09.13.41; author phk; state Exp;
branches;
next 1.2;
1.2
date 94.11.07.20.48.33; author phk; state Exp;
branches
1.2.6.1;
next 1.1;
1.1
date 94.07.24.03.29.54; author phk; state Exp;
branches
1.1.1.1;
next ;
1.1.1.1
date 94.07.24.03.29.55; author phk; state Exp;
branches;
next ;
1.2.6.1
date 95.09.06.14.18.32; author davidg; state Exp;
branches;
next 1.2.6.2;
1.2.6.2
date 95.12.22.22.09.31; author peter; state Exp;
branches;
next ;
desc
@@
1.9
log
@Make the MD* header files C++-aware. Also, string arguments are supposed
to be of type `const char *'.
PR: 3291
Submitted by: dima@@tejblum.dnttm.rssi.ru (Dmitrij Tejblum)
@
text
@/* MD5.H - header file for MD5C.C
* $Id: md5.h,v 1.8 1997/02/22 09:45:33 peter Exp $
*/
/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
rights reserved.
License to copy and use this software is granted provided that it
is identified as the "RSA Data Security, Inc. MD5 Message-Digest
Algorithm" in all material mentioning or referencing this software
or this function.
License is also granted to make and use derivative works provided
that such works are identified as "derived from the RSA Data
Security, Inc. MD5 Message-Digest Algorithm" in all material
mentioning or referencing the derived work.
RSA Data Security, Inc. makes no representations concerning either
the merchantability of this software or the suitability of this
software for any particular purpose. It is provided "as is"
without express or implied warranty of any kind.
These notices must be retained in any copies of any part of this
documentation and/or software.
*/
#ifndef _SYS_MD5_H_
#define _SYS_MD5_H_
/* MD5 context. */
typedef struct MD5Context {
u_int32_t state[4]; /* state (ABCD) */
u_int32_t count[2]; /* number of bits, modulo 2^64 (lsb first) */
unsigned char buffer[64]; /* input buffer */
} MD5_CTX;
#include <sys/cdefs.h>
__BEGIN_DECLS
void MD5Init (MD5_CTX *);
void MD5Update (MD5_CTX *, const unsigned char *, unsigned int);
void MD5Final (unsigned char [16], MD5_CTX *);
char * MD5End(MD5_CTX *, char *);
char * MD5File(const char *, char *);
char * MD5Data(const unsigned char *, unsigned int, char *);
__END_DECLS
#endif /* _SYS_MD5_H_ */
@
1.8
log
@Back out part 1 of the MCFH that changed $Id$ to $FreeBSD$. We are not
ready for it yet.
@
text
@d2 1
a2 1
* $Id$
d36 3
d43 1
a43 1
char * MD5File(char *, char *);
d45 1
@
1.7
log
@Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.
Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.
@
text
@d2 1
a2 1
* $FreeBSD$
@
1.6
log
@Fixup for new location.
This file came here by a repository copy.
@
text
@d2 1
a2 1
* $Id$
@
1.5
log
@close bin/1648 libmd not 64bit safe.
if something fails to compile now, you need to add #include <sys/types.h>
Partially Submitted by: Jason Thorpe <thorpej@@nas.nasa.gov>
@
text
@d2 1
a2 1
* $FreeBSD$
d27 2
a28 2
#ifndef _MD5_H_
#define _MD5_H_
d42 1
a42 1
#endif /* _MD5_H_ */
@
1.4
log
@Add a structure definition to the MD* Contexts, so that cvs can use
the standard libmd version of MD5 instead of it's own seperate copy..
@
text
@d31 2
a32 2
unsigned long state[4]; /* state (ABCD) */
unsigned long count[2]; /* number of bits, modulo 2^64 (lsb first) */
@
1.3
log
@Change this to do what it should have done from the start.
Add argument for buffer for output.
Fix manuals.
@
text
@d30 1
a30 1
typedef struct {
@
1.2
log
@Added "const" to the arguments here and there.
@
text
@d39 3
a41 3
char * MD5End(MD5_CTX *);
char * MD5File(char *);
char * MD5Data(const unsigned char *, unsigned int);
@
1.2.6.1
log
@Brought in changes from main branch: add output buffer pointer to improve
performance.
@
text
@d39 3
a41 3
char * MD5End(MD5_CTX *, char *);
char * MD5File(char *, char *);
char * MD5Data(const unsigned char *, unsigned int, char *);
@
1.2.6.2
log
@One line change to each of these from HEAD..
Add a name to the context structures for compatability
with the CVS in -current. Basically,
typedef struct { ... } MDx_CTX; becomes
typedef struct MDxContext { ... } MDx_CTX;
@
text
@d30 1
a30 1
typedef struct MD5Context {
@
1.1
log
@Initial revision
@
text
@d37 1
a37 1
void MD5Update (MD5_CTX *, unsigned char *, unsigned int);
d41 1
a41 1
char * MD5Data(unsigned char *, unsigned int);
@
1.1.1.1
log
@
Reviewed by: phk
Imported libmd. This library contains MD2, MD4 and MD5.
These three boggers pop up all over the place all of the time, so I
decided we needed a library with them. In general they are used for
security checks, so if you use them you want to link them static.
@
text
@@
--zYM0uCDKw75PZbzx--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19970830104010.46522>