sync with OpenBSD -current
This commit is contained in:
parent
cc5edceac3
commit
6278c437f5
GPG key ID:
F42C07F07E2E35B7
76 changed files with 1108 additions and 2495 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cbc_cksm.c,v 1.10 2023/07/08 07:34:34 jsing Exp $ */
|
||||
/* $OpenBSD: cbc_cksm.c,v 1.11 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -103,3 +103,4 @@ DES_cbc_cksum(const unsigned char *in, DES_cblock *output,
|
|||
((tout1 << 24L) & 0xFF000000);
|
||||
return (tout1);
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_cbc_cksum);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cfb64ede.c,v 1.12 2023/07/08 07:34:34 jsing Exp $ */
|
||||
/* $OpenBSD: cfb64ede.c,v 1.13 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -125,6 +125,7 @@ DES_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
|
|||
v0 = v1 = ti[0] = ti[1] = c = cc = 0;
|
||||
*num = n;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_ede3_cfb64_encrypt);
|
||||
|
||||
/* This is compatible with the single key CFB-r for DES, even thought that's
|
||||
* not what EVP needs.
|
||||
|
|
@ -238,3 +239,4 @@ DES_ede3_cfb_encrypt(const unsigned char *in, unsigned char *out,
|
|||
l2c(v1, iv);
|
||||
v0 = v1 = d0 = d1 = ti[0] = ti[1] = 0;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_ede3_cfb_encrypt);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cfb64enc.c,v 1.8 2023/07/08 07:11:07 beck Exp $ */
|
||||
/* $OpenBSD: cfb64enc.c,v 1.9 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -120,3 +120,4 @@ DES_cfb64_encrypt(const unsigned char *in, unsigned char *out,
|
|||
v0 = v1 = ti[0] = ti[1] = c = cc = 0;
|
||||
*num = n;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_cfb64_encrypt);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cfb_enc.c,v 1.16 2023/07/08 07:11:07 beck Exp $ */
|
||||
/* $OpenBSD: cfb_enc.c,v 1.17 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -187,3 +187,4 @@ DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
|
|||
l2c(v1, iv);
|
||||
v0 = v1 = d0 = d1 = ti[0] = ti[1] = 0;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_cfb_encrypt);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: des_enc.c,v 1.15 2023/07/08 07:34:34 jsing Exp $ */
|
||||
/* $OpenBSD: des_enc.c,v 1.16 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -150,6 +150,7 @@ DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc)
|
|||
data[1] = r;
|
||||
l = r = t = u = 0;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_encrypt1);
|
||||
|
||||
void
|
||||
DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc)
|
||||
|
|
@ -233,6 +234,7 @@ DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc)
|
|||
data[1] = ROTATE(r, 3) & 0xffffffffL;
|
||||
l = r = t = u = 0;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_encrypt2);
|
||||
|
||||
#endif /* OPENBSD_DES_ASM */
|
||||
|
||||
|
|
@ -256,6 +258,7 @@ DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1,
|
|||
data[0] = l;
|
||||
data[1] = r;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_encrypt3);
|
||||
|
||||
void
|
||||
DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
|
||||
|
|
@ -277,6 +280,7 @@ DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
|
|||
data[0] = l;
|
||||
data[1] = r;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_decrypt3);
|
||||
|
||||
#ifndef DES_DEFAULT_OPTIONS
|
||||
|
||||
|
|
@ -388,5 +392,6 @@ DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,
|
|||
tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
|
||||
tin[0] = tin[1] = 0;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_ede3_cbc_encrypt);
|
||||
|
||||
#endif /* DES_DEFAULT_OPTIONS */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ecb3_enc.c,v 1.9 2023/07/08 07:11:07 beck Exp $ */
|
||||
/* $OpenBSD: ecb3_enc.c,v 1.10 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -82,3 +82,4 @@ DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output,
|
|||
l2c(l0, out);
|
||||
l2c(l1, out);
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_ecb3_encrypt);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ecb_enc.c,v 1.19 2023/07/31 05:04:06 tb Exp $ */
|
||||
/* $OpenBSD: ecb_enc.c,v 1.20 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -80,3 +80,4 @@ DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output,
|
|||
l2c(l, out);
|
||||
l = ll[0] = ll[1] = 0;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_ecb_encrypt);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ede_cbcm_enc.c,v 1.9 2023/07/08 07:34:34 jsing Exp $ */
|
||||
/* $OpenBSD: ede_cbcm_enc.c,v 1.10 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/* Written by Ben Laurie <ben@algroup.co.uk> for the OpenSSL
|
||||
* project 13 Feb 1999.
|
||||
*/
|
||||
|
|
@ -186,4 +186,5 @@ DES_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out,
|
|||
tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
|
||||
tin[0] = tin[1] = 0;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_ede3_cbcm_encrypt);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: enc_read.c,v 1.17 2023/07/08 07:11:07 beck Exp $ */
|
||||
/* $OpenBSD: enc_read.c,v 1.18 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -220,3 +220,4 @@ DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched,
|
|||
}
|
||||
return num;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_enc_read);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: enc_writ.c,v 1.17 2023/07/08 07:34:34 jsing Exp $ */
|
||||
/* $OpenBSD: enc_writ.c,v 1.18 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -165,3 +165,4 @@ DES_enc_write(int fd, const void *_buf, int len,
|
|||
|
||||
return (len);
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_enc_write);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: fcrypt.c,v 1.15 2023/07/08 07:34:34 jsing Exp $ */
|
||||
/* $OpenBSD: fcrypt.c,v 1.16 2024/03/29 01:47:29 joshua Exp $ */
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
|
|
@ -58,6 +58,7 @@ DES_crypt(const char *buf, const char *salt)
|
|||
|
||||
return (DES_fcrypt(buf, salt, buff));
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_crypt);
|
||||
|
||||
char *
|
||||
DES_fcrypt(const char *buf, const char *salt, char *ret)
|
||||
|
|
@ -123,3 +124,4 @@ r=(r+7)/8;
|
|||
ret[13] = '\0';
|
||||
return (ret);
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_fcrypt);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ncbc_enc.c,v 1.10 2023/07/08 07:34:34 jsing Exp $ */
|
||||
/* $OpenBSD: ncbc_enc.c,v 1.11 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/*
|
||||
* #included by:
|
||||
* cbc_enc.c (DES_cbc_encrypt)
|
||||
|
|
@ -153,3 +153,8 @@ DES_ncbc_encrypt(const unsigned char *in, unsigned char *out, long length,
|
|||
tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
|
||||
tin[0] = tin[1] = 0;
|
||||
}
|
||||
#ifdef CBC_ENC_C__DONT_UPDATE_IV
|
||||
LCRYPTO_ALIAS(DES_cbc_encrypt);
|
||||
#else
|
||||
LCRYPTO_ALIAS(DES_ncbc_encrypt);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ofb64ede.c,v 1.8 2023/07/08 07:11:07 beck Exp $ */
|
||||
/* $OpenBSD: ofb64ede.c,v 1.9 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -110,3 +110,4 @@ DES_ede3_ofb64_encrypt(const unsigned char *in,
|
|||
v0 = v1 = ti[0] = ti[1] = 0;
|
||||
*num = n;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_ede3_ofb64_encrypt);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ofb64enc.c,v 1.8 2023/07/08 07:11:07 beck Exp $ */
|
||||
/* $OpenBSD: ofb64enc.c,v 1.9 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -107,3 +107,4 @@ DES_ofb64_encrypt(const unsigned char *in,
|
|||
t = v0 = v1 = ti[0] = ti[1] = 0;
|
||||
*num = n;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_ofb64_encrypt);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ofb_enc.c,v 1.8 2023/07/08 07:11:07 beck Exp $ */
|
||||
/* $OpenBSD: ofb_enc.c,v 1.9 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -131,3 +131,4 @@ DES_ofb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
|
|||
l2c(v1, iv);
|
||||
v0 = v1 = d0 = d1 = ti[0] = ti[1] = vv0 = vv1 = 0;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_ofb_encrypt);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: pcbc_enc.c,v 1.9 2023/07/08 07:34:34 jsing Exp $ */
|
||||
/* $OpenBSD: pcbc_enc.c,v 1.10 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -114,3 +114,4 @@ DES_pcbc_encrypt(const unsigned char *input, unsigned char *output,
|
|||
tin[0] = tin[1] = 0;
|
||||
sin0 = sin1 = xor0 = xor1 = tout0 = tout1 = 0;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_pcbc_encrypt);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: qud_cksm.c,v 1.10 2023/07/08 07:34:34 jsing Exp $ */
|
||||
/* $OpenBSD: qud_cksm.c,v 1.11 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -123,3 +123,4 @@ DES_quad_cksum(const unsigned char *input, DES_cblock output[],
|
|||
}
|
||||
return (z0);
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_quad_cksum);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: set_key.c,v 1.26 2023/12/20 06:30:04 tb Exp $ */
|
||||
/* $OpenBSD: set_key.c,v 1.27 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -91,6 +91,7 @@ DES_set_odd_parity(DES_cblock *key)
|
|||
for (i = 0; i < DES_KEY_SZ; i++)
|
||||
(*key)[i] = odd_parity[(*key)[i]];
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_set_odd_parity);
|
||||
|
||||
int
|
||||
DES_check_key_parity(const_DES_cblock *key)
|
||||
|
|
@ -103,6 +104,7 @@ DES_check_key_parity(const_DES_cblock *key)
|
|||
}
|
||||
return (1);
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_check_key_parity);
|
||||
|
||||
/* Weak and semi weak keys as taken from
|
||||
* %A D.W. Davies
|
||||
|
|
@ -145,6 +147,7 @@ DES_is_weak_key(const_DES_cblock *key)
|
|||
return 1;
|
||||
return 0;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_is_weak_key);
|
||||
|
||||
/* NOW DEFINED IN des_local.h
|
||||
* See ecb_encrypt.c for a pseudo description of these macros.
|
||||
|
|
@ -314,6 +317,7 @@ DES_set_key(const_DES_cblock *key, DES_key_schedule *schedule)
|
|||
return 0;
|
||||
}
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_set_key);
|
||||
|
||||
/* return 0 if key parity is odd (correct),
|
||||
* return -1 if key parity error,
|
||||
|
|
@ -329,6 +333,7 @@ DES_set_key_checked(const_DES_cblock *key, DES_key_schedule *schedule)
|
|||
DES_set_key_unchecked(key, schedule);
|
||||
return 0;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_set_key_checked);
|
||||
|
||||
void
|
||||
DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)
|
||||
|
|
@ -388,12 +393,14 @@ DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)
|
|||
*(k++) = ROTATE(t2, 26) & 0xffffffffL;
|
||||
}
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_set_key_unchecked);
|
||||
|
||||
int
|
||||
DES_key_sched(const_DES_cblock *key, DES_key_schedule *schedule)
|
||||
{
|
||||
return (DES_set_key(key, schedule));
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_key_sched);
|
||||
|
||||
int
|
||||
DES_random_key(DES_cblock *ret)
|
||||
|
|
@ -404,3 +411,4 @@ DES_random_key(DES_cblock *ret)
|
|||
} while (DES_is_weak_key(ret));
|
||||
return (1);
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_random_key);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: str2key.c,v 1.13 2023/07/08 07:34:34 jsing Exp $ */
|
||||
/* $OpenBSD: str2key.c,v 1.14 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -97,6 +97,7 @@ DES_string_to_key(const char *str, DES_cblock *key)
|
|||
explicit_bzero(&ks, sizeof(ks));
|
||||
DES_set_odd_parity(key);
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_string_to_key);
|
||||
|
||||
void
|
||||
DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2)
|
||||
|
|
@ -164,3 +165,4 @@ DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2)
|
|||
DES_set_odd_parity(key1);
|
||||
DES_set_odd_parity(key2);
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_string_to_2keys);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: xcbc_enc.c,v 1.12 2023/07/08 07:34:34 jsing Exp $ */
|
||||
/* $OpenBSD: xcbc_enc.c,v 1.13 2024/03/29 01:47:29 joshua Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -151,3 +151,4 @@ DES_xcbc_encrypt(const unsigned char *in, unsigned char *out,
|
|||
inW0 = inW1 = outW0 = outW1 = 0;
|
||||
tin[0] = tin[1] = 0;
|
||||
}
|
||||
LCRYPTO_ALIAS(DES_xcbc_encrypt);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue