Am I going to get herpes?

My (now) ex-boyfriend didn't tell me he has genital herpes. We were together for 5 months. The place he has the sores is beside his penis, in his pubes. We had sex twice, but times without a condom because I'm on birth control and he didn't ejaculate in me. He didn't tell me he had herpes!!! We made out a lot, can I get it from that? What if he masturbated then touched me? I went to the doctor but she said I have to wait 6 months to be clear!