resolve conflicts, fix local changes

1 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/libcrypto/bn/bn_ctx.c b/src/lib/libcrypto/bn/bn_ctx.c
index b3452f1a91..3f2256f675 100644
--- a/src/lib/libcrypto/bn/bn_ctx.c
+++ b/src/lib/libcrypto/bn/bn_ctx.c
@@ -161,7 +161,7 @@ static void ctxdbg(BN_CTX *ctx)
         fprintf(stderr,"(%08x): ", (unsigned int)ctx);
         while(bnidx < ctx->used)
                 {
-                fprintf(stderr,"%02x ", item->vals[bnidx++ % BN_CTX_POOL_SIZE].dmax);
+                fprintf(stderr,"%03x ", item->vals[bnidx++ % BN_CTX_POOL_SIZE].dmax);
                 if(!(bnidx % BN_CTX_POOL_SIZE))
                         item = item->next;
                 }
@@ -171,8 +171,8 @@ static void ctxdbg(BN_CTX *ctx)
         while(fpidx < stack->depth)
                 {
                 while(bnidx++ < stack->indexes[fpidx])
-                        fprintf(stderr,"   ");
-                fprintf(stderr,"^^ ");
+                        fprintf(stderr,"    ");
+                fprintf(stderr,"^^^ ");
                 bnidx++;
                 fpidx++;
                 }