Deleted Added
sdiff udiff text old ( 83551 ) new ( 91754 )
full compact
crypt.c (83551) crypt.c (91754)
1/*
2 * Copyright (c) 1999
3 * Mark Murray. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*
2 * Copyright (c) 1999
3 * Mark Murray. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/lib/libcrypt/crypt.c 83551 2001-09-16 21:35:07Z dillon $");
28__FBSDID("$FreeBSD: head/lib/libcrypt/crypt.c 91754 2002-03-06 17:18:09Z markm $");
29
30#include <sys/types.h>
31#include <string.h>
32#include <libutil.h>
29
30#include <sys/types.h>
31#include <string.h>
32#include <libutil.h>
33#include <unistd.h>
33#include "crypt.h"
34
35static const struct {
36 const char *const name;
37 char *(*const func)(const char *, const char *);
38 const char *const magic;
39} crypt_types[] = {
40#ifdef HAS_DES

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

53 {
54 "blf",
55 crypt_blowfish,
56 "$2"
57 },
58#endif
59 {
60 NULL,
34#include "crypt.h"
35
36static const struct {
37 const char *const name;
38 char *(*const func)(const char *, const char *);
39 const char *const magic;
40} crypt_types[] = {
41#ifdef HAS_DES

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

54 {
55 "blf",
56 crypt_blowfish,
57 "$2"
58 },
59#endif
60 {
61 NULL,
62 NULL,
61 NULL
62 }
63};
64
65static int crypt_type = -1;
66
67static void
68crypt_setdefault(void)
69{
70 char *def;
63 NULL
64 }
65};
66
67static int crypt_type = -1;
68
69static void
70crypt_setdefault(void)
71{
72 char *def;
71 int i;
73 size_t i;
72
73 if (crypt_type != -1)
74 return;
75 def = auth_getval("crypt_default");
76 if (def == NULL) {
77 crypt_type = 0;
78 return;
79 }
80 for (i = 0; i < sizeof(crypt_types) / sizeof(crypt_types[0]) - 1; i++) {
81 if (strcmp(def, crypt_types[i].name) == 0) {
74
75 if (crypt_type != -1)
76 return;
77 def = auth_getval("crypt_default");
78 if (def == NULL) {
79 crypt_type = 0;
80 return;
81 }
82 for (i = 0; i < sizeof(crypt_types) / sizeof(crypt_types[0]) - 1; i++) {
83 if (strcmp(def, crypt_types[i].name) == 0) {
82 crypt_type = i;
84 crypt_type = (int)i;
83 return;
84 }
85 }
86 crypt_type = 0;
87}
88
89const char *
90crypt_get_format(void)
91{
92
93 crypt_setdefault();
94 return (crypt_types[crypt_type].name);
95}
96
97int
85 return;
86 }
87 }
88 crypt_type = 0;
89}
90
91const char *
92crypt_get_format(void)
93{
94
95 crypt_setdefault();
96 return (crypt_types[crypt_type].name);
97}
98
99int
98crypt_set_format(char *type)
100crypt_set_format(const char *type)
99{
101{
100 int i;
102 size_t i;
101
102 crypt_setdefault();
103 for (i = 0; i < sizeof(crypt_types) / sizeof(crypt_types[0]) - 1; i++) {
104 if (strcmp(type, crypt_types[i].name) == 0) {
103
104 crypt_setdefault();
105 for (i = 0; i < sizeof(crypt_types) / sizeof(crypt_types[0]) - 1; i++) {
106 if (strcmp(type, crypt_types[i].name) == 0) {
105 crypt_type = i;
107 crypt_type = (int)i;
106 return (1);
107 }
108 }
109 return (0);
110}
111
112char *
108 return (1);
109 }
110 }
111 return (0);
112}
113
114char *
113crypt(char *passwd, char *salt)
115crypt(const char *passwd, const char *salt)
114{
116{
115 int i;
117 size_t i;
116
117 crypt_setdefault();
118 for (i = 0; i < sizeof(crypt_types) / sizeof(crypt_types[0]) - 1; i++) {
119 if (crypt_types[i].magic != NULL && strncmp(salt,
120 crypt_types[i].magic, strlen(crypt_types[i].magic)) == 0)
121 return (crypt_types[i].func(passwd, salt));
122 }
123 return (crypt_types[crypt_type].func(passwd, salt));
124}
118
119 crypt_setdefault();
120 for (i = 0; i < sizeof(crypt_types) / sizeof(crypt_types[0]) - 1; i++) {
121 if (crypt_types[i].magic != NULL && strncmp(salt,
122 crypt_types[i].magic, strlen(crypt_types[i].magic)) == 0)
123 return (crypt_types[i].func(passwd, salt));
124 }
125 return (crypt_types[crypt_type].func(passwd, salt));
126}