diff options
Diffstat (limited to 'openbsd-compat')
-rw-r--r-- | openbsd-compat/bcrypt_pbkdf.c | 2 | ||||
-rw-r--r-- | openbsd-compat/bsd-cygwin_util.h | 2 | ||||
-rw-r--r-- | openbsd-compat/bsd-nextstep.h | 2 | ||||
-rw-r--r-- | openbsd-compat/bsd-snprintf.c | 2 | ||||
-rw-r--r-- | openbsd-compat/bsd-waitpid.h | 2 | ||||
-rw-r--r-- | openbsd-compat/explicit_bzero.c | 2 | ||||
-rw-r--r-- | openbsd-compat/fmt_scaled.c | 2 | ||||
-rw-r--r-- | openbsd-compat/port-uw.c | 2 | ||||
-rw-r--r-- | openbsd-compat/sha2.c | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/openbsd-compat/bcrypt_pbkdf.c b/openbsd-compat/bcrypt_pbkdf.c index 0a07f9a0f..785234563 100644 --- a/openbsd-compat/bcrypt_pbkdf.c +++ b/openbsd-compat/bcrypt_pbkdf.c | |||
@@ -46,7 +46,7 @@ | |||
46 | * function with the following modifications: | 46 | * function with the following modifications: |
47 | * 1. The input password and salt are preprocessed with SHA512. | 47 | * 1. The input password and salt are preprocessed with SHA512. |
48 | * 2. The output length is expanded to 256 bits. | 48 | * 2. The output length is expanded to 256 bits. |
49 | * 3. Subsequently the magic string to be encrypted is lengthened and modifed | 49 | * 3. Subsequently the magic string to be encrypted is lengthened and modified |
50 | * to "OxychromaticBlowfishSwatDynamite" | 50 | * to "OxychromaticBlowfishSwatDynamite" |
51 | * 4. The hash function is defined to perform 64 rounds of initial state | 51 | * 4. The hash function is defined to perform 64 rounds of initial state |
52 | * expansion. (More rounds are performed by iterating the hash.) | 52 | * expansion. (More rounds are performed by iterating the hash.) |
diff --git a/openbsd-compat/bsd-cygwin_util.h b/openbsd-compat/bsd-cygwin_util.h index 9cef694b9..202c055db 100644 --- a/openbsd-compat/bsd-cygwin_util.h +++ b/openbsd-compat/bsd-cygwin_util.h | |||
@@ -41,7 +41,7 @@ typedef void *HANDLE; | |||
41 | #define UNLEN 256 | 41 | #define UNLEN 256 |
42 | 42 | ||
43 | /* Cygwin functions for which declarations are only available when including | 43 | /* Cygwin functions for which declarations are only available when including |
44 | windows headers, so we have to define them here explicitely. */ | 44 | windows headers, so we have to define them here explicitly. */ |
45 | extern HANDLE cygwin_logon_user (const struct passwd *, const char *); | 45 | extern HANDLE cygwin_logon_user (const struct passwd *, const char *); |
46 | extern void cygwin_set_impersonation_token (const HANDLE); | 46 | extern void cygwin_set_impersonation_token (const HANDLE); |
47 | 47 | ||
diff --git a/openbsd-compat/bsd-nextstep.h b/openbsd-compat/bsd-nextstep.h index 610f9e381..4a45b15af 100644 --- a/openbsd-compat/bsd-nextstep.h +++ b/openbsd-compat/bsd-nextstep.h | |||
@@ -36,7 +36,7 @@ | |||
36 | /* NeXT's readdir() is BSD (struct direct) not POSIX (struct dirent) */ | 36 | /* NeXT's readdir() is BSD (struct direct) not POSIX (struct dirent) */ |
37 | #define dirent direct | 37 | #define dirent direct |
38 | 38 | ||
39 | /* Swap out NeXT's BSD wait() for a more POSIX complient one */ | 39 | /* Swap out NeXT's BSD wait() for a more POSIX compliant one */ |
40 | pid_t posix_wait(int *); | 40 | pid_t posix_wait(int *); |
41 | #define wait(a) posix_wait(a) | 41 | #define wait(a) posix_wait(a) |
42 | 42 | ||
diff --git a/openbsd-compat/bsd-snprintf.c b/openbsd-compat/bsd-snprintf.c index d95b6a401..f27b9d808 100644 --- a/openbsd-compat/bsd-snprintf.c +++ b/openbsd-compat/bsd-snprintf.c | |||
@@ -30,7 +30,7 @@ | |||
30 | * probably requires libm on most operating systems. Don't yet | 30 | * probably requires libm on most operating systems. Don't yet |
31 | * support the exponent (e,E) and sigfig (g,G). Also, fmtint() | 31 | * support the exponent (e,E) and sigfig (g,G). Also, fmtint() |
32 | * was pretty badly broken, it just wasn't being exercised in ways | 32 | * was pretty badly broken, it just wasn't being exercised in ways |
33 | * which showed it, so that's been fixed. Also, formated the code | 33 | * which showed it, so that's been fixed. Also, formatted the code |
34 | * to mutt conventions, and removed dead code left over from the | 34 | * to mutt conventions, and removed dead code left over from the |
35 | * original. Also, there is now a builtin-test, just compile with: | 35 | * original. Also, there is now a builtin-test, just compile with: |
36 | * gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm | 36 | * gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm |
diff --git a/openbsd-compat/bsd-waitpid.h b/openbsd-compat/bsd-waitpid.h index 5ce3ee4b5..b551268ab 100644 --- a/openbsd-compat/bsd-waitpid.h +++ b/openbsd-compat/bsd-waitpid.h | |||
@@ -27,7 +27,7 @@ | |||
27 | #define _BSD_WAITPID_H | 27 | #define _BSD_WAITPID_H |
28 | 28 | ||
29 | #ifndef HAVE_WAITPID | 29 | #ifndef HAVE_WAITPID |
30 | /* Clean out any potental issues */ | 30 | /* Clean out any potential issues */ |
31 | #undef WIFEXITED | 31 | #undef WIFEXITED |
32 | #undef WIFSTOPPED | 32 | #undef WIFSTOPPED |
33 | #undef WIFSIGNALED | 33 | #undef WIFSIGNALED |
diff --git a/openbsd-compat/explicit_bzero.c b/openbsd-compat/explicit_bzero.c index 53a003472..6ef9825a9 100644 --- a/openbsd-compat/explicit_bzero.c +++ b/openbsd-compat/explicit_bzero.c | |||
@@ -41,7 +41,7 @@ explicit_bzero(void *p, size_t n) | |||
41 | /* | 41 | /* |
42 | * clang -fsanitize=memory needs to intercept memset-like functions | 42 | * clang -fsanitize=memory needs to intercept memset-like functions |
43 | * to correctly detect memory initialisation. Make sure one is called | 43 | * to correctly detect memory initialisation. Make sure one is called |
44 | * directly since our indirection trick above sucessfully confuses it. | 44 | * directly since our indirection trick above successfully confuses it. |
45 | */ | 45 | */ |
46 | #if defined(__has_feature) | 46 | #if defined(__has_feature) |
47 | # if __has_feature(memory_sanitizer) | 47 | # if __has_feature(memory_sanitizer) |
diff --git a/openbsd-compat/fmt_scaled.c b/openbsd-compat/fmt_scaled.c index 7c5193e26..f68f24123 100644 --- a/openbsd-compat/fmt_scaled.c +++ b/openbsd-compat/fmt_scaled.c | |||
@@ -188,7 +188,7 @@ scan_scaled(char *scaled, long long *result) | |||
188 | /* scale whole part */ | 188 | /* scale whole part */ |
189 | whole *= scale_fact; | 189 | whole *= scale_fact; |
190 | 190 | ||
191 | /* truncate fpart so it does't overflow. | 191 | /* truncate fpart so it doesn't overflow. |
192 | * then scale fractional part. | 192 | * then scale fractional part. |
193 | */ | 193 | */ |
194 | while (fpart >= LLONG_MAX / scale_fact) { | 194 | while (fpart >= LLONG_MAX / scale_fact) { |
diff --git a/openbsd-compat/port-uw.c b/openbsd-compat/port-uw.c index 014cac264..3028e429a 100644 --- a/openbsd-compat/port-uw.c +++ b/openbsd-compat/port-uw.c | |||
@@ -99,7 +99,7 @@ nischeck(char *namep) | |||
99 | 99 | ||
100 | if ((fd = fopen (password_file, "r")) == NULL) { | 100 | if ((fd = fopen (password_file, "r")) == NULL) { |
101 | /* | 101 | /* |
102 | * If the passwd file has dissapeared we are in a bad state. | 102 | * If the passwd file has disappeared we are in a bad state. |
103 | * However, returning 0 will send us back through the | 103 | * However, returning 0 will send us back through the |
104 | * authentication scheme that has checked the ia database for | 104 | * authentication scheme that has checked the ia database for |
105 | * passwords earlier. | 105 | * passwords earlier. |
diff --git a/openbsd-compat/sha2.c b/openbsd-compat/sha2.c index a22099bbe..b55ea30ac 100644 --- a/openbsd-compat/sha2.c +++ b/openbsd-compat/sha2.c | |||
@@ -72,7 +72,7 @@ | |||
72 | * Please make sure that your system defines BYTE_ORDER. If your | 72 | * Please make sure that your system defines BYTE_ORDER. If your |
73 | * architecture is little-endian, make sure it also defines | 73 | * architecture is little-endian, make sure it also defines |
74 | * LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are | 74 | * LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are |
75 | * equivilent. | 75 | * equivalent. |
76 | * | 76 | * |
77 | * If your system does not define the above, then you can do so by | 77 | * If your system does not define the above, then you can do so by |
78 | * hand like this: | 78 | * hand like this: |