Deleted Added
sdiff udiff text old ( 302408 ) new ( 337982 )
full compact
tb_asnmth.c (302408) tb_asnmth.c (337982)
1/* ====================================================================
1/* ====================================================================
2 * Copyright (c) 2006 The OpenSSL Project. All rights reserved.
2 * Copyright (c) 2006-2018 The OpenSSL Project. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 *
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 *

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

210 ENGINE_FIND_STR *lk = arg;
211 int i;
212 if (lk->ameth)
213 return;
214 for (i = 0; i < sk_ENGINE_num(sk); i++) {
215 ENGINE *e = sk_ENGINE_value(sk, i);
216 EVP_PKEY_ASN1_METHOD *ameth;
217 e->pkey_asn1_meths(e, &ameth, NULL, nid);
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 *
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 *

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

210 ENGINE_FIND_STR *lk = arg;
211 int i;
212 if (lk->ameth)
213 return;
214 for (i = 0; i < sk_ENGINE_num(sk); i++) {
215 ENGINE *e = sk_ENGINE_value(sk, i);
216 EVP_PKEY_ASN1_METHOD *ameth;
217 e->pkey_asn1_meths(e, &ameth, NULL, nid);
218 if (((int)strlen(ameth->pem_str) == lk->len) &&
218 if (ameth != NULL && ((int)strlen(ameth->pem_str) == lk->len) &&
219 !strncasecmp(ameth->pem_str, lk->str, lk->len)) {
220 lk->e = e;
221 lk->ameth = ameth;
222 return;
223 }
224 }
225}
226

--- 20 unchanged lines hidden --- 		219 !strncasecmp(ameth->pem_str, lk->str, lk->len)) {
220 lk->e = e;
221 lk->ameth = ameth;
222 return;
223 }
224 }
225}
226

--- 20 unchanged lines hidden ---