summaryrefslogtreecommitdiff
path: root/krl.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-05-15 13:48:26 +1000
committerDamien Miller <djm@mindrot.org>2014-05-15 13:48:26 +1000
commit633de33b192d808d87537834c316dc8b75fe1880 (patch)
tree54d456735ab7e2848dc8df5eba9c3dbb314b29e1 /krl.c
parent15271907843e4ae50dcfc83b3594014cf5e9607b (diff)
- djm@cvs.openbsd.org 2014/04/28 03:09:18
[authfile.c bufaux.c buffer.h channels.c krl.c mux.c packet.c packet.h] [ssh-keygen.c] buffer_get_string_ptr's return should be const to remind callers that futzing with it will futz with the actual buffer contents
Diffstat (limited to 'krl.c')
-rw-r--r--krl.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/krl.c b/krl.c
index 3b4cded05..c7aa57e66 100644
--- a/krl.c
+++ b/krl.c
@@ -14,7 +14,7 @@
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 */ 15 */
16 16
17/* $OpenBSD: krl.c,v 1.14 2014/01/31 16:39:19 tedu Exp $ */ 17/* $OpenBSD: krl.c,v 1.15 2014/04/28 03:09:18 djm Exp $ */
18 18
19#include "includes.h" 19#include "includes.h"
20 20
@@ -753,7 +753,8 @@ static int
753parse_revoked_certs(Buffer *buf, struct ssh_krl *krl) 753parse_revoked_certs(Buffer *buf, struct ssh_krl *krl)
754{ 754{
755 int ret = -1, nbits; 755 int ret = -1, nbits;
756 u_char type, *blob; 756 u_char type;
757 const u_char *blob;
757 u_int blen; 758 u_int blen;
758 Buffer subsect; 759 Buffer subsect;
759 u_int64_t serial, serial_lo, serial_hi; 760 u_int64_t serial, serial_lo, serial_hi;
@@ -887,7 +888,8 @@ ssh_krl_from_blob(Buffer *buf, struct ssh_krl **krlp,
887 char timestamp[64]; 888 char timestamp[64];
888 int ret = -1, r, sig_seen; 889 int ret = -1, r, sig_seen;
889 Key *key = NULL, **ca_used = NULL; 890 Key *key = NULL, **ca_used = NULL;
890 u_char type, *blob, *rdata = NULL; 891 u_char type, *rdata = NULL;
892 const u_char *blob;
891 u_int i, j, sig_off, sects_off, rlen, blen, format_version, nca_used; 893 u_int i, j, sig_off, sects_off, rlen, blen, format_version, nca_used;
892 894
893 nca_used = 0; 895 nca_used = 0;