diff options
| author |   djm <djm@openbsd.org> | 2012-10-13 21:23:32 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2012-10-13 21:23:32 +0000 |
| commit | ec07fdf13572372e9cd617b18f2e2790e6616c8c (patch) | |
| tree | bc2aaa935cf216bb82963cd07e6b9f736c4cb1e7 /lib/libcrypto/objects/obj_xref.c | |
| parent | sync (diff) | |
| download | wireguard-openbsd-ec07fdf13572372e9cd617b18f2e2790e6616c8c.tar.xz wireguard-openbsd-ec07fdf13572372e9cd617b18f2e2790e6616c8c.zip | |
import OpenSSL-1.0.1c
Diffstat (limited to 'lib/libcrypto/objects/obj_xref.c')
| -rw-r--r-- | lib/libcrypto/objects/obj_xref.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/libcrypto/objects/obj_xref.c b/lib/libcrypto/objects/obj_xref.c index 152eca5c671..9f744bceded 100644 --- a/lib/libcrypto/objects/obj_xref.c +++ b/lib/libcrypto/objects/obj_xref.c @@ -110,8 +110,10 @@ int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid) #endif if (rv == NULL) return 0; - *pdig_nid = rv->hash_id; - *ppkey_nid = rv->pkey_id; + if (pdig_nid) + *pdig_nid = rv->hash_id; + if (ppkey_nid) + *ppkey_nid = rv->pkey_id; return 1; } @@ -144,7 +146,8 @@ int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid) #endif if (rv == NULL) return 0; - *psignid = (*rv)->sign_id; + if (psignid) + *psignid = (*rv)->sign_id; return 1; } |