diff options
author | djm <> | 2012-10-13 21:23:50 +0000 |
---|---|---|
committer | djm <> | 2012-10-13 21:23:50 +0000 |
commit | e9d65189905c6e99c1062d65e26bf83eebb0a26a (patch) | |
tree | 10ebe51c3542099b0ab8325d8f322372375dc3b4 /src/lib/libcrypto/objects/obj_xref.c | |
parent | 59625e84c89bf82e1c6d20c55785b618eb56ea72 (diff) | |
parent | 228cae30b117c2493f69ad3c195341cd6ec8d430 (diff) | |
download | openbsd-e9d65189905c6e99c1062d65e26bf83eebb0a26a.tar.gz openbsd-e9d65189905c6e99c1062d65e26bf83eebb0a26a.tar.bz2 openbsd-e9d65189905c6e99c1062d65e26bf83eebb0a26a.zip |
This commit was generated by cvs2git to track changes on a CVS vendor
branch.
Diffstat (limited to 'src/lib/libcrypto/objects/obj_xref.c')
-rw-r--r-- | src/lib/libcrypto/objects/obj_xref.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/libcrypto/objects/obj_xref.c b/src/lib/libcrypto/objects/obj_xref.c index 152eca5c67..9f744bcede 100644 --- a/src/lib/libcrypto/objects/obj_xref.c +++ b/src/lib/libcrypto/objects/obj_xref.c | |||
@@ -110,8 +110,10 @@ int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid) | |||
110 | #endif | 110 | #endif |
111 | if (rv == NULL) | 111 | if (rv == NULL) |
112 | return 0; | 112 | return 0; |
113 | *pdig_nid = rv->hash_id; | 113 | if (pdig_nid) |
114 | *ppkey_nid = rv->pkey_id; | 114 | *pdig_nid = rv->hash_id; |
115 | if (ppkey_nid) | ||
116 | *ppkey_nid = rv->pkey_id; | ||
115 | return 1; | 117 | return 1; |
116 | } | 118 | } |
117 | 119 | ||
@@ -144,7 +146,8 @@ int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid) | |||
144 | #endif | 146 | #endif |
145 | if (rv == NULL) | 147 | if (rv == NULL) |
146 | return 0; | 148 | return 0; |
147 | *psignid = (*rv)->sign_id; | 149 | if (psignid) |
150 | *psignid = (*rv)->sign_id; | ||
148 | return 1; | 151 | return 1; |
149 | } | 152 | } |
150 | 153 | ||