diff options
| author | daurnimator <quae@daurnimator.com> | 2016-10-30 19:50:59 +1100 |
|---|---|---|
| committer | daurnimator <quae@daurnimator.com> | 2016-10-30 19:50:59 +1100 |
| commit | 0eb79753c2acb611f612a35774c162426fc2ef43 (patch) | |
| tree | f710bb7baa01637a7206e89d0775fae76b65239d /src/openssl.c | |
| parent | 8caed30aa43a9a8e5bb3333e9408cd29c14fbf15 (diff) | |
| download | luaossl-0eb79753c2acb611f612a35774c162426fc2ef43.tar.gz luaossl-0eb79753c2acb611f612a35774c162426fc2ef43.tar.bz2 luaossl-0eb79753c2acb611f612a35774c162426fc2ef43.zip | |
Remove unused GENERAL_NAME_get0_value
Diffstat (limited to 'src/openssl.c')
| -rw-r--r-- | src/openssl.c | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/src/openssl.c b/src/openssl.c index fd392d7..8c02981 100644 --- a/src/openssl.c +++ b/src/openssl.c | |||
| @@ -175,10 +175,6 @@ | |||
| 175 | #define HAVE_EVP_PKEY_ID OPENSSL_PREREQ(1,1,0) | 175 | #define HAVE_EVP_PKEY_ID OPENSSL_PREREQ(1,1,0) |
| 176 | #endif | 176 | #endif |
| 177 | 177 | ||
| 178 | #ifndef HAVE_GENERAL_NAME_GET0_VALUE | ||
| 179 | #define HAVE_GENERAL_NAME_GET0_VALUE OPENSSL_PREREQ(1,1,0) | ||
| 180 | #endif | ||
| 181 | |||
| 182 | #ifndef HAVE_GENERAL_NAME_SET0_VALUE | 178 | #ifndef HAVE_GENERAL_NAME_SET0_VALUE |
| 183 | #define HAVE_GENERAL_NAME_SET0_VALUE OPENSSL_PREREQ(1,1,0) | 179 | #define HAVE_GENERAL_NAME_SET0_VALUE OPENSSL_PREREQ(1,1,0) |
| 184 | #endif | 180 | #endif |
| @@ -1379,68 +1375,6 @@ static void *compat_EVP_PKEY_get0(EVP_PKEY *key) { | |||
| 1379 | } /* compat_EVP_PKEY_get0() */ | 1375 | } /* compat_EVP_PKEY_get0() */ |
| 1380 | #endif | 1376 | #endif |
| 1381 | 1377 | ||
| 1382 | #if !HAVE_GENERAL_NAME_GET0_VALUE | ||
| 1383 | #define GENERAL_NAME_get0_value(...) \ | ||
| 1384 | compat_GENERAL_NAME_get0_value(__VA_ARGS__) | ||
| 1385 | |||
| 1386 | static void *GENERAL_NAME_get0_value(GENERAL_NAME *name, int *type) { | ||
| 1387 | if (type) | ||
| 1388 | *type = name->type; | ||
| 1389 | switch (name->type) { | ||
| 1390 | case GEN_X400: | ||
| 1391 | case GEN_EDIPARTY: | ||
| 1392 | return name->d.other; | ||
| 1393 | case GEN_OTHERNAME: | ||
| 1394 | return name->d.otherName; | ||
| 1395 | case GEN_EMAIL: | ||
| 1396 | case GEN_DNS: | ||
| 1397 | case GEN_URI: | ||
| 1398 | return name->d.ia5; | ||
| 1399 | case GEN_DIRNAME: | ||
| 1400 | return name->d.dirn; | ||
| 1401 | case GEN_IPADD: | ||
| 1402 | return name->d.ip; | ||
| 1403 | case GEN_RID: | ||
| 1404 | return name->d.rid; | ||
| 1405 | default: | ||
| 1406 | return NULL; | ||
| 1407 | } | ||
| 1408 | } /* compat_GENERAL_NAME_get0_value() */ | ||
| 1409 | #endif | ||
| 1410 | |||
| 1411 | #if !HAVE_GENERAL_NAME_SET0_VALUE | ||
| 1412 | #define GENERAL_NAME_set0_value(...) \ | ||
| 1413 | compat_GENERAL_NAME_set0_value(__VA_ARGS__) | ||
| 1414 | |||
| 1415 | static void GENERAL_NAME_set0_value(GENERAL_NAME *name, int type, void *value) { | ||
| 1416 | switch ((name->type = type)) { | ||
| 1417 | case GEN_X400: | ||
| 1418 | case GEN_EDIPARTY: | ||
| 1419 | name->d.other = value; | ||
| 1420 | break; | ||
| 1421 | case GEN_OTHERNAME: | ||
| 1422 | name->d.otherName = value; | ||
| 1423 | break; | ||
| 1424 | case GEN_EMAIL: | ||
| 1425 | case GEN_DNS: | ||
| 1426 | case GEN_URI: | ||
| 1427 | name->d.ia5 = value; | ||
| 1428 | break; | ||
| 1429 | case GEN_DIRNAME: | ||
| 1430 | name->d.dirn = value; | ||
| 1431 | break; | ||
| 1432 | case GEN_IPADD: | ||
| 1433 | name->d.ip = value; | ||
| 1434 | break; | ||
| 1435 | case GEN_RID: | ||
| 1436 | name->d.rid = value; | ||
| 1437 | break; | ||
| 1438 | default: | ||
| 1439 | break; | ||
| 1440 | } | ||
| 1441 | } /* compat_GENERAL_NAME_set0_value() */ | ||
| 1442 | #endif | ||
| 1443 | |||
| 1444 | #if !HAVE_HMAC_CTX_FREE | 1378 | #if !HAVE_HMAC_CTX_FREE |
| 1445 | #define HMAC_CTX_free(ctx) compat_HMAC_CTX_free((ctx)) | 1379 | #define HMAC_CTX_free(ctx) compat_HMAC_CTX_free((ctx)) |
| 1446 | 1380 | ||