diff options
| author | djm <> | 2012-10-13 21:23:50 +0000 |
|---|---|---|
| committer | djm <> | 2012-10-13 21:23:50 +0000 |
| commit | d56dbc3c72494d4b68c03f5bcc3ae1f9df7b17df (patch) | |
| tree | 10ebe51c3542099b0ab8325d8f322372375dc3b4 /src/lib/libcrypto/objects/obj_xref.c | |
| parent | bc685bd401e5657f7fb51b4e1a62a7a5c5ea4098 (diff) | |
| parent | 228cae30b117c2493f69ad3c195341cd6ec8d430 (diff) | |
| download | openbsd-d56dbc3c72494d4b68c03f5bcc3ae1f9df7b17df.tar.gz openbsd-d56dbc3c72494d4b68c03f5bcc3ae1f9df7b17df.tar.bz2 openbsd-d56dbc3c72494d4b68c03f5bcc3ae1f9df7b17df.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 | ||
