diff options
| author | schwarze <> | 2020-07-25 11:53:37 +0000 |
|---|---|---|
| committer | schwarze <> | 2020-07-25 11:53:37 +0000 |
| commit | 86c1d3d52c1c6e9d790bd21b6cd52cafade42943 (patch) | |
| tree | 4986df34ae80c03737d397d06e7a3e84d287b08a | |
| parent | 62d7fed8d5316b61c246a480fe046ef06f7beae4 (diff) | |
| download | openbsd-86c1d3d52c1c6e9d790bd21b6cd52cafade42943.tar.gz openbsd-86c1d3d52c1c6e9d790bd21b6cd52cafade42943.tar.bz2 openbsd-86c1d3d52c1c6e9d790bd21b6cd52cafade42943.zip | |
remove half a dozen "goto" statements and a label
that change nothing whatsoever, except making the code harder to read;
OK tb@
| -rw-r--r-- | src/lib/libcrypto/pem/pem_info.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/lib/libcrypto/pem/pem_info.c b/src/lib/libcrypto/pem/pem_info.c index 9561b5f4df..33c1de43fd 100644 --- a/src/lib/libcrypto/pem/pem_info.c +++ b/src/lib/libcrypto/pem/pem_info.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pem_info.c,v 1.23 2020/07/23 17:15:35 schwarze Exp $ */ | 1 | /* $OpenBSD: pem_info.c,v 1.24 2020/07/25 11:53:37 schwarze Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -128,7 +128,6 @@ PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, | |||
| 128 | } | 128 | } |
| 129 | goto err; | 129 | goto err; |
| 130 | } | 130 | } |
| 131 | start: | ||
| 132 | if ((strcmp(name, PEM_STRING_X509) == 0) || | 131 | if ((strcmp(name, PEM_STRING_X509) == 0) || |
| 133 | (strcmp(name, PEM_STRING_X509_OLD) == 0)) { | 132 | (strcmp(name, PEM_STRING_X509_OLD) == 0)) { |
| 134 | d2i = (D2I_OF(void))d2i_X509; | 133 | d2i = (D2I_OF(void))d2i_X509; |
| @@ -137,7 +136,6 @@ start: | |||
| 137 | goto err; | 136 | goto err; |
| 138 | if ((xi = X509_INFO_new()) == NULL) | 137 | if ((xi = X509_INFO_new()) == NULL) |
| 139 | goto err; | 138 | goto err; |
| 140 | goto start; | ||
| 141 | } | 139 | } |
| 142 | pp = &(xi->x509); | 140 | pp = &(xi->x509); |
| 143 | } else if ((strcmp(name, PEM_STRING_X509_TRUSTED) == 0)) { | 141 | } else if ((strcmp(name, PEM_STRING_X509_TRUSTED) == 0)) { |
| @@ -147,7 +145,6 @@ start: | |||
| 147 | goto err; | 145 | goto err; |
| 148 | if ((xi = X509_INFO_new()) == NULL) | 146 | if ((xi = X509_INFO_new()) == NULL) |
| 149 | goto err; | 147 | goto err; |
| 150 | goto start; | ||
| 151 | } | 148 | } |
| 152 | pp = &(xi->x509); | 149 | pp = &(xi->x509); |
| 153 | } else if (strcmp(name, PEM_STRING_X509_CRL) == 0) { | 150 | } else if (strcmp(name, PEM_STRING_X509_CRL) == 0) { |
| @@ -157,7 +154,6 @@ start: | |||
| 157 | goto err; | 154 | goto err; |
| 158 | if ((xi = X509_INFO_new()) == NULL) | 155 | if ((xi = X509_INFO_new()) == NULL) |
| 159 | goto err; | 156 | goto err; |
| 160 | goto start; | ||
| 161 | } | 157 | } |
| 162 | pp = &(xi->crl); | 158 | pp = &(xi->crl); |
| 163 | } else | 159 | } else |
| @@ -169,12 +165,9 @@ start: | |||
| 169 | goto err; | 165 | goto err; |
| 170 | if ((xi = X509_INFO_new()) == NULL) | 166 | if ((xi = X509_INFO_new()) == NULL) |
| 171 | goto err; | 167 | goto err; |
| 172 | goto start; | ||
| 173 | } | 168 | } |
| 174 | |||
| 175 | xi->enc_data = NULL; | 169 | xi->enc_data = NULL; |
| 176 | xi->enc_len = 0; | 170 | xi->enc_len = 0; |
| 177 | |||
| 178 | xi->x_pkey = X509_PKEY_new(); | 171 | xi->x_pkey = X509_PKEY_new(); |
| 179 | if (xi->x_pkey == NULL) | 172 | if (xi->x_pkey == NULL) |
| 180 | goto err; | 173 | goto err; |
| @@ -192,12 +185,9 @@ start: | |||
| 192 | goto err; | 185 | goto err; |
| 193 | if ((xi = X509_INFO_new()) == NULL) | 186 | if ((xi = X509_INFO_new()) == NULL) |
| 194 | goto err; | 187 | goto err; |
| 195 | goto start; | ||
| 196 | } | 188 | } |
| 197 | |||
| 198 | xi->enc_data = NULL; | 189 | xi->enc_data = NULL; |
| 199 | xi->enc_len = 0; | 190 | xi->enc_len = 0; |
| 200 | |||
| 201 | xi->x_pkey = X509_PKEY_new(); | 191 | xi->x_pkey = X509_PKEY_new(); |
| 202 | if (xi->x_pkey == NULL) | 192 | if (xi->x_pkey == NULL) |
| 203 | goto err; | 193 | goto err; |
| @@ -215,12 +205,9 @@ start: | |||
| 215 | goto err; | 205 | goto err; |
| 216 | if ((xi = X509_INFO_new()) == NULL) | 206 | if ((xi = X509_INFO_new()) == NULL) |
| 217 | goto err; | 207 | goto err; |
| 218 | goto start; | ||
| 219 | } | 208 | } |
| 220 | |||
| 221 | xi->enc_data = NULL; | 209 | xi->enc_data = NULL; |
| 222 | xi->enc_len = 0; | 210 | xi->enc_len = 0; |
| 223 | |||
| 224 | xi->x_pkey = X509_PKEY_new(); | 211 | xi->x_pkey = X509_PKEY_new(); |
| 225 | if (xi->x_pkey == NULL) | 212 | if (xi->x_pkey == NULL) |
| 226 | goto err; | 213 | goto err; |