Skip to content

FreeBSD 12 support #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kirillrdy wants to merge 7 commits into from
Closed

FreeBSD 12 support #166

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
01cb9e2
Use the same parameter types as what's defined by the GNU crypt_r fun…
joegsn Mar 9, 2017
1c743ab
Attempt at FreeBSD 12 check
kirillrdy Apr 13, 2018
c7c949e
So it looks like you need brackets :-)
kirillrdy Apr 14, 2018
0b6d5ff
Better be careful than sorry
kirillrdy Apr 14, 2018
a1454c6
Checking for FreeBSD and including OS check
kirillrdy Apr 15, 2018
63f6088
Lowered version requirement
kirillrdy Apr 15, 2018
ba5684a
Looks like crypt_r is not a thing anymore
kirillrdy Dec 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Attempt at FreeBSD 12 check
  • Loading branch information
@kirillrdy
kirillrdy committed Dec 3, 2018
commit 1c743ab0144f36816d1b0f6a36d586268c102c16
4 changes: 4 additions & 0 deletions ext/mri/ow-crypt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@

#ifndef __SKIP_GNU
extern char *crypt(__const char *key, __const char *setting);
#if __FreeBSD_version <= 1200000
extern char *crypt_r(__const char *key, __const char *setting, struct crypt_data *data);
#else
extern char *crypt_r(__const char *key, __const char *setting, void *data);
#endif
#endif

#ifndef __SKIP_OW
Expand Down
9 changes: 9 additions & 0 deletions ext/mri/wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ char *crypt_ra(const char *key, const char *setting,
return _crypt_blowfish_rn(key, setting, (char *)*data, *size);
}

#if __FreeBSD_version <= 1200000
char *crypt_r(const char *key, const char *setting, struct crypt_data *data)
{
return _crypt_retval_magic(
Expand All @@ -191,6 +192,14 @@ char *crypt(const char *key, const char *setting)
crypt_rn(key, setting, output, sizeof(output)),
setting, output, sizeof(output));
}
#else
char *crypt_r(__const char *key, __const char *setting, void *data)
{
return _crypt_retval_magic(
crypt_rn(key, setting, data, CRYPT_OUTPUT_SIZE),
setting, (char *)data);
}
#endif

#define __crypt_gensalt_rn crypt_gensalt_rn
#define __crypt_gensalt_ra crypt_gensalt_ra
Expand Down