Fix yahoo_crypt() prototype mismatch

pull the prototype from crypt.c and put it in crypt.h.

Signed-off-by: OBATA Akio <obache@wizdas.com>
(cherry picked from commit ae84576d47)
pull/38/head
OBATA Akio 3 years ago committed by Michele Calgaro
parent e081da2f1d
commit e04b5ae8c5
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -34,6 +34,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "crypt.h"
#include "md5.h" #include "md5.h"
/* for MIN and MAX */ /* for MIN and MAX */
#include "libyahoo.h" #include "libyahoo.h"
@ -47,8 +48,6 @@ static const char md5_salt_prefix[] = "$1$";
static const char b64t[64] = static const char b64t[64] =
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
char *yahoo_crypt(const char *key, const char *salt);
char *yahoo_crypt(const char *key, const char *salt) char *yahoo_crypt(const char *key, const char *salt)
{ {
char *buffer = NULL; char *buffer = NULL;

@ -0,0 +1,39 @@
/* One way encryption based on MD5 sum.
Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. */
/* warmenhoven took this file and made it work with the md5.[ch] we
* already had. isn't that lovely. people should just use linux or
* freebsd, crypt works properly on those systems. i hate solaris */
#ifndef crypt_INCLUDED
# define crypt_INCLUDED
#ifdef __cplusplus
extern "C"
{
#endif
char *yahoo_crypt(const char *key, const char *salt);
#ifdef __cplusplus
} /* end extern "C" */
#endif
#endif /* crypt_INCLUDED */

@ -54,8 +54,7 @@
#include "yahoo_fn.h" #include "yahoo_fn.h"
#include "md5.h" #include "md5.h"
#include "sha1.h" #include "sha1.h"
#include "crypt.h"
extern char *yahoo_crypt(char *, char *);
void yahooBase64(unsigned char *out, const unsigned char *in, int inlen) void yahooBase64(unsigned char *out, const unsigned char *in, int inlen)
/* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */ /* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */

Loading…
Cancel
Save