diff options
Diffstat (limited to 'meta-oe/recipes-networking')
| -rw-r--r-- | meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-style-convert-K-R-function-definitions-to-ANSI-C-sty.patch | 301 | ||||
| -rw-r--r-- | meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb | 1 |
2 files changed, 302 insertions, 0 deletions
diff --git a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-style-convert-K-R-function-definitions-to-ANSI-C-sty.patch b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-style-convert-K-R-function-definitions-to-ANSI-C-sty.patch new file mode 100644 index 0000000000..d8efc9b5d7 --- /dev/null +++ b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-style-convert-K-R-function-definitions-to-ANSI-C-sty.patch | |||
| @@ -0,0 +1,301 @@ | |||
| 1 | From 80bc0c1bfff769728d18ac5d9e22755e60fc23d8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 3 | Date: Fri, 10 Apr 2026 13:08:52 -0700 | ||
| 4 | Subject: [PATCH] style: convert K&R function definitions to ANSI C style in | ||
| 5 | md5.c | ||
| 6 | |||
| 7 | Replace old-style K&R function parameter declarations with modern ANSI | ||
| 8 | C prototypes across all functions in lib/md5.c. Also strip trailing | ||
| 9 | whitespace throughout the file. No functional changes. | ||
| 10 | |||
| 11 | Upstream-Status: Inappropriate [md5 does not exist in master branch] | ||
| 12 | Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 13 | --- | ||
| 14 | lib/md5.c | 231 +++++++++++++++++++++++++----------------------- | ||
| 15 | saslauthd/md5.c | 77 +++++++++------- | ||
| 16 | 2 files changed, 163 insertions(+), 145 deletions(-) | ||
| 17 | |||
| 18 | --- a/saslauthd/md5.c | ||
| 19 | +++ b/saslauthd/md5.c | ||
| 20 | @@ -98,8 +98,9 @@ Rotation is separate from addition to pr | ||
| 21 | /* MD5 initialization. Begins an MD5 operation, writing a new context. | ||
| 22 | */ | ||
| 23 | |||
| 24 | -void _saslauthd_MD5Init (context) | ||
| 25 | -MD5_CTX *context; /* context */ | ||
| 26 | +void _saslauthd_MD5Init ( | ||
| 27 | +MD5_CTX *context /* context */ | ||
| 28 | +) | ||
| 29 | { | ||
| 30 | context->count[0] = context->count[1] = 0; | ||
| 31 | |||
| 32 | @@ -114,10 +115,11 @@ MD5_CTX *context; /* context */ | ||
| 33 | operation, processing another message block, and updating the context. | ||
| 34 | */ | ||
| 35 | |||
| 36 | -void _saslauthd_MD5Update (context, input, inputLen) | ||
| 37 | -MD5_CTX *context; /* context */ | ||
| 38 | -unsigned char *input; /* input block */ | ||
| 39 | -unsigned int inputLen; /* length of input block */ | ||
| 40 | +void _saslauthd_MD5Update ( | ||
| 41 | +MD5_CTX *context, /* context */ | ||
| 42 | +unsigned char *input, /* input block */ | ||
| 43 | +unsigned int inputLen /* length of input block */ | ||
| 44 | +) | ||
| 45 | { | ||
| 46 | unsigned int i, index, partLen; | ||
| 47 | |||
| 48 | @@ -159,9 +161,10 @@ unsigned int inputLen; /* length of inpu | ||
| 49 | the message digest and zeroizing the context. | ||
| 50 | */ | ||
| 51 | |||
| 52 | -void _saslauthd_MD5Final (digest, context) | ||
| 53 | -unsigned char digest[16]; /* message digest */ | ||
| 54 | -MD5_CTX *context; /* context */ | ||
| 55 | +void _saslauthd_MD5Final ( | ||
| 56 | +unsigned char digest[16], /* message digest */ | ||
| 57 | +MD5_CTX *context /* context */ | ||
| 58 | +) | ||
| 59 | { | ||
| 60 | unsigned char bits[8]; | ||
| 61 | unsigned int index, padLen; | ||
| 62 | @@ -186,9 +189,10 @@ MD5_CTX *context; /* context */ | ||
| 63 | |||
| 64 | /* MD5 basic transformation. Transforms state based on block. */ | ||
| 65 | |||
| 66 | -static void MD5Transform (state, block) | ||
| 67 | -UINT4 state[4]; | ||
| 68 | -unsigned char block[64]; | ||
| 69 | +static void MD5Transform ( | ||
| 70 | +UINT4 state[4], | ||
| 71 | +unsigned char block[64] | ||
| 72 | +) | ||
| 73 | { | ||
| 74 | UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16]; | ||
| 75 | |||
| 76 | @@ -281,10 +285,11 @@ unsigned char block[64]; | ||
| 77 | |||
| 78 | */ | ||
| 79 | |||
| 80 | -static void Encode (output, input, len) | ||
| 81 | -unsigned char *output; | ||
| 82 | -UINT4 *input; | ||
| 83 | -unsigned int len; | ||
| 84 | +static void Encode ( | ||
| 85 | +unsigned char *output, | ||
| 86 | +UINT4 *input, | ||
| 87 | +unsigned int len | ||
| 88 | +) | ||
| 89 | { | ||
| 90 | unsigned int i, j; | ||
| 91 | |||
| 92 | @@ -301,10 +306,11 @@ unsigned int len; | ||
| 93 | |||
| 94 | */ | ||
| 95 | |||
| 96 | -static void Decode (output, input, len) | ||
| 97 | -UINT4 *output; | ||
| 98 | -unsigned char *input; | ||
| 99 | -unsigned int len; | ||
| 100 | +static void Decode ( | ||
| 101 | +UINT4 *output, | ||
| 102 | +unsigned char *input, | ||
| 103 | +unsigned int len | ||
| 104 | +) | ||
| 105 | { | ||
| 106 | unsigned int i, j; | ||
| 107 | |||
| 108 | @@ -317,10 +323,11 @@ unsigned int len; | ||
| 109 | |||
| 110 | */ | ||
| 111 | |||
| 112 | -static void MD5_memcpy (output, input, len) | ||
| 113 | -POINTER output; | ||
| 114 | -POINTER input; | ||
| 115 | -unsigned int len; | ||
| 116 | +static void MD5_memcpy ( | ||
| 117 | +POINTER output, | ||
| 118 | +POINTER input, | ||
| 119 | +unsigned int len | ||
| 120 | +) | ||
| 121 | { | ||
| 122 | unsigned int i; | ||
| 123 | |||
| 124 | @@ -331,10 +338,11 @@ unsigned int len; | ||
| 125 | /* Note: Replace "for loop" with standard memset if possible. | ||
| 126 | */ | ||
| 127 | |||
| 128 | -static void MD5_memset (output, value, len) | ||
| 129 | -POINTER output; | ||
| 130 | -int value; | ||
| 131 | -unsigned int len; | ||
| 132 | +static void MD5_memset ( | ||
| 133 | +POINTER output, | ||
| 134 | +int value, | ||
| 135 | +unsigned int len | ||
| 136 | +) | ||
| 137 | { | ||
| 138 | unsigned int i; | ||
| 139 | |||
| 140 | @@ -452,12 +460,13 @@ void _saslauthd_hmac_md5_final(unsigned | ||
| 141 | } | ||
| 142 | |||
| 143 | |||
| 144 | -void _saslauthd_hmac_md5(text, text_len, key, key_len, digest) | ||
| 145 | -const unsigned char* text; /* pointer to data stream */ | ||
| 146 | -int text_len; /* length of data stream */ | ||
| 147 | -const unsigned char* key; /* pointer to authentication key */ | ||
| 148 | -int key_len; /* length of authentication key */ | ||
| 149 | -unsigned char *digest; /* caller digest to be filled in */ | ||
| 150 | +void _saslauthd_hmac_md5( | ||
| 151 | +const unsigned char* text, /* pointer to data stream */ | ||
| 152 | +int text_len, /* length of data stream */ | ||
| 153 | +const unsigned char* key, /* pointer to authentication key */ | ||
| 154 | +int key_len, /* length of authentication key */ | ||
| 155 | +unsigned char *digest /* caller digest to be filled in */ | ||
| 156 | +) | ||
| 157 | { | ||
| 158 | MD5_CTX context; | ||
| 159 | |||
| 160 | --- a/lib/md5.c | ||
| 161 | +++ b/lib/md5.c | ||
| 162 | @@ -98,8 +98,9 @@ Rotation is separate from addition to pr | ||
| 163 | /* MD5 initialization. Begins an MD5 operation, writing a new context. | ||
| 164 | */ | ||
| 165 | |||
| 166 | -void _sasl_MD5Init (context) | ||
| 167 | -MD5_CTX *context; /* context */ | ||
| 168 | +void _sasl_MD5Init ( | ||
| 169 | +MD5_CTX *context /* context */ | ||
| 170 | +) | ||
| 171 | { | ||
| 172 | context->count[0] = context->count[1] = 0; | ||
| 173 | |||
| 174 | @@ -114,10 +115,11 @@ MD5_CTX *context; /* context */ | ||
| 175 | operation, processing another message block, and updating the context. | ||
| 176 | */ | ||
| 177 | |||
| 178 | -void _sasl_MD5Update (context, input, inputLen) | ||
| 179 | -MD5_CTX *context; /* context */ | ||
| 180 | -const unsigned char *input; /* input block */ | ||
| 181 | -unsigned int inputLen; /* length of input block */ | ||
| 182 | +void _sasl_MD5Update ( | ||
| 183 | +MD5_CTX *context, /* context */ | ||
| 184 | +const unsigned char *input, /* input block */ | ||
| 185 | +unsigned int inputLen /* length of input block */ | ||
| 186 | +) | ||
| 187 | { | ||
| 188 | unsigned int i, index, partLen; | ||
| 189 | |||
| 190 | @@ -159,9 +161,10 @@ unsigned int inputLen; /* length of inpu | ||
| 191 | the message digest and zeroizing the context. | ||
| 192 | */ | ||
| 193 | |||
| 194 | -void _sasl_MD5Final (digest, context) | ||
| 195 | -unsigned char digest[16]; /* message digest */ | ||
| 196 | -MD5_CTX *context; /* context */ | ||
| 197 | +void _sasl_MD5Final ( | ||
| 198 | +unsigned char digest[16], /* message digest */ | ||
| 199 | +MD5_CTX *context /* context */ | ||
| 200 | +) | ||
| 201 | { | ||
| 202 | unsigned char bits[8]; | ||
| 203 | unsigned int index, padLen; | ||
| 204 | @@ -186,9 +189,10 @@ MD5_CTX *context; /* context */ | ||
| 205 | |||
| 206 | /* MD5 basic transformation. Transforms state based on block. */ | ||
| 207 | |||
| 208 | -static void MD5Transform (state, block) | ||
| 209 | -UINT4 state[4]; | ||
| 210 | -const unsigned char block[64]; | ||
| 211 | +static void MD5Transform ( | ||
| 212 | +UINT4 state[4], | ||
| 213 | +const unsigned char block[64] | ||
| 214 | +) | ||
| 215 | { | ||
| 216 | UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16]; | ||
| 217 | |||
| 218 | @@ -281,10 +285,11 @@ const unsigned char block[64]; | ||
| 219 | |||
| 220 | */ | ||
| 221 | |||
| 222 | -static void Encode (output, input, len) | ||
| 223 | -unsigned char *output; | ||
| 224 | -UINT4 *input; | ||
| 225 | -unsigned int len; | ||
| 226 | +static void Encode ( | ||
| 227 | +unsigned char *output, | ||
| 228 | +UINT4 *input, | ||
| 229 | +unsigned int len | ||
| 230 | +) | ||
| 231 | { | ||
| 232 | unsigned int i, j; | ||
| 233 | |||
| 234 | @@ -301,10 +306,11 @@ unsigned int len; | ||
| 235 | |||
| 236 | */ | ||
| 237 | |||
| 238 | -static void Decode (output, input, len) | ||
| 239 | -UINT4 *output; | ||
| 240 | -const unsigned char *input; | ||
| 241 | -unsigned int len; | ||
| 242 | +static void Decode ( | ||
| 243 | +UINT4 *output, | ||
| 244 | +const unsigned char *input, | ||
| 245 | +unsigned int len | ||
| 246 | +) | ||
| 247 | { | ||
| 248 | unsigned int i, j; | ||
| 249 | |||
| 250 | @@ -317,10 +323,11 @@ unsigned int len; | ||
| 251 | |||
| 252 | */ | ||
| 253 | |||
| 254 | -static void MD5_memcpy (output, input, len) | ||
| 255 | -POINTER output; | ||
| 256 | -POINTER input; | ||
| 257 | -unsigned int len; | ||
| 258 | +static void MD5_memcpy ( | ||
| 259 | +POINTER output, | ||
| 260 | +POINTER input, | ||
| 261 | +unsigned int len | ||
| 262 | +) | ||
| 263 | { | ||
| 264 | unsigned int i; | ||
| 265 | |||
| 266 | @@ -331,10 +338,11 @@ unsigned int len; | ||
| 267 | /* Note: Replace "for loop" with standard memset if possible. | ||
| 268 | */ | ||
| 269 | |||
| 270 | -static void MD5_memset (output, value, len) | ||
| 271 | -POINTER output; | ||
| 272 | -int value; | ||
| 273 | -unsigned int len; | ||
| 274 | +static void MD5_memset ( | ||
| 275 | +POINTER output, | ||
| 276 | +int value, | ||
| 277 | +unsigned int len | ||
| 278 | +) | ||
| 279 | { | ||
| 280 | unsigned int i; | ||
| 281 | |||
| 282 | @@ -452,12 +460,13 @@ void _sasl_hmac_md5_final(unsigned char | ||
| 283 | } | ||
| 284 | |||
| 285 | |||
| 286 | -void _sasl_hmac_md5(text, text_len, key, key_len, digest) | ||
| 287 | -const unsigned char* text; /* pointer to data stream */ | ||
| 288 | -int text_len; /* length of data stream */ | ||
| 289 | -const unsigned char* key; /* pointer to authentication key */ | ||
| 290 | -int key_len; /* length of authentication key */ | ||
| 291 | -unsigned char *digest; /* caller digest to be filled in */ | ||
| 292 | +void _sasl_hmac_md5( | ||
| 293 | +const unsigned char* text, /* pointer to data stream */ | ||
| 294 | +int text_len, /* length of data stream */ | ||
| 295 | +const unsigned char* key, /* pointer to authentication key */ | ||
| 296 | +int key_len, /* length of authentication key */ | ||
| 297 | +unsigned char *digest /* caller digest to be filled in */ | ||
| 298 | +) | ||
| 299 | { | ||
| 300 | MD5_CTX context; | ||
| 301 | |||
diff --git a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb index bd15b0bda8..26ec8a71a1 100644 --- a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb +++ b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb | |||
| @@ -20,6 +20,7 @@ SRC_URI = " \ | |||
| 20 | file://0001-configure-prototypes.patch \ | 20 | file://0001-configure-prototypes.patch \ |
| 21 | file://0002-Fix-incompatible-pointer-types-error-with-gcc-15.patch \ | 21 | file://0002-Fix-incompatible-pointer-types-error-with-gcc-15.patch \ |
| 22 | file://0003-Add-compatibility-for-gcc-15-869.patch \ | 22 | file://0003-Add-compatibility-for-gcc-15-869.patch \ |
| 23 | file://0001-style-convert-K-R-function-definitions-to-ANSI-C-sty.patch \ | ||
| 23 | " | 24 | " |
| 24 | 25 | ||
| 25 | UPSTREAM_CHECK_URI = "https://github.com/cyrusimap/cyrus-sasl/archives" | 26 | UPSTREAM_CHECK_URI = "https://github.com/cyrusimap/cyrus-sasl/archives" |
