Deleted Added
full compact
xcrypt.c (192595) xcrypt.c (255767)
1/*
2 * Copyright (c) 2003 Ben Lindstrom. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 41 unchanged lines hidden (view full) ---

50# if defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW)
51# include <sys/label.h>
52# include <sys/audit.h>
53# include <pwdadj.h>
54# endif
55
56# if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT)
57# include "md5crypt.h"
1/*
2 * Copyright (c) 2003 Ben Lindstrom. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 41 unchanged lines hidden (view full) ---

50# if defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW)
51# include <sys/label.h>
52# include <sys/audit.h>
53# include <pwdadj.h>
54# endif
55
56# if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT)
57# include "md5crypt.h"
58# endif
58# endif
59
59
60# if !defined(HAVE_CRYPT) && defined(HAVE_DES_CRYPT)
61# include <openssl/des.h>
62# define crypt DES_crypt
63# endif
64
60char *
61xcrypt(const char *password, const char *salt)
62{
63 char *crypted;
64
65# ifdef HAVE_MD5_PASSWORDS
66 if (is_md5_salt(salt))
67 crypted = md5_crypt(password, salt);

--- 50 unchanged lines hidden ---
65char *
66xcrypt(const char *password, const char *salt)
67{
68 char *crypted;
69
70# ifdef HAVE_MD5_PASSWORDS
71 if (is_md5_salt(salt))
72 crypted = md5_crypt(password, salt);

--- 50 unchanged lines hidden ---