I would say that character touches on both: what your values are, and how well you uphold them especially when it gets difficult. If you have chosen dishonorable values, I would not consider that good character, nor if you cite good values but fail to follow them.
Hmm ...
Re: Hmm ...